Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade terraform-provider-google-beta to v5.41.0 #2311

Merged
merged 3 commits into from
Aug 14, 2024
Merged

Upgrade terraform-provider-google-beta to v5.41.0 #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db60f8a
make tfgen
guineveresaenger Aug 14, 2024
311c4e0
make build_sdks
guineveresaenger Aug 14, 2024
15a93ea
Update test to contain new default
guineveresaenger Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion patches/0002-Add-nil-checks-for-sql-database-instance-flattening.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add nil checks for sql database instance flattening


diff --git a/google-beta/services/sql/resource_sql_database_instance.go b/google-beta/services/sql/resource_sql_database_instance.go
index 16cc296c2..da372674a 100644
index a828724b0..196f48c7e 100644
--- a/google-beta/services/sql/resource_sql_database_instance.go
+++ b/google-beta/services/sql/resource_sql_database_instance.go
@@ -2062,6 +2062,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
Expand Down
38 changes: 19 additions & 19 deletions patches/0006-docs-patching.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,12 +522,12 @@ index c3e738686..4ab0fb25d 100644
* `project` - (Optional) The ID of the project in which the resource belongs.
If it is not provided, the provider project is used.
diff --git a/website/docs/r/composer_environment.html.markdown b/website/docs/r/composer_environment.html.markdown
index 77abc0296..46bd484a8 100644
index bc7b99b97..2e32cd9b9 100644
--- a/website/docs/r/composer_environment.html.markdown
+++ b/website/docs/r/composer_environment.html.markdown
@@ -32,24 +32,21 @@ To get more information about Environments, see:
@@ -31,24 +31,21 @@ To get more information about Environments, see:
of Airflow, bugfixes, and security updates. We recommend using
Cloud Composer 2 or Cloud Composer 3 instead.
</Note>

