Generate SslCertificate in Terraform.

.ci/ci.yml.tmpl

@@ -26,14 +26,18 @@ build/{{repo}}/{{name}}
   }
 %}
 {% set puppet_test_excludes = {
-  'compute': [
-      'spec/gcompute_instance_group_manager_provider_spec.rb',
-      'spec/gcompute_instance_provider_spec.rb',
-      'spec/gcompute_instance_template_provider_spec.rb',
-      'spec/gcompute_target_https_proxy_provider_spec.rb',
-      'spec/gcompute_target_ssl_proxy_provider_spec.rb',
-      'spec/gcompute_vpn_tunnel_provider_spec.rb',
-      'spec/puppetlint_spec.rb']
+    'compute': [
+        'spec/gcompute_instance_group_manager_provider_spec.rb',
+        'spec/gcompute_instance_provider_spec.rb',
+        'spec/gcompute_instance_template_provider_spec.rb',
+        'spec/gcompute_target_https_proxy_provider_spec.rb',
+        'spec/gcompute_target_ssl_proxy_provider_spec.rb',
+        'spec/gcompute_vpn_tunnel_provider_spec.rb',
+        'spec/puppetlint_spec.rb'
+    ],
+    'bigquery': [
+      'spec/gbigquery_table_provider_spec.rb'
+    ]
   }
 %}
 

TEMPLATE_SDK.md

@@ -761,12 +761,12 @@ line #1 by compiling the license template:
 To ensure no doubts exist on the readers' minds, we recommend that you mark the
 copyright notice on the template with a ERB block:
 
-    <% if false # the license inside this if block assertains to this file -%>
+    <%# The license inside this block applies to this file
     # Copyright 2017 Google Inc.
     ...
     ...
     ...
-    <% end # copyright -%>
+    -%>
 
 ### Determining the generated artifact "effective year"
 

api/resource.rb

@@ -424,6 +424,7 @@ def full_delete_url
     def regex_url
       self_link_url.join.gsub('{{project}}', '.*')
                    .gsub('{{name}}', '[a-z1-9\-]*')
+                   .gsub('{{zone}}', '[a-z1-9\-]*')
     end
 
     private

api/type.rb

@@ -16,6 +16,7 @@
 
 module Api
   # Represents a property type
+  # rubocop:disable Metrics/ClassLength
   class Type < Api::Object::Named
     # The list of properties (attr_reader) that can be overridden in
     # <provider>.yaml.
@@ -37,6 +38,9 @@ module Fields
       # "ForceSendFields" concepts in the autogenerated API clients.
       attr_reader :send_empty_value
       attr_reader :min_version
+
+      # Can only be overriden - we should never set this ourselves.
+      attr_reader :new_type
     end
 
     include Fields
@@ -128,6 +132,22 @@ def exclude_if_not_in_version(version)
       @exclude ||= version < min_version
     end
 
+    # Overriding is_a? to enable class overrides.
+    # Ruby does not let you natively change types, so this is the next best
+    # thing.
+    def is_a?(clazz)
+      return Module.const_get(@new_type).new.is_a?(clazz) if @new_type
+      super(clazz)
+    end
+
+    # Overriding class to enable class overrides.
+    # Ruby does not let you natively change types, so this is the next best
+    # thing.
+    def class
+      return Module.const_get(@new_type) if @new_type
+      super
+    end
+
     private
 
     # A constant value to be provided as field
@@ -158,8 +178,8 @@ class Double < Primitive
 
     # Represents a string
     class String < Primitive
-      def initialize(name)
-        @name = name
+      def initialize(name = nil)
+        @name ||= name
       end
 
       PROJECT = Api::Type::String.new('project')
@@ -518,4 +538,5 @@ def property_ns_prefix
       ]
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

compiler.rb

@@ -36,9 +36,9 @@
 require 'provider/terraform'
 require 'pp' if ENV['COMPILER_DEBUG']
 
-catalog = nil
-output = nil
-provider = nil
+product_name = nil
+output_path = nil
+provider_name = nil
 types_to_generate = []
 version = nil
 
@@ -47,13 +47,13 @@
 
 OptionParser.new do |opt|
   opt.on('-p', '--product PRODUCT', 'Folder with product catalog') do |p|
-    catalog = p
+    product_name = p
   end
   opt.on('-o', '--output OUTPUT', 'Folder for module output') do |o|
-    output = o
+    output_path = o
   end
-  opt.on('-e', '--engine ENGINE', 'Technology to build for') do |e|
-    provider = "#{e}.yaml"
+  opt.on('-e', '--engine ENGINE', 'Provider ("engine") to build') do |e|
+    provider_name = e
   end
   opt.on('-t', '--type TYPE[,TYPE...]', Array, 'Types to generate') do |t|
     types_to_generate = t
@@ -70,27 +70,31 @@
   end
 end.parse!
 
-raise 'Option -p/--product is a required parameter' if catalog.nil?
-raise 'Option -o/--output is a required parameter' if output.nil?
-raise 'Option -e/--engine is a required parameter' if provider.nil?
+raise 'Option -p/--product is a required parameter' if product_name.nil?
+raise 'Option -o/--output is a required parameter' if output_path.nil?
+raise 'Option -e/--engine is a required parameter' if provider_name.nil?
 
