sfn 2.2.0 → 3.0.0

data/lib/sfn/utils/stack_parameter_validator.rb

@@ -4,183 +4,188 @@ module Sfn
   module Utils
 
     # Helper utility for validating stack parameters
-    class StackParameterValidator
-      class << self
-
-        include Bogo::AnimalStrings
-
-        # HOT parameter mapping
-        HEAT_CONSTRAINT_MAP = {
-          'MaxLength' => [:length, :max],
-          'MinLength' => [:length, :min],
-          'MaxValue' => [:range, :max],
-          'MinValue' => [:range, :min],
-          'AllowedValues' => [:allowed_values],
-          'AllowedPattern' => [:allowed_pattern]
-        }
-
-        # Parameter mapping identifier and content
-        PARAMETER_DEFINITION_MAP = {
-          'constraints' => HEAT_CONSTRAINT_MAP
-        }
-
-        # Supported parameter validations
-        PARAMETER_VALIDATIONS = [
-          'allowed_values',
-          'allowed_pattern',
-          'max_length',
-          'min_length',
-          'max_value',
-          'min_value'
-        ]
-
-        # Validate a parameters
-        #
-        # @param value [Object] value for parameter
-        # @param parameter_definition [Hash]
-        # @option parameter_definition [Array<String>] 'AllowedValues'
-        # @option parameter_definition [String] 'AllowedPattern'
-        # @option parameter_definition [String, Integer] 'MaxLength'
-        # @option parameter_definition [String, Integer] 'MinLength'
-        # @option parameter_definition [String, Integer] 'MaxValue'
-        # @option parameter_definition [String, Integer] 'MinValue'
-        # @return [TrueClass, Array<String>] true if valid. array of string errors if invalid
-        def validate(value, parameter_definition)
-          return [[:blank, 'Value cannot be blank']] if value.to_s.strip.empty?
-          parameter_definition = reformat_definition(parameter_definition)
-          value_list = list_type?(parameter_definition.fetch('Type', parameter_definition['type'].to_s)) ? value.to_s.split(',') : [value]
-          result = PARAMETER_VALIDATIONS.map do |validator_key|
-            valid_key = parameter_definition.keys.detect do |pdef_key|
-              pdef_key.downcase.gsub('_', '') == validator_key.downcase.gsub('_', '')
-            end
-            if(valid_key)
-              value_list.map do |value|
-                res = self.send(validator_key, value, parameter_definition[valid_key])
-                res == true ? true : [validator_key, res]
-              end
-            else
-              true
+    module StackParameterValidator
+
+      include Bogo::AnimalStrings
+
+      # HOT parameter mapping
+      HEAT_CONSTRAINT_MAP = {
+        'MaxLength' => [:length, :max],
+        'MinLength' => [:length, :min],
+        'MaxValue' => [:range, :max],
+        'MinValue' => [:range, :min],
+        'AllowedValues' => [:allowed_values],
+        'AllowedPattern' => [:allowed_pattern]
+      }
+
+      # GCDM parameter mapping
+      GOOGLE_CONSTRAINT_MAP = {
+        'AllowedPattern' => [:pattern],
+        'MaxValue' => [:maximum],
+        'MinValue' => [:minimum]
+      }
+
+      # Parameter mapping identifier and content
+      PARAMETER_DEFINITION_MAP = {
+        'constraints' => HEAT_CONSTRAINT_MAP
+      }
+
+      # Supported parameter validations
+      PARAMETER_VALIDATIONS = [
+        'allowed_values',
+        'allowed_pattern',
+        'max_length',
+        'min_length',
+        'max_value',
+        'min_value'
+      ]
+
+      # Validate a parameters
+      #
+      # @param value [Object] value for parameter
+      # @param parameter_definition [Hash]
+      # @option parameter_definition [Array<String>] 'AllowedValues'
+      # @option parameter_definition [String] 'AllowedPattern'
+      # @option parameter_definition [String, Integer] 'MaxLength'
+      # @option parameter_definition [String, Integer] 'MinLength'
+      # @option parameter_definition [String, Integer] 'MaxValue'
+      # @option parameter_definition [String, Integer] 'MinValue'
+      # @return [TrueClass, Array<String>] true if valid. array of string errors if invalid
+      def validate_parameter(value, parameter_definition)
+        return [[:blank, 'Value cannot be blank']] if value.to_s.strip.empty?
+        parameter_definition = reformat_definition(parameter_definition)
+        value_list = list_type?(parameter_definition.fetch('Type', parameter_definition['type'].to_s)) ? value.to_s.split(',') : [value]
+        result = PARAMETER_VALIDATIONS.map do |validator_key|
+          valid_key = parameter_definition.keys.detect do |pdef_key|
+            pdef_key.downcase.gsub('_', '') == validator_key.downcase.gsub('_', '')
+          end
+          if(valid_key)
+            value_list.map do |value|
+              res = self.send(validator_key, value, parameter_definition[valid_key])
+              res == true ? true : [validator_key, res]
             end
