Chef resource ref has reference to parent (#450)

Merged PR #450.

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

templates/chef/property/resourceref.rb.erb

@@ -12,15 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 <% end -%>
-<% if emit_array -%>
-require 'google/<%= prop_ns_dir -%>/property/array'
-<% end -%>
 <%# Requires: resource - name of resource being fetched -%>
 <%#           imports - name of property being fetched -%>
 <%= compile('templates/license.erb') -%>
 
 <%= lines(autogen_notice :ruby) -%>
 
+<% if emit_array -%>
+require 'google/<%= prop_ns_dir -%>/property/array'
+<% end -%>
+
 module Google
   module <%= product_ns %>
     module Data
@@ -61,8 +62,9 @@ module Google
                             :disabled), 6))
 -%>
       class <%= class_name %>Catalog < <%= class_name %>
-        def initialize(title)
+        def initialize(title, parent_resource)
           @title = title
+          @parent_resource = parent_resource
         end
 
         # Chef requires the title for autorequiring
@@ -84,6 +86,25 @@ module Google
           Chef.run_context.resource_collection.each do |entry|
             return entry.exports[:<%= imports -%>] if entry.name == @title
           end
+
+<%# Readonly ResourceRefs should regex check + assemble from shortnames for selflinks
+If the user inputs a shortname e.g. 'n1-standard-1' we can assemble that into a full URL
+based off of the parent's project and zone. -%>
+<% if property.resource_ref.readonly && property.imports == 'selfLink' -%>
+
+          unless /<%= property.resource_ref.regex_url.gsub('/', '\/') -%>/.match(@title)
+            # We'll assemble the self_link for the user if a full URL was not specified
+            # We need to retrieve attributes from the parent resource to qualify the URL
+            if @parent_resource.nil?
+              raise "Cannot find parent resource for resource #{@title}"
+            end
+            return "<%= property.resource_ref.self_link_url.join
+              .gsub('{{name}}', '#{@title}')
+              .gsub('{{project}}', '#{@parent_resource.project}')
+              .gsub('{{zone}}', '#{@parent_resource.zone}') 
+              -%>"
+          end
+<% end # if resource_ref.readonly && selfLink -%>
 <% if property.resource_ref.readonly -%>
           @title
 <% else -%>
@@ -120,16 +141,19 @@ module Google
     module Property
       # A class to manage fetching <%= imports -%> from a <%= resource %>
       class <%= class_name %>
-<%= emit_coerce(product_ns, class_name, 8) -%>
-        def catalog_parse(value)
+        def self.coerce
+          ->(parent_resource, value) { <%= "::Google::#{product_ns}::Property::#{class_name}"%>.catalog_parse(value, parent_resource) }
+        end
+
+        def catalog_parse(value, parent_resource = nil)
           return if value.nil?
-          self.class.catalog_parse(value)
+          self.class.catalog_parse(value, parent_resource)
         end
 
-        def self.catalog_parse(value)
+        def self.catalog_parse(value, parent_resource = nil)
           return if value.nil?
           return value if value.is_a? Data::<%= class_name %>
-          Data::<%= class_name %>Catalog.new(value)
+          Data::<%= class_name %>Catalog.new(value, parent_resource)
         end
 
         # Used for fetched JSON values
@@ -145,11 +169,11 @@ module Google
       class <%= class_name %>Array < Google::<%= product_ns -%>::Property::Array
 <%= emit_coerce(product_ns, "#{class_name}Array", 8) -%>
         # Used for parsing Chef catalog
-        def self.catalog_parse(value)
+        def self.catalog_parse(value, parent_resource = nil)
           return if value.nil?
-          return <%= class_name %>.catalog_parse(value) \
+          return <%= class_name %>.catalog_parse(value, parent_resource) \
             unless value.is_a?(::Array)
-          value.map { |v| <%= class_name %>.catalog_parse(v) }
+          value.map { |v| <%= class_name %>.catalog_parse(v, parent_resource) }
         end
 
         # Used for parsing GCP API responses