mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-04 17:51:11 +00:00
Merge pull request #1385 from terraform-providers/paddy_flow_logs
Support subnetwork flow logs.
This commit is contained in:
commit
851dd22d25
@ -3,22 +3,22 @@ package google
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
|
"net"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/apparentlymart/go-cidr/cidr"
|
"github.com/apparentlymart/go-cidr/cidr"
|
||||||
"github.com/hashicorp/terraform/helper/customdiff"
|
"github.com/hashicorp/terraform/helper/customdiff"
|
||||||
"github.com/hashicorp/terraform/helper/schema"
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
computeBeta "google.golang.org/api/compute/v0.beta"
|
computeBeta "google.golang.org/api/compute/v0.beta"
|
||||||
"google.golang.org/api/compute/v1"
|
"google.golang.org/api/compute/v1"
|
||||||
"net"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
SubnetworkBaseApiVersion = v1
|
SubnetworkBaseApiVersion = v1
|
||||||
SubnetworkVersionedFeatures = []Feature{
|
SubnetworkVersionedFeatures = []Feature{
|
||||||
{Version: v0beta, Item: "secondary_ip_range"},
|
{Version: v0beta, Item: "secondary_ip_range"},
|
||||||
|
{Version: v0beta, Item: "enable_flow_logs"},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -112,6 +112,11 @@ func resourceComputeSubnetwork() *schema.Resource {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"enable_flow_logs": &schema.Schema{
|
||||||
|
Type: schema.TypeBool,
|
||||||
|
Optional: true,
|
||||||
|
},
|
||||||
|
|
||||||
"self_link": &schema.Schema{
|
"self_link": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
@ -125,6 +130,7 @@ func resourceComputeSubnetwork() *schema.Resource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) error {
|
func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
computeApiVersion := getComputeApiVersion(d, SubnetworkBaseApiVersion, SubnetworkVersionedFeatures)
|
||||||
config := meta.(*Config)
|
config := meta.(*Config)
|
||||||
network, err := ParseNetworkFieldValue(d.Get("network").(string), d, config)
|
network, err := ParseNetworkFieldValue(d.Get("network").(string), d, config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -142,18 +148,32 @@ func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) e
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Build the subnetwork parameters
|
// Build the subnetwork parameters
|
||||||
subnetwork := &compute.Subnetwork{
|
subnetwork := &computeBeta.Subnetwork{
|
||||||
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),
|
PrivateIpGoogleAccess: d.Get("private_ip_google_access").(bool),
|
||||||
SecondaryIpRanges: expandSecondaryRanges(d.Get("secondary_ip_range").([]interface{})),
|
SecondaryIpRanges: expandSecondaryRangesV0Beta(d.Get("secondary_ip_range").([]interface{})),
|
||||||
Network: network.RelativeLink(),
|
Network: network.RelativeLink(),
|
||||||
|
EnableFlowLogs: d.Get("enable_flow_logs").(bool),
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("[DEBUG] Subnetwork insert request: %#v", subnetwork)
|
log.Printf("[DEBUG] Subnetwork insert request: %#v", subnetwork)
|
||||||
|
|
||||||
op, err := config.clientCompute.Subnetworks.Insert(project, region, subnetwork).Do()
|
subnetworkV1 := &compute.Subnetwork{}
|
||||||
|
err = Convert(subnetwork, subnetworkV1)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
subnetworkV1.ForceSendFields = subnetwork.ForceSendFields
|
||||||
|
|
||||||
|
var op interface{}
|
||||||
|
switch computeApiVersion {
|
||||||
|
case v1:
|
||||||
|
op, err = config.clientCompute.Subnetworks.Insert(project, region, subnetworkV1).Do()
|
||||||
|
case v0beta:
|
||||||
|
op, err = config.clientComputeBeta.Subnetworks.Insert(project, region, subnetwork).Do()
|
||||||
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error creating subnetwork: %s", err)
|
return fmt.Errorf("Error creating subnetwork: %s", err)
|
||||||
@ -164,8 +184,9 @@ func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) e
|
|||||||
// "When creating a new subnetwork, its name has to be unique in that project for that region, even across networks.
|
// "When creating a new subnetwork, its name has to be unique in that project for that region, even across networks.
|
||||||
// The same name can appear twice in a project, as long as each one is in a different region."
|
// The same name can appear twice in a project, as long as each one is in a different region."
|
||||||
// https://cloud.google.com/compute/docs/subnetworks
|
// https://cloud.google.com/compute/docs/subnetworks
|
||||||
|
subnetworkV1.Region = region
|
||||||
subnetwork.Region = region
|
subnetwork.Region = region
|
||||||
d.SetId(createSubnetID(subnetwork))
|
d.SetId(createSubnetID(subnetworkV1))
|
||||||
|
|
||||||
err = computeSharedOperationWaitTime(config.clientCompute, op, project, int(d.Timeout(schema.TimeoutCreate).Minutes()), "Creating Subnetwork")
|
err = computeSharedOperationWaitTime(config.clientCompute, op, project, int(d.Timeout(schema.TimeoutCreate).Minutes()), "Creating Subnetwork")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -243,6 +264,7 @@ func resourceComputeSubnetworkReadV0Beta(d *schema.ResourceData, meta interface{
|
|||||||
d.Set("secondary_ip_range", flattenSecondaryRangesV0Beta(subnetwork.SecondaryIpRanges))
|
d.Set("secondary_ip_range", flattenSecondaryRangesV0Beta(subnetwork.SecondaryIpRanges))
|
||||||
d.Set("project", project)
|
d.Set("project", project)
|
||||||
d.Set("region", region)
|
d.Set("region", region)
|
||||||
|
d.Set("enable_flow_logs", subnetwork.EnableFlowLogs)
|
||||||
d.Set("self_link", ConvertSelfLinkToV1(subnetwork.SelfLink))
|
d.Set("self_link", ConvertSelfLinkToV1(subnetwork.SelfLink))
|
||||||
d.Set("fingerprint", subnetwork.Fingerprint)
|
d.Set("fingerprint", subnetwork.Fingerprint)
|
||||||
|
|
||||||
@ -306,24 +328,31 @@ func resourceComputeSubnetworkUpdate(d *schema.ResourceData, meta interface{}) e
|
|||||||
d.SetPartial("ip_cidr_range")
|
d.SetPartial("ip_cidr_range")
|
||||||
}
|
}
|
||||||
|
|
||||||
if d.HasChange("secondary_ip_range") && computeApiVersion == v0beta {
|
if (d.HasChange("secondary_ip_range") || d.HasChange("enable_flow_logs")) && computeApiVersion == v0beta {
|
||||||
v0BetaSubnetwork := &computeBeta.Subnetwork{
|
v0BetaSubnetwork := &computeBeta.Subnetwork{
|
||||||
SecondaryIpRanges: expandSecondaryRangesV0Beta(d.Get("secondary_ip_range").([]interface{})),
|
Fingerprint: d.Get("fingerprint").(string),
|
||||||
Fingerprint: d.Get("fingerprint").(string),
|
}
|
||||||
|
if d.HasChange("secondary_ip_range") {
|
||||||
|
v0BetaSubnetwork.SecondaryIpRanges = expandSecondaryRangesV0Beta(d.Get("secondary_ip_range").([]interface{}))
|
||||||
|
}
|
||||||
|
if d.HasChange("enable_flow_logs") {
|
||||||
|
v0BetaSubnetwork.EnableFlowLogs = d.Get("enable_flow_logs").(bool)
|
||||||
|
v0BetaSubnetwork.ForceSendFields = append(v0BetaSubnetwork.ForceSendFields, "EnableFlowLogs")
|
||||||
}
|
}
|
||||||
|
|
||||||
op, err := config.clientComputeBeta.Subnetworks.Patch(
|
op, err := config.clientComputeBeta.Subnetworks.Patch(
|
||||||
project, region, d.Get("name").(string), v0BetaSubnetwork).Do()
|
project, region, d.Get("name").(string), v0BetaSubnetwork).Do()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error updating subnetwork SecondaryIpRanges: %s", err)
|
return fmt.Errorf("Error updating subnetwork %q: %s", d.Id(), err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = computeSharedOperationWaitTime(config.clientCompute, op, project, int(d.Timeout(schema.TimeoutUpdate).Minutes()), "Updating Subnetwork SecondaryIpRanges")
|
err = computeSharedOperationWaitTime(config.clientCompute, op, project, int(d.Timeout(schema.TimeoutUpdate).Minutes()), "Updating Subnetwork")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
d.SetPartial("secondary_ip_range")
|
d.SetPartial("secondary_ip_range")
|
||||||
|
d.SetPartial("enable_flow_logs")
|
||||||
}
|
}
|
||||||
|
|
||||||
d.Partial(false)
|
d.Partial(false)
|
||||||
|
@ -171,6 +171,42 @@ func TestAccComputeSubnetwork_secondaryIpRanges(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAccComputeSubnetwork_flowLogs(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
var subnetwork compute.Subnetwork
|
||||||
|
|
||||||
|
cnName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||||
|
subnetworkName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
|
||||||
|
|
||||||
|
resource.Test(t, resource.TestCase{
|
||||||
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
|
Providers: testAccProviders,
|
||||||
|
CheckDestroy: testAccCheckComputeSubnetworkDestroy,
|
||||||
|
Steps: []resource.TestStep{
|
||||||
|
{
|
||||||
|
Config: testAccComputeSubnetwork_flowLogs(cnName, subnetworkName, true),
|
||||||
|
Check: resource.ComposeTestCheckFunc(
|
||||||
|
testAccCheckComputeSubnetworkExists(
|
||||||
|
"google_compute_subnetwork.network-with-flow-logs", &subnetwork),
|
||||||
|
resource.TestCheckResourceAttr("google_compute_subnetwork.network-with-flow-logs",
|
||||||
|
"enable_flow_logs", "true"),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
// no import, as import currently doesn't work for beta
|
||||||
|
{
|
||||||
|
Config: testAccComputeSubnetwork_flowLogs(cnName, subnetworkName, false),
|
||||||
|
Check: resource.ComposeTestCheckFunc(
|
||||||
|
testAccCheckComputeSubnetworkExists(
|
||||||
|
"google_compute_subnetwork.network-with-flow-logs", &subnetwork),
|
||||||
|
resource.TestCheckResourceAttr("google_compute_subnetwork.network-with-flow-logs",
|
||||||
|
"enable_flow_logs", "false"),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func testAccCheckComputeSubnetworkDestroy(s *terraform.State) error {
|
func testAccCheckComputeSubnetworkDestroy(s *terraform.State) error {
|
||||||
config := testAccProvider.Meta().(*Config)
|
config := testAccProvider.Meta().(*Config)
|
||||||
|
|
||||||
@ -357,3 +393,20 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
|
|||||||
}
|
}
|
||||||
`, cnName, subnetworkName)
|
`, cnName, subnetworkName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func testAccComputeSubnetwork_flowLogs(cnName, subnetworkName string, enableLogs bool) string {
|
||||||
|
return fmt.Sprintf(`
|
||||||
|
resource "google_compute_network" "custom-test" {
|
||||||
|
name = "%s"
|
||||||
|
auto_create_subnetworks = false
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "google_compute_subnetwork" "network-with-flow-logs" {
|
||||||
|
name = "%s"
|
||||||
|
ip_cidr_range = "10.0.0.0/16"
|
||||||
|
region = "us-central1"
|
||||||
|
network = "${google_compute_network.custom-test.self_link}"
|
||||||
|
enable_flow_logs = %v
|
||||||
|
}
|
||||||
|
`, cnName, subnetworkName, enableLogs)
|
||||||
|
}
|
||||||
|
@ -56,6 +56,11 @@ The following arguments are supported:
|
|||||||
can access Google services without assigned external IP
|
can access Google services without assigned external IP
|
||||||
addresses.
|
addresses.
|
||||||
|
|
||||||
|
* `enable_flow_logs` - (Optional, [Beta](/docs/providers/google/index.html#beta-features))
|
||||||
|
Set to `true` to enable [flow logs](https://cloud.google.com/vpc/docs/using-flow-logs)
|
||||||
|
for this subnetwork.
|
||||||
|
|
||||||
|
|
||||||
- - -
|
- - -
|
||||||
|
|
||||||
* `secondary_ip_range` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) An array of configurations for secondary IP ranges for VM instances contained in this subnetwork. Structure is documented below.
|
* `secondary_ip_range` - (Optional, [Beta](/docs/providers/google/index.html#beta-features)) An array of configurations for secondary IP ranges for VM instances contained in this subnetwork. Structure is documented below.
|
||||||
|
Loading…
Reference in New Issue
Block a user