@aws-amplify/cli-internal-gen2-migration-experimental-alpha 0.5.0 → 0.7.0

package/adr/004-gen2-migration-validation-modeling.md

@@ -0,0 +1,336 @@
+# ADR-004: Unified Validation Model for gen2-migration
+
+## Status
+
+Accepted (implemented with deviations noted below)
+
+## Context
+
+The gen2-migration tool currently has three separate validation mechanisms:
+
+1. **Step-level validations** (`executeValidate`/`rollbackValidate` on `AmplifyMigrationStep`).
+   These run before planning and are skippable via `--skip-validations`. They check
+   environment preconditions like drift, lock status, deployment status, and working
+   directory cleanliness. They throw on failure; the orchestrator catches the throw and
+   re-throws with a hint to use `--skip-validations`.
+
+2. **Operation-level validations** (`validate()` on `AmplifyMigrationOperation`).
+   These run after planning, before execution. They are not skippable. Today most
+   implementations are no-ops (`async () => { return; }`).
+
+3. **Implicit planning-time validations** (throws inside `CategoryRefactorer.plan()`).
+   For example, `plan()` throws `InvalidStackError` if only one of source/target stack
+   IDs is found. These crash the program on the first category that exhibits the problem,
+   preventing the user from seeing issues in other categories.
+
+### Problems
+
+- **Three mechanisms for one concept.** Validation is validation regardless of when it
+  runs. Having three separate paths makes the system harder to reason about and extend.
+
+- **Planning-time throws are not aggregatable.** When `CategoryRefactorer.plan()` throws
+  on the first bad category, the user has to fix it, re-run, discover the next problem,
+  fix it, re-run, etc. The tool should report all problems upfront.
+
+## Requirements
+
+### R1 — Single validation mechanism
+
+All validations — environment preconditions, planning-time checks, and pre-execution
+checks — flow through one mechanism.
+
+### R2 — Aggregate reporting
+
+When multiple validations fail, the user sees all failures at once, not just the first
+one.
+
+### R3 — Validations are skippable via `--skip-validations`
+
+All operation-level validations are skippable. Conditions that cannot be skipped are
+planning errors, not validations.
+
+### R4 — Validations run before any mutation
+
+No `execute()` runs until all validations across all operations have been evaluated.
+
+### R5 — Planning errors are aggregated
+
+When a step plans multiple categories and some fail, the user sees all planning
+failures at once. `plan()` throws for conditions it cannot recover from, but the
+step catches and aggregates these across all planners before surfacing them.
+
+## Decision
+
+Two changes:
+
+1. **Operation-level validation becomes the single validation mechanism.** [R1]
+   `validate()` on `AmplifyMigrationOperation` returns a `ValidationResult` instead
+   of throwing. Step-level validations (`executeValidate`/`rollbackValidate`) are
+   removed; those checks become operations in the operations list. A new `Plan`
+   object encapsulates the operations array and exposes `describe()`, `validate()`,
+   and `execute()` to the orchestrator.
+
+2. **Planning errors are aggregated by the step.** [R5]
+   `plan()` throws a typed `Gen2MigrationPlanningError` for conditions it cannot
+   plan around. The step catches these across all planners and throws a single
+   aggregated error. This is separate from the operation validation mechanism —
+   if you can't plan, there's nothing to validate or execute.
+
+### User-facing flow
+
+```
+Planning... done
+
+Validating...
+
+Lock status                                              ✔ Passed
+Deployment status                                        ✔ Passed
+Drift detection                                          ✔ Passed
+
+Operations Summary
+
+  • Update source stack 'auth-abc123' with resolved references
+  • Move Gen2 resources to holding stack 'auth-abc123-holding'
+  • Refactor resources from Gen1 to Gen2
+
+Implications
+
+  • Move stateful resources from your Gen1 app to be managed by your Gen2 app
+
+(You can rollback this command by running: 'amplify gen2-migration refactor --rollback')
+
+Do you want to continue? (y/n)
+```
+
+When planning fails, the user sees the aggregated errors and the process stops:
+
+```
+Planning...
+  ✘ auth: Category exists in source but not destination stack
+  ✘ storage: Category exists in source but not destination stack
+
+Planning failed. Resolve the errors above before proceeding.
+```
+
+When validations fail, each validation gets its own section with a name (bold in
+the terminal), a status, and an optional report indented below:
+
+```
+Validating...
+
+Lock status                                              ✔ Passed
+Deployment status                                        ✔ Passed
+Drift detection                                          ✘ Failed
+
+  Resource              Property           Expected        Actual
+  ─────────────────────────────────────────────────────────────────
+  UserPool              MfaConfiguration   OFF             ON
+  UserPoolClient        ExplicitAuthFlows  ALLOW_REFRESH   ALLOW_USER_SRP
+  S3Bucket              VersioningConfig   Enabled         Suspended
+
+Validations failed. Resolve the errors above or re-run with '--skip-validations'.
+```
+
+### `Plan`
+
+Steps currently return `AmplifyMigrationOperation[]` from `execute()`/`rollback()`.
+Instead they return a `Plan` that encapsulates the operations array:
+
+```typescript
+class Plan {
+  constructor(private readonly operations: AmplifyMigrationOperation[]) {}
+
+  /** Descriptions of what the operations will do. */
+  async describe(): Promise<string[]> {
+    const descriptions: string[] = [];
+    for (const op of this.operations) {
+      descriptions.push(...(await op.describe()));
+    }
+    return descriptions;
+  }
+
+  /** Runs all validations, returns all results. */
+  async validate(): Promise<ValidationResult[]> {
+    const results: ValidationResult[] = [];
+    for (const op of this.operations) {
+      results.push(await op.validate());
+    }
+    return results;
+  }
+
+  /** Executes all operations sequentially. */
+  async execute(): Promise<void> {
+    for (const op of this.operations) {
+      await op.execute();
+    }
+  }
+}
+```
+
+The orchestrator interacts only with `Plan` — individual operations are an internal
+detail. The orchestrator flow becomes:
+
+```typescript
+const plan = rollingBack ? await step.rollback() : await step.execute();
+
+// Operations summary
+for (const line of await plan.describe()) {
+  printer.info(`• ${line}`);
+}
+
+// Implications + confirmation prompt (unchanged)
+// ...
+
+// Validate [R1, R2, R4]
+const results = await plan.validate();
+renderValidationResults(results);
+
+const failures = results.filter((r) => !r.valid);
+if (failures.length > 0 && !skipValidations) {
+  throw new AmplifyError('MigrationError', {
+    message: failures.map((r) => r.name).join(', ') + ' failed',
+    resolution: `Resolve the errors or re-run with '--skip-validations'`,
+  });
+}
+
+// Execute
+await plan.execute();
+```
+
+What gets removed from the orchestrator:
+
+- The `validate()` helper function (step-level validation wrapper)
+- `executeValidate()` and `rollbackValidate()` on `AmplifyMigrationStep`
+- `CachedAmplifyMigrationStep`
+- `runOperations()` (replaced by `plan.validate()` + `plan.execute()`)
+
+### `ValidationResult`
+
+```typescript
+interface ValidationResult {
+  /** Label shown on the status line (e.g., "Lock status", "Drift detection"). */
+  readonly name: string;
+  /** Whether the validation passed. */
+  readonly valid: boolean;
+  /** Optional detailed output shown indented below the status line. */
+  readonly report?: string;
+}
+```
+
+`validate()` on `AmplifyMigrationOperation` changes from `Promise<void>` to
+`Promise<ValidationResult>`.
+
+### Step-level validations become operations
+
+Validations that currently live in `executeValidate()`/`rollbackValidate()` (drift
+detection, lock status, deployment status, working directory cleanliness) become
+operations in the `Plan`. Their `execute()` is a no-op — the validation is the
+entire point.
+
+### Planning error aggregation
+
+`plan()` throws a typed `Gen2MigrationPlanningError` when it cannot formulate a
+plan. This is the right semantic — if you can't gather enough information to plan,
+throwing is the honest response.
+
+The step that orchestrates multiple planners (e.g., `AmplifyMigrationRefactorStep`)
+catches these errors, continues planning remaining categories, and throws a single
+aggregated error after all planners have been attempted:
+
+```typescript
+private async plan(
+  refactorers: Refactorer[],
+): Promise<Plan> {
+  const operations: AmplifyMigrationOperation[] = [];
+  const planningErrors: Gen2MigrationPlanningError[] = [];
+
+  for (const refactorer of refactorers) {
+    try {
+      operations.push(...(await refactorer.plan()));
+    } catch (error) {
+      if (error instanceof Gen2MigrationPlanningError) {
+        planningErrors.push(error);
+      } else {
+        throw error; // unexpected error — propagate immediately
+      }
+    }
+  }
+
+  if (planningErrors.length > 0) {
+    throw new AmplifyError('MigrationError', {
+      message: planningErrors.map((e) => e.message).join('\n'),
+    });
+  }
+
+  return new Plan(operations);
+}
+```
+
+Unexpected errors (network failures, SDK errors) are not
+`Gen2MigrationPlanningError` and propagate immediately — they indicate something
+is broken, not a validatable condition.
+
+## Consequences
+
+### What changes
+
+- `AmplifyMigrationOperation.validate()` returns `Promise<ValidationResult>` instead
+  of `Promise<void>`.
+- Steps return `Plan` instead of `AmplifyMigrationOperation[]`.
+- `AmplifyMigrationStep.executeValidate()` and `rollbackValidate()` are removed.
+- The `validate()` function in `gen2-migration.ts` is removed.
+- `runOperations()` is removed (replaced by `plan.validate()` + `plan.execute()`).
+- `--validations-only` is trivially supported: call `plan.validate()` and stop.
+- `CachedAmplifyMigrationStep` is removed.
+- `CategoryRefactorer.plan()` throws `Gen2MigrationPlanningError` for precondition
+  failures. The step catches and aggregates these across all planners.
+- Step implementations (lock, generate, refactor, decommission) move their
+  precondition checks into operations in the `Plan`.
+- `--skip-validations` skips all validation failures. Conditions that must not be
+  skipped are modeled as planning errors, not validations.
+
+### What stays the same
+
+- The `AmplifyMigrationOperation` interface keeps its three methods (`describe`,
+  `validate`, `execute`), but is now an internal detail behind `Plan`.
+- The `Planner` interface is unchanged.
+- The two-pass structure (validate all, then execute all) is preserved inside `Plan`.
+- `--skip-validations` flag semantics are preserved for the user, but the mechanism
+  is simpler: all validations are skippable, non-skippable conditions are planning
+  errors.
+
+### Migration path
+
+Since this code hasn't been published yet, this is a breaking change to internal
+interfaces only. All step implementations and their tests need to be updated in a
+single pass.
+
+## Implementation Deviations
+
+The following deviations from the original proposal were made during implementation:
+
+1. **`validate()` returns `Validation | undefined`, not `Promise<ValidationResult>`.**
+   Operations that have no validation return `undefined` instead of a passing
+   `ValidationResult`. The `Validation` interface is a declarative object with a
+   `description` string and a `run()` callback — the `Plan` drives the spinner
+   lifecycle around each validation.
+
+2. **`Plan.validate()` returns `Promise<boolean>`, not `Promise<ValidationResult[]>`.**
+   The `Plan` renders the validation summary table internally and returns a simple
+   pass/fail boolean. The orchestrator doesn't need the individual results.
+
+3. **`Plan` constructor takes `PlanProps` (operations, logger, title, implications).**
+   Implications are part of the `Plan` rather than being a separate step method.
+   The `Plan` renders them in `describe()`.
+
+4. **Steps expose `forward()` and `rollback()`, not `execute()` and `rollback()`.**
+   Renamed to avoid confusion with `Plan.execute()`.
+
+5. **`Gen2MigrationPlanningError` was not implemented.** Planning errors are thrown
+   as `AmplifyError` and are not aggregated across categories. This is a known gap
+   — R5 from the requirements is not yet satisfied.
+
+6. **Validation runs before describe/confirmation, not after.** The actual flow is
+   plan → validate → describe → confirm → execute. This gives faster feedback when
+   validations fail — the user doesn't have to read through the operations summary
+   before learning that a precondition check failed.

