From 9d6b8d21fbeb7e8e61e75f46a0f15ea9806d515f Mon Sep 17 00:00:00 2001 From: Jake Heath <76011913+jakeyheath@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:36:06 -0700 Subject: [PATCH] feat: add default tags to AWS provider (#941) * feat: use tfc environment variables as default AWS tags * add var.tags to default * add helper scripts * update actions * update runs-on self-hosted * update golden files * commit from ci -- updated golden files --------- Co-authored-by: jakeyheath --- .github/workflows/build.yml | 38 ++- .../workflows/conventional_commits_title.yml | 2 +- .github/workflows/dependabot_automerge.yml | 2 +- .github/workflows/release.yml | 7 +- templates/templates/common/aws_provider.tmpl | 18 ++ .../component/terraform/fogg.tf.tmpl | 32 ++- .../repo/scripts/git_authors_json.sh | 3 + .../templates/repo/scripts/git_branch_json.sh | 3 + .../templates/repo/scripts/git_email_json.sh | 3 + .../templates/repo/scripts/git_sha_json.sh | 3 + .../templates/repo/scripts/git_user_json.sh | 3 + .../templates/repo/scripts/update-readme.sh | 0 .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/accounts/foo/fogg.tf | 30 +++ .../terraform/envs/bar/bam/fogg.tf | 30 +++ .../terraform/global/fogg.tf | 30 +++ .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/accounts/foo/fogg.tf | 30 +++ .../terraform/envs/bar/bam/fogg.tf | 30 +++ .../terraform/global/fogg.tf | 30 +++ testdata/circleci/scripts/git_authors_json.sh | 3 + testdata/circleci/scripts/git_branch_json.sh | 3 + testdata/circleci/scripts/git_email_json.sh | 3 + testdata/circleci/scripts/git_sha_json.sh | 3 + testdata/circleci/scripts/git_user_json.sh | 3 + testdata/circleci/terraform/global/fogg.tf | 30 +++ .../scripts/git_authors_json.sh | 3 + .../github_actions/scripts/git_branch_json.sh | 3 + .../github_actions/scripts/git_email_json.sh | 3 + .../github_actions/scripts/git_sha_json.sh | 3 + .../github_actions/scripts/git_user_json.sh | 3 + .../github_actions/terraform/global/fogg.tf | 30 +++ .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/accounts/foo/fogg.tf | 30 +++ .../terraform/envs/bar/bam/fogg.tf | 30 +++ .../terraform/global/fogg.tf | 30 +++ .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/accounts/foo/fogg.tf | 30 +++ .../terraform/envs/bar/bam/fogg.tf | 30 +++ .../terraform/global/fogg.tf | 30 +++ .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/accounts/acct1/fogg.tf | 30 +++ .../terraform/global/fogg.tf | 30 +++ .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/accounts/foo/fogg.tf | 30 +++ .../terraform/envs/bar/bam/fogg.tf | 30 +++ .../terraform/global/fogg.tf | 30 +++ .../tfe_config/scripts/git_authors_json.sh | 3 + .../tfe_config/scripts/git_branch_json.sh | 3 + testdata/tfe_config/scripts/git_email_json.sh | 3 + testdata/tfe_config/scripts/git_sha_json.sh | 3 + testdata/tfe_config/scripts/git_user_json.sh | 3 + .../terraform/accounts/account/fogg.tf | 48 ++++ .../terraform/envs/staging/comp1/fogg.tf | 48 ++++ testdata/tfe_config/terraform/global/fogg.tf | 48 ++++ testdata/tfe_config/terraform/tfe/fogg.tf | 48 ++++ .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../tfe_provider_yaml/scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/accounts/foo/fogg.tf | 30 +++ .../terraform/envs/bar/bam/fogg.tf | 30 +++ .../terraform/global/fogg.tf | 30 +++ .../v2_full_yaml/scripts/git_authors_json.sh | 3 + .../v2_full_yaml/scripts/git_branch_json.sh | 3 + .../v2_full_yaml/scripts/git_email_json.sh | 3 + testdata/v2_full_yaml/scripts/git_sha_json.sh | 3 + .../v2_full_yaml/scripts/git_user_json.sh | 3 + .../terraform/accounts/bar/fogg.tf | 228 ++++++++++++++++++ .../terraform/accounts/foo/fogg.tf | 48 ++++ .../terraform/envs/prod/datadog/fogg.tf | 48 ++++ .../terraform/envs/prod/hero/fogg.tf | 48 ++++ .../terraform/envs/prod/okta/fogg.tf | 48 ++++ .../terraform/envs/prod/sentry/fogg.tf | 48 ++++ .../terraform/envs/prod/vpc/fogg.tf | 48 ++++ .../terraform/envs/staging/comp1/fogg.tf | 48 ++++ .../terraform/envs/staging/comp2/fogg.tf | 48 ++++ .../terraform/envs/staging/k8s-comp/fogg.tf | 48 ++++ .../terraform/envs/staging/vpc/fogg.tf | 48 ++++ .../v2_full_yaml/terraform/global/fogg.tf | 48 ++++ .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/global/fogg.tf | 30 +++ .../scripts/git_authors_json.sh | 3 + .../scripts/git_branch_json.sh | 3 + .../scripts/git_email_json.sh | 3 + .../scripts/git_sha_json.sh | 3 + .../scripts/git_user_json.sh | 3 + .../terraform/accounts/bar/fogg.tf | 30 +++ .../terraform/accounts/foo/fogg.tf | 30 +++ .../terraform/envs/staging/comp1/fogg.tf | 30 +++ .../terraform/envs/staging/comp2/fogg.tf | 30 +++ .../terraform/envs/staging/vpc/fogg.tf | 30 +++ .../terraform/global/fogg.tf | 30 +++ 122 files changed, 2114 insertions(+), 13 deletions(-) create mode 100755 templates/templates/repo/scripts/git_authors_json.sh create mode 100755 templates/templates/repo/scripts/git_branch_json.sh create mode 100755 templates/templates/repo/scripts/git_email_json.sh create mode 100755 templates/templates/repo/scripts/git_sha_json.sh create mode 100755 templates/templates/repo/scripts/git_user_json.sh mode change 100644 => 100755 templates/templates/repo/scripts/update-readme.sh create mode 100644 testdata/auth0_provider_yaml/scripts/git_authors_json.sh create mode 100644 testdata/auth0_provider_yaml/scripts/git_branch_json.sh create mode 100644 testdata/auth0_provider_yaml/scripts/git_email_json.sh create mode 100644 testdata/auth0_provider_yaml/scripts/git_sha_json.sh create mode 100644 testdata/auth0_provider_yaml/scripts/git_user_json.sh create mode 100644 testdata/bless_provider_yaml/scripts/git_authors_json.sh create mode 100644 testdata/bless_provider_yaml/scripts/git_branch_json.sh create mode 100644 testdata/bless_provider_yaml/scripts/git_email_json.sh create mode 100644 testdata/bless_provider_yaml/scripts/git_sha_json.sh create mode 100644 testdata/bless_provider_yaml/scripts/git_user_json.sh create mode 100644 testdata/circleci/scripts/git_authors_json.sh create mode 100644 testdata/circleci/scripts/git_branch_json.sh create mode 100644 testdata/circleci/scripts/git_email_json.sh create mode 100644 testdata/circleci/scripts/git_sha_json.sh create mode 100644 testdata/circleci/scripts/git_user_json.sh create mode 100644 testdata/github_actions/scripts/git_authors_json.sh create mode 100644 testdata/github_actions/scripts/git_branch_json.sh create mode 100644 testdata/github_actions/scripts/git_email_json.sh create mode 100644 testdata/github_actions/scripts/git_sha_json.sh create mode 100644 testdata/github_actions/scripts/git_user_json.sh create mode 100644 testdata/github_provider_yaml/scripts/git_authors_json.sh create mode 100644 testdata/github_provider_yaml/scripts/git_branch_json.sh create mode 100644 testdata/github_provider_yaml/scripts/git_email_json.sh create mode 100644 testdata/github_provider_yaml/scripts/git_sha_json.sh create mode 100644 testdata/github_provider_yaml/scripts/git_user_json.sh create mode 100644 testdata/okta_provider_yaml/scripts/git_authors_json.sh create mode 100644 testdata/okta_provider_yaml/scripts/git_branch_json.sh create mode 100644 testdata/okta_provider_yaml/scripts/git_email_json.sh create mode 100644 testdata/okta_provider_yaml/scripts/git_sha_json.sh create mode 100644 testdata/okta_provider_yaml/scripts/git_user_json.sh create mode 100644 testdata/remote_backend_yaml/scripts/git_authors_json.sh create mode 100644 testdata/remote_backend_yaml/scripts/git_branch_json.sh create mode 100644 testdata/remote_backend_yaml/scripts/git_email_json.sh create mode 100644 testdata/remote_backend_yaml/scripts/git_sha_json.sh create mode 100644 testdata/remote_backend_yaml/scripts/git_user_json.sh create mode 100644 testdata/snowflake_provider_yaml/scripts/git_authors_json.sh create mode 100644 testdata/snowflake_provider_yaml/scripts/git_branch_json.sh create mode 100644 testdata/snowflake_provider_yaml/scripts/git_email_json.sh create mode 100644 testdata/snowflake_provider_yaml/scripts/git_sha_json.sh create mode 100644 testdata/snowflake_provider_yaml/scripts/git_user_json.sh create mode 100644 testdata/tfe_config/scripts/git_authors_json.sh create mode 100644 testdata/tfe_config/scripts/git_branch_json.sh create mode 100644 testdata/tfe_config/scripts/git_email_json.sh create mode 100644 testdata/tfe_config/scripts/git_sha_json.sh create mode 100644 testdata/tfe_config/scripts/git_user_json.sh create mode 100644 testdata/tfe_provider_yaml/scripts/git_authors_json.sh create mode 100644 testdata/tfe_provider_yaml/scripts/git_branch_json.sh create mode 100644 testdata/tfe_provider_yaml/scripts/git_email_json.sh create mode 100644 testdata/tfe_provider_yaml/scripts/git_sha_json.sh create mode 100644 testdata/tfe_provider_yaml/scripts/git_user_json.sh create mode 100644 testdata/v2_full_yaml/scripts/git_authors_json.sh create mode 100644 testdata/v2_full_yaml/scripts/git_branch_json.sh create mode 100644 testdata/v2_full_yaml/scripts/git_email_json.sh create mode 100644 testdata/v2_full_yaml/scripts/git_sha_json.sh create mode 100644 testdata/v2_full_yaml/scripts/git_user_json.sh create mode 100644 testdata/v2_minimal_valid_yaml/scripts/git_authors_json.sh create mode 100644 testdata/v2_minimal_valid_yaml/scripts/git_branch_json.sh create mode 100644 testdata/v2_minimal_valid_yaml/scripts/git_email_json.sh create mode 100644 testdata/v2_minimal_valid_yaml/scripts/git_sha_json.sh create mode 100644 testdata/v2_minimal_valid_yaml/scripts/git_user_json.sh create mode 100644 testdata/v2_no_aws_provider_yaml/scripts/git_authors_json.sh create mode 100644 testdata/v2_no_aws_provider_yaml/scripts/git_branch_json.sh create mode 100644 testdata/v2_no_aws_provider_yaml/scripts/git_email_json.sh create mode 100644 testdata/v2_no_aws_provider_yaml/scripts/git_sha_json.sh create mode 100644 testdata/v2_no_aws_provider_yaml/scripts/git_user_json.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52ec30707..deef8fcd7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,23 +1,49 @@ on: pull_request jobs: + golden: + runs-on: [self-hosted, ARM64, linux] + steps: + - name: Generate token + id: generate_token + uses: chanzuckerberg/github-app-token@v1.1.4 + with: + app_id: ${{ secrets.CZI_RELEASE_PLEASE_APP_ID }} + private_key: ${{ secrets.CZI_RELEASE_PLEASE_PK }} + - uses: actions/checkout@v3 + with: + token: ${{ steps.generate_token.outputs.token }} + ref: ${{ github.event.pull_request.head.ref }} + - uses: actions/setup-go@v4 + with: + go-version-file: go.mod + cache: true + - name: Run tests + run: make update-golden-files + - name: Commit updated mod tidy + uses: EndBug/add-and-commit@v9 + with: + add: -A + message: commit from ci -- updated golden files test: - runs-on: self-hosted + runs-on: [self-hosted, ARM64, linux] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v3 + - uses: actions/setup-go@v4 with: go-version-file: go.mod + cache: true - name: Run tests run: make test-ci lint: - runs-on: self-hosted + runs-on: [self-hosted, ARM64, linux] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v3 + - uses: actions/setup-go@v4 with: go-version-file: go.mod + cache: true - uses: actions/setup-node@v3 with: node-version: 18 diff --git a/.github/workflows/conventional_commits_title.yml b/.github/workflows/conventional_commits_title.yml index 0b649edf8..4048a7b84 100644 --- a/.github/workflows/conventional_commits_title.yml +++ b/.github/workflows/conventional_commits_title.yml @@ -9,6 +9,6 @@ on: jobs: conventional_commit_title: - runs-on: self-hosted + runs-on: [self-hosted, ARM64, linux] steps: - uses: chanzuckerberg/github-actions/.github/actions/conventional-commits@main diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml index 5a67f70ee..f40ece613 100644 --- a/.github/workflows/dependabot_automerge.yml +++ b/.github/workflows/dependabot_automerge.yml @@ -9,7 +9,7 @@ concurrency: cancel-in-progress: true jobs: dependabot: - runs-on: [ARM64, self-hosted, Linux] + runs-on: [self-hosted, ARM64, linux] if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Generate token diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d7e703ce..3f2f0063e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: name: release-please jobs: release-please: - runs-on: self-hosted + runs-on: [self-hosted, ARM64, linux] steps: - uses: actions/github-script@v5 id: configure-changelog @@ -38,16 +38,17 @@ jobs: changelog-types: ${{ steps.configure-changelog.outputs.result }} token: ${{ steps.generate_token.outputs.token }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # we need to fetch all history and tags # so we build the proper version with: fetch-depth: 0 if: ${{ steps.release.outputs.release_created }} - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version-file: go.mod + cache: true if: ${{ steps.release.outputs.release_created }} - name: Run GoReleaser diff --git a/templates/templates/common/aws_provider.tmpl b/templates/templates/common/aws_provider.tmpl index 06b25adb1..92eea1b98 100644 --- a/templates/templates/common/aws_provider.tmpl +++ b/templates/templates/common/aws_provider.tmpl @@ -8,6 +8,24 @@ provider "aws" { role_arn = "{{ .RoleArn }}" } {{ end }} + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["{{ .AccountID }}"] } {{ end }} diff --git a/templates/templates/component/terraform/fogg.tf.tmpl b/templates/templates/component/terraform/fogg.tf.tmpl index 520343f54..022e6965a 100644 --- a/templates/templates/component/terraform/fogg.tf.tmpl +++ b/templates/templates/component/terraform/fogg.tf.tmpl @@ -1,13 +1,39 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. - +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} {{ if .ProviderConfiguration.AWS }} {{ template "aws_provider" .ProviderConfiguration.AWS}} # Aliased Providers (for doing things in every region). {{ range $p := .ProviderConfiguration.AWSAdditionalProviders }} {{ template "aws_provider" $p}} {{ end }} - {{ end }} {{ if .ProviderConfiguration.Snowflake }}{{ if not .ProviderConfiguration.Snowflake.CustomProvider }} @@ -120,6 +146,8 @@ variable "owner" { } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({project: string, env: string, service: string, owner: string, managedBy: string}) default = { diff --git a/templates/templates/repo/scripts/git_authors_json.sh b/templates/templates/repo/scripts/git_authors_json.sh new file mode 100755 index 000000000..86f26bdbe --- /dev/null +++ b/templates/templates/repo/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/templates/templates/repo/scripts/git_branch_json.sh b/templates/templates/repo/scripts/git_branch_json.sh new file mode 100755 index 000000000..916ed8495 --- /dev/null +++ b/templates/templates/repo/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/templates/templates/repo/scripts/git_email_json.sh b/templates/templates/repo/scripts/git_email_json.sh new file mode 100755 index 000000000..81c05ce36 --- /dev/null +++ b/templates/templates/repo/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/templates/templates/repo/scripts/git_sha_json.sh b/templates/templates/repo/scripts/git_sha_json.sh new file mode 100755 index 000000000..c153c223d --- /dev/null +++ b/templates/templates/repo/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/templates/templates/repo/scripts/git_user_json.sh b/templates/templates/repo/scripts/git_user_json.sh new file mode 100755 index 000000000..492af9e6b --- /dev/null +++ b/templates/templates/repo/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/templates/templates/repo/scripts/update-readme.sh b/templates/templates/repo/scripts/update-readme.sh old mode 100644 new mode 100755 diff --git a/testdata/auth0_provider_yaml/scripts/git_authors_json.sh b/testdata/auth0_provider_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/auth0_provider_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/auth0_provider_yaml/scripts/git_branch_json.sh b/testdata/auth0_provider_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/auth0_provider_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/auth0_provider_yaml/scripts/git_email_json.sh b/testdata/auth0_provider_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/auth0_provider_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/auth0_provider_yaml/scripts/git_sha_json.sh b/testdata/auth0_provider_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/auth0_provider_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/auth0_provider_yaml/scripts/git_user_json.sh b/testdata/auth0_provider_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/auth0_provider_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/auth0_provider_yaml/terraform/accounts/foo/fogg.tf b/testdata/auth0_provider_yaml/terraform/accounts/foo/fogg.tf index b46373d43..2558cad85 100644 --- a/testdata/auth0_provider_yaml/terraform/accounts/foo/fogg.tf +++ b/testdata/auth0_provider_yaml/terraform/accounts/foo/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -106,6 +134,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/auth0_provider_yaml/terraform/envs/bar/bam/fogg.tf b/testdata/auth0_provider_yaml/terraform/envs/bar/bam/fogg.tf index 8de4c3002..ecd3f42e3 100644 --- a/testdata/auth0_provider_yaml/terraform/envs/bar/bam/fogg.tf +++ b/testdata/auth0_provider_yaml/terraform/envs/bar/bam/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -101,6 +129,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/auth0_provider_yaml/terraform/global/fogg.tf b/testdata/auth0_provider_yaml/terraform/global/fogg.tf index b25702224..0bf9fd42a 100644 --- a/testdata/auth0_provider_yaml/terraform/global/fogg.tf +++ b/testdata/auth0_provider_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -101,6 +129,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/bless_provider_yaml/scripts/git_authors_json.sh b/testdata/bless_provider_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/bless_provider_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/bless_provider_yaml/scripts/git_branch_json.sh b/testdata/bless_provider_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/bless_provider_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/bless_provider_yaml/scripts/git_email_json.sh b/testdata/bless_provider_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/bless_provider_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/bless_provider_yaml/scripts/git_sha_json.sh b/testdata/bless_provider_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/bless_provider_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/bless_provider_yaml/scripts/git_user_json.sh b/testdata/bless_provider_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/bless_provider_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/bless_provider_yaml/terraform/accounts/foo/fogg.tf b/testdata/bless_provider_yaml/terraform/accounts/foo/fogg.tf index a9b18ab87..1e62722d2 100644 --- a/testdata/bless_provider_yaml/terraform/accounts/foo/fogg.tf +++ b/testdata/bless_provider_yaml/terraform/accounts/foo/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -119,6 +147,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/bless_provider_yaml/terraform/envs/bar/bam/fogg.tf b/testdata/bless_provider_yaml/terraform/envs/bar/bam/fogg.tf index dbfa7be40..a2b0c0b81 100644 --- a/testdata/bless_provider_yaml/terraform/envs/bar/bam/fogg.tf +++ b/testdata/bless_provider_yaml/terraform/envs/bar/bam/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -114,6 +142,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/bless_provider_yaml/terraform/global/fogg.tf b/testdata/bless_provider_yaml/terraform/global/fogg.tf index 2576e96bf..fe390e2a0 100644 --- a/testdata/bless_provider_yaml/terraform/global/fogg.tf +++ b/testdata/bless_provider_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -114,6 +142,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/circleci/scripts/git_authors_json.sh b/testdata/circleci/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/circleci/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/circleci/scripts/git_branch_json.sh b/testdata/circleci/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/circleci/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/circleci/scripts/git_email_json.sh b/testdata/circleci/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/circleci/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/circleci/scripts/git_sha_json.sh b/testdata/circleci/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/circleci/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/circleci/scripts/git_user_json.sh b/testdata/circleci/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/circleci/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/circleci/terraform/global/fogg.tf b/testdata/circleci/terraform/global/fogg.tf index bf353d734..da88d992a 100644 --- a/testdata/circleci/terraform/global/fogg.tf +++ b/testdata/circleci/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -90,6 +118,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/github_actions/scripts/git_authors_json.sh b/testdata/github_actions/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/github_actions/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_actions/scripts/git_branch_json.sh b/testdata/github_actions/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/github_actions/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_actions/scripts/git_email_json.sh b/testdata/github_actions/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/github_actions/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_actions/scripts/git_sha_json.sh b/testdata/github_actions/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/github_actions/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_actions/scripts/git_user_json.sh b/testdata/github_actions/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/github_actions/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_actions/terraform/global/fogg.tf b/testdata/github_actions/terraform/global/fogg.tf index bf353d734..da88d992a 100644 --- a/testdata/github_actions/terraform/global/fogg.tf +++ b/testdata/github_actions/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -90,6 +118,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/github_provider_yaml/scripts/git_authors_json.sh b/testdata/github_provider_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/github_provider_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_provider_yaml/scripts/git_branch_json.sh b/testdata/github_provider_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/github_provider_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_provider_yaml/scripts/git_email_json.sh b/testdata/github_provider_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/github_provider_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_provider_yaml/scripts/git_sha_json.sh b/testdata/github_provider_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/github_provider_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_provider_yaml/scripts/git_user_json.sh b/testdata/github_provider_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/github_provider_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/github_provider_yaml/terraform/accounts/foo/fogg.tf b/testdata/github_provider_yaml/terraform/accounts/foo/fogg.tf index 4544e8652..34b3a2a95 100644 --- a/testdata/github_provider_yaml/terraform/accounts/foo/fogg.tf +++ b/testdata/github_provider_yaml/terraform/accounts/foo/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -107,6 +135,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/github_provider_yaml/terraform/envs/bar/bam/fogg.tf b/testdata/github_provider_yaml/terraform/envs/bar/bam/fogg.tf index c54b16285..180517ad2 100644 --- a/testdata/github_provider_yaml/terraform/envs/bar/bam/fogg.tf +++ b/testdata/github_provider_yaml/terraform/envs/bar/bam/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -102,6 +130,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/github_provider_yaml/terraform/global/fogg.tf b/testdata/github_provider_yaml/terraform/global/fogg.tf index 7ca61098f..9cebfe0b7 100644 --- a/testdata/github_provider_yaml/terraform/global/fogg.tf +++ b/testdata/github_provider_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -102,6 +130,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/okta_provider_yaml/scripts/git_authors_json.sh b/testdata/okta_provider_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/okta_provider_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/okta_provider_yaml/scripts/git_branch_json.sh b/testdata/okta_provider_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/okta_provider_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/okta_provider_yaml/scripts/git_email_json.sh b/testdata/okta_provider_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/okta_provider_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/okta_provider_yaml/scripts/git_sha_json.sh b/testdata/okta_provider_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/okta_provider_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/okta_provider_yaml/scripts/git_user_json.sh b/testdata/okta_provider_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/okta_provider_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/okta_provider_yaml/terraform/accounts/foo/fogg.tf b/testdata/okta_provider_yaml/terraform/accounts/foo/fogg.tf index 1685c4e59..0eae47ddf 100644 --- a/testdata/okta_provider_yaml/terraform/accounts/foo/fogg.tf +++ b/testdata/okta_provider_yaml/terraform/accounts/foo/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -107,6 +135,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/okta_provider_yaml/terraform/envs/bar/bam/fogg.tf b/testdata/okta_provider_yaml/terraform/envs/bar/bam/fogg.tf index 997522d34..fe817efdd 100644 --- a/testdata/okta_provider_yaml/terraform/envs/bar/bam/fogg.tf +++ b/testdata/okta_provider_yaml/terraform/envs/bar/bam/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -102,6 +130,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/okta_provider_yaml/terraform/global/fogg.tf b/testdata/okta_provider_yaml/terraform/global/fogg.tf index 5478aede6..81a0575a8 100644 --- a/testdata/okta_provider_yaml/terraform/global/fogg.tf +++ b/testdata/okta_provider_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -102,6 +130,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/remote_backend_yaml/scripts/git_authors_json.sh b/testdata/remote_backend_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/remote_backend_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/remote_backend_yaml/scripts/git_branch_json.sh b/testdata/remote_backend_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/remote_backend_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/remote_backend_yaml/scripts/git_email_json.sh b/testdata/remote_backend_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/remote_backend_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/remote_backend_yaml/scripts/git_sha_json.sh b/testdata/remote_backend_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/remote_backend_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/remote_backend_yaml/scripts/git_user_json.sh b/testdata/remote_backend_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/remote_backend_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/remote_backend_yaml/terraform/accounts/acct1/fogg.tf b/testdata/remote_backend_yaml/terraform/accounts/acct1/fogg.tf index 7f6c1c426..2b2bcab94 100644 --- a/testdata/remote_backend_yaml/terraform/accounts/acct1/fogg.tf +++ b/testdata/remote_backend_yaml/terraform/accounts/acct1/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -93,6 +121,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/remote_backend_yaml/terraform/global/fogg.tf b/testdata/remote_backend_yaml/terraform/global/fogg.tf index 993b72e1a..06680e262 100644 --- a/testdata/remote_backend_yaml/terraform/global/fogg.tf +++ b/testdata/remote_backend_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -88,6 +116,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/snowflake_provider_yaml/scripts/git_authors_json.sh b/testdata/snowflake_provider_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/snowflake_provider_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/snowflake_provider_yaml/scripts/git_branch_json.sh b/testdata/snowflake_provider_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/snowflake_provider_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/snowflake_provider_yaml/scripts/git_email_json.sh b/testdata/snowflake_provider_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/snowflake_provider_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/snowflake_provider_yaml/scripts/git_sha_json.sh b/testdata/snowflake_provider_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/snowflake_provider_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/snowflake_provider_yaml/scripts/git_user_json.sh b/testdata/snowflake_provider_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/snowflake_provider_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/snowflake_provider_yaml/terraform/accounts/foo/fogg.tf b/testdata/snowflake_provider_yaml/terraform/accounts/foo/fogg.tf index de075704e..8d3fa91ea 100644 --- a/testdata/snowflake_provider_yaml/terraform/accounts/foo/fogg.tf +++ b/testdata/snowflake_provider_yaml/terraform/accounts/foo/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "snowflake" { account = "foo" @@ -108,6 +136,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/snowflake_provider_yaml/terraform/envs/bar/bam/fogg.tf b/testdata/snowflake_provider_yaml/terraform/envs/bar/bam/fogg.tf index 881826a5d..5baa17523 100644 --- a/testdata/snowflake_provider_yaml/terraform/envs/bar/bam/fogg.tf +++ b/testdata/snowflake_provider_yaml/terraform/envs/bar/bam/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "snowflake" { account = "foo" @@ -103,6 +131,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/snowflake_provider_yaml/terraform/global/fogg.tf b/testdata/snowflake_provider_yaml/terraform/global/fogg.tf index 02779039f..48d759b42 100644 --- a/testdata/snowflake_provider_yaml/terraform/global/fogg.tf +++ b/testdata/snowflake_provider_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "snowflake" { account = "foo" @@ -103,6 +131,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/tfe_config/scripts/git_authors_json.sh b/testdata/tfe_config/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/tfe_config/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_config/scripts/git_branch_json.sh b/testdata/tfe_config/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/tfe_config/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_config/scripts/git_email_json.sh b/testdata/tfe_config/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/tfe_config/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_config/scripts/git_sha_json.sh b/testdata/tfe_config/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/tfe_config/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_config/scripts/git_user_json.sh b/testdata/tfe_config/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/tfe_config/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_config/terraform/accounts/account/fogg.tf b/testdata/tfe_config/terraform/accounts/account/fogg.tf index bd0a10b27..7e39f0be5 100644 --- a/testdata/tfe_config/terraform/accounts/account/fogg.tf +++ b/testdata/tfe_config/terraform/accounts/account/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" @@ -9,6 +37,24 @@ provider "aws" { role_arn = "arn:aws:iam::626314663667:role/tfe-si" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["626314663667"] } # Aliased Providers (for doing things in every region). @@ -118,6 +164,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/tfe_config/terraform/envs/staging/comp1/fogg.tf b/testdata/tfe_config/terraform/envs/staging/comp1/fogg.tf index 2dadc6b4d..937ee629f 100644 --- a/testdata/tfe_config/terraform/envs/staging/comp1/fogg.tf +++ b/testdata/tfe_config/terraform/envs/staging/comp1/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" @@ -9,6 +37,24 @@ provider "aws" { role_arn = "arn:aws:iam::626314663667:role/tfe-si" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["626314663667"] } # Aliased Providers (for doing things in every region). @@ -115,6 +161,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/tfe_config/terraform/global/fogg.tf b/testdata/tfe_config/terraform/global/fogg.tf index d032cd819..4fdd7da54 100644 --- a/testdata/tfe_config/terraform/global/fogg.tf +++ b/testdata/tfe_config/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" @@ -9,6 +37,24 @@ provider "aws" { role_arn = "arn:aws:iam::626314663667:role/tfe-si" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["626314663667"] } # Aliased Providers (for doing things in every region). @@ -113,6 +159,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/tfe_config/terraform/tfe/fogg.tf b/testdata/tfe_config/terraform/tfe/fogg.tf index 366ad69d8..bf984e4f3 100644 --- a/testdata/tfe_config/terraform/tfe/fogg.tf +++ b/testdata/tfe_config/terraform/tfe/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" @@ -9,6 +37,24 @@ provider "aws" { role_arn = "arn:aws:iam::626314663666:role/tfe-si" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["626314663666"] } # Aliased Providers (for doing things in every region). @@ -120,6 +166,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/tfe_provider_yaml/scripts/git_authors_json.sh b/testdata/tfe_provider_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/tfe_provider_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_provider_yaml/scripts/git_branch_json.sh b/testdata/tfe_provider_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/tfe_provider_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_provider_yaml/scripts/git_email_json.sh b/testdata/tfe_provider_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/tfe_provider_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_provider_yaml/scripts/git_sha_json.sh b/testdata/tfe_provider_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/tfe_provider_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_provider_yaml/scripts/git_user_json.sh b/testdata/tfe_provider_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/tfe_provider_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/tfe_provider_yaml/terraform/accounts/foo/fogg.tf b/testdata/tfe_provider_yaml/terraform/accounts/foo/fogg.tf index 4f54e211f..dc19a798a 100644 --- a/testdata/tfe_provider_yaml/terraform/accounts/foo/fogg.tf +++ b/testdata/tfe_provider_yaml/terraform/accounts/foo/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -105,6 +133,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/tfe_provider_yaml/terraform/envs/bar/bam/fogg.tf b/testdata/tfe_provider_yaml/terraform/envs/bar/bam/fogg.tf index 0ea4354ce..dcda28880 100644 --- a/testdata/tfe_provider_yaml/terraform/envs/bar/bam/fogg.tf +++ b/testdata/tfe_provider_yaml/terraform/envs/bar/bam/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -90,6 +118,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/tfe_provider_yaml/terraform/global/fogg.tf b/testdata/tfe_provider_yaml/terraform/global/fogg.tf index 643d2459f..d733df25d 100644 --- a/testdata/tfe_provider_yaml/terraform/global/fogg.tf +++ b/testdata/tfe_provider_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} @@ -100,6 +128,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/scripts/git_authors_json.sh b/testdata/v2_full_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/v2_full_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_full_yaml/scripts/git_branch_json.sh b/testdata/v2_full_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/v2_full_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_full_yaml/scripts/git_email_json.sh b/testdata/v2_full_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/v2_full_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_full_yaml/scripts/git_sha_json.sh b/testdata/v2_full_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/v2_full_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_full_yaml/scripts/git_user_json.sh b/testdata/v2_full_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/v2_full_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_full_yaml/terraform/accounts/bar/fogg.tf b/testdata/v2_full_yaml/terraform/accounts/bar/fogg.tf index 8935a4300..b7bd8a795 100644 --- a/testdata/v2_full_yaml/terraform/accounts/bar/fogg.tf +++ b/testdata/v2_full_yaml/terraform/accounts/bar/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" @@ -9,6 +37,24 @@ provider "aws" { role_arn = "arn:aws:iam::00456:role/foo" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -23,6 +69,24 @@ provider "aws" { role_arn = "arn:aws:iam::different_account:role/foo" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["different_account"] } @@ -36,6 +100,24 @@ provider "aws" { role_arn = "arn:aws:iam::different_account:role/foo" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["different_account"] } @@ -49,6 +131,24 @@ provider "aws" { role_arn = "arn:aws:iam::different_account:role/foo" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["different_account"] } @@ -62,6 +162,24 @@ provider "aws" { role_arn = "arn:aws:iam::another_different_account:role/foo" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["another_different_account"] } @@ -75,6 +193,24 @@ provider "aws" { role_arn = "arn:aws:iam::another_different_account:role/foo" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["another_different_account"] } @@ -88,6 +224,24 @@ provider "aws" { role_arn = "arn:aws:iam::789:role/different_role" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["789"] } @@ -101,6 +255,24 @@ provider "aws" { role_arn = "arn:aws:iam::789:role/different_role" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["789"] } @@ -114,6 +286,24 @@ provider "aws" { role_arn = "arn:aws:iam::789:role/different_role" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["789"] } @@ -127,6 +317,24 @@ provider "aws" { role_arn = "arn:aws:iam::00456:role/foo" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } @@ -140,6 +348,24 @@ provider "aws" { role_arn = "arn:aws:iam::00456:role/foo" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } @@ -262,6 +488,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/accounts/foo/fogg.tf b/testdata/v2_full_yaml/terraform/accounts/foo/fogg.tf index 8a097aa1f..573d991a2 100644 --- a/testdata/v2_full_yaml/terraform/accounts/foo/fogg.tf +++ b/testdata/v2_full_yaml/terraform/accounts/foo/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" @@ -9,6 +37,24 @@ provider "aws" { role_arn = "arn:aws:iam::123:role/roll" } + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["123"] } # Aliased Providers (for doing things in every region). @@ -132,6 +178,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/prod/datadog/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/datadog/fogg.tf index ea7ccf50d..a21185f2c 100644 --- a/testdata/v2_full_yaml/terraform/envs/prod/datadog/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/prod/datadog/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -125,6 +171,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/prod/hero/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/hero/fogg.tf index 4747bb1c7..58e0c5af0 100644 --- a/testdata/v2_full_yaml/terraform/envs/prod/hero/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/prod/hero/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -133,6 +179,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/prod/okta/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/okta/fogg.tf index 6e636c652..e85acf088 100644 --- a/testdata/v2_full_yaml/terraform/envs/prod/okta/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/prod/okta/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -128,6 +174,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/prod/sentry/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/sentry/fogg.tf index cdcf17fb8..eaefb8cf4 100644 --- a/testdata/v2_full_yaml/terraform/envs/prod/sentry/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/prod/sentry/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -126,6 +172,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/prod/vpc/fogg.tf b/testdata/v2_full_yaml/terraform/envs/prod/vpc/fogg.tf index cb60f3ee6..fb0ec852d 100644 --- a/testdata/v2_full_yaml/terraform/envs/prod/vpc/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/prod/vpc/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -116,6 +162,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/staging/comp1/fogg.tf b/testdata/v2_full_yaml/terraform/envs/staging/comp1/fogg.tf index 7a6e287d1..a67464ab4 100644 --- a/testdata/v2_full_yaml/terraform/envs/staging/comp1/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/staging/comp1/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -114,6 +160,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/staging/comp2/fogg.tf b/testdata/v2_full_yaml/terraform/envs/staging/comp2/fogg.tf index 40bdc0c72..57468cb88 100644 --- a/testdata/v2_full_yaml/terraform/envs/staging/comp2/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/staging/comp2/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -114,6 +160,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/staging/k8s-comp/fogg.tf b/testdata/v2_full_yaml/terraform/envs/staging/k8s-comp/fogg.tf index 1a1f5b7e1..ece140b9c 100644 --- a/testdata/v2_full_yaml/terraform/envs/staging/k8s-comp/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/staging/k8s-comp/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -132,6 +178,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/envs/staging/vpc/fogg.tf b/testdata/v2_full_yaml/terraform/envs/staging/vpc/fogg.tf index bdf1c6ee9..f90f462eb 100644 --- a/testdata/v2_full_yaml/terraform/envs/staging/vpc/fogg.tf +++ b/testdata/v2_full_yaml/terraform/envs/staging/vpc/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -114,6 +160,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_full_yaml/terraform/global/fogg.tf b/testdata/v2_full_yaml/terraform/global/fogg.tf index 03de18300..27fba750b 100644 --- a/testdata/v2_full_yaml/terraform/global/fogg.tf +++ b/testdata/v2_full_yaml/terraform/global/fogg.tf @@ -1,10 +1,56 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "aws" { region = "us-west-2" profile = "profile" + # this is the new way of injecting AWS tags to all AWS resources + # var.tags should be considered deprecated + default_tags { + tags = { + TFC_RUN_ID = var.TFC_RUN_ID + TFC_WORKSPACE_NAME = var.TFC_WORKSPACE_NAME + TFC_WORKSPACE_SLUG = var.TFC_WORKSPACE_SLUG + TFC_CONFIGURATION_VERSION_GIT_BRANCH = var.TFC_CONFIGURATION_VERSION_GIT_BRANCH + TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA + TFC_CONFIGURATION_VERSION_GIT_TAG = var.TFC_CONFIGURATION_VERSION_GIT_TAG + TFC_PROJECT_NAME = var.TFC_PROJECT_NAME + project = var.tags.project + env = var.tags.env + service = var.tags.service + owner = var.tags.owner + managedBy = "terraform" + } + } allowed_account_ids = ["00456"] } # Aliased Providers (for doing things in every region). @@ -116,6 +162,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_minimal_valid_yaml/scripts/git_authors_json.sh b/testdata/v2_minimal_valid_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/v2_minimal_valid_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_minimal_valid_yaml/scripts/git_branch_json.sh b/testdata/v2_minimal_valid_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/v2_minimal_valid_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_minimal_valid_yaml/scripts/git_email_json.sh b/testdata/v2_minimal_valid_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/v2_minimal_valid_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_minimal_valid_yaml/scripts/git_sha_json.sh b/testdata/v2_minimal_valid_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/v2_minimal_valid_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_minimal_valid_yaml/scripts/git_user_json.sh b/testdata/v2_minimal_valid_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/v2_minimal_valid_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_minimal_valid_yaml/terraform/global/fogg.tf b/testdata/v2_minimal_valid_yaml/terraform/global/fogg.tf index bf353d734..da88d992a 100644 --- a/testdata/v2_minimal_valid_yaml/terraform/global/fogg.tf +++ b/testdata/v2_minimal_valid_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -90,6 +118,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_no_aws_provider_yaml/scripts/git_authors_json.sh b/testdata/v2_no_aws_provider_yaml/scripts/git_authors_json.sh new file mode 100644 index 000000000..86f26bdbe --- /dev/null +++ b/testdata/v2_no_aws_provider_yaml/scripts/git_authors_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"authors\": \"$(git --no-pager log --format='%an' -- . | grep -v "[bot]" | head -10)\"}" || echo "{ \"authors\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_no_aws_provider_yaml/scripts/git_branch_json.sh b/testdata/v2_no_aws_provider_yaml/scripts/git_branch_json.sh new file mode 100644 index 000000000..916ed8495 --- /dev/null +++ b/testdata/v2_no_aws_provider_yaml/scripts/git_branch_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"branch\": \"$(git --no-pager rev-parse --abbrev-ref HEAD)\"}" || echo "{ \"branch\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_no_aws_provider_yaml/scripts/git_email_json.sh b/testdata/v2_no_aws_provider_yaml/scripts/git_email_json.sh new file mode 100644 index 000000000..81c05ce36 --- /dev/null +++ b/testdata/v2_no_aws_provider_yaml/scripts/git_email_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"email\": \"$(git --no-pager config --global --get user.email)\"}" || echo "{ \"email\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_no_aws_provider_yaml/scripts/git_sha_json.sh b/testdata/v2_no_aws_provider_yaml/scripts/git_sha_json.sh new file mode 100644 index 000000000..c153c223d --- /dev/null +++ b/testdata/v2_no_aws_provider_yaml/scripts/git_sha_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +git --no-pager log --pretty=format:"{ \"sha\": \"%H\" }" -1 HEAD || echo "{ \"sha\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_no_aws_provider_yaml/scripts/git_user_json.sh b/testdata/v2_no_aws_provider_yaml/scripts/git_user_json.sh new file mode 100644 index 000000000..492af9e6b --- /dev/null +++ b/testdata/v2_no_aws_provider_yaml/scripts/git_user_json.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "{\"name\": \"$(git --no-pager config --global --get user.name)\"}" || echo "{ \"user\": \"unknown\" }" \ No newline at end of file diff --git a/testdata/v2_no_aws_provider_yaml/terraform/accounts/bar/fogg.tf b/testdata/v2_no_aws_provider_yaml/terraform/accounts/bar/fogg.tf index 5930a25ad..704d861bb 100644 --- a/testdata/v2_no_aws_provider_yaml/terraform/accounts/bar/fogg.tf +++ b/testdata/v2_no_aws_provider_yaml/terraform/accounts/bar/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -93,6 +121,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_no_aws_provider_yaml/terraform/accounts/foo/fogg.tf b/testdata/v2_no_aws_provider_yaml/terraform/accounts/foo/fogg.tf index 135314db4..8a7a60737 100644 --- a/testdata/v2_no_aws_provider_yaml/terraform/accounts/foo/fogg.tf +++ b/testdata/v2_no_aws_provider_yaml/terraform/accounts/foo/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -93,6 +121,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp1/fogg.tf b/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp1/fogg.tf index eb99a7036..83c7e980f 100644 --- a/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp1/fogg.tf +++ b/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp1/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -88,6 +116,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp2/fogg.tf b/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp2/fogg.tf index 670cf53f7..8fe0f817f 100644 --- a/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp2/fogg.tf +++ b/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp2/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -88,6 +116,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/vpc/fogg.tf b/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/vpc/fogg.tf index 639a161cc..1c867d3a4 100644 --- a/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/vpc/fogg.tf +++ b/testdata/v2_no_aws_provider_yaml/terraform/envs/staging/vpc/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -88,6 +116,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = { diff --git a/testdata/v2_no_aws_provider_yaml/terraform/global/fogg.tf b/testdata/v2_no_aws_provider_yaml/terraform/global/fogg.tf index 3a8a61d80..e2063f0e1 100644 --- a/testdata/v2_no_aws_provider_yaml/terraform/global/fogg.tf +++ b/testdata/v2_no_aws_provider_yaml/terraform/global/fogg.tf @@ -1,5 +1,33 @@ # Auto-generated by fogg. Do not edit # Make improvements in fogg, so that everyone can benefit. +variable "TFC_RUN_ID" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_NAME" { + type = string + default = "unknown" +} +variable "TFC_WORKSPACE_SLUG" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_BRANCH" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA" { + type = string + default = "unknown" +} +variable "TFC_CONFIGURATION_VERSION_GIT_TAG" { + type = string + default = "unknown" +} +variable "TFC_PROJECT_NAME" { + type = string + default = "unknown" +} provider "assert" {} terraform { @@ -88,6 +116,8 @@ variable "owner" { default = "foo@example.com" } # tflint-ignore: terraform_unused_declarations +# DEPRECATED: this field is deprecated in favor or +# AWS provider default tags. variable "tags" { type = object({ project : string, env : string, service : string, owner : string, managedBy : string }) default = {