mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-07-08 19:18:30 +00:00
provider/google: Add support for privateIpGoogleAccess on subnetworks (#14234)
This commit is contained in:
parent
176aae79a0
commit
36aff9a2c1
|
@ -29,6 +29,10 @@ func dataSourceGoogleComputeSubnetwork() *schema.Resource {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
},
|
},
|
||||||
|
"private_ip_google_access": &schema.Schema{
|
||||||
|
Type: schema.TypeBool,
|
||||||
|
Computed: true,
|
||||||
|
},
|
||||||
"network": &schema.Schema{
|
"network": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
|
@ -75,6 +79,7 @@ func dataSourceGoogleComputeSubnetworkRead(d *schema.ResourceData, meta interfac
|
||||||
}
|
}
|
||||||
|
|
||||||
d.Set("ip_cidr_range", subnetwork.IpCidrRange)
|
d.Set("ip_cidr_range", subnetwork.IpCidrRange)
|
||||||
|
d.Set("private_ip_google_access", subnetwork.PrivateIpGoogleAccess)
|
||||||
d.Set("self_link", subnetwork.SelfLink)
|
d.Set("self_link", subnetwork.SelfLink)
|
||||||
d.Set("description", subnetwork.Description)
|
d.Set("description", subnetwork.Description)
|
||||||
d.Set("gateway_address", subnetwork.GatewayAddress)
|
d.Set("gateway_address", subnetwork.GatewayAddress)
|
||||||
|
|
|
@ -45,6 +45,7 @@ func testAccDataSourceGoogleSubnetworkCheck(data_source_name string, resource_na
|
||||||
"description",
|
"description",
|
||||||
"ip_cidr_range",
|
"ip_cidr_range",
|
||||||
"network",
|
"network",
|
||||||
|
"private_ip_google_access",
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, attr_to_check := range subnetwork_attrs_to_test {
|
for _, attr_to_check := range subnetwork_attrs_to_test {
|
||||||
|
@ -73,6 +74,7 @@ resource "google_compute_subnetwork" "foobar" {
|
||||||
description = "my-description"
|
description = "my-description"
|
||||||
ip_cidr_range = "10.0.0.0/24"
|
ip_cidr_range = "10.0.0.0/24"
|
||||||
network = "${google_compute_network.foobar.self_link}"
|
network = "${google_compute_network.foobar.self_link}"
|
||||||
|
private_ip_google_access = true
|
||||||
}
|
}
|
||||||
|
|
||||||
data "google_compute_subnetwork" "my_subnetwork" {
|
data "google_compute_subnetwork" "my_subnetwork" {
|
||||||
|
|
|
@ -58,6 +58,12 @@ func resourceComputeSubnetwork() *schema.Resource {
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"private_ip_google_access": &schema.Schema{
|
||||||
|
Type: schema.TypeBool,
|
||||||
|
Optional: true,
|
||||||
|
ForceNew: true,
|
||||||
|
},
|
||||||
|
|
||||||
"self_link": &schema.Schema{
|
"self_link": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
|
@ -100,6 +106,7 @@ func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) e
|
||||||
Name: d.Get("name").(string),
|
Name: d.Get("name").(string),
|
||||||
Description: d.Get("description").(string),
|
Description: d.Get("description").(string),
|
||||||
IpCidrRange: d.Get("ip_cidr_range").(string),
|
IpCidrRange: d.Get("ip_cidr_range").(string),
|
||||||
|
PrivateIpGoogleAccess: d.Get("private_ip_google_access").(bool),
|
||||||
Network: network,
|
Network: network,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -102,4 +102,12 @@ resource "google_compute_subnetwork" "network-ref-by-name" {
|
||||||
network = "${google_compute_network.custom-test.name}"
|
network = "${google_compute_network.custom-test.name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
|
resource "google_compute_subnetwork" "network-with-private-google-access" {
|
||||||
|
name = "subnetwork-test-%s"
|
||||||
|
ip_cidr_range = "10.2.0.0/16"
|
||||||
|
region = "us-central1"
|
||||||
|
network = "${google_compute_network.custom-test.self_link}"
|
||||||
|
private_ip_google_access = true
|
||||||
|
}
|
||||||
|
|
||||||
|
`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user