Generate Filestore in Terraform in Magic Modules.

.ci/unit-tests/ansible.sh

@@ -3,8 +3,11 @@
 set -e
 set -x
 
+apt-get update
 pushd "magic-modules/build/ansible"
+apt-get install -y man
 pip install tox
 
+
 source hacking/env-setup
 ansible-test sanity -v --tox --python 2.7 --base-branch origin/devel lib/ansible/modules/cloud/google/

api/type.rb

@@ -29,6 +29,7 @@ module Fields
 
       attr_reader :output # If set value will not be sent to server on sync
       attr_reader :input # If set to true value is used only on creation
+      attr_reader :url_param_only # If, true will not be send in request body
       attr_reader :required
       attr_reader :update_verb
       attr_reader :update_url
@@ -60,6 +61,7 @@ def validate
 
       check_optional_property :output, :boolean
       check_optional_property :required, :boolean
+      check_optional_property :url_param_only, :boolean
 
       raise 'Property cannot be output and required at the same time.' \
         if @output && @required
@@ -250,22 +252,24 @@ class Array < Composite
       NESTED_ARRAY_TYPE = [Api::Type::Array, Api::Type::NestedObject].freeze
       RREF_ARRAY_TYPE = [Api::Type::Array, Api::Type::ResourceRef].freeze
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def validate
         super
         if @item_type.is_a?(NestedObject) || @item_type.is_a?(ResourceRef)
           @item_type.set_variable(@name, :__name)
           @item_type.set_variable(@__resource, :__resource)
           @item_type.set_variable(self, :__parent)
         end
-        check_property :item_type, [::String, NestedObject, ResourceRef]
+        check_property :item_type, [::String, NestedObject, ResourceRef, Enum]
         unless @item_type.is_a?(NestedObject) || @item_type.is_a?(ResourceRef) \
-          || type?(@item_type)
+            || @item_type.is_a?(Enum) || type?(@item_type)
           raise "Invalid type #{@item_type}"
         end
 
         check_optional_property :min_size, ::Integer
         check_optional_property :max_size, ::Integer
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def item_type_class
         return Api::Type::NestedObject if @item_type.is_a? NestedObject
@@ -276,6 +280,8 @@ def item_type_class
       def property_class
         if @item_type.is_a?(NestedObject) || @item_type.is_a?(ResourceRef)
           type = @item_type.property_class
+        elsif @item_type.is_a?(Enum)
+          raise 'aaaa'
         else
           type = property_ns_prefix
           type << get_type(@item_type).new(@name).type

products/compute/ansible.yaml

@@ -133,17 +133,17 @@ overrides: !ruby/object:Provider::ResourceOverrides
   Firewall: !ruby/object:Provider::Ansible::ResourceOverride
     properties:
       denied: !ruby/object:Provider::Ansible::PropertyOverride
-        version_added: '2.7'
+        version_added: '2.8'
       destinationRanges: !ruby/object:Provider::Ansible::PropertyOverride
-        version_added: '2.7'
+        version_added: '2.8'
       direction: !ruby/object:Provider::Ansible::PropertyOverride
-        version_added: '2.7'
+        version_added: '2.8'
       priority: !ruby/object:Provider::Ansible::PropertyOverride
-        version_added: '2.7'
+        version_added: '2.8'
       sourceServiceAccounts: !ruby/object:Provider::Ansible::PropertyOverride
-        version_added: '2.7'
+        version_added: '2.8'
       targetServiceAccounts: !ruby/object:Provider::Ansible::PropertyOverride
-        version_added: '2.7'
+        version_added: '2.8'
   ForwardingRule: !ruby/object:Provider::Ansible::ResourceOverride
     properties:
       target: !ruby/object:Provider::Ansible::PropertyOverride
@@ -233,7 +233,7 @@ overrides: !ruby/object:Provider::ResourceOverrides
   InstanceGroup: !ruby/object:Provider::Ansible::ResourceOverride
     properties:
       instances: !ruby/object:Provider::Ansible::PropertyOverride
-        version_added: '2.7'
+        version_added: '2.8'
         exclude: false
     update: |
       instance = InstanceLogic(module)

products/dns/ansible.yaml

@@ -30,14 +30,14 @@ datasources: !ruby/object:Provider::ResourceOverrides
   Project: !ruby/object:Provider::Ansible::ResourceOverride
     exclude: true
   ResourceRecordSet: !ruby/object:Provider::Ansible::ResourceOverride
-    version_added: '2.7'
+    version_added: '2.8'
     facts: !ruby/object:Provider::Ansible::FactsOverride
       has_filters: false
       list_key: 'rrsets'
       test: results['items'] | length >= 2
     collection: "https://www.googleapis.com/dns/v1/projects/{project}/managedZones/{managed_zone}/rrsets"
   ManagedZone: !ruby/object:Provider::Ansible::ResourceOverride
