From 92e0241a8c39724a81b0a75c975742ae4bb83f3f Mon Sep 17 00:00:00 2001 From: Sayali M Date: Tue, 2 Jan 2024 15:39:51 -0600 Subject: [PATCH 01/13] temp changes as per spacelift migration --- ...e-enterprisedocs-staging-to-production.yml | 27 +++++++++++-------- .../promote-staging-to-production.yml | 25 ++++++++++------- .../send-docs-redirects-to-staging.yml | 16 ++++++++--- .../send-enterprise-redirects-to-staging.yml | 16 ++++++++--- .../redirect_creation/prod.remote.tfbackend | 1 + .../staging.remote.tfbackend | 1 + 6 files changed, 57 insertions(+), 29 deletions(-) diff --git a/.github/workflows/promote-enterprisedocs-staging-to-production.yml b/.github/workflows/promote-enterprisedocs-staging-to-production.yml index c18395205..d109a9104 100644 --- a/.github/workflows/promote-enterprisedocs-staging-to-production.yml +++ b/.github/workflows/promote-enterprisedocs-staging-to-production.yml @@ -32,12 +32,7 @@ jobs: working-directory: scripts/redirect_creation steps: - uses: actions/checkout@v3 - - - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 - with: - cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} - + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 with: @@ -45,10 +40,20 @@ jobs: aws-secret-access-key: ${{ secrets.DOCS_AWS_KEY }} aws-region: us-east-1 - - name: Terraform Init - id: init - run: terraform init -backend-config=$TF_VAR_env.remote.tfbackend + - name: Install spacectl + uses: spacelift-io/setup-spacectl@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Preview liquibase-docs-prod Stack run + run: spacectl stack local-preview --id liquibase-docs-prod - - name: Terraform Apply - run: terraform apply -target=aws_s3_object.enterprise_redirects -auto-approve + - name: Deploy infrastructure + env: + SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io + SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} + run: | + spacectl init -backend-config=$TF_VAR_env.remote.tfbackend + spacectl stack deploy --id liquibase-docs-prod -target=aws_s3_object.enterprise_redirects \ No newline at end of file diff --git a/.github/workflows/promote-staging-to-production.yml b/.github/workflows/promote-staging-to-production.yml index 0876f69f5..b2aa273a2 100644 --- a/.github/workflows/promote-staging-to-production.yml +++ b/.github/workflows/promote-staging-to-production.yml @@ -33,11 +33,6 @@ jobs: working-directory: scripts/redirect_creation steps: - uses: actions/checkout@v3 - - - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 - with: - cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 @@ -46,9 +41,19 @@ jobs: aws-secret-access-key: ${{ secrets.DOCS_AWS_KEY }} aws-region: us-east-1 - - name: Terraform Init - id: init - run: terraform init -backend-config=$TF_VAR_env.remote.tfbackend + - name: Install spacectl + uses: spacelift-io/setup-spacectl@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Preview liquibase-docs-staging Stack run + run: spacectl stack local-preview --id liquibase-docs-prod - - name: Terraform Apply - run: terraform apply -auto-approve + - name: Deploy infrastructure + env: + SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io + SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} + run: | + spacectl init -backend-config=$TF_VAR_env.remote.tfbackend + spacectl stack deploy --id liquibase-docs-prod diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 251e02653..1ad7bec2e 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -26,10 +26,18 @@ jobs: with: ref: ${{ github.event.inputs.branch }} - - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 - with: - cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + - name: Install spacectl + uses: spacelift-io/setup-spacectl@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Preview liquibase-docs-stagging Stack run + env: + SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io + SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} + run: + spacectl stack local-preview --id liquibase-docs-staging - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 diff --git a/.github/workflows/send-enterprise-redirects-to-staging.yml b/.github/workflows/send-enterprise-redirects-to-staging.yml index 27866366b..ba12fd02b 100644 --- a/.github/workflows/send-enterprise-redirects-to-staging.yml +++ b/.github/workflows/send-enterprise-redirects-to-staging.yml @@ -23,10 +23,18 @@ jobs: with: ref: ${{ github.event.inputs.branch }} - - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 - with: - cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + - name: Install spacectl + uses: spacelift-io/setup-spacectl@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Preview liquibase-docs-stagging Stack run + env: + SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io + SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} + run: + spacectl stack local-preview --id liquibase-docs-staging - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 diff --git a/scripts/redirect_creation/prod.remote.tfbackend b/scripts/redirect_creation/prod.remote.tfbackend index 747384de8..9a9972646 100644 --- a/scripts/redirect_creation/prod.remote.tfbackend +++ b/scripts/redirect_creation/prod.remote.tfbackend @@ -1,3 +1,4 @@ #Selecting the prod TF Cloud workspace workspaces { name = "liquibase-docs-prod" } organization = "liquibase" +hostname = "spacelift.io" \ No newline at end of file diff --git a/scripts/redirect_creation/staging.remote.tfbackend b/scripts/redirect_creation/staging.remote.tfbackend index fd8666f7a..33cb9e00b 100644 --- a/scripts/redirect_creation/staging.remote.tfbackend +++ b/scripts/redirect_creation/staging.remote.tfbackend @@ -1,3 +1,4 @@ #Selecting the staging TF Cloud workspace workspaces { name = "liquibase-docs-staging" } organization = "liquibase" +hostname = "spacelift.io" \ No newline at end of file From c95dca171775b7dfee19e6fced28a58ee42a7085 Mon Sep 17 00:00:00 2001 From: Sayali M Date: Tue, 2 Jan 2024 18:00:01 -0600 Subject: [PATCH 02/13] temp changes --- ...romote-enterprisedocs-staging-to-production.yml | 6 +++--- .../workflows/promote-staging-to-production.yml | 6 +++--- .../workflows/send-docs-redirects-to-staging.yml | 14 +++++++------- scripts/redirect_creation/prod.remote.tfbackend | 3 +-- scripts/redirect_creation/staging.remote.tfbackend | 3 +-- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/promote-enterprisedocs-staging-to-production.yml b/.github/workflows/promote-enterprisedocs-staging-to-production.yml index d109a9104..9760bebf5 100644 --- a/.github/workflows/promote-enterprisedocs-staging-to-production.yml +++ b/.github/workflows/promote-enterprisedocs-staging-to-production.yml @@ -45,8 +45,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Preview liquibase-docs-prod Stack run - run: spacectl stack local-preview --id liquibase-docs-prod + # - name: Preview liquibase-docs-prod Stack run + # run: spacectl stack local-preview --id liquibase-docs-prod - name: Deploy infrastructure env: @@ -54,6 +54,6 @@ jobs: SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} run: | - spacectl init -backend-config=$TF_VAR_env.remote.tfbackend + terraform init -backend-config=$TF_VAR_env.remote.tfbackend spacectl stack deploy --id liquibase-docs-prod -target=aws_s3_object.enterprise_redirects \ No newline at end of file diff --git a/.github/workflows/promote-staging-to-production.yml b/.github/workflows/promote-staging-to-production.yml index b2aa273a2..e06ab72b0 100644 --- a/.github/workflows/promote-staging-to-production.yml +++ b/.github/workflows/promote-staging-to-production.yml @@ -46,8 +46,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Preview liquibase-docs-staging Stack run - run: spacectl stack local-preview --id liquibase-docs-prod + # - name: Preview liquibase-docs-staging Stack run + # run: spacectl stack local-preview --id liquibase-docs-prod - name: Deploy infrastructure env: @@ -55,5 +55,5 @@ jobs: SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} run: | - spacectl init -backend-config=$TF_VAR_env.remote.tfbackend + terraform init -backend-config=$TF_VAR_env.remote.tfbackend spacectl stack deploy --id liquibase-docs-prod diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 1ad7bec2e..5eac999ca 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -31,13 +31,13 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Preview liquibase-docs-stagging Stack run - env: - SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io - SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} - SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} - run: - spacectl stack local-preview --id liquibase-docs-staging + # - name: Preview liquibase-docs-stagging Stack run + # env: + # SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io + # SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + # SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} + # run: + # spacectl stack local-preview --id liquibase-docs-staging - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 diff --git a/scripts/redirect_creation/prod.remote.tfbackend b/scripts/redirect_creation/prod.remote.tfbackend index 9a9972646..7126502db 100644 --- a/scripts/redirect_creation/prod.remote.tfbackend +++ b/scripts/redirect_creation/prod.remote.tfbackend @@ -1,4 +1,3 @@ #Selecting the prod TF Cloud workspace workspaces { name = "liquibase-docs-prod" } -organization = "liquibase" -hostname = "spacelift.io" \ No newline at end of file +organization = "liquibase" \ No newline at end of file diff --git a/scripts/redirect_creation/staging.remote.tfbackend b/scripts/redirect_creation/staging.remote.tfbackend index 33cb9e00b..50fc3d426 100644 --- a/scripts/redirect_creation/staging.remote.tfbackend +++ b/scripts/redirect_creation/staging.remote.tfbackend @@ -1,4 +1,3 @@ #Selecting the staging TF Cloud workspace workspaces { name = "liquibase-docs-staging" } -organization = "liquibase" -hostname = "spacelift.io" \ No newline at end of file +organization = "liquibase" \ No newline at end of file From 3437038cf9639c3459680ef0b9de1d6b5cd5c90d Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 14:50:11 -0600 Subject: [PATCH 03/13] testing --- ...e-enterprisedocs-staging-to-production.yml | 25 +++++++------------ .../promote-staging-to-production.yml | 24 ++++++------------ .../send-docs-redirects-to-staging.yml | 22 ++++++---------- .../send-enterprise-redirects-to-staging.yml | 18 +++---------- scripts/redirect_creation/main.tf | 1 + .../redirect_creation/prod.remote.tfbackend | 3 ++- .../staging.remote.tfbackend | 3 ++- 7 files changed, 33 insertions(+), 63 deletions(-) diff --git a/.github/workflows/promote-enterprisedocs-staging-to-production.yml b/.github/workflows/promote-enterprisedocs-staging-to-production.yml index 9760bebf5..451577573 100644 --- a/.github/workflows/promote-enterprisedocs-staging-to-production.yml +++ b/.github/workflows/promote-enterprisedocs-staging-to-production.yml @@ -27,12 +27,15 @@ jobs: runs-on: ubuntu-20.04 env: TF_VAR_env: "prod" + SPACELIFT_API_KEY_ENDPOINT: ${{ secrets.SPACELIFT_API_KEY_ENDPOINT }} + SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} defaults: run: working-directory: scripts/redirect_creation steps: - uses: actions/checkout@v3 - + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 with: @@ -40,20 +43,10 @@ jobs: aws-secret-access-key: ${{ secrets.DOCS_AWS_KEY }} aws-region: us-east-1 - - name: Install spacectl - uses: spacelift-io/setup-spacectl@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # - name: Preview liquibase-docs-prod Stack run - # run: spacectl stack local-preview --id liquibase-docs-prod + - name: Terraform Init + id: init + run: terraform init -backend-config=$TF_VAR_env.remote.tfbackend - - name: Deploy infrastructure - env: - SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io - SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} - SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} - run: | - terraform init -backend-config=$TF_VAR_env.remote.tfbackend - spacectl stack deploy --id liquibase-docs-prod -target=aws_s3_object.enterprise_redirects + - name: Terraform Apply + run: terraform apply -target=aws_s3_object.enterprise_redirects -auto-approve \ No newline at end of file diff --git a/.github/workflows/promote-staging-to-production.yml b/.github/workflows/promote-staging-to-production.yml index e06ab72b0..0b91fc2ec 100644 --- a/.github/workflows/promote-staging-to-production.yml +++ b/.github/workflows/promote-staging-to-production.yml @@ -1,4 +1,3 @@ - # Terraform Action to promote content and redirects from staging to production name: Promote Docs Staging to Production on: @@ -28,6 +27,9 @@ jobs: runs-on: ubuntu-20.04 env: TF_VAR_env: "prod" + SPACELIFT_API_KEY_ENDPOINT: ${{ secrets.SPACELIFT_API_KEY_ENDPOINT }} + SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} defaults: run: working-directory: scripts/redirect_creation @@ -41,19 +43,9 @@ jobs: aws-secret-access-key: ${{ secrets.DOCS_AWS_KEY }} aws-region: us-east-1 - - name: Install spacectl - uses: spacelift-io/setup-spacectl@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # - name: Preview liquibase-docs-staging Stack run - # run: spacectl stack local-preview --id liquibase-docs-prod + - name: Terraform Init + id: init + run: terraform init -backend-config=$TF_VAR_env.remote.tfbackend - - name: Deploy infrastructure - env: - SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io - SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} - SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} - run: | - terraform init -backend-config=$TF_VAR_env.remote.tfbackend - spacectl stack deploy --id liquibase-docs-prod + - name: Terraform Apply + run: terraform apply -auto-approve \ No newline at end of file diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 5eac999ca..1f2ae5670 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -17,6 +17,9 @@ jobs: runs-on: ubuntu-20.04 env: TF_VAR_env: "staging" + SPACELIFT_API_KEY_ENDPOINT: ${{ secrets.SPACELIFT_API_KEY_ENDPOINT }} + SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} defaults: run: working-directory: scripts/redirect_creation @@ -26,19 +29,6 @@ jobs: with: ref: ${{ github.event.inputs.branch }} - - name: Install spacectl - uses: spacelift-io/setup-spacectl@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # - name: Preview liquibase-docs-stagging Stack run - # env: - # SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io - # SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} - # SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} - # run: - # spacectl stack local-preview --id liquibase-docs-staging - - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 with: @@ -53,7 +43,9 @@ jobs: - name: Terraform Init id: init - run: terraform init -backend-config=$TF_VAR_env.remote.tfbackend + run: | + terraform login spacelift.io + terraform init -backend-config=$TF_VAR_env.remote.tfbackend - name: Terraform Validate if: ${{ github.event_name == 'pull_request' }} @@ -113,4 +105,4 @@ jobs: - name: Terraform Apply if: ${{ github.event_name == 'push' }} - run: terraform apply -auto-approve + run: terraform apply -auto-approve \ No newline at end of file diff --git a/.github/workflows/send-enterprise-redirects-to-staging.yml b/.github/workflows/send-enterprise-redirects-to-staging.yml index ba12fd02b..77546c8e6 100644 --- a/.github/workflows/send-enterprise-redirects-to-staging.yml +++ b/.github/workflows/send-enterprise-redirects-to-staging.yml @@ -14,6 +14,9 @@ jobs: runs-on: ubuntu-20.04 env: TF_VAR_env: "staging" + SPACELIFT_API_KEY_ENDPOINT: ${{ secrets.SPACELIFT_API_KEY_ENDPOINT }} + SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} + SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} defaults: run: working-directory: scripts/redirect_creation @@ -23,19 +26,6 @@ jobs: with: ref: ${{ github.event.inputs.branch }} - - name: Install spacectl - uses: spacelift-io/setup-spacectl@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Preview liquibase-docs-stagging Stack run - env: - SPACELIFT_API_KEY_ENDPOINT: https://liquibase.app.spacelift.io - SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} - SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} - run: - spacectl stack local-preview --id liquibase-docs-staging - - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 with: @@ -110,4 +100,4 @@ jobs: - name: Terraform Apply if: ${{ github.event_name == 'push' }} - run: terraform apply -target=aws_s3_object.enterprise_redirects -auto-approve + run: terraform apply -target=aws_s3_object.enterprise_redirects -auto-approve \ No newline at end of file diff --git a/scripts/redirect_creation/main.tf b/scripts/redirect_creation/main.tf index e4d92cd18..caa4cf203 100644 --- a/scripts/redirect_creation/main.tf +++ b/scripts/redirect_creation/main.tf @@ -7,6 +7,7 @@ terraform { data "terraform_remote_state" "state" { backend = "remote" config = { + hostname = "spacelift.io" organization = "liquibase" workspaces = { name = "liquibase-${var.env}" diff --git a/scripts/redirect_creation/prod.remote.tfbackend b/scripts/redirect_creation/prod.remote.tfbackend index 7126502db..76d57aa7b 100644 --- a/scripts/redirect_creation/prod.remote.tfbackend +++ b/scripts/redirect_creation/prod.remote.tfbackend @@ -1,3 +1,4 @@ #Selecting the prod TF Cloud workspace workspaces { name = "liquibase-docs-prod" } -organization = "liquibase" \ No newline at end of file +organization = "liquibase" +hostname = "spacelift.io" \ No newline at end of file diff --git a/scripts/redirect_creation/staging.remote.tfbackend b/scripts/redirect_creation/staging.remote.tfbackend index 50fc3d426..6e4104ae1 100644 --- a/scripts/redirect_creation/staging.remote.tfbackend +++ b/scripts/redirect_creation/staging.remote.tfbackend @@ -1,3 +1,4 @@ #Selecting the staging TF Cloud workspace workspaces { name = "liquibase-docs-staging" } -organization = "liquibase" \ No newline at end of file +organization = "liquibase" +hostname = "spacelift.io" \ No newline at end of file From a552e9b9deca026913c708d4f7aafc671f499462 Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 14:53:33 -0600 Subject: [PATCH 04/13] testing --- .github/workflows/send-docs-redirects-to-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 1f2ae5670..37ee50ef3 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -44,7 +44,7 @@ jobs: - name: Terraform Init id: init run: | - terraform login spacelift.io + yes yes | terraform login spacelift.io terraform init -backend-config=$TF_VAR_env.remote.tfbackend - name: Terraform Validate From d43c6b2c8a629fe008e98b48867c0406b47de04c Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 15:11:37 -0600 Subject: [PATCH 05/13] adding key SPACELIFT_API_KEY --- .github/workflows/send-docs-redirects-to-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 37ee50ef3..191ba6217 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -44,7 +44,7 @@ jobs: - name: Terraform Init id: init run: | - yes yes | terraform login spacelift.io + export SPACELIFT_API_KEY=${{ secrets.SPACELIFT_API_KEY}} terraform init -backend-config=$TF_VAR_env.remote.tfbackend - name: Terraform Validate From f35585493e6ac6806d2ba23a78d1dcaa7d542e64 Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 15:14:57 -0600 Subject: [PATCH 06/13] testing --- .github/workflows/send-docs-redirects-to-staging.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 191ba6217..c5ae825a3 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -20,6 +20,7 @@ jobs: SPACELIFT_API_KEY_ENDPOINT: ${{ secrets.SPACELIFT_API_KEY_ENDPOINT }} SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} + SPACELIFT_API_KEY: ${{ secrets.SPACELIFT_API_KEY }} defaults: run: working-directory: scripts/redirect_creation @@ -44,7 +45,7 @@ jobs: - name: Terraform Init id: init run: | - export SPACELIFT_API_KEY=${{ secrets.SPACELIFT_API_KEY}} + echo "credentials \"${{ secrets.SPACELIFT_API_KEY_ENDPOINT }}\" { token = \"${{ secrets.SPACELIFT_API_KEY_ID }}:${{ secrets.SPACELIFT_API_KEY_SECRET }}\" }" > spacelift_credentials.tfrc.json terraform init -backend-config=$TF_VAR_env.remote.tfbackend - name: Terraform Validate From 255b009ac171665dc41db3e8e20e9c2fe17899a8 Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 15:18:53 -0600 Subject: [PATCH 07/13] testing --- .github/workflows/send-docs-redirects-to-staging.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index c5ae825a3..4145bdac3 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -45,8 +45,7 @@ jobs: - name: Terraform Init id: init run: | - echo "credentials \"${{ secrets.SPACELIFT_API_KEY_ENDPOINT }}\" { token = \"${{ secrets.SPACELIFT_API_KEY_ID }}:${{ secrets.SPACELIFT_API_KEY_SECRET }}\" }" > spacelift_credentials.tfrc.json - terraform init -backend-config=$TF_VAR_env.remote.tfbackend + terraform init -backend-config=$TF_VAR_env.remote.tfbackend -backend-config="credentials=${SPACELIFT_API_KEY_ID}:${SPACELIFT_API_KEY_SECRET}@${SPACELIFT_API_KEY_ENDPOINT}" - name: Terraform Validate if: ${{ github.event_name == 'pull_request' }} From eb51571d26366b318114a00b5bd2c5703098088e Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 15:53:18 -0600 Subject: [PATCH 08/13] testing --- .github/workflows/send-docs-redirects-to-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 4145bdac3..42f95e779 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -45,7 +45,7 @@ jobs: - name: Terraform Init id: init run: | - terraform init -backend-config=$TF_VAR_env.remote.tfbackend -backend-config="credentials=${SPACELIFT_API_KEY_ID}:${SPACELIFT_API_KEY_SECRET}@${SPACELIFT_API_KEY_ENDPOINT}" + terraform init -backend-config=staging.remote.tfbackend -backend-config="credentials=${{ secrets.SPACELIFT_API_KEY_ID }}:${{ secrets.SPACELIFT_API_KEY_SECRET }}@${{ secrets.SPACELIFT_API_KEY_ENDPOINT }}" - name: Terraform Validate if: ${{ github.event_name == 'pull_request' }} From 467f9bf638addcc430cea14ff36436946839e0de Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 15:58:15 -0600 Subject: [PATCH 09/13] testing --- .github/workflows/send-docs-redirects-to-staging.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 42f95e779..ac4fb8a10 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -42,10 +42,15 @@ jobs: id: fmt run: terraform fmt + - name: Create Spacelift credentials file + run: | + echo "credentials \"${{ secrets.SPACELIFT_API_KEY_ENDPOINT }}\" { token = \"${{ secrets.SPACELIFT_API_KEY_ID }}:${{ secrets.SPACELIFT_API_KEY_SECRET }}\" }" > spacelift_credentials.hcl + - name: Terraform Init id: init run: | - terraform init -backend-config=staging.remote.tfbackend -backend-config="credentials=${{ secrets.SPACELIFT_API_KEY_ID }}:${{ secrets.SPACELIFT_API_KEY_SECRET }}@${{ secrets.SPACELIFT_API_KEY_ENDPOINT }}" + terraform init -backend-config=staging.remote.tfbackend -reconfigure + - name: Terraform Validate if: ${{ github.event_name == 'pull_request' }} From 3d7bf3ba6a8118f5814f973b327fd316b108b4c6 Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 16:15:35 -0600 Subject: [PATCH 10/13] testing --- .github/workflows/send-docs-redirects-to-staging.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index ac4fb8a10..b47ddf673 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -42,9 +42,11 @@ jobs: id: fmt run: terraform fmt - - name: Create Spacelift credentials file - run: | - echo "credentials \"${{ secrets.SPACELIFT_API_KEY_ENDPOINT }}\" { token = \"${{ secrets.SPACELIFT_API_KEY_ID }}:${{ secrets.SPACELIFT_API_KEY_SECRET }}\" }" > spacelift_credentials.hcl + - name: Set up credentials + run: echo "credentials \"${{ secrets.SPACELIFT_API_TOKEN }}\"" > credentials.tfrc.json + + - name: Terraform Login + run: terraform login spacelift.io - name: Terraform Init id: init From 196486edc3abf6ef5d1cb2bc6de40f161443b2bb Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 16:18:35 -0600 Subject: [PATCH 11/13] Configure Terraform with Spacelift API token --- .github/workflows/send-docs-redirects-to-staging.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index b47ddf673..9ffaa8f2d 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -42,11 +42,8 @@ jobs: id: fmt run: terraform fmt - - name: Set up credentials - run: echo "credentials \"${{ secrets.SPACELIFT_API_TOKEN }}\"" > credentials.tfrc.json - - - name: Terraform Login - run: terraform login spacelift.io + - name: Configure Terraform with Spacelift API token + run: terraform init -backend-config="token=${{ secrets.SPACELIFT_API_TOKEN }}" - name: Terraform Init id: init From ca9f1c194be74970e440440f89fc7e59ab6c5e4a Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 20:57:37 -0600 Subject: [PATCH 12/13] testing with TF_CLI_CONFIG_FILE --- .github/workflows/send-docs-redirects-to-staging.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index 9ffaa8f2d..ebee10d5c 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -20,7 +20,6 @@ jobs: SPACELIFT_API_KEY_ENDPOINT: ${{ secrets.SPACELIFT_API_KEY_ENDPOINT }} SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} - SPACELIFT_API_KEY: ${{ secrets.SPACELIFT_API_KEY }} defaults: run: working-directory: scripts/redirect_creation @@ -42,14 +41,9 @@ jobs: id: fmt run: terraform fmt - - name: Configure Terraform with Spacelift API token - run: terraform init -backend-config="token=${{ secrets.SPACELIFT_API_TOKEN }}" - - name: Terraform Init id: init - run: | - terraform init -backend-config=staging.remote.tfbackend -reconfigure - + run: terraform init -backend-config=$TF_VAR_env.remote.tfbackend - name: Terraform Validate if: ${{ github.event_name == 'pull_request' }} From b717d1318a113a4ddbe2fdf30657013047fa024f Mon Sep 17 00:00:00 2001 From: Sayali M Date: Wed, 3 Jan 2024 21:11:44 -0600 Subject: [PATCH 13/13] testing with credentials --- .github/workflows/send-docs-redirects-to-staging.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/send-docs-redirects-to-staging.yml b/.github/workflows/send-docs-redirects-to-staging.yml index ebee10d5c..aa0095778 100644 --- a/.github/workflows/send-docs-redirects-to-staging.yml +++ b/.github/workflows/send-docs-redirects-to-staging.yml @@ -20,6 +20,7 @@ jobs: SPACELIFT_API_KEY_ENDPOINT: ${{ secrets.SPACELIFT_API_KEY_ENDPOINT }} SPACELIFT_API_KEY_ID: ${{ secrets.SPACELIFT_API_KEY_ID }} SPACELIFT_API_KEY_SECRET: ${{ secrets.SPACELIFT_API_KEY_SECRET }} + SPACELIFT_API_KEY: ${{ secrets.SPACELIFT_API_KEY }} defaults: run: working-directory: scripts/redirect_creation @@ -41,9 +42,17 @@ jobs: id: fmt run: terraform fmt + - name: Set up credentials + run: | + echo "credentials \"spacelift.io\" { \ + token = \"${{ secrets.SPACELIFT_API_TOKEN }}\"}" > /home/runner/.terraformrc + #run: echo "credentials \"${{ secrets.SPACELIFT_API_TOKEN }}\"" > credentials.tfrc.json + - name: Terraform Init id: init - run: terraform init -backend-config=$TF_VAR_env.remote.tfbackend + run: | + terraform init -backend-config=staging.remote.tfbackend -reconfigure + - name: Terraform Validate if: ${{ github.event_name == 'pull_request' }}