Skip to content

Commit af15580

Browse files
zli82016modular-magician
zli82016
and
modular-magician
authored
Add 'soft_delete_policy' to 'google_storage_bucket' resource (#7510)
* Adds support for Soft Delete feature, which allows setting soft delete policy on 'google_storage_bucket' resource. (#10171) (#7119) [upstream:3b9c61bd50c271e769a6cb81dbd28d5ba7512c15] Signed-off-by: Modular Magician <[email protected]> * Comment out PF provider config test that's affected by ADCs in our CI (#9034) (#6326) Signed-off-by: Modular Magician <[email protected]> * fix TestAccFirebaseWebApp_firebaseWebAppFull * Upgrade go api client to 0.167 * Fix TestAccFirebaseWebApp_firebaseWebAppBasicExample * Add 4.84.1 changelog * Update 4.85 CHANGELOG --------- Signed-off-by: Modular Magician <[email protected]> Co-authored-by: The Magician <[email protected]>
1 parent 13f70f5 commit af15580

11 files changed

+342
-144
lines changed

‎.changelog/10171.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note: enhancement
2+
storage: added 'soft_delete_policy' to 'google_storage_bucket' resource
3+
```

‎.changelog/9034.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎CHANGELOG.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
## 4.84.0 (Unreleased)
1+
## 4.85.0 (Unreleased)
2+
3+
NOTES:
4+
* The `4.85.0` release backports configuration for the retention period for Cloud Storage soft delete (https://cloud.google.com/resources/storage/soft-delete-announce) so that customers who have not yet upgraded to `5.22.0`+ are able to configure the retention period of objects in their buckets. By upgrading to this version and configuring or otherwise interacting with the `google_storage_bucket.soft_delete_policy` values, you will need to upgrade directly to `5.22.0`+ from `4.85.0` when upgrading to `5.X` in the future.
5+
6+
IMPROVEMENTS:
7+
* storage: added 'soft_delete_policy' to 'google_storage_bucket' resource ([#7119](https://github.com/hashicorp/terraform-provider-google-beta/pull/7119))
8+
9+
## 4.84.0 (September 26, 2023)
210

311
DEPRECATIONS:
412
* alloydb: deprecated `network` field in favor of `network_config` on `google_alloydb_cluster`. ([#6297](https://github.com/hashicorp/terraform-provider-google-beta/pull/6297))

‎go.mod

+35-25
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module github.com/hashicorp/terraform-provider-google-beta
2+
23
go 1.19
34

45
require (
@@ -23,41 +24,44 @@ require (
2324
github.com/mitchellh/go-homedir v1.1.0
2425
github.com/mitchellh/hashstructure v1.1.0
2526
github.com/sirupsen/logrus v1.8.1
26-
golang.org/x/net v0.14.0
27-
golang.org/x/oauth2 v0.11.0
28-
google.golang.org/api v0.139.0
29-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
30-
google.golang.org/grpc v1.57.0
31-
google.golang.org/protobuf v1.31.0
27+
golang.org/x/net v0.21.0
28+
golang.org/x/oauth2 v0.17.0
29+
google.golang.org/api v0.167.0
30+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9
31+
google.golang.org/grpc v1.61.1
32+
google.golang.org/protobuf v1.32.0
3233
)
3334

3435
require (
3536
bitbucket.org/creachadair/stringset v0.0.8 // indirect
36-
cloud.google.com/go v0.110.6 // indirect
37-
cloud.google.com/go/compute v1.23.0 // indirect
37+
cloud.google.com/go v0.112.0 // indirect
38+
cloud.google.com/go/compute v1.23.4 // indirect
3839
cloud.google.com/go/compute/metadata v0.2.3 // indirect
39-
cloud.google.com/go/iam v1.1.1 // indirect
40-
cloud.google.com/go/longrunning v0.5.1 // indirect
40+
cloud.google.com/go/iam v1.1.6 // indirect
41+
cloud.google.com/go/longrunning v0.5.5 // indirect
4142
github.com/agext/levenshtein v1.2.2 // indirect
4243
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
4344
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
4445
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
4546
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4647
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
47-
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
48-
github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
49-
github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
48+
github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101 // indirect
49+
github.com/envoyproxy/go-control-plane v0.11.1 // indirect
50+
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
5051
github.com/fatih/color v1.13.0 // indirect
52+
github.com/felixge/httpsnoop v1.0.4 // indirect
5153
github.com/gammazero/deque v0.0.0-20180920172122-f6adf94963e4 // indirect
52-
github.com/golang/glog v1.1.0 // indirect
54+
github.com/go-logr/logr v1.4.1 // indirect
55+
github.com/go-logr/stdr v1.2.2 // indirect
56+
github.com/golang/glog v1.1.2 // indirect
5357
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5458
github.com/golang/protobuf v1.5.3 // indirect
55-
github.com/google/go-cmp v0.5.9 // indirect
59+
github.com/google/go-cmp v0.6.0 // indirect
5660
github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932 // indirect
5761
github.com/google/s2a-go v0.1.7 // indirect
58-
github.com/google/uuid v1.3.0 // indirect
59-
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
60-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
62+
github.com/google/uuid v1.6.0 // indirect
63+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
64+
github.com/googleapis/gax-go/v2 v2.12.1 // indirect
6165
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
6266
github.com/hashicorp/go-hclog v1.2.1 // indirect
6367
github.com/hashicorp/go-plugin v1.4.8 // indirect
@@ -84,13 +88,19 @@ require (
8488
github.com/vmihailenco/tagparser v0.1.2 // indirect
8589
github.com/zclconf/go-cty v1.11.0 // indirect
8690
go.opencensus.io v0.24.0 // indirect
87-
golang.org/x/crypto v0.12.0 // indirect
88-
golang.org/x/sync v0.3.0 // indirect
89-
golang.org/x/sys v0.11.0 // indirect
90-
golang.org/x/text v0.12.0 // indirect
91+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
92+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
93+
go.opentelemetry.io/otel v1.23.0 // indirect
94+
go.opentelemetry.io/otel/metric v1.23.0 // indirect
95+
go.opentelemetry.io/otel/trace v1.23.0 // indirect
96+
golang.org/x/crypto v0.19.0 // indirect
97+
golang.org/x/sync v0.6.0 // indirect
98+
golang.org/x/sys v0.17.0 // indirect
99+
golang.org/x/text v0.14.0 // indirect
100+
golang.org/x/time v0.5.0 // indirect
91101
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
92-
google.golang.org/appengine v1.6.7 // indirect
93-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
94-
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
102+
google.golang.org/appengine v1.6.8 // indirect
103+
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
104+
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
95105
gopkg.in/yaml.v2 v2.4.0 // indirect
96106
)

0 commit comments

Comments
 (0)