-    version_added: '2.7'
+    version_added: '2.8'
     facts: !ruby/object:Provider::Ansible::FactsOverride
       filter: !ruby/object:Provider::Ansible::FilterProp
         name: dnsName

products/filestore/api.yaml

@@ -0,0 +1,170 @@
+# 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.
+
+--- !ruby/object:Api::Product
+name: Google Cloud Filestore
+# There is a problem here - the generated api is called 'file', and that's
+# a bad name for the library.  So we set the name to gfilestore, and
+# that means that Terraform in particular is going to try to import
+# 'filestore'.  But the library is called 'file', so instead we need to
+# include a small hack to rename the library - see
+# templates/terraform/constants/filestore.erb.
+prefix: gfilestore
+versions:
+  - !ruby/object:Api::Product::Version
+    name: beta
+    base_url: https://file.googleapis.com/v1beta1/
+scopes:
+  - https://www.googleapis.com/auth/cloud-platform
+objects:
+  - !ruby/object:Api::Resource
+    name: 'Instance'
+    exclude: true
+    base_url: |
+      projects/{{project}}/locations/{{zone}}/instances?instanceId={{name}}
+    self_link: projects/{{project}}/locations/{{zone}}/instances/{{name}}
+    update_verb: :PATCH
+    description: |
+      A Google Cloud Filestore instance.
+    references: !ruby/object:Api::Resource::ReferenceLinks
+      guides:
+        'Official Documentation':
+          'https://cloud.google.com/filestore/docs/creating-instances'
+        'Use with Kubernetes':
+          'https://cloud.google.com/filestore/docs/accessing-fileshares'
+        'Copying Data In/Out':
+          'https://cloud.google.com/filestore/docs/copying-data'
+      api: 'https://cloud.google.com/filestore/docs/reference/rest/v1beta1/projects.locations.instances/create'
+<%=
+  indent(compile_file({timeouts: { insert_sec: 5 * 60 }},
+                      'templates/zonal_async.yaml.erb'), 4)
+%>
+    parameters:
+      - !ruby/object:Api::Type::String
+        name: 'zone'
+        description: |
+          The name of the Filestore zone of the instance.
+        required: true
+        input: true
+        url_param_only: true
+    properties:
+      - !ruby/object:Api::Type::String
+        name: 'name'
+        description: |
+          The resource name of the instance.
+        required: true
+        url_param_only: true
+      - !ruby/object:Api::Type::String
+        name: 'description'
+        description: |
+          A description of the instance.
+      - !ruby/object:Api::Type::String
+        name: 'state'
+        description: |
+          The instance state - short description.
+        output: true
+        exclude: true
+      - !ruby/object:Api::Type::String
+        name: 'statusMessage'
+        description: |
+          Additional information about the instance state, if available.
+        output: true
+        exclude: true
+      - !ruby/object:Api::Type::Time
+        name: 'createTime'
+        description: Creation timestamp in RFC3339 text format.
+        output: true
+      - !ruby/object:Api::Type::Enum
+        name: 'tier'
+        description: |
+          The service tier of the instance.
+        required: true
+        input: true
+        values:
+          - TIER_UNSPECIFIED
+          - STANDARD
+          - PREMIUM
+      - !ruby/object:Api::Type::NameValues
+        name: 'labels'
+        description: |
+          Resource labels to represent user-provided metadata.
+        key_type: Api::Type::String
+        value_type: Api::Type::String
+      - !ruby/object:Api::Type::Array
+        name: 'fileShares'
+        required: true
+        description: |
+          File system shares on the instance. For this version, only a
+          single file share is supported.
+        max_size: 1
+        item_type: !ruby/object:Api::Type::NestedObject
+          properties:
+            - !ruby/object:Api::Type::String
+              name: 'name'
+              description: |
+                The name of the fileshare (16 characters or less)
+              required: true
+              input: true
+            - !ruby/object:Api::Type::Integer
+              name: 'capacityGb'
+              description: |
+                File share capacity in GB.
+              required: true
+      - !ruby/object:Api::Type::Array
+        name: 'networks'
+        description: |
+          VPC networks to which the instance is connected. For this version,
+          only a single network is supported.
+        required: true
+        min_size: 1
+        input: true
+        item_type: !ruby/object:Api::Type::NestedObject
+          properties:
+            - !ruby/object:Api::Type::String
+              name: 'network'
+              description: |
+                The name of the GCE VPC network to which the
+                instance is connected.
+              required: true
+              input: true
+            - !ruby/object:Api::Type::Array
+              name: 'modes'
+              description: |
+                IP versions for which the instance has
+                IP addresses assigned.
+              required: true
+              input: true
+              item_type: !ruby/object:Api::Type::Enum
+                name: 'mode'
+                description: An IP version.
+                values:
+                  - ADDRESS_MODE_UNSPECIFIED
+                  - MODE_IPV4
+                  - MODE_IPV6
+            - !ruby/object:Api::Type::String
+              name: 'reservedIpRange'
+              description: |
+                A /29 CIDR block that identifies the range of IP
+                addresses reserved for this instance.
+            - !ruby/object:Api::Type::Array
+              name: 'ipAddresses'
+              description: |
+                A list of IPv4 or IPv6 addresses.
+              output: true
+              item_type: Api::Type::String
+      - !ruby/object:Api::Type::String
+        name: 'etag'
+        description: |
+          Server-specified ETag for the instance resource to prevent
+          simultaneous updates from overwriting each other.
+        output: true

