Merge pull request #21 from modular-magician/codegen-pr-136

Magic Modules changes.

Author: nelsonjr

README.md

@@ -5378,7 +5378,7 @@ gcompute_target_tcp_proxy { 'id-of-resource':
 
 ##### `name`
 
-  Name of the resource. Provided by the client when the resource is
+Required.  Name of the resource. Provided by the client when the resource is
   created. The name must be 1-63 characters long, and comply with
   RFC1035. Specifically, the name must be 1-63 characters long and match
   the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?` which means the
@@ -5393,7 +5393,7 @@ gcompute_target_tcp_proxy { 'id-of-resource':
 
 ##### `service`
 
-  A reference to BackendService resource
+Required.  A reference to BackendService resource
 
 
 ##### Output-only properties

lib/puppet/provider/gcompute_target_tcp_proxy/google.rb

@@ -35,6 +35,7 @@
 require 'google/compute/property/string'
 require 'google/compute/property/time'
 require 'google/hash_utils'
+require 'google/object_store'
 require 'puppet'
 
 Puppet::Type.type(:gcompute_target_tcp_proxy).provide(:google) do
@@ -56,28 +57,31 @@ def self.prefetch(resources)
       debug("prefetch #{name} @ #{project}") unless project.nil?
       fetch = fetch_resource(resource, self_link(resource),
                              'compute#targetTcpProxy')
-      resource.provider = present(name, fetch) unless fetch.nil?
+      resource.provider = present(name, fetch, resource) unless fetch.nil?
+      Google::ObjectStore.instance.add(:gcompute_target_tcp_proxy, resource)
     end
   end
 
-  def self.present(name, fetch)
-    result = new({ title: name, ensure: :present }.merge(fetch_to_hash(fetch)))
+  def self.present(name, fetch, resource)
+    result = new(
+      { title: name, ensure: :present }.merge(fetch_to_hash(fetch, resource))
+    )
+    result.instance_variable_set(:@fetched, fetch)
     result
   end
 
-  def self.fetch_to_hash(fetch)
+  def self.fetch_to_hash(fetch, resource)
     {
       creation_timestamp:
         Google::Compute::Property::Time.api_munge(fetch['creationTimestamp']),
-      description:
-        Google::Compute::Property::String.api_munge(fetch['description']),
       id: Google::Compute::Property::Integer.api_munge(fetch['id']),
-      name: Google::Compute::Property::String.api_munge(fetch['name']),
       proxy_header:
         Google::Compute::Property::Enum.api_munge(fetch['proxyHeader']),
       service: Google::Compute::Property::BackServSelfLinkRef.api_munge(
         fetch['service']
-      )
+      ),
+      description: resource[:description],
+      name: resource[:name]
     }.reject { |_, v| v.nil? }
   end
 
@@ -93,7 +97,7 @@ def create
                                                     fetch_auth(@resource),
                                                     'application/json',
                                                     resource_to_request)
-    wait_for_operation create_req.send, @resource
+    @fetched = wait_for_operation create_req.send, @resource
     @property_hash[:ensure] = :present
   end
 
@@ -114,7 +118,7 @@ def flush
                                                    fetch_auth(@resource),
                                                    'application/json',
                                                    resource_to_request)
-    wait_for_operation update_req.send, @resource
+    @fetched = wait_for_operation update_req.send, @resource
   end
 
   def dirty(field, from, to)
@@ -125,6 +129,12 @@ def dirty(field, from, to)
     }
   end
 
+  def exports
+    {
+      self_link: @fetched['selfLink']
+    }
+  end
+
   private
 
   def self.resource_to_hash(resource)

lib/puppet/type/gcompute_target_tcp_proxy.rb

@@ -30,6 +30,7 @@
 require 'google/compute/property/integer'
 require 'google/compute/property/string'
 require 'google/compute/property/time'
+require 'google/object_store'
 require 'puppet'
 
 Puppet::Type.newtype(:gcompute_target_tcp_proxy) do
@@ -99,4 +100,9 @@
               parent: Google::Compute::Property::BackServSelfLinkRef) do
     desc 'A reference to BackendService resource'
   end
+
+  # Returns all properties that a provider can export to other resources
+  def exports
+    provider.exports
+  end
 end

spec/gcompute_target_tcp_proxy_provider_spec.rb

@@ -506,13 +506,22 @@
         context 'title == name (pass)' do
           before(:each) do
             expect_network_get_failed 1, name: 'title0'
+            expect_network_get_success_backend_service 1
           end
 
           subject do
             apply_with_error_check(
               <<-MANIFEST
+              gcompute_backend_service { 'resource(backend_service,0)':
+                ensure     => present,
+                name       => 'test name#0 data',
+                project    => 'test project#0 data',
+                credential => 'cred0',
+              }
+
               gcompute_target_tcp_proxy { 'title0':
                 ensure     => absent,
+                service    => 'resource(backend_service,0)',
                 project    => 'test project#0 data',
                 credential => 'cred0',
               }
@@ -538,14 +547,23 @@
         context 'title != name (pass)' do
           before(:each) do
             expect_network_get_failed 1
+            expect_network_get_success_backend_service 1
           end
 
           subject do
             apply_with_error_check(
               <<-MANIFEST
+              gcompute_backend_service { 'resource(backend_service,0)':
+                ensure     => present,
+                name       => 'test name#0 data',
+                project    => 'test project#0 data',
+                credential => 'cred0',
+              }
+
               gcompute_target_tcp_proxy { 'title0':
                 ensure     => absent,
                 name       => 'test name#0 data',
+                service    => 'resource(backend_service,0)',
                 project    => 'test project#0 data',
                 credential => 'cred0',
               }
@@ -575,13 +593,22 @@
             expect_network_get_success 1, name: 'title0'
             expect_network_delete 1, 'title0'
             expect_network_get_async 1, name: 'title0'
+            expect_network_get_success_backend_service 1
           end
 
           subject do
             apply_with_error_check(
               <<-MANIFEST
+              gcompute_backend_service { 'resource(backend_service,0)':
+                ensure     => present,
+                name       => 'test name#0 data',
+                project    => 'test project#0 data',
+                credential => 'cred0',
+              }
+
               gcompute_target_tcp_proxy { 'title0':
                 ensure     => absent,
+                service    => 'resource(backend_service,0)',
                 project    => 'test project#0 data',
                 credential => 'cred0',
               }
@@ -609,14 +636,23 @@
             expect_network_get_success 1
             expect_network_delete 1
             expect_network_get_async 1
+            expect_network_get_success_backend_service 1
           end
 
           subject do
             apply_with_error_check(
               <<-MANIFEST
+              gcompute_backend_service { 'resource(backend_service,0)':
+                ensure     => present,
+                name       => 'test name#0 data',
+                project    => 'test project#0 data',
+                credential => 'cred0',
+              }
+
               gcompute_target_tcp_proxy { 'title0':
                 ensure     => absent,
                 name       => 'test name#0 data',
+                service    => 'resource(backend_service,0)',
                 project    => 'test project#0 data',
                 credential => 'cred0',
               }
@@ -663,6 +699,26 @@
     end
   end
 
+  context '#exports' do
+    context 'exports all properties' do
+      let(:resource1) { create_type 1 }
+      before do
+        prefetch_backend_service
+        expect_network_get_success 1
+        described_class.prefetch(title0: resource1)
+      end
+
+      subject { resource1.exports }
+
+      let(:expected_results) do
+        {
+          self_link: 'selflink(resource(target_tcp_proxy,0))'
+        }
+      end
+      it { is_expected.to eq(expected_results) }
+    end
+  end
+
   private
 
   def expect_network_get_success(id, data = {})
@@ -829,6 +885,19 @@ def debug_network(message)
       if ENV['RSPEC_DEBUG'] || ENV['RSPEC_HTTP_VERBOSE']
   end
 
+  # Creates and prefetch type so exports can be resolved without network access.
+  def prefetch_backend_service
+    expect_network_get_success_backend_service 1
+
+    resource = Puppet::Type.type(:gcompute_backend_service).new(
+      project: 'test project#0 data',
+      name: 'test name#0 data'
+    )
+
+    Puppet::Type.type(:gcompute_backend_service).provider(:google)
+                .prefetch(resource: resource)
+  end
+
   def expand_variables_backend_service(template, data, ext_dat = {})
     Puppet::Type.type(:gcompute_backend_service).provider(:google)
                 .expand_variables(template, data, ext_dat)