Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

template: Align with latest AWS tagging guidance #1782

Merged
merged 3 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/ten-plums-travel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'skuba': patch
---

template: Align with latest AWS tagging guidance
3 changes: 1 addition & 2 deletions template/express-rest-api/.gantry/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
# datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>

tags:
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'
# seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'
3 changes: 1 addition & 2 deletions template/koa-rest-api/.gantry/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
# datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>

tags:
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'
# seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'
6 changes: 2 additions & 4 deletions template/lambda-sqs-worker-cdk/infra/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ const app = new App();
const appStack = new AppStack(app, 'appStack', {
stackName: config.appName,
tags: {
'seek:env:label': environment,
'seek:source:sha': process.env.BUILDKITE_COMMIT ?? 'na',
// 'seek:source:url': 'TODO: add source URL',
// 'seek:system:name': 'TODO: add system name',
'seek:source:url': 'https://github.com/SEEK-Jobs/<%- repoName %>',
// 'seek:system:name': 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema',
Comment on lines -14 to +13
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or would we prefer to omit the internal links and just say something like "refer to AWS Tagging Standard RFC"?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this does much harm

},
});

Expand Down
5 changes: 1 addition & 4 deletions template/lambda-sqs-worker/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,8 @@ provider:
Effect: Allow
Resource: !Ref DestinationTopic
stackTags:
seek:env:label: ${env:ENVIRONMENT}
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:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'

package:
patterns:
Expand Down
Loading