products/filestore/terraform.yaml

@@ -0,0 +1,74 @@
+# Copyright 2017 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.
+
+--- !ruby/object:Provider::Terraform::Config
+overrides: !ruby/object:Provider::ResourceOverrides
+  Instance: !ruby/object:Provider::Terraform::ResourceOverride
+    exclude: false
+    id_format: "{{project}}/{{zone}}/{{name}}"
+    import_format: ["projects/{{project}}/locations/{{zone}}/instances/{{name}}"]
+    examples: |
+      ### Basic Usage
+      ```hcl
+        resource "google_file_instance" "instance" {
+          name = "test-instance"
+          zone = "us-central1-b"
+          file_shares {
+            capacity_gb = 2660
+            name = "share1"
+          }
+          networks {
+            network = "default"
+            modes = ["MODE_IPV4"]
+          }
+          tier = "PREMIUM"
+        }
+      ```
+    properties:
+      name: !ruby/object:Provider::Terraform::PropertyOverride
+        custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb'
+      zone: !ruby/object:Provider::Terraform::PropertyOverride
+        ignore_read: true
+      networks.reservedIpRange: !ruby/object:Provider::Terraform::PropertyOverride
+        default_from_api: true
+    custom_code: !ruby/object:Provider::Terraform::CustomCode
+      pre_update: templates/terraform/pre_update/update_mask.erb
+      constants: templates/terraform/constants/filestore.erb
+
+# This is for a list of example files.
+examples: !ruby/object:Api::Resource::HashArray
+
+# This is for copying files over
+files: !ruby/object:Provider::Config::Files
+  # All of these files will be copied verbatim.
+  copy:
+    'google/transport.go': 'templates/terraform/transport.go'
+    'google/transport_test.go': 'templates/terraform/transport_test.go'
+    'google/import.go': 'templates/terraform/import.go'
+    'google/import_test.go': 'templates/terraform/import_test.go'
+    'google/filestore_operation.go': 'templates/terraform/filestore_operation.go'
+  # These files have templating (ERB) code that will be run.
+  # This is usually to add licensing info, autogeneration notices, etc.
+  compile:
+    'google/provider_{{product_name}}_gen.go': 'templates/terraform/provider_gen.erb'
+
+# This is for custom testing code. All of our tests follow a specific pattern
+# that sometimes needs to be deviated from. We're working towards a world where
+# these handwritten tests would be unnecessary in many cases (custom types).
+tests: !ruby/object:Api::Resource::HashArray
+
+# This would be for custom network responses. Tests work by running some block
+# of autogenerated code and then verifying the network calls.
+# The network call verifications are automatically generated, but can be
+# overriden.
+test_data: !ruby/object:Provider::Config::TestData

products/pubsub/ansible.yaml

@@ -25,12 +25,12 @@ manifest: !ruby/object:Provider::Ansible::Manifest
   author: Google Inc. (@googlecloudplatform)
 datasources: !ruby/object:Provider::ResourceOverrides
   Topic: !ruby/object:Provider::Ansible::ResourceOverride
-    version_added: '2.7'
+    version_added: '2.8'
     facts: !ruby/object:Provider::Ansible::FactsOverride
       list_key: 'topics'
       has_filters: false
   Subscription: !ruby/object:Provider::Ansible::ResourceOverride
-    version_added: '2.7'
+    version_added: '2.8'
     facts: !ruby/object:Provider::Ansible::FactsOverride
       list_key: 'subscriptions'
       has_filters: false

products/redis/api.yaml

@@ -47,6 +47,7 @@ objects:
           The name of the Redis region of the instance.
         required: true
         input: true
+        url_param_only: true
     properties:
       - !ruby/object:Api::Type::String
         name: alternativeLocationId

products/redis/terraform.yaml

@@ -18,8 +18,6 @@ overrides: !ruby/object:Provider::ResourceOverrides
     id_format: "{{project}}/{{region}}/{{name}}"
     import_format: ["projects/{{project}}/locations/{{region}}/instances/{{name}}"]
     custom_code: !ruby/object:Provider::Terraform::CustomCode
-      decoder: 'templates/terraform/decoders/redis_instance.erb'
-      encoder: 'templates/terraform/encoders/redis_instance.erb'
       pre_update: 'templates/terraform/pre_update/redis_instance.erb'
     examples: |
       ### Basic Usage