chore: merge upstream datahub-project/master into acryldata/master (76 commits) by treff7es · Pull Request #388 · acryldata/datahub

treff7es · 2026-05-19T16:22:05Z

Summary

Routine upstream sync — merging 76 commits from datahub-project/datahub master into acryldata/datahub master.

Conflicts: 1 (.github/workflows/docker-unified.yml)
Conflict resolution: Kept Acryl's on: workflow_dispatch override (the explicit "DO NOT OVERWRITE THIS CHANGE IN MERGES" banner). Dropped upstream's new playwright_shard_count input declaration; the single reference to it (github.event.inputs.playwright_shard_count || '4') has a working fallback.
Auto-merged in the same file (~285 lines, preserved): Playwright E2E test job + shard matrix, smoke-test profile resolution from smoke:<configKey> PR labels, DEPOT_PROJECT_ID parameterization via vars.DEPOT_PROJECT_ID.
Both Acryl overrides intact (the on: trigger gutting and the DOCKER_REGISTRY: "acryldata-do-not-publish" env block).

Latent issue flagged (pre-existing, not introduced here)

Line ~645 in docker-unified.yml references env.PROFILE_NAME, but Acryl's existing override deleted that env var. Empty value on manual dispatch. Same behavior as before this merge — worth a follow-up for whoever owns the workflow override.

Upstream commits included

Highlights from the 76 commits (full list via git log master..sync/upstream-merge-2026-05-19):

