Upgrade terraform provider google beta to v6.0.1 major #2355

guineveresaenger · 2024-08-28T21:13:40Z

Upgrades upstream provider to v6.0.1.

Resolves #2348.
Resolves #2357
- Adds a patch for renaming new default label to goog-pului-provisioned
- Renames config field to addPulumiAttributionLabel
- Adjusts labels tests to expect new label
- Adjusts bucket label patch to avoid writing this label to the Bucket resource itself.

Introduces additional breaking change via cloudrunv2.Service ports field, which is now a MaxItemsOne upstream, which turns it into an object on our end, rather than an array entry. Look for a state transformer on the resource for upgrades.

Removes patches:

github-actions · 2024-08-28T21:57:40Z

Does the PR have any schema changes?

Found 52 breaking changes:

Resources

"gcp:alloydb/cluster:Cluster":
- 🟡 inputs: "network" missing
- 🟡 properties: "network" missing output "network"
"gcp:applicationintegration/client:Client":
- inputs:
  - 🟡 "createSampleWorkflows" missing
  - 🟡 "provisionGmek" missing
- properties:
  - 🟡 "createSampleWorkflows" missing output "createSampleWorkflows"
  - 🟡 "provisionGmek" missing output "provisionGmek"
"gcp:bigquery/reservation:Reservation":
- 🟡 inputs: "multiRegionAuxiliary" missing
- 🟡 properties: "multiRegionAuxiliary" missing output "multiRegionAuxiliary"
"gcp:bigquery/table:Table":
- 🟡 inputs: "allowResourceTagsOnDeletion" missing
- 🟡 properties: "allowResourceTagsOnDeletion" missing output "allowResourceTagsOnDeletion"
🟡 "gcp:compute/managedSslCertificate:ManagedSslCertificate": inputs: "certificateId" missing
🟡 "gcp:compute/mangedSslCertificate:MangedSslCertificate": inputs: "certificateId" missing
🔴 "gcp:datastore/dataStoreIndex:DataStoreIndex" missing
"gcp:gkeonprem/vMwareCluster:VMwareCluster":
- 🟡 inputs: "vcenters" missing
- 🟡 properties: "vcenters" missing output "vcenters"
🔴 "gcp:identityplatform/projectDefaultConfig:ProjectDefaultConfig" missing
"gcp:organizations/project:Project":
- 🟡 inputs: "skipDelete" missing
- 🟡 properties: "skipDelete" missing output "skipDelete"
🟢 "gcp:pubsub/topic:Topic": required: "schemaSettings" property is no longer Required

Types

