From 0d5db083c8f46d2773b8c80084627608e16f322c Mon Sep 17 00:00:00 2001 From: matttrach Date: Tue, 2 Dec 2025 11:19:45 -0600 Subject: [PATCH] fix: resolve variable problems in nix shell Signed-off-by: matttrach --- .github/workflows/release.yaml | 15 ++++++++------- examples/downstream/variables.tf | 3 --- test/tests/util.go | 1 + 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f7d1603..5582482 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -104,15 +104,16 @@ jobs: AWS_ACCESS_KEY_ID: ${{ steps.aws-creds.outputs.aws-access-key-id }} AWS_SECRET_ACCESS_KEY: ${{ steps.aws-creds.outputs.aws-secret-access-key }} AWS_SESSION_TOKEN: ${{ steps.aws-creds.outputs.aws-session-token }} - AWS_MAX_ATTEMPTS: 100 - AWS_RETRY_MODE: adaptive GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - GITHUB_OWNER: rancher - IDENTIFIER: ${{github.run_id}} ZONE: ${{secrets.ZONE}} - ACME_SERVER_URL: https://acme-v02.api.letsencrypt.org/directory - RANCHER_INSECURE: false + IDENTIFIER: ${{github.run_id}} run: | + # nix ignores environment variables that are not specifically kept + export AWS_MAX_ATTEMPTS="100" + export AWS_RETRY_MODE="adaptive" + export GITHUB_OWNER="rancher" + export ACME_SERVER_URL="https://acme-v02.api.letsencrypt.org/directory" + export RANCHER_INSECURE="false" ./run_tests.sh -s cleanup: @@ -146,9 +147,9 @@ jobs: AWS_ACCESS_KEY_ID: ${{ steps.aws-creds.outputs.aws-access-key-id }} AWS_SECRET_ACCESS_KEY: ${{ steps.aws-creds.outputs.aws-secret-access-key }} AWS_SESSION_TOKEN: ${{ steps.aws-creds.outputs.aws-session-token }} - AWS_MAX_ATTEMPTS: 100 IDENTIFIER: ${{github.run_id}} run: | + export AWS_MAX_ATTEMPTS="100" ./run_tests.sh -c $IDENTIFIER report: diff --git a/examples/downstream/variables.tf b/examples/downstream/variables.tf index d9a2364..fd3f0ca 100644 --- a/examples/downstream/variables.tf +++ b/examples/downstream/variables.tf @@ -43,7 +43,6 @@ variable "rancher_version" { description = <<-EOT The version of rancher to install on the rke2 cluster. EOT - default = "2.9.1" } variable "file_path" { type = string @@ -58,7 +57,6 @@ variable "acme_server_url" { The ACME server URL to use for cert-manager. This is useful for using the Let's Encrypt staging server for testing. EOT - default = "https://acme-staging-v02.api.letsencrypt.org/directory" } variable "runner_ip" { type = string @@ -66,7 +64,6 @@ variable "runner_ip" { The IP of the sever running Terraform. Only this IP will have access to the cluster. EOT - default = "" } variable "aws_access_key_id" { type = string diff --git a/test/tests/util.go b/test/tests/util.go index 6ff1e94..a50dbdb 100644 --- a/test/tests/util.go +++ b/test/tests/util.go @@ -394,6 +394,7 @@ func SetAcmeServer(t *testing.T) string { acmeserver := os.Getenv("ACME_SERVER_URL") if acmeserver == "" { os.Setenv("ACME_SERVER_URL", "https://acme-staging-v02.api.letsencrypt.org/directory") //nolint usetesting + acmeserver = "https://acme-staging-v02.api.letsencrypt.org/directory" } return acmeserver }