fix: change vars to amplifyApiEnvironmentName

Author: Dane Pilcher

packages/backend-data/src/convert_js_resolvers.test.ts

@@ -37,7 +37,9 @@ void describe('defaultJsResolverCode', () => {
   void it('returns the default JS resolver code with api id and env name in valid JS', async () => {
     const code = defaultJsResolverCode('testApiId', 'testEnvName');
     assert(code.includes("ctx.stash.awsAppsyncApiId = 'testApiId';"));
-    assert(code.includes("ctx.stash.amplifyBranchName = 'testEnvName';"));
+    assert(
+      code.includes("ctx.stash.amplifyApiEnvironmentName = 'testEnvName';")
+    );
 
     const tempDir = tmpdir();
     const filename = join(tempDir, 'js_resolver_handler.js');
@@ -52,7 +54,7 @@ void describe('defaultJsResolverCode', () => {
     // assert api id and env name are added to the context stash
     assert.deepEqual(context.stash, {
       awsAppsyncApiId: 'testApiId',
-      amplifyBranchName: 'testEnvName',
+      amplifyApiEnvironmentName: 'testEnvName',
     });
     assert.equal(resolver.response(context), 'result');
   });
@@ -230,7 +232,7 @@ void describe('convertJsResolverDefinition', () => {
                 'ApiId',
               ],
             },
-            "';\n    ctx.stash.amplifyBranchName = 'NONE';\n    return {};\n};\n/**\n * Pipeline resolver response handler\n */\nexport const response = (ctx) => {\n    return ctx.prev.result;\n};\n",
+            "';\n    ctx.stash.amplifyApiEnvironmentName = 'NONE';\n    return {};\n};\n/**\n * Pipeline resolver response handler\n */\nexport const response = (ctx) => {\n    return ctx.prev.result;\n};\n",
           ],
         ],
       },

packages/backend-data/src/convert_js_resolvers.ts

@@ -24,7 +24,7 @@ const JS_PIPELINE_RESOLVER_HANDLER = './assets/js_resolver_handler.js';
  */
 export const defaultJsResolverCode = (
   amplifyApiId: string,
-  amplifyEnvironmentName: string
+  amplifyApiEnvironmentName: string
 ): string => {
   const resolvedTemplatePath = resolve(
     fileURLToPath(import.meta.url),
@@ -35,8 +35,8 @@ export const defaultJsResolverCode = (
   return readFileSync(resolvedTemplatePath, 'utf-8')
     .replace(new RegExp(/\$\{amplifyApiId\}/, 'g'), amplifyApiId)
     .replace(
-      new RegExp(/\$\{amplifyEnvironmentName\}/, 'g'),
-      amplifyEnvironmentName
+      new RegExp(/\$\{amplifyApiEnvironmentName\}/, 'g'),
+      amplifyApiEnvironmentName
     );
 };
 
@@ -78,15 +78,15 @@ export const convertJsResolverDefinition = (
 
     const resolverName = `Resolver_${resolver.typeName}_${resolver.fieldName}`;
 
-    const amplifyEnvironmentName =
+    const amplifyApiEnvironmentName =
       scope.node.tryGetContext('amplifyEnvironmentName') ?? 'NONE';
     new CfnResolver(scope, resolverName, {
       apiId: amplifyApi.apiId,
       fieldName: resolver.fieldName,
       typeName: resolver.typeName,
       kind: APPSYNC_PIPELINE_RESOLVER,
       // Uses synth-time inline code to avoid circular dependency when adding the API ID as an environment variable.
-      code: defaultJsResolverCode(amplifyApi.apiId, amplifyEnvironmentName),
+      code: defaultJsResolverCode(amplifyApi.apiId, amplifyApiEnvironmentName),
       runtime: {
         name: APPSYNC_JS_RUNTIME_NAME,
         runtimeVersion: APPSYNC_JS_RUNTIME_VERSION,