fix: handle potentially missing author org & email info

alma-cdk · May 14, 2022 · 65e6a59 · 65e6a59
1 parent 1e480aa
commit 65e6a59
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/src/smartstack/tags/index.ts b/src/smartstack/tags/index.ts
@@ -1,7 +1,7 @@
 import { Tags } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import { excludeSpecials } from './exclude';
-import { tagAccount, tagEnvironment, tagProject, tagAuthorInfo } from './taggers';
+import { tagAccount, tagEnvironment, tagProject, tagAuthorEmail, tagAuthorName, tagAuthorOrganization } from './taggers';
 import { resolveTagValues } from './values';
 
 function getTags(scope: Construct): Tags {
@@ -15,6 +15,8 @@ export function addTags(scope: Construct): void {
   tagAccount(scope, tags, values);
   tagEnvironment(scope, tags, values);
   tagProject(scope, tags, values);
-  tagAuthorInfo(scope, tags, values);
+  tagAuthorName(scope, tags, values);
+  tagAuthorOrganization(scope, tags, values);
+  tagAuthorEmail(scope, tags, values);
   excludeSpecials(tags);
-}
+}
diff --git a/src/smartstack/tags/taggers.ts b/src/smartstack/tags/taggers.ts
@@ -1,6 +1,7 @@
 import { Tags } from 'aws-cdk-lib';
 import { capitalCase, pascalCase } from 'change-case';
 import { Construct } from 'constructs';
+import { isSet } from 'lodash';
 import { hasAccount, hasEnvironment, useLegacyTags } from './checks';
 import { tagKey, Values } from './values';
 
@@ -10,18 +11,18 @@ interface Tagger {
 
 export const tagAccount: Tagger = (_: Construct, tags: Tags, values: Values) => {
   if (hasAccount(values)) {
-    tags.add(tagKey.ACCOUNT, values.accountType);
+    tags.add(tagKey.ACCOUNT, values.accountType!);
   }
 };
 
 export const tagEnvironment: Tagger = (scope: Construct, tags: Tags, values: Values) => {
   if (hasEnvironment(values)) {
-    tags.add(tagKey.ENVIRONMENT, values.environmentType);
+    tags.add(tagKey.ENVIRONMENT, values.environmentType!);
 
     if (useLegacyTags(scope)) {
       tags.add(
         tagKey.LEGACY_PROJECT_ENVIRONMENT,
-        `${pascalCase(values.projectName)}${pascalCase(values.environmentType)}`,
+        `${pascalCase(values.projectName)}${pascalCase(values.environmentType!)}`,
       );
     }
   }
@@ -35,8 +36,18 @@ export const tagProject: Tagger = (scope: Construct, tags: Tags, values: Values)
   tags.add(tagKey.PROJECT, value);
 };
 
-export const tagAuthorInfo: Tagger = (scope: Construct, tags: Tags, values: Values) => {
+export const tagAuthorName: Tagger = (_: Construct, tags: Tags, values: Values) => {
   tags.add(tagKey.AUTHOR_NAME, values.authorName);
-  tags.add(tagKey.AUTHOR_ORGANIZATION, values.authorOrganization);
-  tags.add(tagKey.AUTHOR_EMAIL, values.authorEmail);
+};
+
+export const tagAuthorOrganization: Tagger = (_: Construct, tags: Tags, values: Values) => {
+  if (isSet(values.authorOrganization)) {
+    tags.add(tagKey.AUTHOR_ORGANIZATION, values.authorOrganization);
+  }
+};
+
+export const tagAuthorEmail: Tagger = (_: Construct, tags: Tags, values: Values) => {
+  if (isSet(values.authorEmail)) {
+    tags.add(tagKey.AUTHOR_EMAIL, values.authorEmail);
+  }
 };
diff --git a/src/smartstack/tags/values.ts b/src/smartstack/tags/values.ts
@@ -6,8 +6,8 @@ export interface Values {
   environmentType?: string;
   projectName: string;
   authorName: string;
-  authorOrganization: string;
-  authorEmail: string;
+  authorOrganization?: string;
+  authorEmail?: string;
 }
 
 export enum tagKey {