hako 0.25.2 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af9dc270bc2256c6afe5c2a1f4a3aa5cbce005d
-  data.tar.gz: 7e776cd502c68aa760dee703aba4da6089bbd695
+  metadata.gz: 0b907e44ac8f76ff6a5d9e6ffe8872c6a59af395
+  data.tar.gz: a61274497bbc2345db4c6ee456da7f574628ab3a
 SHA512:
-  metadata.gz: 84cb70ece19f489aecbeb85f7a39d56445a276925ecf771b3ffb07d192a2a9fa563c252699e2e62b8d64daee39d35f537d6ac947ce445f0832f1f755d98fb45f
-  data.tar.gz: 9625218050f8d55df0a69d4e38c770dff1d9bf5c66b7fe605ee8b54a76fef954da166fbd75959d9b6bb7c5d18cb1f7d0b839d9baae0b178dc938359a4d2cce6c
+  metadata.gz: bfe9cc3eaf589ddb8368c0d87db6409b0130ae6d61323fb90d11c832dd3cdc366d9d02880dd0f50e49530fb7af7815759513c53cbcc20fd9894a5c868b6acb7b
+  data.tar.gz: bc26cf71de0d60111cab73941b967a57b11f051612f073d27382d83ec041bcfeec0a302600bcf9f4dc2e83e48b222b63847fe825f76ea3a96e9a1f09ff02eda3

data/lib/hako/container.rb

@@ -84,11 +84,13 @@ module Hako
     def expand_env(env)
       env = env.dup
       provider_types = env.delete(PROVIDERS_KEY) || []
+      providers = load_providers(provider_types)
+      expander = EnvExpander.new(providers)
       if @dry_run
+        expander.validate!(env)
         env
       else
-        providers = load_providers(provider_types)
-        EnvExpander.new(providers).expand(env)
+        expander.expand(env)
       end
     end
 

data/lib/hako/env_expander.rb

@@ -20,16 +20,14 @@ module Hako
     # @param [Hash<String, String>] env
     # @return [Hash<String, String>]
     def expand(env)
-      parsed_env = {}
+      parsed_env = parse_env(env)
       variables = Set.new
-      env.each do |key, val|
-        tokens = parse(val.to_s)
+      parsed_env.each_value do |tokens|
         tokens.each do |t|
           if t.is_a?(Variable)
             variables << t.name
           end
         end
-        parsed_env[key] = tokens
       end
 
       values = {}
@@ -53,8 +51,50 @@ module Hako
       expanded_env
     end
 
+    # @param [Hash<String, String>] env
+    # @return [Boolean]
+    def validate!(env)
+      parsed_env = parse_env(env)
+      variables = Set.new
+      parsed_env.each_value do |tokens|
+        tokens.each do |t|
+          if t.is_a?(Variable)
+            variables << t.name
+          end
+        end
+      end
+
+      @providers.each do |provider|
+        if variables.empty?
+          break
+        end
+        if provider.can_ask_keys?
+          provider.ask_keys(variables.to_a).each do |var|
+            variables.delete(var)
+          end
+        else
+          Hako.logger.warn("EnvProvider#validate! is skipped because #{provider.class} doesn't support ask_keys method")
+          return false
+        end
+      end
+      unless variables.empty?
+        raise ExpansionError.new("Could not find embedded variables from $providers=#{@providers}: #{variables.to_a}")
+      end
+      true
+    end
+
     private
 
+    # @param [Hash<String, String>] env
+    # @return [Hash<String, Array<Literal, Variable>>]
+    def parse_env(env)
+      parsed_env = {}
+      env.each do |key, val|
+        parsed_env[key] = parse(val.to_s)
+      end
+      parsed_env
+    end
+
     # @param [String] value
     # @return [Array]
     def parse(value)

data/lib/hako/env_provider.rb

@@ -14,6 +14,14 @@ module Hako
       raise NotImplementedError
     end
 
+    def can_ask_keys?
+      raise NotImplementedError
+    end
+
+    def ask_keys(_variables)
+      raise NotImplementedError
+    end
+
     private
 
     def validation_error!(message)

data/lib/hako/env_providers/file.rb

@@ -25,6 +25,23 @@ module Hako
         env
       end
 
+      # @return [Boolean]
+      def can_ask_keys?
+        true
+      end
+
+      # @param [Array<String>] variables
+      # @return [Array<String>]
+      def ask_keys(variables)
+        keys = []
+        read_from_file do |key, _|
+          if variables.include?(key)
+            keys << key
+          end
+        end
+        keys
+      end
+
       private
 
       # @yieldparam [String] key

data/lib/hako/env_providers/yaml.rb

@@ -33,6 +33,23 @@ module Hako
         env
       end
 
+      # @return [Boolean]
+      def can_ask_keys?
+        true
+      end
+
+      # @param [Array<String>] variables
+      # @return [Array<String>]
+      def ask_keys(variables)
+        keys = []
+        read_from_yaml do |key, _|
+          if variables.include?(key)
+            keys << key
+          end
+        end
+        keys
+      end
+
       private
 
       # @yieldparam [String] key

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.25.2'
+  VERSION = '0.26.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.26.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk