Disable & remove region config

This is not implemented in the underlying TF provider so causes an exception. The tests only pass because they don't pass the CI env down to the test environment.
pulumi · Jun 20, 2024 · 98bd5de · 98bd5de
1 parent cdd90be
commit 98bd5de
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 20 deletions.
diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml
@@ -1,7 +1,7 @@
 provider: xyz
 env:
   PULUMI_MISSING_DOCS_ERROR: true
-  XYZ_REGION: "us-west-2"
+  # XYZ_REGION: "us-west-2"
 makeTemplate: bridged
 pulumiConvert: 1
 goBuildParallelism: 2

diff --git a/.github/workflows/build_sdk.yml b/.github/workflows/build_sdk.yml
@@ -26,7 +26,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
   PROVIDER_VERSION: ${{ inputs.version }}
 
 jobs:

diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml
@@ -19,7 +19,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 jobs:
   command-dispatch-for-testing:
     name: command-dispatch-for-testing

diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -26,7 +26,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 
 jobs:
   license_check:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,7 +25,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 
 jobs:
   lint:

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -19,7 +19,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 jobs:
   prerequisites:
     uses: ./.github/workflows/prerequisites.yml

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -20,7 +20,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 jobs:
   prerequisites:
     uses: ./.github/workflows/prerequisites.yml

diff --git a/.github/workflows/prerequisites.yml b/.github/workflows/prerequisites.yml
@@ -36,7 +36,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 
 jobs:
   prerequisites:

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -19,7 +19,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 jobs:
   comment-on-pr:
     if: github.event.pull_request.head.repo.full_name != github.repository

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 jobs:
   prerequisites:
     uses: ./.github/workflows/prerequisites.yml

diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml
@@ -21,7 +21,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 jobs:
   resync_build:
     name: resync-build

diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
@@ -20,7 +20,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 
 # This should cancel any previous runs of the same workflow on the same branch which are still running.
 concurrency:

diff --git a/.github/workflows/verify-release.yml b/.github/workflows/verify-release.yml
@@ -42,7 +42,6 @@ env:
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   TF_APPEND_USER_AGENT: pulumi
-  XYZ_REGION: us-west-2
 
 jobs:
   verify-release:

diff --git a/provider/resources.go b/provider/resources.go
@@ -92,13 +92,14 @@ func Provider() tfbridge.ProviderInfo {
 		GitHubOrg:        "",
 		UpstreamRepoPath: "github.com/iwahbe/terraform-provider-xyz",
 		MetadataInfo:     tfbridge.NewProviderMetadata(metadata),
-		Config: map[string]*tfbridge.SchemaInfo{
-			"region": {
-				Type: tfbridge.MakeResource(mainPkg, "region", "Region"),
-				Default: &tfbridge.DefaultInfo{
-					EnvVars: []string{"XYZ_REGION", "XYZ_DEFAULT_REGION"},
-				},
-			},
+		Config:           map[string]*tfbridge.SchemaInfo{
+			// TODO: Implement region in the upstream provider so it doesn't error when set.
+			// "region": {
+			// 	Type: tfbridge.MakeResource(mainPkg, "region", "Region"),
+			// 	Default: &tfbridge.DefaultInfo{
+			// 		EnvVars: []string{"XYZ_REGION", "XYZ_DEFAULT_REGION"},
+			// 	},
+			// },
 		},
 		PreConfigureCallback: preConfigureCallback,
 		Resources: map[string]*tfbridge.ResourceInfo{