knife-cloudformation 0.1.22 → 0.2.0

data/lib/knife-cloudformation/utils/stack_parameter_scrubber.rb

@@ -0,0 +1,35 @@
+require 'knife-cloudformation'
+
+module KnifeCloudformation
+  module Utils
+    # Helper for scrubbing stack parameters
+    class StackParameterScrubber
+
+      class << self
+
+        # Validate attributes within Parameter blocks
+        ALLOWED_PARAMETER_ATTRIBUTES = %w(
+          Type Default NoEcho AllowedValues AllowedPattern
+          MaxLength MinLength MaxValue MinValue Description
+          ConstraintDescription
+        )
+
+        # Clean the parameters of the template
+        #
+        # @param template [Hash]
+        # @return [Hash] template
+        def scrub!(template)
+          parameters = template.fetch('Parameters', {})
+          parameters.each do |name, options|
+            options.delete_if do |attribute, value|
+              !ALLOWED_PARAMETER_ATTRIBUTES.include?(attribute)
+            end
+          end
+          template['Parameters'] = parameters
+          template
+        end
+
+      end
+    end
+  end
+end

data/lib/knife-cloudformation/utils/stack_parameter_validator.rb

@@ -0,0 +1,124 @@
+require 'knife-cloudformation'
+
+module KnifeCloudformation
+  module Utils
+
+    # Helper utility for validating stack parameters
+    class StackParameterValidator
+      class << self
+
+        include KnifeCloudformation::Utils::AnimalStrings
+
+        # 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?
+          result = %w(AllowedValues AllowedPattern MaxLength MinLength MaxValue MinValue).map do |key|
+            if(parameter_definition[key])
+              res = self.send(snake(key), value, parameter_definition)
+              res == true ? true : [snake(key), res]
+            else
+              true
+            end
+          end
+          result.delete_if{|x| x == true}
+          result.empty? ? true : result
+        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['AllowedValues'].include?(value))
+            true
+          else
+            "Not an allowed value: #{pdef['AllowedValues'].join(', ')}"
+          end
+        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(/#{pdef['AllowedPattern']}/))
+            true
+          else
+            "Not a valid pattern. Must match: #{pdef['AllowedPattern']}"
+          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['MaxLength'].to_i)
+            true
+          else
+            "Value must not exceed #{pdef['MaxLength']} characters"
+          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['MinLength'].to_i)
+            true
+          else
+            "Value must be at least #{pdef['MinLength']} 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['MaxValue'].to_i)
+            true
+          else
+            "Value must not be greater than #{pdef['MaxValue']}"
+          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['MinValue'].to_i)
+            true
+          else
+            "Value must not be less than #{pdef['MinValue']}"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/knife-cloudformation/version.rb

@@ -1,6 +1,4 @@
 module KnifeCloudformation
-  class Version < Gem::Version
-  end
-
-  VERSION = Version.new('0.1.22')
+  # Current library version
+  VERSION = Gem::Version.new('0.2.0')
 end

metadata

@@ -1,181 +1,134 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudformation
 version: !ruby/object:Gem::Version
-  version: 0.1.22
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: miasma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: unf
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-sftp
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sparkle_formation
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: redis-objects
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: attribute_struct
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.2.0
 description: Knife tooling for Cloud Formation
 email: chrisroberts.code@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/chef/knife/cloudformation_events.rb
-- lib/chef/knife/cloudformation_destroy.rb
+- CHANGELOG.md
+- README.md
+- knife-cloudformation.gemspec
+- lib/chef/knife/cloudformation_create.rb
 - lib/chef/knife/cloudformation_describe.rb
+- lib/chef/knife/cloudformation_destroy.rb
+- lib/chef/knife/cloudformation_events.rb
 - lib/chef/knife/cloudformation_export.rb
+- lib/chef/knife/cloudformation_import.rb
+- lib/chef/knife/cloudformation_inspect.rb
 - lib/chef/knife/cloudformation_list.rb
