Skip to content

Commit

Permalink
Rename upstream config for default provisioning label. Add patch to r…
Browse files Browse the repository at this point in the history
…ename the key of this default label.

Fixes #2357.
  • Loading branch information
guineveresaenger committed Sep 6, 2024
1 parent 1742ac0 commit 7fc1e00
Show file tree
Hide file tree
Showing 15 changed files with 668 additions and 643 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: guineveresaenger <guinevere@pulumi.com>
Date: Fri, 30 Aug 2024 14:01:35 -0700
Subject: [PATCH] Rename default provisioning label to goog-pulumi-provisioned


diff --git a/google-beta/transport/config.go b/google-beta/transport/config.go
index 2c93a76fb..13baca8ef 100644
--- a/google-beta/transport/config.go
+++ b/google-beta/transport/config.go
@@ -642,7 +642,7 @@ var DefaultClientScopes = []string{
"https://www.googleapis.com/auth/userinfo.email",
}

-const AttributionKey = "goog-terraform-provisioned"
+const AttributionKey = "goog-pulumi-provisioned"
const AttributionValue = "true"
const CreateOnlyAttributionStrategy = "CREATION_ONLY"
const ProactiveAttributionStrategy = "PROACTIVE"
24 changes: 12 additions & 12 deletions provider/cmd/pulumi-resource-gcp/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"activeDirectoryCustomEndpoint": {
"type": "string"
},
"addTerraformAttributionLabel": {
"addPulumiAttributionLabel": {
"type": "boolean"
},
"alloydbCustomEndpoint": {
Expand Down Expand Up @@ -586,6 +586,9 @@
"pubsubLiteCustomEndpoint": {
"type": "string"
},
"pulumiAttributionLabelAdditionStrategy": {
"type": "string"
},
"recaptchaEnterpriseCustomEndpoint": {
"type": "string"
},
Expand Down Expand Up @@ -695,9 +698,6 @@
"tagsLocationCustomEndpoint": {
"type": "string"
},
"terraformAttributionLabelAdditionStrategy": {
"type": "string"
},
"tpuCustomEndpoint": {
"type": "string"
},
Expand Down Expand Up @@ -111144,7 +111144,7 @@
"activeDirectoryCustomEndpoint": {
"type": "string"
},
"addTerraformAttributionLabel": {
"addPulumiAttributionLabel": {
"type": "boolean"
},
"alloydbCustomEndpoint": {
Expand Down Expand Up @@ -111528,6 +111528,9 @@
"pubsubLiteCustomEndpoint": {
"type": "string"
},
"pulumiAttributionLabelAdditionStrategy": {
"type": "string"
},
"recaptchaEnterpriseCustomEndpoint": {
"type": "string"
},
Expand Down Expand Up @@ -111621,9 +111624,6 @@
"tagsLocationCustomEndpoint": {
"type": "string"
},
"terraformAttributionLabelAdditionStrategy": {
"type": "string"
},
"tpuCustomEndpoint": {
"type": "string"
},
Expand Down Expand Up @@ -111672,7 +111672,7 @@
"activeDirectoryCustomEndpoint": {
"type": "string"
},
"addTerraformAttributionLabel": {
"addPulumiAttributionLabel": {
"type": "boolean"
},
"alloydbCustomEndpoint": {
Expand Down Expand Up @@ -112064,6 +112064,9 @@
"pubsubLiteCustomEndpoint": {
"type": "string"
},
"pulumiAttributionLabelAdditionStrategy": {
"type": "string"
},
"recaptchaEnterpriseCustomEndpoint": {
"type": "string"
},
Expand Down Expand Up @@ -112164,9 +112167,6 @@
"tagsLocationCustomEndpoint": {
"type": "string"
},
"terraformAttributionLabelAdditionStrategy": {
"type": "string"
},
"tpuCustomEndpoint": {
"type": "string"
},
Expand Down
6 changes: 6 additions & 0 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,12 @@ func Provider() tfbridge.ProviderInfo {
"access_token": {
Secret: tfbridge.True(),
},
"add_terraform_attribution_label": {
Name: "addPulumiAttributionLabel",
},
"terraform_attribution_label_addition_strategy": {
Name: "pulumiAttributionLabelAdditionStrategy",
},
},
ExtraConfig: map[string]*tfbridge.ConfigInfo{
"skipRegionValidation": {
Expand Down
22 changes: 11 additions & 11 deletions sdk/dotnet/Config/Config.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions sdk/dotnet/Provider.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions sdk/go/gcp/config/config.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7fc1e00

Please sign in to comment.