🟡 "gcp:cloudrunv2/ServiceTemplateContainer:ServiceTemplateContainer": properties: "ports" type changed from "array" to "#/types/gcp:cloudrunv2/ServiceTemplateContainerPorts:ServiceTemplateContainerPorts":
- 🟡 items had &{Type: Ref:#/types/gcp:cloudrunv2/ServiceTemplateContainerPort:ServiceTemplateContainerPort AdditionalProperties: Items: OneOf:[] Discriminator: Plain:false} but now has no type
🔴 "gcp:cloudrunv2/ServiceTemplateContainerPort:ServiceTemplateContainerPort" missing
"gcp:compute/BackendServiceIap:BackendServiceIap": required:
- 🟢 "enabled" property has changed to Required
- 🟢 "oauth2ClientId" property is no longer Required
- 🟢 "oauth2ClientSecret" property is no longer Required
"gcp:compute/RegionBackendServiceIap:RegionBackendServiceIap": required:
- 🟢 "enabled" property has changed to Required
- 🟢 "oauth2ClientId" property is no longer Required
- 🟢 "oauth2ClientSecret" property is no longer Required
🟢 "gcp:compute/SubnetworkSecondaryIpRange:SubnetworkSecondaryIpRange": required: "ipCidrRange" property is no longer Required
🟢 "gcp:compute/getBackendServiceIap:getBackendServiceIap": required: "enabled" property has changed to Required
🟢 "gcp:compute/getForwardingRulesRule:getForwardingRulesRule": required: "forwardingRuleId" property has changed to Required
🟡 "gcp:container/ClusterMonitoringConfig:ClusterMonitoringConfig": properties: "advancedDatapathObservabilityConfigs" missing
"gcp:container/ClusterMonitoringConfigAdvancedDatapathObservabilityConfig:ClusterMonitoringConfigAdvancedDatapathObservabilityConfig":
- 🟡 properties: "relayMode" missing
- 🟢 required: "enableRelay" property has changed to Required
"gcp:container/getClusterMonitoringConfigAdvancedDatapathObservabilityConfig:getClusterMonitoringConfigAdvancedDatapathObservabilityConfig":
- 🟡 properties: "relayMode" missing
- 🟢 required: "relayMode" property is no longer Required
🔴 "gcp:datastore/DataStoreIndexProperty:DataStoreIndexProperty" missing
🟡 "gcp:gkeonprem/VMwareNodePoolConfig:VMwareNodePoolConfig": properties: "vsphereConfigs" missing
🔴 "gcp:identityplatform/ProjectDefaultConfigSignIn:ProjectDefaultConfigSignIn" missing
🔴 "gcp:identityplatform/ProjectDefaultConfigSignInAnonymous:ProjectDefaultConfigSignInAnonymous" missing
🔴 "gcp:identityplatform/ProjectDefaultConfigSignInEmail:ProjectDefaultConfigSignInEmail" missing
🔴 "gcp:identityplatform/ProjectDefaultConfigSignInHashConfig:ProjectDefaultConfigSignInHashConfig" missing
🔴 "gcp:identityplatform/ProjectDefaultConfigSignInPhoneNumber:ProjectDefaultConfigSignInPhoneNumber" missing
🟡 "gcp:sql/DatabaseInstanceSettingsIpConfiguration:DatabaseInstanceSettingsIpConfiguration": properties: "requireSsl" missing
"gcp:sql/getDatabaseInstanceSettingIpConfiguration:getDatabaseInstanceSettingIpConfiguration":
- 🟡 properties: "requireSsl" missing
- 🟢 required: "requireSsl" property is no longer Required
"gcp:sql/getDatabaseInstancesInstanceSettingIpConfiguration:getDatabaseInstancesInstanceSettingIpConfiguration":
- 🟡 properties: "requireSsl" missing
- 🟢 required: "requireSsl" property is no longer Required
🟡 "gcp:storage/BucketLifecycleRuleCondition:BucketLifecycleRuleCondition": properties: "noAge" missing
"gcp:storage/getBucketLifecycleRuleCondition:getBucketLifecycleRuleCondition":
- 🟡 properties: "noAge" missing
- required:
  - 🟢 "noAge" property is no longer Required
  - 🟢 "sendAgeIfZero" property has changed to Required

New resources:

kms/ekmConnectionIamBinding.EkmConnectionIamBinding
kms/ekmConnectionIamMember.EkmConnectionIamMember
kms/ekmConnectionIamPolicy.EkmConnectionIamPolicy
securitycenter/v2OrganizationSccBigQueryExports.V2OrganizationSccBigQueryExports

New functions:

kms/getEkmConnectionIamPolicy.getEkmConnectionIamPolicy

Maintainer note: consult the runbook for dealing with any breaking changes.

VenelinMartinov · 2024-08-29T11:50:18Z

For the 0002 patch: #2319 (comment)

I'm concerned that it's still an issue since the underlying bridge problem is not fixed - could we add a regression test with a partial state .get?

provider/resources.go

iwahbe

Looks good to me. Only 2 nits:

The comment about TransormFromState.
The TODO still remaining.

Otherwise I think this is good to merge.

provider/provider_yaml_test.go

VenelinMartinov

Great! Can we add an upgrade test for the new state migration?

Also the change in TestOrganizationsProjectAutoNaming looks like it will leak resources.

Can we also separate the patch removals in a new PR? They don't look like they interact with the major version upgrade.

VenelinMartinov · 2024-09-11T09:30:01Z

provider/provider_yaml_test.go

-		{"cloudrunv2-service-7"},
+		// TODO: This upgrade will no longer be possible, as it touches multiple new changes. Must be re-recorded.
+		// Skipping for now.
+		//{"cloudrunv2-service-7"},


Are we re-recording it?

I'll file a follow-up issue and link it here. 👍

This is the only test which has a non-null value for the migrated parameter, we should fix it or write a new one to make sure that the migration works for users.

guineveresaenger · 2024-09-11T16:28:56Z

@VenelinMartinov - I believe the state transformation is already covered by the cloudrunv2-service-4 and cloudrunv2-service-5 upgrade tests - their failure is what made us aware of this breaking change. Their passing is proof the state migration works.

VenelinMartinov · 2024-09-11T16:50:01Z

Hm, neither cloudrunv2-service-4 or cloudrunv2-service-5 actually use the parameter - we should either fix service-7 which uses the ports parameter or write a new test which shows that the migration works for users.

Resolves #1188.

Resolves #2324, #2326

guineveresaenger · 2024-09-11T18:16:28Z

@VenelinMartinov - the state migration is specifically for a default port parameter, which is not visible in the code.

We cannot "fix" service-7, because this is a breaking change due to MaxItemsOne. When ports is explicitly specified in pulumi code, users must re-write the field to be an Object, not an Array item. This is noted here.

VenelinMartinov · 2024-09-11T19:17:37Z

Discussed offline and found @corymhall's code which tests exactly the case we need here: https://github.com/pulumi/pulumi-aws/blob/de5418dbd55dcc23ccc45e756b258bf4e12165da/provider/provider_yaml_test.go#L322

Upgrade test where the new program needs to change compared to the old one.

iwahbe

LGTM

Have we verified that the pulumi/examples repo passes with the new provider?

examples/labels-combinations-go/main.go

.goreleaser.prerelease.yml

pulumi-bot · 2024-09-13T20:18:57Z

This PR has been shipped in release v8.0.0.

guineveresaenger added the needs-release/major When a PR with this label merges, it initiates a release of vX+1.0.0 label Aug 28, 2024

guineveresaenger mentioned this pull request Aug 28, 2024

Create a testing branch for GCP 8.0 #2318

Closed

guineveresaenger force-pushed the upgrade-terraform-provider-google-beta-to-v6.0.1-major branch from 8f3714f to 92b0582 Compare August 29, 2024 19:55

mjeffryes assigned guineveresaenger Aug 30, 2024

iwahbe reviewed Sep 5, 2024

View reviewed changes

provider/resources.go Outdated Show resolved Hide resolved

guineveresaenger force-pushed the upgrade-terraform-provider-google-beta-to-v6.0.1-major branch 4 times, most recently from c6939a2 to 3382ff7 Compare September 10, 2024 00:33

guineveresaenger marked this pull request as ready for review September 10, 2024 16:54

guineveresaenger requested review from iwahbe, a team and VenelinMartinov September 10, 2024 22:47

iwahbe reviewed Sep 11, 2024

View reviewed changes

provider/provider_yaml_test.go Outdated Show resolved Hide resolved

VenelinMartinov reviewed Sep 11, 2024

View reviewed changes

guineveresaenger force-pushed the upgrade-terraform-provider-google-beta-to-v6.0.1-major branch from 7f98067 to 50564c0 Compare September 11, 2024 17:35

guineveresaenger added 5 commits September 11, 2024 10:59

Update to upstream v6 and make tfgen

f3ac0db

Remove Add-flattening-of-self-managed-certificates.patch.

0a0f538

Resolves #1188.

Remove Remove-pattern-string-from-compute-forwarding-rules.patch

e2596ed

Resolves #2324, #2326

Build SDKs

1fe7e10

Update examples tests

7de432a

guineveresaenger force-pushed the upgrade-terraform-provider-google-beta-to-v6.0.1-major branch from 50564c0 to f83416f Compare September 11, 2024 18:00

guineveresaenger force-pushed the upgrade-terraform-provider-google-beta-to-v6.0.1-major branch 2 times, most recently from 2ae64aa to 242aec1 Compare September 12, 2024 15:56

guineveresaenger mentioned this pull request Sep 12, 2024

Migration Guide for GCP v8 pulumi/registry#5403

Merged

iwahbe self-requested a review September 13, 2024 09:05

iwahbe approved these changes Sep 13, 2024

View reviewed changes

examples/labels-combinations-go/main.go Outdated Show resolved Hide resolved

.goreleaser.prerelease.yml Outdated Show resolved Hide resolved

Squash for release

c29bcdb

guineveresaenger force-pushed the upgrade-terraform-provider-google-beta-to-v6.0.1-major branch from 242aec1 to c29bcdb Compare September 13, 2024 17:46

guineveresaenger merged commit c8582e0 into master Sep 13, 2024
46 checks passed

guineveresaenger deleted the upgrade-terraform-provider-google-beta-to-v6.0.1-major branch September 13, 2024 18:53

This was referenced Sep 13, 2024

Upgrade terraform-provider-google-beta to v6.0.1 #2348

Closed

Handle new default label #2357

Closed

github-actions bot removed the needs-release/major When a PR with this label merges, it initiates a release of vX+1.0.0 label Sep 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade terraform provider google beta to v6.0.1 major #2355

Upgrade terraform provider google beta to v6.0.1 major #2355

guineveresaenger commented Aug 28, 2024 •

edited by VenelinMartinov

Loading

github-actions bot commented Aug 28, 2024 •

edited

Loading

VenelinMartinov commented Aug 29, 2024 •

edited

Loading

iwahbe left a comment

VenelinMartinov left a comment

VenelinMartinov Sep 11, 2024

guineveresaenger Sep 11, 2024

VenelinMartinov Sep 11, 2024

guineveresaenger commented Sep 11, 2024

VenelinMartinov commented Sep 11, 2024 •

edited

Loading

guineveresaenger commented Sep 11, 2024

VenelinMartinov commented Sep 11, 2024

iwahbe left a comment

pulumi-bot commented Sep 13, 2024

Upgrade terraform provider google beta to v6.0.1 major #2355

Upgrade terraform provider google beta to v6.0.1 major #2355

Conversation

guineveresaenger commented Aug 28, 2024 • edited by VenelinMartinov Loading

github-actions bot commented Aug 28, 2024 • edited Loading

Does the PR have any schema changes?

Resources

Types

New resources:

New functions:

VenelinMartinov commented Aug 29, 2024 • edited Loading

iwahbe left a comment

Choose a reason for hiding this comment

VenelinMartinov left a comment

Choose a reason for hiding this comment

VenelinMartinov Sep 11, 2024

Choose a reason for hiding this comment

guineveresaenger Sep 11, 2024

Choose a reason for hiding this comment

VenelinMartinov Sep 11, 2024

Choose a reason for hiding this comment

guineveresaenger commented Sep 11, 2024

VenelinMartinov commented Sep 11, 2024 • edited Loading

guineveresaenger commented Sep 11, 2024

VenelinMartinov commented Sep 11, 2024

iwahbe left a comment

Choose a reason for hiding this comment

pulumi-bot commented Sep 13, 2024

guineveresaenger commented Aug 28, 2024 •

edited by VenelinMartinov

Loading

github-actions bot commented Aug 28, 2024 •

edited

Loading

VenelinMartinov commented Aug 29, 2024 •

edited

Loading

VenelinMartinov commented Sep 11, 2024 •

edited

Loading