-Several special considerations apply to managing Cloud Composer environments
-with Terraform:
Expand Down Expand Up @@ -1611,7 +1611,7 @@ index f18c91533..924ad4cc0 100644
<div class = "oics-button" style="float: right; margin: 0 0 -15px">
<a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgit.luolix.top%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=vpn_tunnel_basic&open_in_editor=main.tf" target="_blank">
diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
index 411ac707c..117c575f2 100644
index 73120a1c1..93f2c3d03 100644
--- a/website/docs/r/container_cluster.html.markdown
+++ b/website/docs/r/container_cluster.html.markdown
@@ -13,15 +13,12 @@ To get more information about GKE clusters, see:
Expand Down Expand Up @@ -1702,7 +1702,7 @@ index 411ac707c..117c575f2 100644
release channel, but will not unenroll it. Instead, use the `"UNSPECIFIED"`
channel. Structure is [documented below](#nested_release_channel).

@@ -870,8 +888,6 @@ gvnic {
@@ -874,8 +892,6 @@ gvnic {

* `guest_accelerator` - (Optional) List of the type and count of accelerator cards attached to the instance.
Structure [documented below](#nested_guest_accelerator).
Expand All @@ -1711,7 +1711,7 @@ index 411ac707c..117c575f2 100644

* `image_type` - (Optional) The image type to use for this node. Note that changing the image type
will delete and recreate all nodes in the node pool.
@@ -892,7 +908,7 @@ gvnic {
@@ -896,7 +912,7 @@ gvnic {
* `metadata` - (Optional) The metadata key/value pairs assigned to instances in
the cluster. From GKE `1.12` onwards, `disable-legacy-endpoints` is set to
`true` by the API; if `metadata` is set but that default value is not
Expand All @@ -1720,7 +1720,7 @@ index 411ac707c..117c575f2 100644
value in your config.

* `min_cpu_platform` - (Optional) Minimum CPU platform to be used by this instance.
@@ -917,10 +933,7 @@ gvnic {
@@ -921,10 +937,7 @@ gvnic {
See the [official documentation](https://cloud.google.com/kubernetes-engine/docs/concepts/spot-vms)
for more information. Defaults to false.

Expand All @@ -1732,7 +1732,7 @@ index 411ac707c..117c575f2 100644

* `service_account` - (Optional) The service account to be used by the Node VMs.
If not specified, the "default" service account is used.
@@ -932,13 +945,14 @@ gvnic {
@@ -936,13 +949,14 @@ gvnic {

* `resource_manager_tags` - (Optional) A map of resource manager tag keys and values to be attached to the nodes for managing Compute Engine firewalls using Network Firewall Policies. Tags must be according to specifications found [here](https://cloud.google.com/vpc/docs/tags-firewalls-overview#specifications). A maximum of 5 tag key-value pairs can be specified. Existing tags will be replaced with new values. Tags must be in one of the following formats ([KEY]=[VALUE]) 1. `tagKeys/{tag_key_id}=tagValues/{tag_value_id}` 2. `{org_id}/{tag_key_name}={tag_value_name}` 3. `{project_id}/{tag_key_name}={tag_value_name}`.

Expand All @@ -1754,7 +1754,7 @@ index 411ac707c..117c575f2 100644

* `workload_metadata_config` - (Optional) Metadata configuration to expose to workloads on the node pool.
Structure is [documented below](#nested_workload_metadata_config).
@@ -991,6 +1005,20 @@ sole_tenant_config {
@@ -995,6 +1009,20 @@ sole_tenant_config {

* `enable_nested_virtualization`- (Optional) Defines whether the instance should have nested virtualization enabled. Defaults to false.

Expand All @@ -1775,7 +1775,7 @@ index 411ac707c..117c575f2 100644
<a name="nested_ephemeral_storage_config"></a>The `ephemeral_storage_config` block supports:

* `local_ssd_count` (Required) - Number of local SSDs to use to back ephemeral storage. Uses NVMe interfaces. Each local SSD is 375 GB in size. If zero, it means to disable using local SSDs as ephemeral storage.
@@ -1151,7 +1179,7 @@ for more details. This field only applies to private clusters, when
@@ -1155,7 +1183,7 @@ for more details. This field only applies to private clusters, when
* `private_endpoint_subnetwork` - (Optional) Subnetwork in cluster's network where master's endpoint will be provisioned.

* `master_global_access_config` (Optional) - Controls cluster master global
Expand All @@ -1784,7 +1784,7 @@ index 411ac707c..117c575f2 100644
not modify the previously-set value. Structure is [documented below](#nested_master_global_access_config).

In addition, the `private_cluster_config` allows access to the following read-only fields:
@@ -1252,9 +1280,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at
@@ -1256,9 +1284,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at

* `mode` (Required) How to expose the node metadata to the workload running on the node.
Accepted values are:
Expand Down Expand Up @@ -2707,7 +2707,7 @@ index 1e419d9e4..16c9465d2 100644
## Example Usage

diff --git a/website/docs/r/google_project.html.markdown b/website/docs/r/google_project.html.markdown
index 00ee09dc4..304699bf9 100644
index fff53a4a8..f9dc5f497 100644
--- a/website/docs/r/google_project.html.markdown
+++ b/website/docs/r/google_project.html.markdown
@@ -11,15 +11,13 @@ Allows creation and management of a Google Cloud Platform project.
Expand Down Expand Up @@ -2738,11 +2738,11 @@ index 00ee09dc4..304699bf9 100644
See [Google Cloud Billing API Access Control](https://cloud.google.com/billing/docs/how-to/billing-access)
for more details.

-* `skip_delete` - (Optional) If true, the Terraform resource can be deleted
+* `skip_delete` - (Optional) If true, the resource can be deleted
without deleting the Project via the Google API. `skip_delete` is deprecated and will be removed in a future major release. The new release adds support for `deletion_policy` instead.

* `labels` - (Optional) A set of key/value label pairs to assign to the project.
-* `skip_delete` - (Optional) If true, the Terraform resource can be deleted without
+* `skip_delete` - (Optional) If true, the resource can be deleted without
deleting the Project via the Google API. `skip_delete` is deprecated and will be
removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false`
can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true`
diff --git a/website/docs/r/google_project_iam.html.markdown b/website/docs/r/google_project_iam.html.markdown
index 46cae09f8..69b15c96e 100644
--- a/website/docs/r/google_project_iam.html.markdown
Expand Down Expand Up @@ -3599,7 +3599,7 @@ index 2ac02739f..da87bdaae 100644

<a name="nested_encryption_config"></a>The `encryption_config` block supports:
diff --git a/website/docs/r/sql_database_instance.html.markdown b/website/docs/r/sql_database_instance.html.markdown
index 429b84d0d..195b61f47 100644
index da7cc31cf..56e5111f0 100644
--- a/website/docs/r/sql_database_instance.html.markdown
+++ b/website/docs/r/sql_database_instance.html.markdown
@@ -10,12 +10,12 @@ Creates a new Google SQL Database Instance. For more information, see the [offic
Expand Down Expand Up @@ -3790,7 +3790,7 @@ index 762e52b5f..e0fd45e24 100644
## Attributes Reference

diff --git a/website/docs/r/storage_bucket_object.html.markdown b/website/docs/r/storage_bucket_object.html.markdown
index 92eec523d..2ecef695c 100644
index c58c1c856..4278b76f6 100644
--- a/website/docs/r/storage_bucket_object.html.markdown
+++ b/website/docs/r/storage_bucket_object.html.markdown
@@ -48,7 +48,7 @@ The following arguments are supported:
Expand Down
2 changes: 1 addition & 1 deletion patches/0009-Fix-794-with-an-unconditional-read.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Fix #794 with an unconditional read.


diff --git a/google-beta/services/sql/resource_sql_database_instance.go b/google-beta/services/sql/resource_sql_database_instance.go
index da372674a..db76a3d3e 100644
index 196f48c7e..ae5e9d0c7 100644
--- a/google-beta/services/sql/resource_sql_database_instance.go
+++ b/google-beta/services/sql/resource_sql_database_instance.go
@@ -1917,10 +1917,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
Expand Down
147 changes: 147 additions & 0 deletions provider/cmd/pulumi-resource-gcp/bridge-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,87 @@
}
}
},
"google_access_context_manager_service_perimeter_dry_run_egress_policy": {
"current": "gcp:accesscontextmanager/servicePerimeterDryRunEgressPolicy:ServicePerimeterDryRunEgressPolicy",
"majorVersion": 7,
"fields": {
"egress_from": {
"maxItemsOne": true,
"elem": {
"fields": {
"identities": {
"maxItemsOne": false
},
"sources": {
"maxItemsOne": false
}
}
}
},
"egress_to": {
"maxItemsOne": true,
"elem": {
"fields": {
"external_resources": {
"maxItemsOne": false
},
"operations": {
"maxItemsOne": false,
"elem": {
"fields": {
"method_selectors": {
"maxItemsOne": false
}
}
}
},
"resources": {
"maxItemsOne": false
}
}
}
}
}
},
"google_access_context_manager_service_perimeter_dry_run_ingress_policy": {
"current": "gcp:accesscontextmanager/servicePerimeterDryRunIngressPolicy:ServicePerimeterDryRunIngressPolicy",
"majorVersion": 7,
"fields": {
"ingress_from": {
"maxItemsOne": true,
"elem": {
"fields": {
"identities": {
"maxItemsOne": false
},
"sources": {
"maxItemsOne": false
}
}
}
},
"ingress_to": {
"maxItemsOne": true,
"elem": {
"fields": {
"operations": {
"maxItemsOne": false,
"elem": {
"fields": {
"method_selectors": {
"maxItemsOne": false
}
}
}
},
"resources": {
"maxItemsOne": false
}
}
}
}
}
},
"google_access_context_manager_service_perimeter_dry_run_resource": {
"current": "gcp:accesscontextmanager/servicePerimeterDryRunResource:ServicePerimeterDryRunResource",
"majorVersion": 7
Expand Down Expand Up @@ -9672,6 +9753,9 @@
}
}
},
"auto_provisioning_locations": {
"maxItemsOne": false
},
"resource_limits": {
"maxItemsOne": false
}
Expand Down Expand Up @@ -24244,6 +24328,10 @@
"current": "gcp:securitycenter/sourceIamPolicy:SourceIamPolicy",
"majorVersion": 7
},
"google_scc_v2_folder_mute_config": {
"current": "gcp:securitycenter/v2FolderMuteConfig:V2FolderMuteConfig",
"majorVersion": 7
},
"google_scc_v2_organization_mute_config": {
"current": "gcp:securitycenter/v2OrganizationMuteConfig:V2OrganizationMuteConfig",
"majorVersion": 7
Expand All @@ -24257,6 +24345,48 @@
}
}
},
"google_scc_v2_organization_source": {
"current": "gcp:securitycenter/v2OrganizationSource:V2OrganizationSource",
"majorVersion": 7
},
"google_scc_v2_organization_source_iam_binding": {
"current": "gcp:securitycenter/v2OrganizationSourceIamBinding:V2OrganizationSourceIamBinding",
"majorVersion": 7,
"fields": {
"condition": {
"maxItemsOne": true
},
"members": {
"maxItemsOne": false
}
}
},
"google_scc_v2_organization_source_iam_member": {
"current": "gcp:securitycenter/v2OrganizationSourceIamMember:V2OrganizationSourceIamMember",
"majorVersion": 7,
"fields": {
"condition": {
"maxItemsOne": true
}
}
},
"google_scc_v2_organization_source_iam_policy": {
"current": "gcp:securitycenter/v2OrganizationSourceIamPolicy:V2OrganizationSourceIamPolicy",
"majorVersion": 7
},
"google_scc_v2_project_mute_config": {
"current": "gcp:securitycenter/v2ProjectMuteConfig:V2ProjectMuteConfig",
"majorVersion": 7
},
"google_scc_v2_project_notification_config": {
"current": "gcp:securitycenter/v2ProjectNotificationConfig:V2ProjectNotificationConfig",
"majorVersion": 7,
"fields": {
"streaming_config": {
"maxItemsOne": true
}
}
},
"google_secret_manager_secret": {
"current": "gcp:secretmanager/secret:Secret",
"majorVersion": 7,
Expand Down Expand Up @@ -29343,6 +29473,9 @@
}
}
},
"auto_provisioning_locations": {
"maxItemsOne": false
},
"resource_limits": {
"maxItemsOne": false
}
Expand Down Expand Up @@ -31098,6 +31231,10 @@
"current": "gcp:securitycenter/getSourceIamPolicy:getSourceIamPolicy",
"majorVersion": 7
},
"google_scc_v2_organization_source_iam_policy": {
"current": "gcp:securitycenter/getV2OrganizationSourceIamPolicy:getV2OrganizationSourceIamPolicy",
"majorVersion": 7
},
"google_secret_manager_secret": {
"current": "gcp:secretmanager/getSecret:getSecret",
"majorVersion": 7,
Expand Down Expand Up @@ -32904,6 +33041,8 @@
"gcp:accesscontextmanager/gcpUserAccessBinding:GcpUserAccessBinding": 0,
"gcp:accesscontextmanager/ingressPolicy:IngressPolicy": 0,
"gcp:accesscontextmanager/servicePerimeter:ServicePerimeter": 0,
"gcp:accesscontextmanager/servicePerimeterDryRunEgressPolicy:ServicePerimeterDryRunEgressPolicy": 0,
"gcp:accesscontextmanager/servicePerimeterDryRunIngressPolicy:ServicePerimeterDryRunIngressPolicy": 0,
"gcp:accesscontextmanager/servicePerimeterDryRunResource:ServicePerimeterDryRunResource": 0,
"gcp:accesscontextmanager/servicePerimeterEgressPolicy:ServicePerimeterEgressPolicy": 0,
"gcp:accesscontextmanager/servicePerimeterIngressPolicy:ServicePerimeterIngressPolicy": 0,
Expand Down Expand Up @@ -33733,8 +33872,15 @@
"gcp:securitycenter/sourceIamBinding:SourceIamBinding": 0,
"gcp:securitycenter/sourceIamMember:SourceIamMember": 0,
"gcp:securitycenter/sourceIamPolicy:SourceIamPolicy": 0,
"gcp:securitycenter/v2FolderMuteConfig:V2FolderMuteConfig": 0,
"gcp:securitycenter/v2OrganizationMuteConfig:V2OrganizationMuteConfig": 0,
"gcp:securitycenter/v2OrganizationNotificationConfig:V2OrganizationNotificationConfig": 0,
"gcp:securitycenter/v2OrganizationSource:V2OrganizationSource": 0,
"gcp:securitycenter/v2OrganizationSourceIamBinding:V2OrganizationSourceIamBinding": 0,
"gcp:securitycenter/v2OrganizationSourceIamMember:V2OrganizationSourceIamMember": 0,
"gcp:securitycenter/v2OrganizationSourceIamPolicy:V2OrganizationSourceIamPolicy": 0,
"gcp:securitycenter/v2ProjectMuteConfig:V2ProjectMuteConfig": 0,
"gcp:securitycenter/v2ProjectNotificationConfig:V2ProjectNotificationConfig": 0,
"gcp:securityposture/posture:Posture": 0,
"gcp:securityposture/postureDeployment:PostureDeployment": 0,
"gcp:serviceaccount/account:Account": 0,
Expand Down Expand Up @@ -34103,6 +34249,7 @@
"gcp:securesourcemanager/getInstanceIamPolicy:getInstanceIamPolicy": 0,
"gcp:securesourcemanager/getRepositoryIamPolicy:getRepositoryIamPolicy": 0,
"gcp:securitycenter/getSourceIamPolicy:getSourceIamPolicy": 0,
"gcp:securitycenter/getV2OrganizationSourceIamPolicy:getV2OrganizationSourceIamPolicy": 0,
"gcp:serviceaccount/getAccount:getAccount": 0,
"gcp:serviceaccount/getAccountAccessToken:getAccountAccessToken": 0,
"gcp:serviceaccount/getAccountIdToken:getAccountIdToken": 0,
Expand Down
Loading
Loading