-raise "Product '#{catalog}' does not have api.yaml" \
-  unless File.exist?(File.join(catalog, 'api.yaml'))
-raise "Product '#{catalog}' does not have #{provider} settings" \
-  unless File.exist?(File.join(catalog, provider))
+product_yaml_path = File.join(product_name, 'api.yaml')
+raise "Product '#{product_name}' does not have an api.yaml file" \
+  unless File.exist?(product_yaml_path)
 
-raise "Output '#{output}' is not a directory" unless Dir.exist?(output)
+provider_yaml_path = File.join(product_name, "#{provider_name}.yaml")
+raise "Product '#{product_name}' does not have a #{provider_name}.yaml file" \
+  unless File.exist?(provider_yaml_path)
 
-Google::LOGGER.info "Compiling '#{catalog}' output to '#{output}'"
+raise "Output path '#{output_path}' does not exist or is not a directory" \
+  unless Dir.exist?(output_path)
+
+Google::LOGGER.info "Compiling '#{product_name}' output to '#{output_path}'"
 Google::LOGGER.info \
   "Generating types: #{types_to_generate.empty? ? 'ALL' : types_to_generate}"
 
-api = Api::Compiler.new(File.join(catalog, 'api.yaml')).run
-api.validate
-pp api if ENV['COMPILER_DEBUG']
+product_api = Api::Compiler.new(product_yaml_path).run
+product_api.validate
+pp product_api if ENV['COMPILER_DEBUG']
 
-config = Provider::Config.parse(File.join(catalog, provider), api, version)
-pp config if ENV['COMPILER_DEBUG']
+provider_config = Provider::Config.parse(provider_yaml_path, product_api, version)
+pp provider_config if ENV['COMPILER_DEBUG']
 
-provider = config.provider.new(config, api)
-provider.generate output, types_to_generate, version
+provider = provider_config.provider.new(provider_config, product_api)
+provider.generate output_path, types_to_generate, version

products/_bundle/templates/chef/README.md.erb

@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file.
 # 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.
@@ -11,7 +11,7 @@
 # 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.
-<% end -%>
+-%>
 <% autogen_exception -%>
 
 Google Cloud Platform for Chef

products/_bundle/templates/puppet/README.md.erb

@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file.
 # 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.
@@ -11,7 +11,7 @@
 # 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.
-<% end -%>
+-%>
 <% autogen_exception -%>
 
 Google Cloud Platform for Puppet

products/bigquery/api.yaml

@@ -146,15 +146,28 @@ objects:
     name: 'Table'
     kind: 'bigquery#table'
     base_url: projects/{{project}}/datasets/{{dataset}}/tables
-    exclude: true
     description: >
       A Table that belongs to a Dataset
     parameters:
-      # TODO: Convert to ResourceRef when multi-layered exports exist
+      # TODO(alexstephen): Remove once we have support for placing
+      # nested object fields in URL
       - !ruby/object:Api::Type::String
         name: 'dataset'
-        description: The dataset this table belongs to.
+        description: Name of the dataset
     properties:
+      - !ruby/object:Api::Type::NestedObject
+        name: tableReference
+        description: Reference describing the ID of this table
+        properties:
+          - !ruby/object:Api::Type::String
+            name: 'datasetId'
+            description: The ID of the dataset containing this table
+          - !ruby/object:Api::Type::String
+            name: 'projectid'
+            description: The ID of the project containing this table
+          - !ruby/object:Api::Type::String
+            name: 'tableId'
+            description: The ID of the the table
       - !ruby/object:Api::Type::Integer
         name: 'creationTime'
         output: true

products/bigquery/examples/puppet/dataset.pp

@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # 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.
@@ -11,7 +11,7 @@
 # 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.
-<% end -%>
+-%>
 <% unless name == "README.md" -%>
 <%= compile 'templates/license.erb' -%>
 

products/bigquery/examples/puppet/delete_dataset.pp

@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # 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.
@@ -11,7 +11,7 @@
 # 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.
-<% end -%>
+-%>
 <% unless name == "README.md" -%>
 <%= compile 'templates/license.erb' -%>
 

products/bigquery/examples/puppet/table.pp

@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # 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.
@@ -11,7 +11,7 @@
 # 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.
-<% end -%>
+-%>
 <% unless name == "README.md" -%>
 <%= compile 'templates/license.erb' -%>
 
@@ -30,8 +30,13 @@
 }
 
 gbigquery_table { <%= example_resource_name('example_table') -%>:
-  ensure     => present,
-  dataset    => <%= example_resource_name('example_dataset') -%>,
-  project    => $project, # e.g. 'my-test-project'
-  credential => 'mycred',
+  ensure          => present,
+  dataset         => <%= example_resource_name('example_dataset') -%>,
+  table_reference => {
+    dataset_id => <%= example_resource_name('example_dataset') -%>,
+    project_id => $project,
+    table_id   => <%= example_resource_name('example_table') %>
+  },
+  project         => $project, # e.g. 'my-test-project'
+  credential      => 'mycred',
 }