feat(upgrade): re-apply retention policies on system-update (feat(upgrade): re-apply retention policies on system-update when conf… datahub-project/datahub#17493)
fix(ingest/snowflake): allow overriding Snowsight base URL for private link (fix(ingest/snowflake): allow overriding Snowsight base URL for private link datahub-project/datahub#17502)
fix(security): home page templates/module scope hijacking (fix(security): Fix home page templates/module scope highjacking datahub-project/datahub#17487)
fix(security): validate URLs before rendering links (fix(ui): Fix directing users to SSO from signup link datahub-project/datahub#17492)
fix(ui): directing users to SSO from signup link (fix(ui): Fix directing users to SSO from signup link datahub-project/datahub#17492)
feat(ingestion/airbyte): Airbyte connector (feat(ingestion/airbyte): Airbyte Connector datahub-project/datahub#13217)
feat(ingest/unity): opt-in Databricks Unity Catalog Metric View support
feat(pgqueue): metadata-ingestion sink and actions pg_queue event source
feat(k8s): KEDA-aware scaling support for KubernetesController
ci(playwright): integrate Playwright E2E tests into docker-unified pipeline (ci(playwright): integrate Playwright E2E tests into docker-unified CI pipeline datahub-project/datahub#17361)
feat(ci): drive unified smoke builds from smoke:<configKey> PR labels (feat(ci): drive unified smoke builds from smoke:<configKey> PR labels datahub-project/datahub#17470)
...and 65 more

Test plan

CI passes on this branch
Spot-check that Acryl-specific docker-unified.yml overrides still appear in the workflow file at HEAD
Manual workflow_dispatch of docker-unified.yml (if needed for verification) still behaves as before

🤖 Generated with Claude Code

…ub-project#16902)

…les (datahub-project#16947)

Co-authored-by: Mihai Ciocirdel <mihai.ciocirdel1@swisscom.com> Co-authored-by: Devashish Chandra <devashish2203@users.noreply.github.com> Co-authored-by: mihai103 <mihai103@noreply.com>

…ustom artifact server (datahub-project#17381) Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

datahub-project#17398) Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

…hub-project#17403) Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Jay <jayacryl@users.noreply.github.com>

…project#17410) Co-authored-by: Claude <noreply@anthropic.com>

…project#17408) Co-authored-by: Claude <noreply@anthropic.com>

…7394)

…atahub-project#17284)

…tahub-project#17402)

…#17423)

…eps (datahub-project#17422) Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>

…llback When updating labels on an existing issue, Linear rejects the mutation if the new ref label (e.g. v1.0.1-cloud) is in the same label group as an existing ref label (e.g. v1.0.0-cloud). On collision, create/reuse a team-scoped label with a -sec suffix to avoid the workspace group constraint. Protects both the existing-issue update path and the new-issue create path. Co-authored-by: Cursor <cursoragent@cursor.com>

…estionSourceSchedule (datahub-project#17416)

…datahub-project#17404)

datahub-project#17433) Co-authored-by: Cursor <cursoragent@cursor.com>

datahub-project#17431) Co-authored-by: Cursor <cursoragent@cursor.com>

…est body small (datahub-project#17385)

datahub-project#17238)

…-project#17420)

…ectors and field-level transform support (datahub-project#16515)

…Snowflake, Databricks, BigQuery, Redshift, and Postgres (datahub-project#17396) Co-authored-by: Claude <noreply@anthropic.com>

…lumn-path.spec) test (datahub-project#17438)

datahub-project#17430) Co-authored-by: Cursor <cursoragent@cursor.com>

…ahub-project#17501)

…#17492)

…app (datahub-project#17489)

…hub-project#17487)

…e link (datahub-project#17502)

datahub-project#17493) Co-authored-by: Cursor <cursoragent@cursor.com>

Brings in 76 upstream commits from datahub-project/datahub master. Conflict resolution: - .github/workflows/docker-unified.yml: kept Acryl's `on: workflow_dispatch` override (the explicit "DO NOT OVERWRITE THIS CHANGE IN MERGES" banner). Upstream's new `playwright_shard_count` input was dropped from the inputs declaration; the one reference to it uses `|| '4'` as a default, so the Playwright matrix step still works on manual dispatch. All other upstream additions to that file (~285 lines: Playwright E2E job, smoke profile resolution from PR labels, DEPOT_PROJECT_ID parameterization) auto-merged and were preserved. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

github-actions · 2026-05-19T16:23:07Z

+      - name: Build Playwright shard matrix
+        id: set-playwright-matrix
+        if: ${{ github.event_name != 'pull_request' && (steps.ci-optimize.outputs.backend-change == 'true' || steps.ci-optimize.outputs.frontend-change == 'true' || steps.ci-optimize.outputs.playwright-change == 'true') }}
+        run: |


🚫 [actionlint] _{reported by reviewdog 🐶}
property "playwright_shard_count" is not defined in object type {} [expression]

codecov · 2026-05-19T16:26:42Z

Codecov Report

❌ Patch coverage is 84.24242% with 416 lines in your changes missing coverage. Please review.
✅ All tests successful. No failed tests found.

Files with missing lines	Patch %	Lines
...rc/app/ingest/source/builder/RecipeForm/airbyte.ts	0.00%	171 Missing ⚠️
...ion/src/datahub/ingestion/source/airbyte/client.py	81.65%	73 Missing ⚠️
...ion/src/datahub/ingestion/source/airbyte/source.py	86.11%	60 Missing ⚠️
...ion/src/datahub/ingestion/source/airbyte/models.py	90.65%	20 Missing ⚠️
.../criterion/CriterionFilterAspectsBlockingStep.java	87.14%	14 Missing and 4 partials ⚠️
...src/datahub/ingestion/source/airbyte/connection.py	86.90%	11 Missing ⚠️
...ngestV2/source/builder/RecipeForm/matillion-dpc.ts	97.17%	8 Missing ⚠️
...kedin/metadata/models/StructuredPropertyUtils.java	78.12%	3 Missing and 4 partials ⚠️
...ion/src/datahub/ingestion/source/airbyte/config.py	92.70%	7 Missing ⚠️
...com/linkedin/datahub/graphql/GmsGraphQLEngine.java	0.00%	5 Missing ⚠️
... and 16 more

📢 Thoughts on this report? Let us know!

aikido-pr-checks · 2026-05-19T16:29:08Z

+        """Return ``(topic_id, partition_count, default_content_type_id)`` or None."""
+        with conn.cursor() as cur:
+            cur.execute(
+                f"SELECT id, partition_count, default_content_type_id FROM {self._topic} WHERE topic_name = %s",


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:10Z

+    def _ensure_mime_registered(self, conn: PGConnection, mime: str) -> int:
+        with conn.cursor() as cur:
+            cur.execute(
+                f"INSERT INTO {self._content_type} (mime) VALUES (%s) ON CONFLICT (mime) DO NOTHING",


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:11Z

+                (mime,),
+            )
+            cur.execute(
+                f"SELECT id FROM {self._content_type} WHERE mime = %s",


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:13Z

+                ),
+            )
+            cur.execute(
+                f"SELECT id FROM {self._topic} WHERE topic_name = %s",


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:14Z

+        with conn.cursor() as cur:
+            cur.execute(
+                f"""
+                SELECT offset_value FROM {self._consumer_offset}


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:15Z

+            cur.execute(
+                f"""
+                SELECT m.id, m.enqueued_at, m.topic_id, m.partition_id, m.enqueue_seq
+                FROM {self._message} m


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:17Z

+        with conn.cursor() as cur:
+            cur.execute(
+                f"""
+                INSERT INTO {lease}


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:18Z

+        with conn.cursor() as cur:
+            cur.execute(
+                f"""
+                SELECT m.priority, m.payload, {ctype_expr} AS content_type,


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:19Z

+                    delete_params.extend([h.id, h.enqueued_at])
+                cur.execute(
+                    f"""
+                    DELETE FROM {self._lease}


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:20Z

+                    for part_id, seq in pmap.items():
+                        cur.execute(
+                            f"""
+                            INSERT INTO {self._consumer_offset} AS co


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:22Z

+                params.extend([consumer_group, lock_owner])
+                cur.execute(
+                    f"""
+                    UPDATE {self._lease} AS l


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:23Z

+        with conn.cursor() as cur:
+            cur.execute(
+                f"""
+                INSERT INTO {self._topic} AS ptopic


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

aikido-pr-checks · 2026-05-19T16:29:24Z

+            cur.execute(
+                f"""
+                SELECT partition_id, COALESCE(MAX(enqueue_seq), 0)
+                FROM {self._message}


Potential SQL injection via string-based query concatenation - critical severity
SQL injection might be possible in these locations, especially if the strings being concatenated are controlled via user input.

Show fix

Remediation: If possible, rebuild the query to use prepared statements or an ORM. If that is not possible, make sure the user input is verified or sanitized. As an added layer of protection, we also recommend installing a WAF that blocks SQL injection attacks.

_{Reply @AikidoSec ignore: [REASON] to ignore this issue.}
_{More info}

codecov · 2026-05-19T16:30:39Z

Bundle Report

Changes will increase total bundle size by 77.08kB (0.34%) ⬆️. This is within the configured threshold ✅

Detailed changes

Bundle name	Size	Change
datahub-react-web-esm	23.06MB	77.08kB (0.34%) ⬆️

Affected Assets, Files, and Routes:

view changes for bundle: datahub-react-web-esm

Assets Changed:

Asset Name	Size Change	Total Size	Change (%)
`assets/index-*.js`	15.2kB	8.66MB	0.18%
*`assets/matillionlogo-.png`** (New)	37.34kB	37.34kB	100.0% 🚀
*`assets/airbytelogo-.png`** (New)	24.54kB	24.54kB	100.0% 🚀

david-leifker

Workflow changes around profile name seem ok to me. I'd let others speak for playwright, etc

askumar27 and others added 30 commits May 12, 2026 09:10

fix(actions): route sub-ERROR logs to stdout for observability (datah…

249df30

…ub-project#16902)

fix(ingest/powerbi): remove redundant calls to dashboard users and ti…

6fece89

…les (datahub-project#16947)

feat: show tests in health icon (datahub-project#16455)

cba5383

Co-authored-by: Mihai Ciocirdel <mihai.ciocirdel1@swisscom.com> Co-authored-by: Devashish Chandra <devashish2203@users.noreply.github.com> Co-authored-by: mihai103 <mihai103@noreply.com>

build(): Consolidate properties that support airgapped builds using c…

a59b31f

…ustom artifact server (datahub-project#17381) Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

feat(metadata): criterion value→values aspect migration and blocking … (

2a37bfe

datahub-project#17398) Co-authored-by: Cursor <cursoragent@cursor.com>

feat(ci): extend security scan Linear sync (datahub-project#17405)

e05338a

Co-authored-by: Cursor <cursoragent@cursor.com>

feat: Add PdlEnumMapper for safe PDL-to-GraphQL enum conversion (data…

e2a05a9

…hub-project#17403) Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Jay <jayacryl@users.noreply.github.com>

fix: mask invite token in ViewInviteTokenModal for security (datahub-…

fb8fac8

…project#17410) Co-authored-by: Claude <noreply@anthropic.com>

fix: Explicitly set Snowflake authentication_type in recipe (datahub-…

dd6c85b

…project#17408) Co-authored-by: Claude <noreply@anthropic.com>

refactor(logs): Corrected logs in hook and logback (datahub-project#1…

4ea04a6

…7394)

feat(ingest/fabric-onelake): extract query usage from queryinsights (d…

95de278

…atahub-project#17284)

fix(re-index-loop): prevent perpetual ES8 reindex loop (PFP-3594) (da…

d8ec7da

…tahub-project#17402)

fix(ci): enable schema version bumps pre-commit hook (datahub-project…

9789744

…#17423)

fix(precommit): propagate schemaVersion bump through PDL field-type d…

4a13974

…eps (datahub-project#17422) Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>

feat(model): adds hasScheduleInterval filter capability to DataHubIng…

c2a70bc

…estionSourceSchedule (datahub-project#17416)

docs(release): v1.0.1 Release notes (datahub-project#17428)

07299f4

fix(datahub-web-react): Member Group UI fixes (datahub-project#17409)

ac7030d

fix(search): use _source includes format for ES 8 kNN semantic search (…

087d628

…datahub-project#17404)

fix(build): copy buildArgs map to avoid UnsupportedOperationException… (

a4e859e

datahub-project#17433) Co-authored-by: Cursor <cursoragent@cursor.com>

feat(search): add timeseries write throttle for Elasticsearch index u… (

467ce07

datahub-project#17431) Co-authored-by: Cursor <cursoragent@cursor.com>

fix(graphql): preserve named fragments in QueryProjector to keep requ…

d4531e5

…est body small (datahub-project#17385)

fix(actions/kafka): re-raise from with_retry after exhausting attempts (

0a827b9

datahub-project#17238)

test(playwright): migrate ingestion tests (frontend changes) (datahub…

cca686d

…-project#17420)

feat(ingestion/kafka-connect): add column-level lineage for sink conn…

023ea41

…ectors and field-level transform support (datahub-project#16515)

docs: replace generic concept mappings with source-specific ones for …

25568d9

…Snowflake, Databricks, BigQuery, Redshift, and Postgres (datahub-project#17396) Co-authored-by: Claude <noreply@anthropic.com>

fix(playwright): fix flaky lineage V2 (tests/lineage-v2/v2-lineage-co…

a57c3a1

…lumn-path.spec) test (datahub-project#17438)

test(playwright): migrate tags tests (datahub-project#17324)

2fbaf48

fix(kafka): correct MCL batch listener registration and enable batchi… (

e09e0e5

datahub-project#17430) Co-authored-by: Cursor <cursoragent@cursor.com>

feat(ingestion/matillion): matillion connector (datahub-project#15966)

9a10fd1

lakshay-nasa and others added 7 commits May 19, 2026 18:51

docs: clarify Compliance Forms UI is Cloud-only, API-only in OSS (dat…

e784496

…ahub-project#17501)

fix(ui): Fix directing users to SSO from signup link (datahub-project…

754d7b7

…#17492)

fix(security): Validate URLs before rendering links with them in the …

19fb354

…app (datahub-project#17489)

fix(security): Fix home page templates/module scope highjacking (data…

0832b82

…hub-project#17487)

fix(ingest/snowflake): allow overriding Snowsight base URL for privat…

20ed88c

…e link (datahub-project#17502)

feat(upgrade): re-apply retention policies on system-update when conf… (

76d490d

datahub-project#17493) Co-authored-by: Cursor <cursoragent@cursor.com>

github-actions Bot added ingestion devops product docs smoke_test labels May 19, 2026

github-actions Bot reviewed May 19, 2026

View reviewed changes

aikido-pr-checks Bot reviewed May 19, 2026

View reviewed changes

david-leifker approved these changes May 19, 2026

View reviewed changes

treff7es merged commit dbadffc into master May 19, 2026
84 checks passed

Conversation

treff7es commented May 19, 2026

Summary

Latent issue flagged (pre-existing, not introduced here)

Upstream commits included

Test plan

Uh oh!

github-actions Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

aikido-pr-checks Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented May 19, 2026

Bundle Report

Affected Assets, Files, and Routes:

Assets Changed:

Uh oh!

david-leifker left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

codecov Bot commented May 19, 2026 •

edited

Loading