clean up cicd script and template

Author: cat5inthecradle

cicd/2-cicd/cicd.template.yml

@@ -35,9 +35,7 @@ Parameters:
 Conditions:
   TargetsMainBranch: !Equals [ !Ref GitHubBranch, main ]
   DeployToAdhoc: !Equals [!Ref Mode, adhoc ]
-  # DeployToTest and DeployToProd are the same right now
-  DeployToTest: !Equals [!Ref Mode, standard ]
-  DeployToProd: !Equals [ !Ref Mode, standard ]
+  DeployToTestAndProd: !Equals [!Ref Mode, standard ]
 
 
 Resources:
@@ -269,7 +267,6 @@ Resources:
                 ConnectionArn: !Sub arn:aws:codestar-connections:us-east-1:${AWS::AccountId}:connection/${CodeStarConnectionResourceId}
                 FullRepositoryId: !Sub ${GitHubOwner}/${GitHubRepo}
                 BranchName: !Ref GitHubBranch
-                DetectChanges: true
 
         - Name: Build
           Actions:
@@ -325,7 +322,7 @@ Resources:
           - !Ref AWS::NoValue
 
         - !If
-          - DeployToTest
+          - DeployToTestAndProd
           - Name: Deploy_To_Test
             Actions:
               - Name: app-deploy
@@ -351,7 +348,7 @@ Resources:
           - !Ref AWS::NoValue
 
         - !If
-          - DeployToTest
+          - DeployToTestAndProd
           - Name: Integration_Test
             Actions:
               - Name: integration-test
@@ -373,7 +370,7 @@ Resources:
           - !Ref AWS::NoValue
 
         - !If
-          - DeployToProd
+          - DeployToTestAndProd
           - Name: Deploy_To_Production
             Actions:
               - Name: app-deploy

cicd/2-cicd/deploy-cicd.sh

@@ -7,7 +7,6 @@ echo Deploying Javabuilder CICD Pipeline
 # - TARGET_BRANCH: Defaults to `main`, passed as a Parameter for "cicd/2-cicd/cicd.template.yml"
 # - MODE: Can be 'standard' (default) or 'adhoc', passed as a Parameter for "cicd/2-cicd/cicd.template.yml"
 # - GITHUB_BADGE_ENABLED: defaults to true, passed as a Parameter for "cicd/2-cicd/cicd.template.yml"
-# - STACK_NAME: defaults to an automated naming convention, no current use cases for changing this.
 
 # 'Developer' role requires a specific service role for all CloudFormation operations.
 if [[ $(aws sts get-caller-identity --query Arn --output text) =~ "assumed-role/Developer/" ]]; then
@@ -20,9 +19,9 @@ fi
 TARGET_BRANCH=${TARGET_BRANCH-'main'}
 if [ "$TARGET_BRANCH" == "main" ]
 then
-  STACK_NAME=${STACK_NAME-'javabuilder-cicd'}
+  STACK_NAME="javabuilder-cicd"
 else
-  STACK_NAME=${STACK_NAME-"javabuilder-$TARGET_BRANCH-cicd"}
+  STACK_NAME=${"javabuilder-$TARGET_BRANCH-cicd"}
 fi
 
 MODE=${MODE-'standard'}