bosh-template 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 225cc24dcfea221f0c7c6dcd7c06857b21f07ae8
-  data.tar.gz: a66bf44b3825ce1e406a7fc3dc22cf5fe3fdfdd2
+  metadata.gz: 5283a92f4022095fe04822e315c9c6f8fa78b2a2
+  data.tar.gz: 11aef776a890ddbf4581fef919324cf99c7c663d
 SHA512:
-  metadata.gz: 93cfadffd893c78c122399b806f4ae8bdd3da693d40c342dc51a4bb18546b1bd91b8dc151f10544abc315a977685fe453036bf2661687056dc7ed3fbdf60bc86
-  data.tar.gz: 4dba063576b3a70450260d33b5cafc6cf80524731949ea78aa77b658954427109d48684ac56e9121254bd28b877ba7560a414ca4e04cbd1a7c29e2ab6040f2a5
+  metadata.gz: 646a0e5647c7860a0ea184e845d20e21ca3d868a4e040bc80ca72ec717e31e8370d0f38c5ee380ebeff7874e884b73157b5318360f388bb5d48a670600e999b6
+  data.tar.gz: 2d9202fec9416f221b3d464e7ff94722787d306f68944e2cb40f24b976d0e2e19e2d8549647c371f653f31290c57dd3c5eaa9f8911aa134f88570eddf2a3fb74

data/lib/bosh/template/evaluation_context.rb

@@ -51,6 +51,13 @@ module Bosh
         @links = spec['links'] || {}
       end
 
+      def ==(other)
+        public_members = %w[spec raw_properties name index properties]
+        public_members.all? do |member|
+          other.respond_to?(member) && send(member) == other.send(member)
+        end
+      end
+
       # @return [Binding] Template binding
       def get_binding
         binding.taint
@@ -154,15 +161,24 @@ module Bosh
           encoder_to_inject = @dns_encoder
         end
 
-        return EvaluationLink.new(
+        group_name = link_spec['instance_group']
+        group_type = 'instance-group'
+
+        if link_spec.fetch('use_link_dns_names', false)
+          group_name = link_spec['group_name']
+          group_type = 'link'
+        end
+
+        EvaluationLink.new(
           link_instances,
           link_spec['properties'],
-          link_spec['instance_group'],
+          group_name,
+          group_type,
           link_spec['default_network'],
           link_spec['deployment_name'],
           link_spec['domain'],
           encoder_to_inject,
-          link_spec.fetch('use_short_dns_addresses', false)
+          link_spec.fetch('use_short_dns_addresses', false),
         )
       end
 

data/lib/bosh/template/evaluation_link.rb

@@ -8,10 +8,21 @@ module Bosh
       attr_reader :instances
       attr_reader :properties
 
-      def initialize(instances, properties, instance_group, default_network, deployment_name, root_domain, dns_encoder, use_short_dns)
+      def initialize(
+        instances,
+        properties,
+        group_name,
+        group_type,
+        default_network,
+        deployment_name,
+        root_domain,
+        dns_encoder,
+        use_short_dns
+      )
         @instances = instances
         @properties = properties
-        @instance_group = instance_group
+        @group_name = group_name
+        @group_type = group_type
         @default_network = default_network
         @deployment_name = deployment_name
         @root_domain = root_domain
@@ -28,30 +39,33 @@ module Bosh
         end
 
         return args[1] if args.length == 2
-        raise UnknownProperty.new(names)
+
+        raise UnknownProperty, names
       end
 
       def if_p(*names)
         values = names.map do |name|
           value = lookup_property(@properties, name)
           return Bosh::Template::EvaluationContext::ActiveElseBlock.new(self) if value.nil?
+
           value
         end
 
-        yield *values
+        yield(*values)
+
         Bosh::Template::EvaluationContext::InactiveElseBlock.new
       end
 
       def address(criteria = {})
-        raise NotImplementedError.new('link.address requires bosh director') if @dns_encoder.nil?
+        raise NotImplementedError, 'link.address requires bosh director' if @dns_encoder.nil?
 
         full_criteria = criteria.merge(
-          instance_group: @instance_group,
+          group_name: @group_name,
+          group_type: @group_type,
           default_network: @default_network,
           deployment_name: @deployment_name,
           root_domain: @root_domain,
         )
-
         @dns_encoder.encode_query(full_criteria, @use_short_dns)
       end
     end

data/lib/bosh/template/evaluation_link_instance.rb

@@ -32,19 +32,21 @@ module Bosh
         end
 
         return args[1] if args.length == 2
-        raise UnknownProperty.new(names)
+
+        raise UnknownProperty, names
       end
 
       def if_p(*names)
         values = names.map do |name|
           value = lookup_property(@properties, name)
-          return ActiveElseBlock.new(self) if value.nil?
+          return Bosh::Template::EvaluationContext::ActiveElseBlock.new(self) if value.nil?
+
           value
         end
 
-        yield *values
-        InactiveElseBlock.new
+        yield(*values)
+        Bosh::Template::EvaluationContext::InactiveElseBlock.new
       end
     end
   end
-end
+end

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

@@ -1,11 +1,12 @@
 module Bosh::Template::Test
   class Link
-    attr_reader :instances, :name, :properties
+    attr_reader :instances, :name, :properties, :address
 
-    def initialize(name:, instances: [], properties: {})
+    def initialize(name:, instances: [], properties: {}, address: nil)
       @instances = instances
       @name = name
       @properties = properties
+      @address = address
     end
 
     def to_h
@@ -13,6 +14,7 @@ module Bosh::Template::Test
         'instances' => instances.map(&:to_h),
         'name' => name,
         'properties' => properties,
+        'address' => address,
       }
     end
   end

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

@@ -19,7 +19,7 @@ module Bosh::Template
 
         binding = Bosh::Template::EvaluationContext.new(sanitized_hash_with_spec, nil).get_binding
         raise "No such file at #{@template_path}" unless File.exist?(@template_path)
-        ERB.new(File.read(@template_path), safe_level = nil, trim_mode = '-').result(binding)
+        ERB.new(File.read(@template_path), nil, '-').result(binding)
       end
 
       private

data/lib/bosh/template/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Template
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-template
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2019-05-23 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.6.14.1
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Renders bosh templates