bosh-template 2.1.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85722b0330f29047967d4ca4720f426ae91bb189
-  data.tar.gz: 8e2c8efbda1cc38181caa059aeed914af9e633f4
+SHA256:
+  metadata.gz: 01d69552923f4dfd1902462b47700dafdd64c091776af13857184a8cb965ef2d
+  data.tar.gz: 593d53fe6d34c009da3b713d8ea24c66e46c73798417d74b80929b065cc34a0c
 SHA512:
-  metadata.gz: 5e98e351adac155ec9972e51b440680c19a3e4c703c270c2dfccd7ad597e5117fcabf8c2688a2bf08694d47d36155d6fd8e5f9a06e6b06f27beaf120b9281aa6
-  data.tar.gz: 8a4ad0c89aa5d22e7666ffc6a20a8aa066b01197855a1b89e8fb1b47b1f9a3f5fc7b81dcd85c9232342362735c534bd28792a121c2a335aaca4f5d5aba7bc4eb
+  metadata.gz: ab2f789ecfd531efa14e2620770b8ac14b73a29c7b1fa47072a27f06e3b9f1262c5035e93f26f975e759e5f4400b1432ee5477fc696a4fad9df849d753e36c26
+  data.tar.gz: 435a6311b59e22e6849c37409d4e72613260387a7861fb5324ee4ca875e73c0e5ab630f9e3c4265025a3766cf8829a378a3229a2a1a40ea56d58ed34e3f634f5

data/README.md

@@ -21,19 +21,21 @@ When you create your own release, you can likewise create a tests folder in your
 ```ruby
 let(:job) {release.job('JOB-NAME')}  # e.g. 'web-server;
 let(:template) {job.template('PATH-TO-TEMPLATE')}  # e.g. 'config/config-with-nested'
-let(:manifest) {
-  'cert' => '----- BEGIN ... -----',
-  'port' => 42,
-}
+let(:manifest) do
+  {
+    'cert' => '----- BEGIN ... -----',
+    'port' => 42,
+  }
+end
 let(:instance) { InstanceSpec.new(name:'instance-name', az: 'az1', bootstrap: true) }
 let(:link_instance) { InstanceSpec.new(name:'link-instance-name', az: 'az2') }
-let(:link_properties){
-   'link-key' => 'link-value',
-}
+let(:link_properties) do
+  { 'link-key' => 'link-value' }
+end
 let(:link) { Link.new(name:'link-name', instances:[link_instance], properties: link_properties)}
 
 
 rendered_template = JSON.parse(template.render(manifest, spec: instance, consumes: [link]))
 ```
 
-And then check that their template rendered as they expected.
+And then check that their template rendered as they expected.

data/lib/bosh/template/evaluation_context.rb

@@ -51,9 +51,16 @@ 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
+        binding
       end
 
       # Property lookup helper
@@ -154,14 +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),
         )
       end
 

data/lib/bosh/template/evaluation_link.rb

@@ -8,14 +8,26 @@ module Bosh
       attr_reader :instances
       attr_reader :properties
 
-      def initialize(instances, properties, instance_group, default_network, deployment_name, root_domain, dns_encoder)
+      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
         @dns_encoder = dns_encoder
+        @use_short_dns = use_short_dns
       end
 
       def p(*args)
@@ -27,31 +39,34 @@ 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)
+        @dns_encoder.encode_query(full_criteria, @use_short_dns)
       end
     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/manual_link_dns_encoder.rb

@@ -5,7 +5,7 @@ module Bosh
         @manual_link_address = manual_link_address
       end
 
-      def encode_query(_)
+      def encode_query(*_)
         @manual_link_address
       end
     end

data/lib/bosh/template/renderer.rb

@@ -12,7 +12,7 @@ module Bosh
       def render(template_name)
         spec = JSON.parse(@context)
         evaluation_context = EvaluationContext.new(spec, nil)
-        template = ERB.new(File.read(template_name), safe_level = nil, trim_mode = "-")
+        template = ERB.new(File.read(template_name), trim_mode: "-")
         template.result(evaluation_context.get_binding)
       end
     end

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

@@ -8,7 +8,7 @@ module Bosh::Template::Test
       @job_path = File.join(@release_path, 'jobs', @name)
       # raise "No such job at path: #{@job_path}" if !File.exist?(@job_path)
       spec_path = File.join(@job_path, 'spec')
-      @spec = YAML.load(File.read(spec_path))
+      @spec = YAML.load(File.read(spec_path), aliases: true)
       @templates = @spec['templates']
     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)).result(binding)
+        ERB.new(File.read(@template_path), trim_mode: '-').result(binding)
       end
 
       private
@@ -74,4 +74,4 @@ module Bosh::Template
       end
     end
   end
-end
+end

data/lib/bosh/template/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-template
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Pivotal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semi_semantic
@@ -56,7 +56,7 @@ homepage: https://github.com/cloudfoundry/bosh
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -71,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Renders bosh templates
 test_files: []