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

package/lib/commands/gen2-migration/refactor/oauth-values-retriever.js

@@ -1,69 +1,77 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.constructSignInWithApplePrivateKeyParamName = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
+exports.constructSignInWithApplePrivateKeyParamName = constructSignInWithApplePrivateKeyParamName;
+exports.retrieveOAuthValues = retrieveOAuthValues;
 const client_ssm_1 = require("@aws-sdk/client-ssm");
 const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
-const INVALID_OAUTH_GEN1_PROVIDER_METADATA_ERROR = 'Invalid Gen1 OAuth provider metadata';
-const isHostedProviderMetadata = (parsedValue) => {
-    return typeof parsedValue === 'object' && parsedValue !== null && 'ProviderName' in parsedValue;
+const amplify_cli_core_1 = require("@aws-amplify/amplify-cli-core");
+const isHostedProviderMetadata = (value) => {
+    return typeof value === 'object' && value !== null && 'ProviderName' in value;
 };
-const constructSignInWithApplePrivateKeyParamName = (appId, environment) => {
+function constructSignInWithApplePrivateKeyParamName(appId, environment) {
     return `/amplify/${appId}/${environment}/AMPLIFY_SIWA_PRIVATE_KEY`;
-};
-exports.constructSignInWithApplePrivateKeyParamName = constructSignInWithApplePrivateKeyParamName;
-const retrieveOAuthValues = async ({ ssmClient, cognitoIdpClient, oAuthParameter, userPoolId, appId, environmentName, }) => {
+}
+async function retrieveOAuthValues({ ssmClient, cognitoIdpClient, oAuthParameter, userPoolId, appId, environmentName, }) {
     const value = oAuthParameter.ParameterValue;
-    (0, node_assert_1.default)(value);
+    if (!value) {
+        throw new amplify_cli_core_1.AmplifyError('MissingExpectedParameterError', {
+            message: "OAuth parameter 'hostedUIProviderMeta' has no value",
+        });
+    }
     const parsedValue = JSON.parse(value);
     if (!Array.isArray(parsedValue) || parsedValue.length === 0) {
-        throw new Error(INVALID_OAUTH_GEN1_PROVIDER_METADATA_ERROR);
+        throw new amplify_cli_core_1.AmplifyError('InputValidationError', {
+            message: "OAuth parameter 'hostedUIProviderMeta' must be a non-empty array of provider metadata",
+        });
     }
-    const oAuthClientValues = [];
+    const oAuthClients = [];
     for (const provider of parsedValue) {
         if (!isHostedProviderMetadata(provider)) {
-            throw new Error(INVALID_OAUTH_GEN1_PROVIDER_METADATA_ERROR);
+            throw new amplify_cli_core_1.AmplifyError('InputValidationError', {
+                message: `Invalid OAuth provider metadata: ${JSON.stringify(provider)}`,
+            });
         }
         const { ProviderName } = provider;
-        const { IdentityProvider } = await cognitoIdpClient.send(new client_cognito_identity_provider_1.DescribeIdentityProviderCommand({
-            UserPoolId: userPoolId,
-            ProviderName,
-        }));
+        const { IdentityProvider } = await cognitoIdpClient.send(new client_cognito_identity_provider_1.DescribeIdentityProviderCommand({ UserPoolId: userPoolId, ProviderName }));
         const providerDetails = IdentityProvider === null || IdentityProvider === void 0 ? void 0 : IdentityProvider.ProviderDetails;
-        (0, node_assert_1.default)(providerDetails);
+        if (!providerDetails) {
+            throw new amplify_cli_core_1.AmplifyError('ResourceNotReadyError', {
+                message: `OAuth provider '${ProviderName}' returned no provider details from Cognito`,
+            });
+        }
         const { client_id, client_secret, team_id, key_id } = providerDetails;
-        (0, node_assert_1.default)(client_id);
+        if (!client_id) {
+            throw new amplify_cli_core_1.AmplifyError('MissingExpectedParameterError', {
+                message: `OAuth provider '${ProviderName}' has no client_id in Cognito provider details`,
+            });
+        }
         if (ProviderName === 'SignInWithApple') {
-            (0, node_assert_1.default)(team_id);
-            (0, node_assert_1.default)(key_id);
-            const { Parameter: PrivateKeyParameter } = await ssmClient.send(new client_ssm_1.GetParameterCommand({
-                Name: (0, exports.constructSignInWithApplePrivateKeyParamName)(appId, environmentName),
+            if (!team_id || !key_id) {
+                throw new amplify_cli_core_1.AmplifyError('MissingExpectedParameterError', {
+                    message: `SignInWithApple provider is missing team_id or key_id in Cognito provider details`,
+                });
+            }
+            const { Parameter: privateKeyParam } = await ssmClient.send(new client_ssm_1.GetParameterCommand({
+                Name: constructSignInWithApplePrivateKeyParamName(appId, environmentName),
                 WithDecryption: true,
             }));
-            (0, node_assert_1.default)(PrivateKeyParameter);
-            const privateKey = PrivateKeyParameter.Value;
-            (0, node_assert_1.default)(privateKey);
-            oAuthClientValues.push({
-                ProviderName,
-                client_id,
-                team_id,
-                key_id,
-                private_key: privateKey,
-            });
+            const privateKey = privateKeyParam === null || privateKeyParam === void 0 ? void 0 : privateKeyParam.Value;
+            if (!privateKey) {
+                throw new amplify_cli_core_1.AmplifyError('ParameterNotFoundError', {
+                    message: `SignInWithApple private key not found in SSM at '${constructSignInWithApplePrivateKeyParamName(appId, environmentName)}'`,
+                });
+            }
+            oAuthClients.push({ ProviderName, client_id, team_id, key_id, private_key: privateKey });
         }
         else {
-            (0, node_assert_1.default)(client_secret);
-            oAuthClientValues.push({
-                ProviderName,
-                client_id,
-                client_secret,
-            });
+            if (!client_secret) {
+                throw new amplify_cli_core_1.AmplifyError('MissingExpectedParameterError', {
+                    message: `OAuth provider '${ProviderName}' has no client_secret in Cognito provider details`,
+                });
+            }
+            oAuthClients.push({ ProviderName, client_id, client_secret });
         }
     }
-    return oAuthClientValues;
-};
-exports.default = retrieveOAuthValues;
+    return oAuthClients;
+}
 //# sourceMappingURL=oauth-values-retriever.js.map

package/lib/commands/gen2-migration/refactor/oauth-values-retriever.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-values-retriever.js","sourceRoot":"","sources":["../../../../src/commands/gen2-migration/refactor/oauth-values-retriever.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth-values-retriever.js","sourceRoot":"","sources":["../../../../src/commands/gen2-migration/refactor/oauth-values-retriever.ts"],"names":[],"mappings":"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"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-condition-resolver.d.ts

@@ -1,13 +1,4 @@
-import { CFNTemplate } from '../types';
 import { Parameter } from '@aws-sdk/client-cloudformation';
-declare class CFNConditionResolver {
-    private readonly template;
-    private readonly conditions;
-    constructor(template: CFNTemplate);
-    resolve(parameters: Parameter[]): CFNTemplate;
-    private resolveCondition;
-    private resolveConditionInResources;
-    private resolveIfCondition;
-}
-export default CFNConditionResolver;
+import { CFNTemplate } from '../../_infra/cfn-template';
+export declare function resolveConditions(template: CFNTemplate, parameters: Parameter[]): CFNTemplate;
 //# sourceMappingURL=cfn-condition-resolver.d.ts.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-condition-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cfn-condition-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-condition-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiF,WAAW,EAAE,MAAM,UAAU,CAAC;AAEtH,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAO3D,cAAM,oBAAoB;IAEZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;IADrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmD;gBACjD,QAAQ,EAAE,WAAW;IAI3C,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE;IAoBtC,OAAO,CAAC,gBAAgB;IA4FxB,OAAO,CAAC,2BAA2B;IA0BnC,OAAO,CAAC,kBAAkB;CAY3B;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"cfn-condition-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-condition-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAE3D,OAAO,EAAoE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAe1H,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,WAAW,CA4C7F"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-condition-resolver.js

@@ -1,137 +1,103 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const types_1 = require("../types");
-const node_assert_1 = __importDefault(require("node:assert"));
-class CFNConditionResolver {
-    constructor(template) {
-        this.template = template;
-        this.conditions = template.Conditions;
+exports.resolveConditions = resolveConditions;
+const amplify_cli_core_1 = require("@aws-amplify/amplify-cli-core");
+const cfn_template_1 = require("../../_infra/cfn-template");
+function resolveConditions(template, parameters) {
+    const conditions = template.Conditions;
+    if (!conditions || Object.keys(conditions).length === 0)
+        return template;
+    const conditionValues = new Map();
+    for (const [conditionKey, conditionDef] of Object.entries(conditions)) {
+        const fnType = Object.keys(conditionDef)[0];
+        if (!Object.values(cfn_template_1.CFNFunction).includes(fnType))
+            continue;
+        const statements = conditionDef[fnType];
+        if ((fnType === cfn_template_1.CFNFunction.Or || fnType === cfn_template_1.CFNFunction.And) && statements.length > 2) {
+            throw new amplify_cli_core_1.AmplifyError('CloudFormationTemplateError', {
+                message: `${fnType} with ${statements.length} operands is not supported (condition '${conditionKey}'). Only 2 operands are handled.`,
+            });
+        }
+        const [left, right] = statements;
+        conditionValues.set(conditionKey, evaluateCondition(conditions, left, right, parameters, fnType));
     }
-    resolve(parameters) {
-        if (!this.conditions || Object.keys(this.conditions).length === 0)
-            return this.template;
-        const clonedTemplate = JSON.parse(JSON.stringify(this.template));
-        const conditionValueMap = new Map();
-        Object.entries(this.conditions).forEach(([conditionKey, conditionValue]) => {
-            const fnType = Object.keys(conditionValue)[0];
-            if (Object.values(types_1.CFNFunction).includes(fnType)) {
-                const conditionStatements = conditionValue[fnType];
-                const [leftStatement, rightStatement] = conditionStatements;
-                const result = this.resolveCondition(leftStatement, rightStatement, parameters, fnType);
-                conditionValueMap.set(conditionKey, result);
+    const resolved = JSON.parse(JSON.stringify(template));
+    for (const [, resource] of Object.entries(resolved.Resources)) {
+        for (const [propName, propValue] of Object.entries(resource.Properties)) {
+            if (typeof propValue === 'object' && propValue !== null && !Array.isArray(propValue)) {
+                resource.Properties[propName] = resolveIfCondition(propValue, conditionValues);
+            }
+            else if (Array.isArray(propValue)) {
+                resource.Properties[propName] = propValue.map((item) => typeof item === 'object' && item !== null ? resolveIfCondition(item, conditionValues) : item);
             }
-        });
-        this.resolveConditionInResources(clonedTemplate.Resources, conditionValueMap);
-        return clonedTemplate;
-    }
-    resolveCondition(leftStatement, rightStatement, params, fnType) {
-        var _a, _b;
-        (0, node_assert_1.default)(this.conditions);
-        let resolvedLeftStatement;
-        let resolvedRightStatement;
-        if (typeof leftStatement !== 'object') {
-            resolvedLeftStatement = leftStatement;
-        }
-        if (typeof rightStatement !== 'object') {
-            resolvedRightStatement = rightStatement;
-        }
-        if (typeof leftStatement === 'object' && 'Condition' in leftStatement) {
-            const nestedConditionName = leftStatement.Condition;
-            const nestedCondition = this.conditions[nestedConditionName];
-            const nestedFnType = Object.keys(nestedCondition)[0];
-            const [nestedLeftStatement, nestedRightStatement] = nestedCondition[nestedFnType];
-            resolvedLeftStatement = this.resolveCondition(nestedLeftStatement, nestedRightStatement, params, nestedFnType);
-        }
-        if (typeof rightStatement === 'object' && 'Condition' in rightStatement) {
-            const nestedConditionName = rightStatement.Condition;
-            const nestedCondition = this.conditions[nestedConditionName];
-            const nestedFnType = Object.keys(nestedCondition)[0];
-            const [nestedLeftStatement, nestedRightStatement] = nestedCondition[nestedFnType];
-            resolvedRightStatement = this.resolveCondition(nestedLeftStatement, nestedRightStatement, params, nestedFnType);
-        }
-        if (typeof leftStatement === 'object' && Object.values(types_1.CFNFunction).includes(Object.keys(leftStatement)[0])) {
-            const nestedCondition = leftStatement;
-            const nestedFnType = Object.keys(nestedCondition)[0];
-            const [nestedLeftStatement, nestedRightStatement] = nestedCondition[nestedFnType];
-            resolvedLeftStatement = this.resolveCondition(nestedLeftStatement, nestedRightStatement, params, nestedFnType);
-        }
-        if (typeof rightStatement === 'object' && Object.values(types_1.CFNFunction).includes(Object.keys(rightStatement)[0])) {
-            const nestedCondition = rightStatement;
-            const nestedFnType = Object.keys(nestedCondition)[0];
-            const [nestedLeftStatement, nestedRightStatement] = nestedCondition[nestedFnType];
-            resolvedRightStatement = this.resolveCondition(nestedLeftStatement, nestedRightStatement, params, nestedFnType);
-        }
-        if (typeof leftStatement === 'object' && 'Ref' in leftStatement) {
-            const parameterKey = leftStatement.Ref;
-            const value = (_a = params.find((p) => p.ParameterKey === parameterKey)) === null || _a === void 0 ? void 0 : _a.ParameterValue;
-            (0, node_assert_1.default)(value);
-            resolvedLeftStatement = value;
         }
-        if (rightStatement && typeof rightStatement === 'object' && 'Ref' in rightStatement) {
-            const parameterKey = rightStatement.Ref;
-            const value = (_b = params.find((p) => p.ParameterKey === parameterKey)) === null || _b === void 0 ? void 0 : _b.ParameterValue;
-            (0, node_assert_1.default)(value);
-            resolvedRightStatement = value;
+    }
+    for (const [logicalId, resource] of Object.entries(resolved.Resources)) {
+        const condition = resource.Condition;
+        if (condition && conditionValues.has(condition) && !conditionValues.get(condition)) {
+            delete resolved.Resources[logicalId];
         }
-        let result;
-        switch (fnType) {
-            case types_1.CFNFunction.Equals:
-                result = resolvedLeftStatement === resolvedRightStatement;
-                break;
-            case types_1.CFNFunction.Not:
-                result = !resolvedLeftStatement;
-                break;
-            case types_1.CFNFunction.Or:
-                result = !!(resolvedLeftStatement || resolvedRightStatement);
-                break;
-            case types_1.CFNFunction.And:
-                result = !!(resolvedLeftStatement && resolvedRightStatement);
-                break;
-            default:
-                throw new Error(`Invalid ${fnType} condition`);
+    }
+    return resolved;
+}
+function resolveStatement(conditions, statement, parameters) {
+    var _a;
+    if (typeof statement !== 'object')
+        return statement;
+    const record = statement;
+    if ('Condition' in record) {
+        const nestedName = record.Condition;
+        const nestedDef = conditions[nestedName];
+        const nestedFnType = Object.keys(nestedDef)[0];
+        const nestedStatements = nestedDef[nestedFnType];
+        return evaluateCondition(conditions, nestedStatements[0], nestedStatements[1], parameters, nestedFnType);
+    }
+    const fnKey = Object.keys(record).find((k) => Object.values(cfn_template_1.CFNFunction).includes(k));
+    if (fnKey) {
+        const nestedStatements = record[fnKey];
+        return evaluateCondition(conditions, nestedStatements[0], nestedStatements[1], parameters, fnKey);
+    }
+    if ('Ref' in record) {
+        const paramKey = record.Ref;
+        const value = (_a = parameters.find((p) => p.ParameterKey === paramKey)) === null || _a === void 0 ? void 0 : _a.ParameterValue;
+        if (value === undefined) {
+            throw new amplify_cli_core_1.AmplifyError('MissingExpectedParameterError', {
+                message: `Condition references parameter '${paramKey}' but no value was provided`,
+            });
         }
-        return result;
+        return value;
     }
-    resolveConditionInResources(resources, conditionValueMap) {
-        Object.entries(resources).forEach(([logicalId, value]) => {
-            const condition = value.Condition;
-            if (condition && conditionValueMap.has(condition)) {
-                const result = conditionValueMap.get(condition);
-                if (!result) {
-                    delete resources[logicalId];
-                }
-            }
-            const props = value.Properties;
-            Object.entries(props).forEach(([propName, propValue]) => {
-                if (typeof propValue === 'object') {
-                    props[propName] = this.resolveIfCondition(propValue, conditionValueMap);
-                }
-                else if (Array.isArray(propValue)) {
-                    propValue.forEach((item, index) => {
-                        if (typeof item === 'object') {
-                            propValue[index] = this.resolveIfCondition(item, conditionValueMap);
-                        }
-                    });
-                }
+    throw new amplify_cli_core_1.AmplifyError('CloudFormationTemplateError', {
+        message: `Unsupported condition statement: ${JSON.stringify(statement)}`,
+    });
+}
+function evaluateCondition(conditions, left, right, parameters, fnType) {
+    const resolvedLeft = resolveStatement(conditions, left, parameters);
+    const resolvedRight = right !== undefined ? resolveStatement(conditions, right, parameters) : undefined;
+    switch (fnType) {
+        case cfn_template_1.CFNFunction.Equals:
+            return resolvedLeft === resolvedRight;
+        case cfn_template_1.CFNFunction.Not:
+            return !resolvedLeft;
+        case cfn_template_1.CFNFunction.Or:
+            return !!(resolvedLeft || resolvedRight);
+        case cfn_template_1.CFNFunction.And:
+            return !!(resolvedLeft && resolvedRight);
+        default:
+            throw new amplify_cli_core_1.AmplifyError('CloudFormationTemplateError', {
+                message: `Unsupported condition function: ${fnType}`,
             });
-        });
-        return resources;
     }
-    resolveIfCondition(propValue, conditionValueMap) {
-        let result = propValue;
-        if (types_1.CFNFunction.If in propValue) {
-            const ifCondition = propValue[types_1.CFNFunction.If];
-            const conditionName = ifCondition[0];
-            if (conditionValueMap.has(conditionName)) {
-                const conditionValue = conditionValueMap.get(conditionName);
-                result = conditionValue ? ifCondition[1] : ifCondition[2];
-            }
+}
+function resolveIfCondition(propValue, conditionValues) {
+    const record = propValue;
+    if (cfn_template_1.CFNFunction.If in record) {
+        const ifCondition = record[cfn_template_1.CFNFunction.If];
+        const conditionName = ifCondition[0];
+        if (conditionValues.has(conditionName)) {
+            return (conditionValues.get(conditionName) ? ifCondition[1] : ifCondition[2]);
         }
-        return result;
     }
+    return propValue;
 }
-exports.default = CFNConditionResolver;
 //# sourceMappingURL=cfn-condition-resolver.js.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-condition-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"cfn-condition-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-condition-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cfn-condition-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-condition-resolver.ts"],"names":[],"mappings":"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"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-dependency-resolver.d.ts

@@ -1,8 +1,3 @@
-import { CFNTemplate } from '../types';
-declare class CfnDependencyResolver {
-    private readonly template;
-    constructor(template: CFNTemplate);
-    resolve(resourcesToRefactor: string[]): CFNTemplate;
-}
-export default CfnDependencyResolver;
+import { CFNTemplate } from '../../_infra/cfn-template';
+export declare function resolveDependencies(template: CFNTemplate): CFNTemplate;
 //# sourceMappingURL=cfn-dependency-resolver.d.ts.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-dependency-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cfn-dependency-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,cAAM,qBAAqB;IACb,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,WAAW;IAE3C,OAAO,CAAC,mBAAmB,EAAE,MAAM,EAAE;CAqB7C;AAED,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"cfn-dependency-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-dependency-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAQxD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,GAAG,WAAW,CAQtE"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-dependency-resolver.js

@@ -1,27 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-class CfnDependencyResolver {
-    constructor(template) {
-        this.template = template;
-    }
-    resolve(resourcesToRefactor) {
-        const clonedGen1Template = JSON.parse(JSON.stringify(this.template));
-        const resources = clonedGen1Template.Resources;
-        Object.entries(resources).forEach(([logicalResourceId, resource]) => {
-            if (resource === null || resource === void 0 ? void 0 : resource.DependsOn) {
-                const deps = Array.isArray(resource.DependsOn) ? resource.DependsOn : [resource.DependsOn];
-                const depsInRefactor = deps.filter((dep) => resourcesToRefactor.includes(dep));
-                if (depsInRefactor.length > 0 && !resourcesToRefactor.includes(logicalResourceId)) {
-                    const filteredDeps = deps.filter((dep) => !resourcesToRefactor.includes(dep));
-                    resource.DependsOn = filteredDeps;
-                }
-                else if (resourcesToRefactor.includes(logicalResourceId) && deps.length > depsInRefactor.length) {
-                    resource.DependsOn = depsInRefactor;
-                }
-            }
-        });
-        return clonedGen1Template;
+exports.resolveDependencies = resolveDependencies;
+function resolveDependencies(template) {
+    const cloned = JSON.parse(JSON.stringify(template));
+    for (const resource of Object.values(cloned.Resources)) {
+        delete resource.DependsOn;
     }
+    return cloned;
 }
-exports.default = CfnDependencyResolver;
 //# sourceMappingURL=cfn-dependency-resolver.js.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-dependency-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"cfn-dependency-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-dependency-resolver.ts"],"names":[],"mappings":";;AAEA,MAAM,qBAAqB;IACzB,YAA6B,QAAqB;QAArB,aAAQ,GAAR,QAAQ,CAAa;IAAG,CAAC;IAE/C,OAAO,CAAC,mBAA6B;QAC1C,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAgB,CAAC;QACpF,MAAM,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,EAAE;YAClE,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,EAAE,CAAC;gBAExB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAC3F,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;gBAEvF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBAClF,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtF,QAAQ,CAAC,SAAS,GAAG,YAAY,CAAC;gBACpC,CAAC;qBAEI,IAAI,mBAAmB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;oBAChG,QAAQ,CAAC,SAAS,GAAG,cAAc,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,kBAAkB,CAAC;IAC5B,CAAC;CACF;AAED,kBAAe,qBAAqB,CAAC"}
+{"version":3,"file":"cfn-dependency-resolver.js","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-dependency-resolver.ts"],"names":[],"mappings":";;AAQA,kDAQC;AARD,SAAgB,mBAAmB,CAAC,QAAqB;IACvD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAgB,CAAC;IAEnE,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACvD,OAAO,QAAQ,CAAC,SAAS,CAAC;IAC5B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/lib/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.d.ts

@@ -1,14 +1,10 @@
-import { CFNTemplate } from '../types';
 import { Output, StackResource } from '@aws-sdk/client-cloudformation';
-declare class CfnOutputResolver {
-    private readonly template;
-    private readonly region;
-    private readonly accountId;
-    constructor(template: CFNTemplate, region: string, accountId: string);
-    resolve(logicalResourceIds: string[], stackOutputs: Output[], stackResources: StackResource[]): CFNTemplate;
-    private tryReplaceLogicalResourceRefWithPhysicalId;
-    private getResourceAttribute;
-    private buildFnGetAttReplace;
-}
-export default CfnOutputResolver;
+import { CFNTemplate } from '../../_infra/cfn-template';
+export declare function resolveOutputs(params: {
+    readonly template: CFNTemplate;
+    readonly stackOutputs: Output[];
+    readonly stackResources: StackResource[];
+    readonly region: string;
+    readonly accountId: string;
+}): CFNTemplate;
 //# sourceMappingURL=cfn-output-resolver.d.ts.map

package/lib/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cfn-output-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,WAAW,EAAE,MAAM,UAAU,CAAC;AAEpF,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AASvE,cAAM,iBAAiB;IACT,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAe,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAlF,QAAQ,EAAE,WAAW,EAAmB,MAAM,EAAE,MAAM,EAAmB,SAAS,EAAE,MAAM;IAEhH,OAAO,CAAC,kBAAkB,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,WAAW;IAoElH,OAAO,CAAC,0CAA0C;IAkDlD,OAAO,CAAC,oBAAoB;IAiD5B,OAAO,CAAC,oBAAoB;CAI7B;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"cfn-output-resolver.d.ts","sourceRoot":"","sources":["../../../../../src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAEvE,OAAO,EAAe,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAgBrE,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACrC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,GAAG,WAAW,CA2Fd"}