Fix implementation

hupe1980 · Feb 26, 2024 · f9542bf · f9542bf
1 parent e764489
commit f9542bf
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 53 deletions.
diff --git a/src/__tests__/__snapshots__/stacks.test.ts.snap b/src/__tests__/__snapshots__/stacks.test.ts.snap
@@ -1,6 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Multiple stacks in a single app dependent stacks 1`] = `
+{
+  "Resources": {
+    "FooDFE0DD70": {
+      "DeletionPolicy": "Retain",
+      "Type": "AWS::S3::Bucket",
+      "UpdateReplacePolicy": "Retain",
+    },
+  },
+}
+`;
+
+exports[`Multiple stacks in a single app dependent stacks 2`] = `
 {
   "Resources": {
     "BarA6AB415C": {
@@ -60,7 +72,32 @@ exports[`Multiple stacks in a single app dependent stacks 1`] = `
 }
 `;
 
-exports[`Multiple stacks in a single app dependent stacks 2`] = `
+exports[`Multiple stacks in a single app one stack referencing the other 1`] = `
+{
+  "Outputs": {
+    "ExportsOutputFnGetAttFooDFE0DD70Arn2A3BEF77": {
+      "Export": {
+        "Name": "S3:ExportsOutputFnGetAttFooDFE0DD70Arn2A3BEF77",
+      },
+      "Value": {
+        "Fn::GetAtt": [
+          "FooDFE0DD70",
+          "Arn",
+        ],
+      },
+    },
+  },
+  "Resources": {
+    "FooDFE0DD70": {
+      "DeletionPolicy": "Retain",
+      "Type": "AWS::S3::Bucket",
+      "UpdateReplacePolicy": "Retain",
+    },
+  },
+}
+`;
+
+exports[`Multiple stacks in a single app one stack referencing the other 2`] = `
 {
   "Resources": {
     "BarA6AB415C": {
@@ -74,6 +111,13 @@ exports[`Multiple stacks in a single app dependent stacks 2`] = `
           },
           "S3Key": "7ecc77636deefb31954ea2e6aadf6d2c361a2943535a678d65f46a8de5e1f503.zip",
         },
+        "Environment": {
+          "Variables": {
+            "bucket": {
+              "Fn::ImportValue": "S3:ExportsOutputFnGetAttFooDFE0DD70Arn2A3BEF77",
+            },
+          },
+        },
         "Handler": "index.handler",
         "Role": {
           "Fn::GetAtt": [
@@ -119,53 +163,3 @@ exports[`Multiple stacks in a single app dependent stacks 2`] = `
   },
 }
 `;
-
-exports[`Multiple stacks in a single app one stack referencing the other 1`] = `
-{
-  "Outputs": {
-    "ExportsOutputFnGetAttFooDFE0DD70Arn2A3BEF77": {
-      "Export": {
-        "Name": "S3:ExportsOutputFnGetAttFooDFE0DD70Arn2A3BEF77",
-      },
-      "Value": {
-        "Fn::GetAtt": [
-          "FooDFE0DD70",
-          "Arn",
-        ],
-      },
-    },
-  },
-  "Resources": {
-    "FooDFE0DD70": {
-      "DeletionPolicy": "Retain",
-      "Type": "AWS::S3::Bucket",
-      "UpdateReplacePolicy": "Retain",
-    },
-  },
-}
-`;
-
-exports[`Multiple stacks in a single app one stack referencing the other 2`] = `
-{
-  "Outputs": {
-    "ExportsOutputFnGetAttFooDFE0DD70Arn2A3BEF77": {
-      "Export": {
-        "Name": "S3:ExportsOutputFnGetAttFooDFE0DD70Arn2A3BEF77",
-      },
-      "Value": {
-        "Fn::GetAtt": [
-          "FooDFE0DD70",
-          "Arn",
-        ],
-      },
-    },
-  },
-  "Resources": {
-    "FooDFE0DD70": {
-      "DeletionPolicy": "Retain",
-      "Type": "AWS::S3::Bucket",
-      "UpdateReplacePolicy": "Retain",
-    },
-  },
-}
-`;
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,5 @@
-import { App, Stack, StageSynthesisOptions } from "aws-cdk-lib";
+import { Template } from "aws-cdk-lib/assertions";
+import { Stack, StageSynthesisOptions } from "aws-cdk-lib";
 import { toMatchSnapshot } from "jest-snapshot";
 import * as jsYaml from "js-yaml";
 
@@ -12,6 +13,21 @@ declare global {
 }
 
 type Options = StageSynthesisOptions & {
+  /**
+   * @deprecated No effect. Please remove this, there is no alternative.
+   */
+  readonly skipValidation?: boolean;
+
+  /**
+   * @deprecated No effect. Please remove this, there is no alternative.
+   */
+  readonly validateOnSynthesis?: boolean;
+
+  /**
+   * @deprecated No effect. Please remove this, there is no alternative.
+   */
+  readonly force?: boolean;
+
   /**
    * Output snapshots in YAML (instead of JSON)
    */
@@ -110,7 +126,11 @@ const convertStack = (stack: Stack, options: Options = {}) => {
     ...synthOptions
   } = options;
 
-  const template = App.of(stack)?.synth(synthOptions).stacks[0].template ?? {};
+  if (Object.keys(synthOptions).length > 0) {
+    console.warn("Synth options are no longer supported. Please remove them.");
+  }
+
+  const template = Template.fromStack(stack, {}).toJSON();
 
   if (ignoreBootstrapVersion) {
     if (template.Parameters) {