Skip to content

Commit 58a2b62

Browse files
fix diff in composer v2 private service connect test (#6164) (#11954)
Signed-off-by: Modular Magician <[email protected]>
1 parent 2b12807 commit 58a2b62

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.changelog/6164.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
composer: fixed permadiff on `private_environment_config.cloud_composer_connection_subnetwork`
3+
```

google/resource_composer_environment.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,13 @@ func resourceComposerEnvironment() *schema.Resource {
427427
Description: `When enabled, IPs from public (non-RFC1918) ranges can be used for ip_allocation_policy.cluster_ipv4_cidr_block and ip_allocation_policy.service_ipv4_cidr_block.`,
428428
},
429429
"cloud_composer_connection_subnetwork": {
430-
Type: schema.TypeString,
431-
Optional: true,
432-
Computed: true,
433-
AtLeastOneOf: composerPrivateEnvironmentConfig,
434-
ForceNew: true,
435-
Description: `When specified, the environment will use Private Service Connect instead of VPC peerings to connect to Cloud SQL in the Tenant Project, and the PSC endpoint in the Customer Project will use an IP address from this subnetwork. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.`,
430+
Type: schema.TypeString,
431+
Optional: true,
432+
Computed: true,
433+
AtLeastOneOf: composerPrivateEnvironmentConfig,
434+
ForceNew: true,
435+
DiffSuppressFunc: compareSelfLinkRelativePaths,
436+
Description: `When specified, the environment will use Private Service Connect instead of VPC peerings to connect to Cloud SQL in the Tenant Project, and the PSC endpoint in the Customer Project will use an IP address from this subnetwork. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.`,
436437
},
437438
},
438439
},

0 commit comments

Comments
 (0)