refactor: evaluate tags in tagParser rather than iacStack

Signed-off-by: seven <[email protected]>

Author: Blankll

src/commands/deploy.ts

@@ -8,7 +8,7 @@ export const deploy = async (
 ) => {
   const context = constructActionContext({ ...options, stackName });
   logger.info('Validating yaml...');
-  const iac = parseYaml(context.iacLocation);
+  const iac = parseYaml(context);
   logger.info('Yaml is valid! 🎉');
 
   logger.info('Deploying stack...');

src/commands/template.ts

@@ -9,7 +9,7 @@ export const template = (
   options: { format: TemplateFormat; location: string; stage: string | undefined },
 ) => {
   const context = constructActionContext({ ...options, stackName });
-  const iac = parseYaml(context.iacLocation);
+  const iac = parseYaml(context);
   const { template } = generateStackTemplate(stackName, iac, context);
 
   const output =

src/commands/validate.ts

@@ -3,7 +3,7 @@ import { parseYaml } from '../parser';
 
 export const validate = (location: string | undefined, stage: string | undefined) => {
   const context = constructActionContext({ location, stage });
-  parseYaml(context.iacLocation);
+  parseYaml(context);
   logger.info('Yaml is valid! 🎉');
   logger.debug('Yaml is valid! debug🎉');
 };

src/parser/index.ts

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs';
-import { ServerlessIac, ServerlessIacRaw } from '../types';
+import { ActionContext, ServerlessIac, ServerlessIacRaw } from '../types';
 import { parseFunction } from './functionParser';
 import { parseEvent } from './eventParser';
 import { parseDatabase } from './databaseParser';
@@ -13,7 +13,7 @@ const validateExistence = (path: string) => {
   }
 };
 
-const transformYaml = (iacJson: ServerlessIacRaw): ServerlessIac => {
+const transformYaml = (iacJson: ServerlessIacRaw, context: ActionContext): ServerlessIac => {
   return {
     service: iacJson.service,
     version: iacJson.version,
@@ -23,17 +23,17 @@ const transformYaml = (iacJson: ServerlessIacRaw): ServerlessIac => {
     functions: parseFunction(iacJson.functions),
     events: parseEvent(iacJson.events),
     databases: parseDatabase(iacJson.databases),
-    tags: parseTag(iacJson.tags),
+    tags: parseTag(iacJson.tags, context),
   };
 };
 
-export const parseYaml = (yamlPath: string): ServerlessIac => {
-  validateExistence(yamlPath);
+export const parseYaml = (context: ActionContext): ServerlessIac => {
+  validateExistence(context.iacLocation);
 
-  const yamlContent = readFileSync(yamlPath, 'utf8');
+  const yamlContent = readFileSync(context.iacLocation, 'utf8');
   const iacJson = parse(yamlContent) as ServerlessIacRaw;
 
   validateYaml(iacJson);
 
-  return transformYaml(iacJson);
+  return transformYaml(iacJson, context);
 };

src/parser/tagParser.ts

@@ -1,9 +1,12 @@
-import { TagDomain, Tags } from '../types';
-import { isEmpty } from 'lodash';
+import { ActionContext, TagDomain, Tags } from '../types';
+import { replaceReference } from '../common';
 
-export const parseTag = (tags?: Tags): Array<TagDomain> => {
-  const tagList = [{ key: 'iac-provider', value: 'ServerlessInsight' }];
-  if (isEmpty(tags)) return tagList;
-
-  return [...tagList, ...Object.entries(tags).map(([key, value]) => ({ key, value }))];
+export const parseTag = (tags: Tags | undefined, context: ActionContext): Array<TagDomain> => {
+  return [
+    { key: 'iac-provider', value: 'ServerlessInsight' },
+    ...Object.entries(tags ?? {}).map(([key, value]) => ({
+      key: replaceReference(key, context),
+      value: replaceReference(value, context),
+    })),
+  ];
 };

src/stack/iacStack.ts

@@ -30,7 +30,7 @@ export class IacStack extends ros.Stack {
     super(scope, replaceReference(iac.service, context), {
       stackName: context.stackName,
       tags: iac.tags?.reduce((acc: { [key: string]: string }, tag) => {
-        acc[tag.key] = replaceReference(tag.value, context);
+        acc[tag.key] = tag.value;
         return acc;
       }, {}),
     });

tests/parser/parse.test.ts

@@ -3,10 +3,16 @@ import { parseYaml } from '../../src/parser';
 
 describe('unit test for parse', () => {
   describe('domain - databases', () => {
-    const yamlPath = path.resolve(__dirname, '../fixtures/serverless-insight-es.yml');
-
+    const defaultContext = {
+      iacLocation: path.resolve(__dirname, '../fixtures/serverless-insight-es.yml'),
+      accessKeyId: 'xxx',
+      accessKeySecret: 'xxx',
+      region: 'cn-chengdu',
+      stackName: 'insight-es-poc-test',
+      stage: 'test',
+    };
     it('should pass databases from yaml to domain instance when the yaml is valid', () => {
-      const databaseDomain = parseYaml(yamlPath);
+      const databaseDomain = parseYaml(defaultContext);
       expect(databaseDomain).toEqual({
         service: 'insight-es-poc',
         version: '0.0.1',