-          end.flatten(1)
-          result.delete_if{|x| x == true}
-          result.empty? ? true : result
-        end
+          else
+            true
+          end
+        end.flatten(1)
+        result.delete_if{|x| x == true}
+        result.empty? ? true : result
+      end
 
-        # Reformat parameter definition with proper keys to allow
-        # validation for templates different parameter definition
-        # layout
-        #
-        # @param pdef [Hash]
-        # @return [Hash]
-        def reformat_definition(pdef)
-          new_def = pdef
-          PARAMETER_DEFINITION_MAP.each do |ident, mapping|
-            if(pdef[ident])
-              new_def = Smash.new
-              mapping.each do |new_key, current_path|
-                if(pdef.get(*current_path))
-                  new_def[new_key] = pdef.get(*current_path)
-                end
+      # Reformat parameter definition with proper keys to allow
+      # validation for templates different parameter definition
+      # layout
+      #
+      # @param pdef [Hash]
+      # @return [Hash]
+      def reformat_definition(pdef)
+        new_def = pdef
+        PARAMETER_DEFINITION_MAP.each do |ident, mapping|
+          if(pdef[ident])
+            new_def = Smash.new
+            mapping.each do |new_key, current_path|
+              if(pdef.get(*current_path))
+                new_def[new_key] = pdef.get(*current_path)
               end
             end
           end
-          new_def
-        end
-
-        # Parameter is within allowed values
-        #
-        # @param value [String]
-        # @param pdef [Hash] parameter definition
-        # @option pdef [Array<String>] 'AllowedValues'
-        # @return [TrueClass, String]
-        def allowed_values(value, pdef)
-          if(pdef.include?(value))
-            true
-          else
-            "Not an allowed value: #{pdef.join(', ')}"
-          end
         end
+        new_def
+      end
 
