bosh-template 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85722b0330f29047967d4ca4720f426ae91bb189
-  data.tar.gz: 8e2c8efbda1cc38181caa059aeed914af9e633f4
+  metadata.gz: 225cc24dcfea221f0c7c6dcd7c06857b21f07ae8
+  data.tar.gz: a66bf44b3825ce1e406a7fc3dc22cf5fe3fdfdd2
 SHA512:
-  metadata.gz: 5e98e351adac155ec9972e51b440680c19a3e4c703c270c2dfccd7ad597e5117fcabf8c2688a2bf08694d47d36155d6fd8e5f9a06e6b06f27beaf120b9281aa6
-  data.tar.gz: 8a4ad0c89aa5d22e7666ffc6a20a8aa066b01197855a1b89e8fb1b47b1f9a3f5fc7b81dcd85c9232342362735c534bd28792a121c2a335aaca4f5d5aba7bc4eb
+  metadata.gz: 93cfadffd893c78c122399b806f4ae8bdd3da693d40c342dc51a4bb18546b1bd91b8dc151f10544abc315a977685fe453036bf2661687056dc7ed3fbdf60bc86
+  data.tar.gz: 4dba063576b3a70450260d33b5cafc6cf80524731949ea78aa77b658954427109d48684ac56e9121254bd28b877ba7560a414ca4e04cbd1a7c29e2ab6040f2a5

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

@@ -162,6 +162,7 @@ module Bosh
           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,7 +8,7 @@ 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, instance_group, default_network, deployment_name, root_domain, dns_encoder, use_short_dns)
         @instances = instances
         @properties = properties
         @instance_group = instance_group
@@ -16,6 +16,7 @@ module Bosh
         @deployment_name = deployment_name
         @root_domain = root_domain
         @dns_encoder = dns_encoder
+        @use_short_dns = use_short_dns
       end
 
       def p(*args)
@@ -51,7 +52,7 @@ module Bosh
           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/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/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), safe_level = nil, 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.2.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.2.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-08-15 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.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Renders bosh templates