hako 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ef57c377dafbf524ddb4d442108f92aee5f278d2506c5f91ca61df1541dd2b
-  data.tar.gz: 7de25a114cf37299e18ffa034d8eed56d6253857c67865bd0a15f90c1c87bb02
+  metadata.gz: b1f36ce62c2bec8de3106ea4c8cda86ca908403a1463afa50da98fd753514cb7
+  data.tar.gz: 22d21c3a01bc721b35dfb2d6956bd0f68c9e6599a534b9e3ad2c0b875145b604
 SHA512:
-  metadata.gz: a30d023690fc56f462e230b0e9b229c63091489446ac85c45a01d7158d0ba363f999ea28ca0cac2a2c9c22dfb387f3a7d5cc8b5fcd9a552fb98581f518eedeee
-  data.tar.gz: 2095d02a1a7da744416a599abf5ba16762206349c4dfd772d7d74f7ef030aab4ffa4a6a4d36005f68d42fdced3e82c2bdbef51b4a0ea1839cdd4b07432709da2
+  metadata.gz: 5710cce2fdbf9f31e371889027dc6d0152e076d011935f084402e7b5077aed83917ca97c56cd14e57427bdcbe152e104ffeb1a0bb9ea51d6beae9fabded554a2
+  data.tar.gz: 27e189dd2d0fa39b1180bff7a0ad77b044d85912d09508069f51cc9c6795bebf3e44d0f5206409599dabda801146a567a47f43d61345f3939548ffa433df4858

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.1 (2017-12-14)
+## Bug fixes
+- Fix compatibility between Jsonnet and YAML when --dry-run is given
+
 # 2.0.0 (2017-12-13)
 ## New features
 - Support Jsonnet as the definition file format

data/lib/hako/application.rb

@@ -15,7 +15,7 @@ module Hako
     #   @return [Hash]
     attr_reader :id, :root_path, :definition
 
-    def initialize(yaml_path, expand_variables: true)
+    def initialize(yaml_path, expand_variables: true, ask_keys: false)
       path = Pathname.new(yaml_path)
       @id = path.basename.sub_ext('').to_s
       @root_path = path.parent
@@ -24,7 +24,7 @@ module Hako
         when '.yml', '.yaml'
           YamlLoader.new.load(path)
         when '.jsonnet', '.json'
-          JsonnetLoader.new(self, expand_variables).load(path)
+          JsonnetLoader.new(self, expand_variables: expand_variables, ask_keys: ask_keys).load(path)
         else
           raise Error.new("Unknown extension: #{path}")
         end

data/lib/hako/cli.rb

@@ -66,7 +66,13 @@ module Hako
           Hako.logger.level = Logger::DEBUG
         end
 
-        Commander.new(Application.new(@yaml_path)).deploy(force: @force, tag: @tag, dry_run: @dry_run, timeout: @timeout)
+        options =
+          if @dry_run
+            { expand_variables: false, ask_keys: true }
+          else
+            {}
+          end
+        Commander.new(Application.new(@yaml_path, options)).deploy(force: @force, tag: @tag, dry_run: @dry_run, timeout: @timeout)
       end
 
       DEFAULT_TIMEOUT = 1200 # 20 minutes
@@ -109,7 +115,13 @@ module Hako
           Hako.logger.level = Logger::DEBUG
         end
 
-        Commander.new(Application.new(@yaml_path)).rollback(dry_run: @dry_run)
+        options =
+          if @dry_run
+            { expand_variables: false, ask_keys: true }
+          else
+            {}
+          end
+        Commander.new(Application.new(@yaml_path, options)).rollback(dry_run: @dry_run)
       end
 
       def parse!(argv)
@@ -144,7 +156,13 @@ module Hako
           Hako.logger.level = Logger::DEBUG
         end
 
-        Commander.new(Application.new(@yaml_path)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run, no_wait: @no_wait)
+        options =
+          if @dry_run
+            { expand_variables: false, ask_keys: true }
+          else
+            {}
+          end
+        Commander.new(Application.new(@yaml_path, options)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run, no_wait: @no_wait)
       end
 
       def parse!(argv)
@@ -213,7 +231,7 @@ module Hako
         parse!(argv)
         require 'hako/application'
         require 'hako/commander'
-        Commander.new(Application.new(@yaml_path)).status
+        Commander.new(Application.new(@yaml_path, expand_variables: false)).status
       end
 
       def parse!(argv)
@@ -239,7 +257,14 @@ module Hako
         parse!(argv)
         require 'hako/application'
         require 'hako/commander'
-        Commander.new(Application.new(@yaml_path)).remove(dry_run: @dry_run)
+
+        options =
+          if @dry_run
+            { expand_variables: false, ask_keys: true }
+          else
+            {}
+          end
+        Commander.new(Application.new(@yaml_path, options)).remove(dry_run: @dry_run)
       end
 
       def parse!(argv)
@@ -267,7 +292,14 @@ module Hako
         parse!(argv)
         require 'hako/application'
         require 'hako/commander'
-        Commander.new(Application.new(@yaml_path)).stop(dry_run: @dry_run)
+
+        options =
+          if @dry_run
+            { expand_variables: false, ask_keys: true }
+          else
+            {}
+          end
+        Commander.new(Application.new(@yaml_path, options)).stop(dry_run: @dry_run)
       end
 
       def parse!(argv)

data/lib/hako/jsonnet_loader.rb

@@ -2,6 +2,7 @@
 
 require 'hako'
 require 'hako/env_providers'
+require 'hako/error'
 require 'hako/loader'
 require 'json'
 require 'jsonnet'
@@ -10,10 +11,11 @@ module Hako
   class JsonnetLoader
     # @param [Application] application
     # @param [Boolean] expand_variables
-    def initialize(application, expand_variables)
+    # @param [Boolean] ask_keys
+    def initialize(application, expand_variables:, ask_keys:)
       @vm = Jsonnet::VM.new
       @root_path = application.root_path
-      define_provider_functions(expand_variables)
+      define_provider_functions(expand_variables, ask_keys)
       @vm.ext_var('appId', application.id)
     end
 
@@ -24,7 +26,7 @@ module Hako
 
     private
 
-    def define_provider_functions(expand_variables)
+    def define_provider_functions(expand_variables, ask_keys)
       Gem.loaded_specs.each do |gem_name, spec|
         spec.require_paths.each do |path|
           Dir.glob(File.join(spec.full_gem_path, path, 'hako/env_providers/*.rb')).each do |provider_path|
@@ -35,7 +37,15 @@ module Hako
               if expand_variables
                 provider_class.new(@root_path, JSON.parse(options)).ask([name]).fetch(name)
               else
-                "\#{#{name}}"
+                if ask_keys
+                  provider = provider_class.new(@root_path, JSON.parse(options))
+                  if provider.can_ask_keys?
+                    if provider.ask_keys([name]).empty?
+                      raise Error.new("Could not lookup #{name} from #{provider_name} provider with options=#{options}")
+                    end
+                  end
+                end
+                "${#{name}}"
               end
             end
           end

data/lib/hako/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hako
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling