Skip to content

Commit 8aab519

Browse files
vpc access connector use self_link or name (#5623) (#10988)
Signed-off-by: Modular Magician <[email protected]>
1 parent e1cec19 commit 8aab519

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.changelog/5623.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
vpc_access_connector: Updated field `network` to accept self_link or name
3+
```

google/resource_vpc_access_connector.go

+11-7
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@ func resourceVPCAccessConnector() *schema.Resource {
7070
Default: 200,
7171
},
7272
"network": {
73-
Type: schema.TypeString,
74-
Optional: true,
75-
ForceNew: true,
76-
Description: `Name of the VPC network. Required if 'ip_cidr_range' is set.`,
77-
ExactlyOneOf: []string{"network"},
73+
Type: schema.TypeString,
74+
Optional: true,
75+
ForceNew: true,
76+
DiffSuppressFunc: compareResourceNames,
77+
Description: `Name or self_link of the VPC network. Required if 'ip_cidr_range' is set.`,
78+
ExactlyOneOf: []string{"network"},
7879
},
7980
"region": {
8081
Type: schema.TypeString,
@@ -362,7 +363,10 @@ func flattenVPCAccessConnectorName(v interface{}, d *schema.ResourceData, config
362363
}
363364

364365
func flattenVPCAccessConnectorNetwork(v interface{}, d *schema.ResourceData, config *Config) interface{} {
365-
return v
366+
if v == nil {
367+
return v
368+
}
369+
return NameFromSelfLinkStateFunc(v)
366370
}
367371

368372
func flattenVPCAccessConnectorIpCidrRange(v interface{}, d *schema.ResourceData, config *Config) interface{} {
@@ -412,7 +416,7 @@ func expandVPCAccessConnectorName(v interface{}, d TerraformResourceData, config
412416
}
413417

414418
func expandVPCAccessConnectorNetwork(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
415-
return v, nil
419+
return GetResourceNameFromSelfLink(v.(string)), nil
416420
}
417421

418422
func expandVPCAccessConnectorIpCidrRange(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {

website/docs/r/vpc_access_connector.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ The following arguments are supported:
179179

180180
* `network` -
181181
(Optional)
182-
Name of the VPC network. Required if `ip_cidr_range` is set.
182+
Name or self_link of the VPC network. Required if `ip_cidr_range` is set.
183183

184184
* `ip_cidr_range` -
185185
(Optional)

0 commit comments

Comments
 (0)