Subnet logconfig prepare for 3.0.0

products/compute/ansible.yaml

@@ -278,6 +278,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       fingerprint: !ruby/object:Overrides::Ansible::PropertyOverride
         update_verb: :PATCH
         update_url:  projects/{{project}}/regions/{{region}}/subnetworks/{{name}}
+      logConfig: !ruby/object:Overrides::Ansible::PropertyOverride
+        exclude: true
   TargetPool: !ruby/object:Overrides::Ansible::ResourceOverride
     transport: !ruby/object:Overrides::Ansible::Transport
       encoder: encode_request

products/compute/api.yaml

@@ -8731,6 +8731,9 @@ objects:
         update_id: 'enableFlowLogs'
         fingerprint_name: 'fingerprint'
         send_empty_value: true
+        deprecation_message: >-
+          This field is being removed in favor of log_config. If log_config is present,
+          flow logs are enabled.
       # TODO(rileykarson): Work with rambleraptor to remove this field from downstreams.
       - !ruby/object:Api::Type::Fingerprint
         name: 'fingerprint'
@@ -8814,10 +8817,13 @@ objects:
         input: true
       - !ruby/object:Api::Type::NestedObject
         name: 'logConfig'
+        update_verb: :PATCH
+        update_url:  projects/{{project}}/regions/{{region}}/subnetworks/{{name}}
+        fingerprint_name: 'fingerprint'
+        update_id: 'logConfig'
         description: |
           Denotes the logging options for the subnetwork flow logs. If logging is enabled
           logs will be exported to Stackdriver.
-        min_version: beta
         properties:
           - !ruby/object:Api::Type::Enum
             name: 'aggregationInterval'

products/compute/terraform.yaml

@@ -1669,6 +1669,12 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           function: 'validateIpCidrRange'
       fingerprint: !ruby/object:Overrides::Terraform::PropertyOverride
         exclude: false
+      enableFlowLogs: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
+      logConfig: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
+        custom_expand: 'templates/terraform/custom_expand/subnetwork_log_config.go.erb'
+        custom_flatten: 'templates/terraform/custom_flatten/subnetwork_log_config.go.erb'
       ipCidrRange: !ruby/object:Overrides::Terraform::PropertyOverride
         validation: !ruby/object:Provider::Terraform::Validation
           function: 'validateIpCidrRange'
@@ -1677,8 +1683,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         input: false
         default_from_api: true
         custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb'
-      logConfig: !ruby/object:Overrides::Terraform::PropertyOverride
-        default_from_api: true
       purpose: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
@@ -1692,9 +1696,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           subnetwork_name: "test-subnetwork"
           network_name: "test-network"
       - !ruby/object:Provider::Terraform::Examples
-        name: "subnetwork_logging_config_beta"
+        name: "subnetwork_logging_config"
         primary_resource_id: "subnet-with-logging"
-        min_version: beta
         vars:
           subnetwork_name: "log-test-subnetwork"
           network_name: "log-test-network"

templates/terraform/custom_expand/subnetwork_log_config.go.erb

@@ -0,0 +1,34 @@
+<%- # the license inside this block applies to this file
+	# Copyright 2018 Google Inc.
+	# Licensed under the Apache License, Version 2.0 (the "License");
+	# you may not use this file except in compliance with the License.
+	# You may obtain a copy of the License at
+	#
+	#     http://www.apache.org/licenses/LICENSE-2.0
+	#
+	# Unless required by applicable law or agreed to in writing, software
+	# distributed under the License is distributed on an "AS IS" BASIS,
+	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	# See the License for the specific language governing permissions and
+	# limitations under the License.
+-%>
+func expand<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+
+	v, ok := d.GetOkExists("enable_flow_logs")
+
+	transformed := make(map[string]interface{})
+	if !ok || v.(bool) {
+		transformed["enable"] = true
+		transformed["aggregationInterval"] = original["aggregation_interval"]
+		transformed["flowSampling"] = original["flow_sampling"]
+		transformed["metadata"] = original["metadata"]
+	}
+
+	return transformed, nil
+}

templates/terraform/custom_flatten/subnetwork_log_config.go.erb

@@ -0,0 +1,34 @@
+<%# The license inside this block applies to this file.
+	# Copyright 2019 Google Inc.
+	# Licensed under the Apache License, Version 2.0 (the "License");
+	# you may not use this file except in compliance with the License.
+	# You may obtain a copy of the License at
+	#
+	#     http://www.apache.org/licenses/LICENSE-2.0
+	#
+	# Unless required by applicable law or agreed to in writing, software
+	# distributed under the License is distributed on an "AS IS" BASIS,
+	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	# See the License for the specific language governing permissions and
+	# limitations under the License.
+-%>
+func flatten<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d *schema.ResourceData) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
+
+	v, ok := original["enable"]
+	if ok && !v.(bool) {
+		return nil
+	}
+
+	transformed := make(map[string]interface{})
+	transformed["flow_sampling"] = original["flowSampling"]
+	transformed["aggregation_interval"] = original["aggregationInterval"]
+	transformed["metadata"] = original["metadata"]
+	return []interface{}{transformed}
+}

templates/terraform/examples/subnetwork_logging_config_beta.tf.erb → templates/terraform/examples/subnetwork_logging_config.tf.erb

@@ -1,25 +1,17 @@
 resource "google_compute_subnetwork" "subnet-with-logging" {
-  provider      = "google-beta" 
   name          = "<%= ctx[:vars]['subnetwork_name'] %>"
   ip_cidr_range = "10.2.0.0/16"
   region        = "us-central1"
   network       = "${google_compute_network.custom-test.self_link}"
 
-  enable_flow_logs = true
   log_config {
     aggregation_interval = "INTERVAL_10_MIN"
-    flow_sampling = 0.5
-    metadata = "INCLUDE_ALL_METADATA"
+    flow_sampling        = 0.5
+    metadata             = "INCLUDE_ALL_METADATA"
   }
 }
 
 resource "google_compute_network" "custom-test" {
-  provider                = "google-beta"
   name                    = "<%= ctx[:vars]['network_name'] %>"
   auto_create_subnetworks = false
 }
-
-provider "google-beta"{
-  region = "us-central1"
-  zone   = "us-central1-a"
-}