apply environment tags

Author: cat5inthecradle

cicd/1-setup/deploy-cicd-dependencies.sh

@@ -21,6 +21,7 @@ then
     --stack-name javabuilder-cicd-deps \
     --template-file ${TEMPLATE_FILE} \
     --capabilities CAPABILITY_IAM \
+    --tags environment=cicd \
     "$@"
 
   echo Complete!

cicd/2-cicd/deploy-cicd.sh

@@ -44,6 +44,7 @@ then
     --template-file $TEMPLATE_FILE \
     --parameter-overrides GitHubBranch=$TARGET_BRANCH GitHubBadgeEnabled=$GITHUB_BADGE_ENABLED Mode=$MODE \
     --capabilities CAPABILITY_IAM \
+    --tags environment=cicd \
     "$@"
 
   echo Complete!

cicd/3-app/javabuilder/config/adhoc.config.json

@@ -7,5 +7,8 @@
     "LimitPerHour": "50",
     "LimitPerDay": "150",
     "SilenceAlerts": "true"
+  },
+  "Tags" : {
+    "environment" : "adhoc"
   }
 }

cicd/3-app/javabuilder/config/production.config.json

@@ -7,5 +7,8 @@
     "LimitPerHour": "150",
     "LimitPerDay": "300",
     "SilenceAlerts": "false"
+  },
+  "Tags" : {
+    "environment" : "production"
   }
 }

cicd/3-app/javabuilder/config/test.config.json

@@ -7,5 +7,8 @@
     "LimitPerHour": "15",
     "LimitPerDay": "40",
     "SilenceAlerts": "false"
+  },
+  "Tags" : {
+    "environment" : "test"
   }
 }

cicd/README.md

@@ -47,19 +47,19 @@ Finally, all of the above need some Roles to exist in the AWS accounts before we
    2. Push a commit to `main`
    3. Press the "Release Change" button on the Pipeline overview page in the AWS Console.
 
-### Deploying a CI/CD pipeline for a different branch
+### Deploying an Adhoc environment
 
-By setting the `TARGET_BRANCH` you can create a new CI/CD pipeline that watches for PR's and changes to the specified branch, deploying a Test and Production environment just like the standard pipeline.
+You can create an Adhoc environment by setting the `MODE` flag on the cicd deploy script. This will create a CI/CD pipeline that will watch for updates to your `TARGET_BRANCH`. The difference between a standard deployment and an adhoc pipeline can be seen in "cicd.template.yml" by following where the `Conditions` are used. In short, an adhoc creates an adhoc environment using "adhoc.config.yml", while a standard deployment will create a Test environment and a Prod environment using the relevent config files.
+Note: your branch name cannot contain the character `\`, as this causes issues in AWS. Note that resources will be deployed with the tags `{environment = adhoc}`.
 
 ```
-TARGET_BRANCH=mybranch cicd/2-cicd/deploy-cicd.sh
+TARGET_BRANCH=mybranch MODE=adhoc cicd/2-cicd/deploy-cicd.sh
 ```
 
-### Deploying an Adhoc environment
+### Deploying a full CI/CD pipeline for a different branch
 
-You can create an Adhoc environment by setting the `MODE` flag on the cicd deploy script. This will create a CI/CD pipeline that will watch for updates to your `TARGET_BRANCH`. The difference between a standard deployment and an adhoc pipeline can be seen in "cicd.template.yml" by following where the `Conditions` are used. In short, an adhoc creates an adhoc environment using "adhoc.config.yml", while a standard deployment will create a Test environment and a Prod environment using the relevent config files.
-Note: your branch name cannot contain the character `\`, as this causes issues in AWS.
+By setting the `TARGET_BRANCH` you can create a new CI/CD pipeline that watches for PR's and changes to the specified branch, deploying a Test and Production environment just like the standard pipeline. Note that resources will be deployed with the tags `{environment = production}` or `{environment = test}`.
 
 ```
-TARGET_BRANCH=mybranch MODE=adhoc cicd/2-cicd/deploy-cicd.sh
+TARGET_BRANCH=mybranch cicd/2-cicd/deploy-cicd.sh
 ```