Skip to content

Commit e4cf2c3

Browse files
authored
remove deprecated integration client fields (#11450)
1 parent 2f02fec commit e4cf2c3

File tree

4 files changed

+8
-33
lines changed

4 files changed

+8
-33
lines changed

mmv1/products/integrations/Client.yaml

-26
Original file line numberDiff line numberDiff line change
@@ -84,34 +84,12 @@ properties:
8484
the kms key is stored at the same project as customer's project and ecrypted
8585
with CMEK, otherwise, the kms key is stored in the tenant project and
8686
encrypted with GMEK.
87-
conflicts:
88-
- provision_gmek
89-
- !ruby/object:Api::Type::Boolean
90-
name: 'createSampleWorkflows'
91-
description: |
92-
Indicates if sample workflow should be created along with provisioning.
93-
immutable: true
94-
ignore_read: true
95-
deprecation_message: "`create_sample_workflows` is deprecated and will be removed in a future major release. Use `create_sample_integrations` instead."
96-
conflicts:
97-
- create_sample_integrations
9887
- !ruby/object:Api::Type::Boolean
9988
name: 'createSampleIntegrations'
10089
description: |
10190
Indicates if sample integrations should be created along with provisioning.
10291
immutable: true
10392
ignore_read: true
104-
conflicts:
105-
- create_sample_workflows
106-
- !ruby/object:Api::Type::Boolean
107-
name: 'provisionGmek'
108-
description: |
109-
Indicates provision with GMEK or CMEK.
110-
deprecation_message: "`provision_gmek` is deprecated and will be removed in a future major release. Client would be provisioned as gmek if `cloud_kms_config` is not given."
111-
immutable: true
112-
ignore_read: true
113-
conflicts:
114-
- cloud_kms_config
11593
- !ruby/object:Api::Type::String
11694
name: 'runAsServiceAccount'
11795
description: |
@@ -129,7 +107,3 @@ examples:
129107
vars:
130108
key_ring_name: my-keyring
131109
service_account_id: service-acc
132-
- !ruby/object:Provider::Terraform::Examples
133-
name: "integrations_client_deprecated_fields"
134-
primary_resource_id: "example"
135-
skip_docs: true

mmv1/templates/terraform/examples/integrations_client_deprecated_fields.tf.erb

-5
This file was deleted.

mmv1/third_party/terraform/services/integrations/resource_integrations_auth_config_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func testAccIntegrationsAuthConfig_full(context map[string]interface{}) string {
4646
return acctest.Nprintf(`
4747
resource "google_integrations_client" "client" {
4848
location = "southamerica-west1"
49-
provision_gmek = true
49+
create_sample_integrations = true
5050
}
5151
5252
resource "google_integrations_auth_config" "update_example" {
@@ -72,7 +72,7 @@ func testAccIntegrationsAuthConfig_update(context map[string]interface{}) string
7272
return acctest.Nprintf(`
7373
resource "google_integrations_client" "client" {
7474
location = "southamerica-west1"
75-
provision_gmek = true
75+
create_sample_integrations = true
7676
}
7777
7878
resource "google_integrations_auth_config" "update_example" {

mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown

+6
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,12 @@ in GCP, including the labels configured through Terraform, the system, and other
334334

335335
`google_identity_platform_project_default_config` is removed in favor of `google_identity_platform_project_config`
336336

337+
## Resource: `google_integrations_client`
338+
339+
### `create_sample_worklfows` and `provision_gmek` is now removed
340+
341+
`create_sample_worklfows` and `provision_gmek` is now removed in favor of `create_sample_integrations`
342+
337343
## Resource: `google_project`
338344

339345
### Project deletion now prevented by default with `deletion_policy`

0 commit comments

Comments
 (0)