Skip to content

Commit

Permalink
Upgrade terraform provider google beta to v6.0.1 major (#2355)
Browse files Browse the repository at this point in the history 
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:
- [~Remove
0002-Add-nil-checks-for-sql-database-instance-flattening.patch~](#2319)
- [Remove
0010-Remove-pattern-string-from-compute-forwarding-rules.patch](#2326)
- [Remove
Add-flattening-of-self-managed-certificates.patch](#1188)
  • Loading branch information
@guineveresaenger
guineveresaenger authored Sep 13, 2024
1 parent 6b0192e commit c8582e0
Show file tree
Hide file tree
Showing 2,224 changed files with 39,273 additions and 29,354 deletions.
2 changes: 1 addition & 1 deletion .ci-mgmt.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
provider: gcp
gcp: true
major-version: 7
major-version: 8
parallel: 2
providerVersion: "github.com/hashicorp/terraform-provider-google-beta/version.ProviderVersion"
env:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
PACK := gcp
ORG := pulumi
PROJECT := github.com/$(ORG)/pulumi-$(PACK)
PROVIDER_PATH := provider/v7
PROVIDER_PATH := provider/v8
VERSION_PATH := $(PROVIDER_PATH)/pkg/version.Version
TFGEN := pulumi-tfgen-$(PACK)
PROVIDER := pulumi-resource-$(PACK)
Expand All @@ -16,7 +16,7 @@ PULUMI_MISSING_DOCS_ERROR := true

# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
# Local & branch builds will just used this fixed default version unless specified
PROVIDER_VERSION ?= 7.0.0-alpha.0+dev
PROVIDER_VERSION ?= 8.0.0-alpha.0+dev
# Use this normalised version everywhere rather than the raw input to ensure consistency.
VERSION_GENERIC = $(shell pulumictl convert-version --language generic --version "$(PROVIDER_VERSION)")

Expand Down
2 changes: 1 addition & 1 deletion examples/bucket-go/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package main

import (
"github.com/pulumi/pulumi-gcp/sdk/v7/go/gcp/storage"
"github.com/pulumi/pulumi-gcp/sdk/v8/go/gcp/storage"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
)

Expand Down
10 changes: 6 additions & 4 deletions examples/examples_go_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func getGoBaseOptions(t *testing.T) integration.ProgramTestOptions {
base := getBaseOptions(t)
goBase := base.With(integration.ProgramTestOptions{
Dependencies: []string{
"github.com/pulumi/pulumi-gcp/sdk/v7",
"github.com/pulumi/pulumi-gcp/sdk/v8",
},
})

Expand Down Expand Up @@ -312,12 +312,11 @@ func TestLabelsCombinationsGo(t *testing.T) {
{
"label kept if default is empty",
labelsState{
Labels: map[string]string{"x": "s"},
Labels: map[string]string{"x": "s"},
},
labelsState{
DefaultLabels: map[string]string{"x": ""},
},

},
}

Expand Down Expand Up @@ -398,7 +397,7 @@ func (st labelsState) validateTransitionTo(t *testing.T, st2 labelsState) {

baseOpts := integration.ProgramTestOptions{
Dependencies: []string{
fmt.Sprintf("github.com/pulumi/pulumi-gcp/sdk/v7=%s", goSdkFolder),
fmt.Sprintf("github.com/pulumi/pulumi-gcp/sdk/v8=%s", goSdkFolder),
},
}
if _, envConfigSet := os.LookupEnv("GOOGLE_ZONE"); envConfigSet {
Expand Down Expand Up @@ -510,6 +509,9 @@ func (st labelsState) expectedLabels(prev labelsState) map[string]string {
}
}

// Because we're reading pulumiLabels, we need to expect the default provisioning label.
r["goog-pulumi-provisioned"] = "true"

return r
}

Expand Down
4 changes: 2 additions & 2 deletions examples/examples_yaml_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func TestWarningsNotDuplicated(t *testing.T) {
func TestInvalidExplicitProviderProject(t *testing.T) {
gcpProject := os.Getenv("GCP_PROJECT")
integration.ProgramTest(t, &integration.ProgramTestOptions{
Dir: filepath.Join(getCwd(t), "non-existent-project"),
Dir: filepath.Join(getCwd(t), "non-existent-project"),
Config: map[string]string{"gcpProj": gcpProject},
})
}
}
6 changes: 3 additions & 3 deletions examples/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module github.com/pulumi/pulumi-gcp/examples/v7
module github.com/pulumi/pulumi-gcp/examples/v8

go 1.21

require (
github.com/pulumi/pulumi-gcp/sdk/v6 v6.67.0
github.com/pulumi/pulumi-gcp/sdk/v7 v7.0.0-alpha.0
github.com/pulumi/pulumi-gcp/sdk/v8 v8.0.0-00010101000000-000000000000
github.com/pulumi/pulumi/pkg/v3 v3.130.0
github.com/pulumi/pulumi/sdk/v3 v3.130.0
github.com/stretchr/testify v1.9.0
)

replace github.com/pulumi/pulumi-gcp/sdk/v7 => ../sdk
replace github.com/pulumi/pulumi-gcp/sdk/v8 => ../sdk

require (
cloud.google.com/go v0.112.1 // indirect
Expand Down
69 changes: 38 additions & 31 deletions examples/labels-combinations-go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,70 @@ module github.com/pulumi/pulumi-aws/examples/tags-combinations-go
go 1.21

require (
github.com/pulumi/pulumi-gcp/sdk/v7 v7.0.0-alpha.0
github.com/pulumi/pulumi/sdk/v3 v3.91.1
github.com/pulumi/pulumi-gcp/sdk/v8 v8.0.0-alpha.0
github.com/pulumi/pulumi/sdk/v3 v3.130.0
)

replace github.com/pulumi/pulumi-gcp/sdk/v8 => ../../sdk

require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/charmbracelet/bubbles v0.16.1 // indirect
github.com/charmbracelet/bubbletea v0.24.2 // indirect
github.com/charmbracelet/bubbletea v0.25.0 // indirect
github.com/charmbracelet/lipgloss v0.7.1 // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/djherbis/times v1.5.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.4.0 // indirect
github.com/go-git/go-git/v5 v5.6.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.12.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.1 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/opentracing/basictracer-go v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pgavlin/fx v0.1.6 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/term v1.1.0 // indirect
github.com/pulumi/esc v0.5.6 // indirect
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
github.com/pulumi/esc v0.9.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -71,18 +77,19 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zclconf/go-cty v1.13.2 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
google.golang.org/grpc v1.57.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/frand v1.4.2 // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 // indirect
)
Loading

0 comments on commit c8582e0

Please sign in to comment.