-        # Parameter matches allowed pattern
-        #
-        # @param value [String]
-        # @param pdef [Hash] parameter definition
-        # @option pdef [String] 'AllowedPattern'
-        # @return [TrueClass, String]
-        def allowed_pattern(value, pdef)
-          if(value.match(%r{#{pdef}}))
-            true
-          else
-            "Not a valid pattern. Must match: #{pdef}"
-          end
+      # Parameter is within allowed values
+      #
+      # @param value [String]
+      # @param pdef [Hash] parameter definition
+      # @option pdef [Array<String>] 'AllowedValues'
+      # @return [TrueClass, String]
+      def allowed_values(value, pdef)
+        if(pdef.include?(value))
+          true
+        else
+          "Not an allowed value: #{pdef.join(', ')}"
         end
+      end
 
-        # Parameter length is less than or equal to max length
-        #
-        # @param value [String, Integer]
-        # @param pdef [Hash] parameter definition
-        # @option pdef [String] 'MaxLength'
-        # @return [TrueClass, String]
-        def max_length(value, pdef)
-          if(value.length <= pdef.to_i)
-            true
-          else
-            "Value must not exceed #{pdef} characters"
-          end
+      # Parameter matches allowed pattern
+      #
+      # @param value [String]
+      # @param pdef [Hash] parameter definition
+      # @option pdef [String] 'AllowedPattern'
+      # @return [TrueClass, String]
+      def allowed_pattern(value, pdef)
+        if(value.match(%r{#{pdef}}))
+          true
+        else
+          "Not a valid pattern. Must match: #{pdef}"
         end
+      end
 
-        # Parameter length is greater than or equal to min length
-        #
-        # @param value [String]
-        # @param pdef [Hash] parameter definition
-        # @option pdef [String] 'MinLength'
-        # @return [TrueClass, String]
-        def min_length(value, pdef)
-          if(value.length >= pdef.to_i)
-            true
-          else
-            "Value must be at least #{pdef} characters"
-          end
+      # Parameter length is less than or equal to max length
+      #
+      # @param value [String, Integer]
+      # @param pdef [Hash] parameter definition
+      # @option pdef [String] 'MaxLength'
+      # @return [TrueClass, String]
+      def max_length(value, pdef)
+        if(value.length <= pdef.to_i)
+          true
+        else
+          "Value must not exceed #{pdef} characters"
         end
+      end
 
-        # Parameter value is less than or equal to max value
-        #
-        # @param value [String]
-        # @param pdef [Hash] parameter definition
-        # @option pdef [String] 'MaxValue'
-        # @return [TrueClass, String]
-        def max_value(value, pdef)
-          if(value.to_i <= pdef.to_i)
-            true
-          else
-            "Value must not be greater than #{pdef}"
-          end
+      # Parameter length is greater than or equal to min length
+      #
+      # @param value [String]
+      # @param pdef [Hash] parameter definition
+      # @option pdef [String] 'MinLength'
+      # @return [TrueClass, String]
+      def min_length(value, pdef)
+        if(value.length >= pdef.to_i)
+          true
+        else
+          "Value must be at least #{pdef} characters"
         end
+      end
 
-        # Parameter value is greater than or equal to min value
-        #
-        # @param value [String]
-        # @param pdef [Hash] parameter definition
-        # @option pdef [String] 'MinValue'
-        # @return [TrueClass, String]
-        def min_value(value, pdef)
-          if(value.to_i >= pdef.to_i)
-            true
-          else
-            "Value must not be less than #{pdef}"
-          end
+      # Parameter value is less than or equal to max value
+      #
+      # @param value [String]
+      # @param pdef [Hash] parameter definition
+      # @option pdef [String] 'MaxValue'
+      # @return [TrueClass, String]
+      def max_value(value, pdef)
+        if(value.to_i <= pdef.to_i)
+          true
+        else
+          "Value must not be greater than #{pdef}"
         end
+      end
 
-        # Check if type is a list type
-        #
-        # @param type [String]
-        # @return [TrueClass, FalseClass]
-        def list_type?(type)
-          type = type.downcase
-          type.start_with?('comma') || type.start_with?('list<')
+      # Parameter value is greater than or equal to min value
+      #
+      # @param value [String]
+      # @param pdef [Hash] parameter definition
+      # @option pdef [String] 'MinValue'
+      # @return [TrueClass, String]
+      def min_value(value, pdef)
+        if(value.to_i >= pdef.to_i)
+          true
+        else
+          "Value must not be less than #{pdef}"
         end
+      end
 
+      # Check if type is a list type
+      #
+      # @param type [String]
+      # @return [TrueClass, FalseClass]
+      def list_type?(type)
+        type = type.downcase
+        type.start_with?('comma') || type.start_with?('list<')
       end
+
     end
   end
 end

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('2.2.0')
+  VERSION = Gem::Version.new('3.0.0')
 end

data/sfn.gemspec

@@ -13,12 +13,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'bogo-cli', '>= 0.2.5', '< 0.4'
   s.add_runtime_dependency 'bogo-ui', '>= 0.1.13', '< 0.4'
   s.add_runtime_dependency 'miasma', '>= 0.3.0', '< 0.4'
-  s.add_runtime_dependency 'miasma-aws', '>= 0.3.0', '< 0.4'
+  s.add_runtime_dependency 'miasma-aws', '>= 0.3.3', '< 0.4'
   s.add_runtime_dependency 'miasma-azure', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'miasma-open-stack', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'miasma-rackspace', '>= 0.1.0', '< 0.3'
+  s.add_runtime_dependency 'miasma-google', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'net-ssh'
-  s.add_runtime_dependency 'sparkle_formation', '>= 2.1.2', '< 3'
+  s.add_runtime_dependency 'sparkle_formation', '>= 3', '< 4'
   s.add_runtime_dependency 'hashdiff', '~> 0.2.2'
   s.add_runtime_dependency 'graph', '~> 2.8.1'
   s.add_development_dependency 'rake', '~> 10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -150,6 +150,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: miasma-google
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -170,20 +190,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -264,10 +284,12 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- bin/command-config-generator
 - bin/generate_sfn_docs
 - bin/sfn
 - docs/README.md
 - docs/callbacks.md
+- docs/command-config.md
 - docs/commands.md
 - docs/configuration.md
 - docs/images/d_create.png
@@ -292,6 +314,8 @@ files:
 - docs/v/loader.js
 - lib/chef/knife/knife_plugin_seed.rb
 - lib/sfn.rb
+- lib/sfn/api_provider.rb
+- lib/sfn/api_provider/google.rb
 - lib/sfn/cache.rb
 - lib/sfn/callback.rb
 - lib/sfn/callback/aws_assume_role.rb
@@ -338,6 +362,8 @@ files:
 - lib/sfn/config/validate.rb
 - lib/sfn/monkey_patch.rb
 - lib/sfn/monkey_patch/stack.rb
+- lib/sfn/monkey_patch/stack/azure.rb
+- lib/sfn/monkey_patch/stack/google.rb
 - lib/sfn/planner.rb
 - lib/sfn/planner/aws.rb
 - lib/sfn/provider.rb