-- lib/chef/knife/cloudformation_create.rb
+- lib/chef/knife/cloudformation_promote.rb
 - lib/chef/knife/cloudformation_update.rb
-- lib/chef/knife/cloudformation_inspect.rb
-- lib/chef/knife/cloudformation_import.rb
+- lib/chef/knife/cloudformation_validate.rb
 - lib/knife-cloudformation.rb
-- lib/knife-cloudformation/cloudformation_base.rb
-- lib/knife-cloudformation/version.rb
-- lib/knife-cloudformation/export.rb
-- lib/knife-cloudformation/aws_commons.rb
 - lib/knife-cloudformation/cache.rb
+- lib/knife-cloudformation/knife.rb
+- lib/knife-cloudformation/knife/base.rb
+- lib/knife-cloudformation/knife/stack.rb
+- lib/knife-cloudformation/knife/template.rb
+- lib/knife-cloudformation/monkey_patch.rb
+- lib/knife-cloudformation/monkey_patch/stack.rb
+- lib/knife-cloudformation/provider.rb
 - lib/knife-cloudformation/utils.rb
-- lib/knife-cloudformation/aws_commons/stack_parameter_validator.rb
-- lib/knife-cloudformation/aws_commons/stack.rb
-- Gemfile
-- README.md
-- knife-cloudformation.gemspec
-- knife-cloudformation-0.1.20.gem
-- CHANGELOG.md
-- Gemfile.lock
+- lib/knife-cloudformation/utils/animal_strings.rb
+- lib/knife-cloudformation/utils/debug.rb
+- lib/knife-cloudformation/utils/json.rb
+- lib/knife-cloudformation/utils/object_storage.rb
+- lib/knife-cloudformation/utils/output.rb
+- lib/knife-cloudformation/utils/path_selector.rb
+- lib/knife-cloudformation/utils/ssher.rb
+- lib/knife-cloudformation/utils/stack_exporter.rb
+- lib/knife-cloudformation/utils/stack_parameter_scrubber.rb
+- lib/knife-cloudformation/utils/stack_parameter_validator.rb
+- lib/knife-cloudformation/version.rb
 homepage: http://github.com/heavywater/knife-cloudformation
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Knife tooling for Cloud Formation
 test_files: []
 has_rdoc: 

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Gemfile.lock

@@ -1,90 +0,0 @@
-PATH
-  remote: .
-  specs:
-    knife-cloudformation (0.1.9)
-      attribute_struct (~> 0.1.6)
-      chef
-      fog (~> 1.15)
-      net-sftp
-      redis-objects
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    attribute_struct (0.1.6)
-      hashie (>= 2.0.0)
-    builder (3.2.2)
-    chef (11.6.0)
-      erubis
-      highline (>= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      mixlib-cli (~> 1.3.0)
-      mixlib-config (>= 1.1.2)
-      mixlib-log (>= 1.3.0)
-      mixlib-shellout
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    erubis (2.7.0)
-    excon (0.25.3)
-    fog (1.15.0)
-      builder
-      excon (~> 0.25.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
-    formatador (0.2.4)
-    hashie (2.0.5)
-    highline (1.6.19)
-    ipaddress (0.8.0)
-    json (1.7.7)
-    mime-types (1.25)
-    mini_portile (0.5.1)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.3.0)
-    mixlib-config (2.0.0)
-    mixlib-log (1.6.0)
-    mixlib-shellout (1.2.0)
-    multi_json (1.8.0)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    ohai (6.18.0)
-      ipaddress
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      mixlib-shellout
-      systemu
-      yajl-ruby
-    redis (3.0.5)
-    redis-objects (0.7.0)
-      redis (>= 3.0.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    ruby-hmac (0.4.0)
-    systemu (2.5.2)
-    yajl-ruby (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  knife-cloudformation!