package/bin/amplify

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires, global-require */
 
 // this file should be a duplicate of amplify.production.template except for the CLI_ENV value
-process.env.CLI_ENV = 'development';
+process.env.CLI_ENV = 'production';
 
 // suppress deprecation warnings
 process.env.AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE = '1';

package/lib/commands/drift-detection/detect-local-drift.d.ts

@@ -1,6 +1,5 @@
 import { $TSContext } from '@aws-amplify/amplify-cli-core';
 export interface LocalDriftResults {
-    totalDrifted: number;
     resourcesToBeCreated?: Array<ResourceInfo>;
     resourcesToBeUpdated?: Array<ResourceInfo>;
     resourcesToBeDeleted?: Array<ResourceInfo>;
@@ -11,7 +10,7 @@ export interface LocalDriftResults {
 export interface ResourceInfo {
     category: string;
     resourceName: string;
-    service?: string;
+    service: string;
     providerPlugin?: string;
     dependsOn?: Array<any>;
 }

package/lib/commands/drift-detection/detect-local-drift.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-local-drift.d.ts","sourceRoot":"","sources":["../../../src/commands/drift-detection/detect-local-drift.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAA6B,MAAM,+BAA+B,CAAC;AAKtF,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,oBAAoB,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,oBAAoB,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,mBAAmB,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAKD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACxB;AAYD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAgDtF"}
+{"version":3,"file":"detect-local-drift.d.ts","sourceRoot":"","sources":["../../../src/commands/drift-detection/detect-local-drift.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAA6B,MAAM,+BAA+B,CAAC;AAMtF,MAAM,WAAW,iBAAiB;IAChC,oBAAoB,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,oBAAoB,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,oBAAoB,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,mBAAmB,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAKD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACxB;AA0BD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA4CtF"}

package/lib/commands/drift-detection/detect-local-drift.js

@@ -1,20 +1,33 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectLocalDrift = detectLocalDrift;
 const amplify_cli_core_1 = require("@aws-amplify/amplify-cli-core");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+function assertValidResourceInfo(resource) {
+    if (typeof resource !== 'object' ||
+        resource === null ||
+        typeof resource.category !== 'string' ||
+        typeof resource.resourceName !== 'string' ||
+        typeof resource.service !== 'string' ||
+        (resource.providerPlugin !== undefined && typeof resource.providerPlugin !== 'string') ||
+        (resource.dependsOn !== undefined && !Array.isArray(resource.dependsOn))) {
+        throw new Error(`Invalid ResourceInfo: ${JSON.stringify(resource)}`);
+    }
+}
 async function detectLocalDrift(context) {
     try {
         if (!amplify_cli_core_1.stateManager.metaFileExists()) {
             return {
-                totalDrifted: 0,
                 skipped: true,
                 skipReason: 'Project not initialized',
             };
         }
         const currentCloudBackendDir = amplify_cli_core_1.pathManager.getCurrentCloudBackendDirPath();
-        if (!currentCloudBackendDir || !require('fs-extra').existsSync(currentCloudBackendDir)) {
+        if (!currentCloudBackendDir || !fs_extra_1.default.existsSync(currentCloudBackendDir)) {
             return {
-                totalDrifted: 0,
                 skipped: true,
                 skipReason: 'No cloud backend found - project may not be deployed yet',
             };
@@ -22,9 +35,10 @@ async function detectLocalDrift(context) {
         const { getResourceStatus } = require('../../extensions/amplify-helpers/resource-status-data');
         const statusResults = await getResourceStatus();
         const { resourcesToBeCreated, resourcesToBeUpdated, resourcesToBeDeleted, resourcesToBeSynced } = statusResults;
-        const totalDrifted = resourcesToBeCreated.length + resourcesToBeUpdated.length + resourcesToBeDeleted.length;
+        for (const arr of [resourcesToBeCreated, resourcesToBeUpdated, resourcesToBeDeleted, resourcesToBeSynced]) {
+            arr.forEach(assertValidResourceInfo);
+        }
         return {
-            totalDrifted,
             resourcesToBeCreated,
             resourcesToBeUpdated,
             resourcesToBeDeleted,
@@ -34,7 +48,6 @@ async function detectLocalDrift(context) {
     }
     catch (error) {
         return {
-            totalDrifted: 0,
             skipped: true,
             skipReason: error.message || 'Unable to detect local drift',
         };

package/lib/commands/drift-detection/detect-local-drift.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect-local-drift.js","sourceRoot":"","sources":["../../../src/commands/drift-detection/detect-local-drift.ts"],"names":[],"mappings":";;AAyCA,4CAgDC;AApFD,oEAAsF;AAoC/E,KAAK,UAAU,gBAAgB,CAAC,OAAmB;IACxD,IAAI,CAAC;QAEH,IAAI,CAAC,+BAAY,CAAC,cAAc,EAAE,EAAE,CAAC;YACnC,OAAO;gBACL,YAAY,EAAE,CAAC;gBACf,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,yBAAyB;aACtC,CAAC;QACJ,CAAC;QAGD,MAAM,sBAAsB,GAAG,8BAAW,CAAC,6BAA6B,EAAE,CAAC;QAC3E,IAAI,CAAC,sBAAsB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACvF,OAAO;gBACL,YAAY,EAAE,CAAC;gBACf,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,0DAA0D;aACvE,CAAC;QACJ,CAAC;QAID,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,uDAAuD,CAAC,CAAC;QAE/F,MAAM,aAAa,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAEhD,MAAM,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC;QAGhH,MAAM,YAAY,GAAG,oBAAoB,CAAC,MAAM,GAAG,oBAAoB,CAAC,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC;QAE7G,OAAO;YACL,YAAY;YACZ,oBAAoB;YACpB,oBAAoB;YACpB,oBAAoB;YACpB,mBAAmB;YACnB,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QAEpB,OAAO;YACL,YAAY,EAAE,CAAC;YACf,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,KAAK,CAAC,OAAO,IAAI,8BAA8B;SAC5D,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"detect-local-drift.js","sourceRoot":"","sources":["../../../src/commands/drift-detection/detect-local-drift.ts"],"names":[],"mappings":";;;;;AAuDA,4CA4CC;AA9FD,oEAAsF;AACtF,wDAA0B;AAyB1B,SAAS,uBAAuB,CAAC,QAAa;IAC5C,IACE,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,KAAK,IAAI;QACjB,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ;QACrC,OAAO,QAAQ,CAAC,YAAY,KAAK,QAAQ;QACzC,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ;QACpC,CAAC,QAAQ,CAAC,cAAc,KAAK,SAAS,IAAI,OAAO,QAAQ,CAAC,cAAc,KAAK,QAAQ,CAAC;QACtF,CAAC,QAAQ,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EACxE,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAYM,KAAK,UAAU,gBAAgB,CAAC,OAAmB;IACxD,IAAI,CAAC;QAEH,IAAI,CAAC,+BAAY,CAAC,cAAc,EAAE,EAAE,CAAC;YACnC,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,yBAAyB;aACtC,CAAC;QACJ,CAAC;QAGD,MAAM,sBAAsB,GAAG,8BAAW,CAAC,6BAA6B,EAAE,CAAC;QAC3E,IAAI,CAAC,sBAAsB,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACtE,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,0DAA0D;aACvE,CAAC;QACJ,CAAC;QAKD,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,uDAAuD,CAAC,CAAC;QAC/F,MAAM,aAAa,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAEhD,MAAM,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC;QAChH,KAAK,MAAM,GAAG,IAAI,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,mBAAmB,CAAC,EAAE,CAAC;YAC1G,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;QACvC,CAAC;QAED,OAAO;YACL,oBAAoB;YACpB,oBAAoB;YACpB,oBAAoB;YACpB,mBAAmB;YACnB,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QAEpB,OAAO;YACL,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,KAAK,CAAC,OAAO,IAAI,8BAA8B;SAC5D,CAAC;IACJ,CAAC;AACH,CAAC"}

package/lib/commands/drift-detection/detect-stack-drift.d.ts

@@ -1,12 +1,23 @@
-import { CloudFormationClient, type DescribeStackResourceDriftsCommandOutput } from '@aws-sdk/client-cloudformation';
-import type { Print } from '../drift';
+import { CloudFormationClient, type StackResourceDrift, type PropertyDifference } from '@aws-sdk/client-cloudformation';
+import type { SpinningLogger } from '../gen2-migration/_infra/spinning-logger';
+export interface StackDriftNode {
+    readonly logicalId: string;
+    readonly category: string;
+    readonly drifts: StackResourceDrift[];
+    readonly driftDetectionId: string;
+    readonly children: StackDriftNode[];
+    readonly skippedChildren?: string[];
+}
 export interface CloudFormationDriftResults {
-    totalDrifted: number;
-    rootStackDrifts: DescribeStackResourceDriftsCommandOutput;
-    nestedStackDrifts: Map<string, DescribeStackResourceDriftsCommandOutput>;
-    nestedStackPhysicalIds: Map<string, string>;
-    skippedNestedStacks?: string[];
+    readonly root: StackDriftNode;
+    readonly skippedStacks: string[];
+    readonly incomplete: boolean;
 }
-export declare function detectStackDrift(cfn: CloudFormationClient, stackName: string, print: Print): Promise<DescribeStackResourceDriftsCommandOutput>;
-export declare function detectStackDriftRecursive(cfn: CloudFormationClient, stackName: string, print: Print, level?: number): Promise<CloudFormationDriftResults>;
+export declare function detectStackDrift(cfn: CloudFormationClient, stackName: string, print: SpinningLogger): Promise<{
+    drifts: StackResourceDrift[];
+    driftDetectionId: string;
+}>;
+export declare function isAmplifyRestApiDescriptionDrift(drift: StackResourceDrift, propDiff: PropertyDifference, print: SpinningLogger): boolean;
+export declare function isAmplifyTriggerPolicyDrift(drift: StackResourceDrift, propDiff: PropertyDifference, print: SpinningLogger): boolean;
+export declare function detectStackDriftRecursive(cfn: CloudFormationClient, stackName: string, print: SpinningLogger): Promise<CloudFormationDriftResults>;
 //# sourceMappingURL=detect-stack-drift.d.ts.map

package/lib/commands/drift-detection/detect-stack-drift.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-stack-drift.d.ts","sourceRoot":"","sources":["../../../src/commands/drift-detection/detect-stack-drift.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EAKpB,KAAK,wCAAwC,EAE9C,MAAM,gCAAgC,CAAC;AAGxC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAKtC,MAAM,WAAW,0BAA0B;IAIzC,YAAY,EAAE,MAAM,CAAC;IAKrB,eAAe,EAAE,wCAAwC,CAAC;IAK1D,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,wCAAwC,CAAC,CAAC;IAKzE,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAK5C,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAuBD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,oBAAoB,EACzB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,wCAAwC,CAAC,CAgHnD;AAmHD,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,oBAAoB,EACzB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,KAAK,EACZ,KAAK,SAAI,GACR,OAAO,CAAC,0BAA0B,CAAC,CAyHrC"}
+{"version":3,"file":"detect-stack-drift.d.ts","sourceRoot":"","sources":["../../../src/commands/drift-detection/detect-stack-drift.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EAMpB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAExB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAY/E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CACrC;AAKD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAuBD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,oBAAoB,EACzB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAE,CAAC,CA+CrE;AAwDD,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAWxI;AAQD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CA+BnI;AAqID,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,oBAAoB,EACzB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,0BAA0B,CAAC,CAUrC"}