bosh-template 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2378abe7a780eedfde0662cecff0c3431262493b
-  data.tar.gz: 0d007a700bb85ba2bef9a076e63ae45a29dd447b
+  metadata.gz: 85722b0330f29047967d4ca4720f426ae91bb189
+  data.tar.gz: 8e2c8efbda1cc38181caa059aeed914af9e633f4
 SHA512:
-  metadata.gz: f96497f3c1d86cd259ef7fb1d1b70f02c5196553660d39c95be450c431e7eebbe076fc246ef409fd5bd056d1611203f07bbef7284625279848334c593abb689d
-  data.tar.gz: e3b70178abec3413f4dbd0008d8883534860a05f88011b0201ac20cbe996428219e4d9648c309c89b21e3097a22e8caa92c60771b9369eb5ef37f03f1cc8f508
+  metadata.gz: 5e98e351adac155ec9972e51b440680c19a3e4c703c270c2dfccd7ad597e5117fcabf8c2688a2bf08694d47d36155d6fd8e5f9a06e6b06f27beaf120b9281aa6
+  data.tar.gz: 8a4ad0c89aa5d22e7666ffc6a20a8aa066b01197855a1b89e8fb1b47b1f9a3f5fc7b81dcd85c9232342362735c534bd28792a121c2a335aaca4f5d5aba7bc4eb

data/lib/bosh/template/evaluation_context.rb

@@ -95,34 +95,6 @@ module Bosh
         raise UnknownProperty.new(names)
       end
 
-      def link(name)
-        link_spec = lookup_property(@links, name)
-        raise UnknownLink.new(name) if link_spec.nil?
-
-        if link_spec.has_key?('instances')
-          link_instances = link_spec['instances'].map do |instance_link_spec|
-            EvaluationLinkInstance.new(instance_link_spec['name'], instance_link_spec['index'], instance_link_spec['id'], instance_link_spec['az'], instance_link_spec['address'], instance_link_spec['properties'], instance_link_spec['bootstrap'])
-          end
-
-          if link_spec.has_key?('address')
-            encoder_to_inject = ManualLinkDnsEncoder.new(link_spec['address'])
-          else
-            encoder_to_inject = @dns_encoder
-          end
-
-          return EvaluationLink.new(
-            link_instances,
-            link_spec['properties'],
-            link_spec['instance_group'],
-            link_spec['default_network'],
-            link_spec['deployment_name'],
-            link_spec['domain'],
-            encoder_to_inject,
-          )
-        end
-        raise UnknownLink.new(name)
-      end
-
       # Run a block of code if all given properties are defined
       # @param [Array<String>] names Property names
       # @yield [Object] property values
@@ -137,6 +109,17 @@ module Bosh
         InactiveElseBlock.new
       end
 
+      def link(name)
+        link_spec = lookup_property(@links, name)
+        raise UnknownLink.new(name) if link_spec.nil?
+
+        if link_spec.has_key?('instances')
+          return create_evaluation_link(link_spec)
+        end
+
+        raise UnknownLink.new(name)
+      end
+
       # Run a block of code if the link given exists
       # @param [String] name of the link
       # @yield [Object] link, which is an array of instances
@@ -145,17 +128,43 @@ module Bosh
         if link_spec.nil? || !link_spec.has_key?('instances')
           return ActiveElseBlock.new(self)
         else
-          link_instances = link_spec['instances'].map do |instance_link_spec|
-            EvaluationLinkInstance.new(instance_link_spec['name'], instance_link_spec['index'], instance_link_spec['id'], instance_link_spec['az'], instance_link_spec['address'], instance_link_spec['properties'], instance_link_spec['bootstrap'])
-          end
-
-          yield EvaluationLink.new(link_instances, link_spec['properties'], link_spec['instance_group'], link_spec['default_network'], link_spec['deployment_name'], link_spec['root_domain'], @dns_encoder)
+          yield create_evaluation_link(link_spec)
           InactiveElseBlock.new
         end
       end
 
       private
 
+      def create_evaluation_link(link_spec)
+        link_instances = link_spec['instances'].map do |instance_link_spec|
+          EvaluationLinkInstance.new(
+            instance_link_spec['name'],
+            instance_link_spec['index'],
+            instance_link_spec['id'],
+            instance_link_spec['az'],
+            instance_link_spec['address'],
+            instance_link_spec['properties'],
+            instance_link_spec['bootstrap'],
+          )
+        end
+
+        if link_spec.has_key?('address')
+          encoder_to_inject = ManualLinkDnsEncoder.new(link_spec['address'])
+        else
+          encoder_to_inject = @dns_encoder
+        end
+
+        return EvaluationLink.new(
+          link_instances,
+          link_spec['properties'],
+          link_spec['instance_group'],
+          link_spec['default_network'],
+          link_spec['deployment_name'],
+          link_spec['domain'],
+          encoder_to_inject,
+        )
+      end
+
       # @return [Object] Object representation where all hashes are unrolled
       #   into OpenStruct objects. This exists mostly for backward
       #   compatibility, as it doesn't provide good error reporting.

data/lib/bosh/template/test/job.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Bosh::Template::Test
   class Job
     def initialize(release_path, name)
@@ -17,4 +19,4 @@ module Bosh::Template::Test
       raise "Template for rendered path filename not found: #{rendered_file_name}. Possible values are: [#{@templates.values.join(', ')}]"
     end
   end
-end
+end

data/lib/bosh/template/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Template
-    VERSION = '2.0.0'
+    VERSION = '2.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-template
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semi_semantic
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Renders bosh templates