Remove account-level tags (#1494)

seek-oss · Mar 25, 2024 · 3bc9ad1 · 3bc9ad1
1 parent 34a9a36
commit 3bc9ad1
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 22 deletions.
diff --git a/.changeset/yellow-gifts-buy.md b/.changeset/yellow-gifts-buy.md
@@ -0,0 +1,7 @@
+---
+'skuba': patch
+---
+
+template: Remove account-level tags from resources
+
+This partially reverts [#1459](https://github.com/seek-oss/skuba/pull/1459) and [#1461](https://github.com/seek-oss/skuba/pull/1461) to avoid unnecessary duplication of account-level tags in our templates.
diff --git a/template/express-rest-api/.gantry/common.yml b/template/express-rest-api/.gantry/common.yml
@@ -9,7 +9,6 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:env:prod: '{{values "isProduction"}}'
   seek:source:sha: '{{.CommitSHA}}'
   seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
   # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
diff --git a/template/express-rest-api/.gantry/dev.yml b/template/express-rest-api/.gantry/dev.yml
@@ -2,8 +2,6 @@ environment: dev
 env:
   SOME_ENVIRONMENT_VARIABLE: dev-value
 
-isProduction: false
-
 maxInstanceCount: 1
 minInstanceCount: 1
 

diff --git a/template/express-rest-api/.gantry/prod.yml b/template/express-rest-api/.gantry/prod.yml
@@ -2,7 +2,5 @@ environment: prod
 env:
   SOME_ENVIRONMENT_VARIABLE: prod-value
 
-isProduction: true
-
 maxInstanceCount: 10
 minInstanceCount: 3
diff --git a/template/koa-rest-api/.gantry/common.yml b/template/koa-rest-api/.gantry/common.yml
@@ -9,7 +9,6 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:env:prod: '{{values "isProduction"}}'
   seek:source:sha: '{{.CommitSHA}}'
   seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
   # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
diff --git a/template/koa-rest-api/.gantry/dev.yml b/template/koa-rest-api/.gantry/dev.yml
@@ -2,13 +2,12 @@ environment: dev
 env:
   SOME_ENVIRONMENT_VARIABLE: dev-value
 
-isProduction: false
-
 maxInstanceCount: 1
 minInstanceCount: 1
 
 # Disable dashboard for cost savings
 cloudwatchDashboardDisabled: true
 
 openTelemetry:
+  datadogEnvironmentName: development
   enabled: false
diff --git a/template/koa-rest-api/.gantry/prod.yml b/template/koa-rest-api/.gantry/prod.yml
@@ -2,10 +2,9 @@ environment: prod
 env:
   SOME_ENVIRONMENT_VARIABLE: prod-value
 
-isProduction: true
-
 maxInstanceCount: 10
 minInstanceCount: 3
 
 openTelemetry:
+  datadogEnvironmentName: production
   enabled: false
diff --git a/template/koa-rest-api/gantry.apply.yml b/template/koa-rest-api/gantry.apply.yml
@@ -29,12 +29,8 @@ datadogSecretId: '{{values "datadogSecretId"}}'
 {{end}}
 
 openTelemetry:
-  enabled: {{.Values.openTelemetry.enabled | default false}}
-  {{if .Values.isProduction}}
-  datadogEnvironmentName: production
-  {{else}}
-  datadogEnvironmentName: development
-  {{end}}
+  datadogEnvironmentName: '{{values "openTelemetry.datadogEnvironmentName"}}'
+  enabled: {{values "openTelemetry.enabled"}}
 {{if .Values.pagerDutyEndpoint}}
 pagerDutyEndpoint: '{{values "pagerDutyEndpoint"}}'
 {{end}}

diff --git a/template/lambda-sqs-worker/serverless.yml b/template/lambda-sqs-worker/serverless.yml
@@ -20,11 +20,9 @@ params:
     description: <%- description %>
   dev:
     deploymentBucket: 'TODO: deployment-bucket-name'
-    isProduction: false
     concurrency: 2
   prod:
     deploymentBucket: 'TODO: deployment-bucket-name'
-    isProduction: true
     concurrency: 20
 
 custom:
@@ -83,14 +81,10 @@ provider:
           Resource: !Ref DestinationTopic
   stackTags:
     seek:env:label: ${env:ENVIRONMENT}
-    seek:env:prod: ${param:isProduction}
-    # seek:owner:cost-centre: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
-    seek:owner:technical: '<%- teamName %>'
     seek:source:sha: ${env:BUILDKITE_COMMIT, 'na'}
     seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
     seek:system:deployed-by: CFN
     # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
-    # seek:system:org: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
 
 package:
   patterns: