Merge branch 'main' of github.com:alma-cdk/project

alma-cdk · Sep 5, 2022 · 20a2265 · 20a2265
2 parents e027e91 + 96ab6f2
commit 20a2265
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/smartstack/name/index.test.ts b/src/smartstack/name/index.test.ts
@@ -51,7 +51,7 @@ describe('SmartStack', () => {
           accountType: 'mock',
           stackId: 'my-stack',
         },
-        expected: 'MyProject-Mock-Account-MyStack',
+        expected: 'MyProject-Account-MyStack',
       },
       {
         name: 'environmentType empty',
@@ -61,7 +61,7 @@ describe('SmartStack', () => {
           environmentType: '',
           stackId: 'my-stack',
         },
-        expected: 'MyProject-Mock-Account-MyStack',
+        expected: 'MyProject-Account-MyStack',
       },
       {
         name: 'accountType missing',
@@ -108,7 +108,7 @@ describe('SmartStack', () => {
           environmentType: undefined,
           stackId: 'my-stack',
         },
-        expected: 'MyProject-'+capitalizeFirstLetter('n'.repeat(32))+'-Account-MyStack',
+        expected: 'MyProject-Account-MyStack',
       },
       {
         name: 'too long environmentType name',

diff --git a/src/smartstack/name/index.ts b/src/smartstack/name/index.ts
@@ -28,8 +28,8 @@ const template = `{#
       #}{{ environment | pascal | stripUnderscore | truncate(32, true, "") | prepend("Environment-") | append("-") }}{#
 
     #}{% elif account | notEmpty %}{#
-      "Dev-Account-"
-      #}{{ account | pascal| truncate(32, true, "") | append("-Account-") }}{#
+      "Project-Account-"
+      #}Account-{#
 
     #}{% endif %}{#