diff --git a/acceptance/libs/telemetry/dummy-without-server/test.toml b/acceptance/libs/telemetry/dummy-without-server/test.toml index e782cec37..fdaf052da 100644 --- a/acceptance/libs/telemetry/dummy-without-server/test.toml +++ b/acceptance/libs/telemetry/dummy-without-server/test.toml @@ -1,6 +1,5 @@ # TODO: We do not run this on windows because we don't have proper stubbing -# for API errors yet. Run this on windows as well once we can stub API errors -GOOS = { - "darwin", - "linux" -} +# for API errors yet. Simply not defining a server stub does not return a 404 on windows. +# Run this on windows as well once we can stub API errors. +[GOOS] +windows = false diff --git a/acceptance/terraform/output.txt b/acceptance/terraform/output.txt index 3d759dbdf..d5504c71a 100644 --- a/acceptance/terraform/output.txt +++ b/acceptance/terraform/output.txt @@ -22,8 +22,6 @@ calculate lock file checksums locally for the following providers: To calculate additional checksums for another platform, run: - terraform providers lock -platform=OS_ARCH -(where OS_ARCH is the platform to generate) Terraform has been successfully initialized! diff --git a/acceptance/terraform/script b/acceptance/terraform/script index 78e35049d..f43cc19f4 100644 --- a/acceptance/terraform/script +++ b/acceptance/terraform/script @@ -8,7 +8,12 @@ # The current .terraform.lock.hcl file only includes checksums for linux_amd64, # so Terraform running on another platform will fail to install these # providers. +# +# Linux: +# To calculate additional checksums for another platform, run: +# terraform providers lock -platform=OS_ARCH +# (where OS_ARCH is the platform to generate) -trace $TERRAFORM init -no-color -get=false | grep -v 'includes checksums for' | grep -v 'so Terraform running on another' | grep -v 'providers\.' +trace $TERRAFORM init -no-color -get=false | grep -v 'includes checksums for' | grep -v 'so Terraform running on another' | grep -v 'providers\.' | grep -v 'terraform providers lock -platform=' | grep -v 'is the platform to generate' trace $TERRAFORM plan -no-color rm -fr .terraform.lock.hcl .terraform diff --git a/acceptance/terraform/test.toml b/acceptance/terraform/test.toml index 23ffcf416..a6849e30f 100644 --- a/acceptance/terraform/test.toml +++ b/acceptance/terraform/test.toml @@ -1,11 +1,3 @@ -[[Repls]] -Old = 'linux_amd64' -New = 'OS_ARCH' - -[[Repls]] -Old = '[OS]_amd64' -New = 'OS_ARCH' - [[Repls]] Old = 'Read complete after [^\s]+' New = 'Read complete after (redacted)'