bosh-template 2.0.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2378abe7a780eedfde0662cecff0c3431262493b
-  data.tar.gz: 0d007a700bb85ba2bef9a076e63ae45a29dd447b
+SHA256:
+  metadata.gz: 01d5f8a545ae5989e1e3aaf8f44100cb936157c1aab72a852b71d2033ab034ad
+  data.tar.gz: 88ced16b9df4bdadd6e355778ef69128911d9a63c50bf67a2c7abe4ccc3de93e
 SHA512:
-  metadata.gz: f96497f3c1d86cd259ef7fb1d1b70f02c5196553660d39c95be450c431e7eebbe076fc246ef409fd5bd056d1611203f07bbef7284625279848334c593abb689d
-  data.tar.gz: e3b70178abec3413f4dbd0008d8883534860a05f88011b0201ac20cbe996428219e4d9648c309c89b21e3097a22e8caa92c60771b9369eb5ef37f03f1cc8f508
+  metadata.gz: 924d88d24c9ddf8966abed228557e520835872f2064eb3ce15be7445624a626a09593e97fb45969a94f7e13a08a6d448add538dcdaa889d7f373b6152f05df3c
+  data.tar.gz: 92b8857af18937f7c93928c0a70a5c010603800d3cd4d463f8b363b6de1f9b08215cc55e352fc5e711b32af75aa4033375158c319923b94905c8ae9a7f8afc70

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,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
@@ -95,34 +102,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 +116,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 +135,53 @@ 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
+
+        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'],
+          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
+
       # @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/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

@@ -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/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.0.0'
+    VERSION = '2.3.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.3.0
 platform: ruby
 authors:
 - Pivotal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 1980-01-01 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.5.1
-signing_key: 
+rubygems_version: 3.2.26
+signing_key:
 specification_version: 4
 summary: Renders bosh templates
 test_files: []