aws-cft-tools 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 153baa62a12a723ecc3749c8e64e04a005f48dd0
-  data.tar.gz: ff49055bd3a98f3262fa9d3e890bf3f9f894ac61
+  metadata.gz: bf914a7a3004e1abd739897b4d1b91b65119c92a
+  data.tar.gz: c84ce2a9eeba3748c36b41833961c1645be38932
 SHA512:
-  metadata.gz: d6ddab54a09a0dfe5bc2a3b5472cbf3cf89c42e1d1bd9780140784a39893ee18861287ad11307373caa6a2887e95f17ad8e5605a00694a595fe4abbec84a1253
-  data.tar.gz: 8332135791348d11749c743e7e9342dee76b56aa1fc2f4dde2e35bc3aa0b31edeb75197d2ff617c9e6c2bc08af6240a2ffd9057e383150b47f259c743b7ff0f5
+  metadata.gz: 211496b26c6170e2c6ab5fab09947c3eecece848e811fe975dcbf0bb0ce0f3603bfe397ad6aa39c7f44a9a63655e407d14a909afc31e416fbf9ba28c45b5e23c
+  data.tar.gz: f9628f83d7e26613dfd8e7af0b513aff118287e0af11afae8436726b946c938101eae7488bb6da19d0d167eb06aa4d426a9e8a8c24eb0b66719539bfa53335c3

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.1.3] - 2018-01-05
+
+### Added
+
+* Support for `AllowedPattern` in the `Environment` template parameter. (Issue #16)
+
+* Support for parameter files to have environment names that resemble regular expressions. If the parameter
+  file doesn't have a key that matches the environment name exactly, then each of the top-level keys in the
+  file will be interpreted as a regular expression and matched against the environment being deployed. The
+  first match wins, so if multiple keys can match, then the result is undefined. (Issue #16)
+
 ## [0.1.2] - 2017-12-22
 
 ### Changed

data/lib/aws_cft_tools/template.rb

@@ -24,10 +24,10 @@ module AwsCftTools
   #
   # === Allowed Environments
   #
-  # The environments in which a template should be deployed is provided by the +AllowedValues+ key of the
-  # +Environment+ template parameter.
+  # The environments in which a template should be deployed is provided by the +AllowedValues+ or the
+  # +AllowedPattern+ key of the +Environment+ template parameter.
   #
-  # @example Allowed Environments
+  # @example Allowed Environments (explicit list)
   #   ---
   #   Parameters:
   #     Environment:
@@ -36,6 +36,12 @@ module AwsCftTools
   #         - Staging
   #         - Production
   #
+  # @example Allowed Environments (implicit pattern)
+  #   ---
+  #   Parameters:
+  #     Environment:
+  #       AllowedPattern: ^(QA|Staging|Production|Dev-.+)$
+  #
   # === Allowed Regions
   #
   # A template can be pinned to a particular region or set of regions by providing a list of values for

data/lib/aws_cft_tools/template/metadata.rb

@@ -114,8 +114,14 @@ module AwsCftTools
       def parameters_for_filename_and_environment!(param_source, env)
         return { Environment: env } unless param_source
 
-        params = YAML.safe_load(process_erb_file(param_source), [], [], true)[env] || {}
-        params.update(Environment: env)
+        params_for_all = YAML.safe_load(process_erb_file(param_source), [], [], true)
+        return params_for_all[env].update('Environment' => env) if params_for_all.key?(env)
+
+        # now check for regex match on keys
+        params_for_all.each do |env_name, params|
+          return params.update('Environment' => env) if Regexp.compile("\\A#{env_name}\\Z").match?(env)
+        end
+        { 'Environment' => env }
       end
 
       def process_erb_file(content)

data/lib/aws_cft_tools/template/properties.rb

@@ -15,8 +15,15 @@ module AwsCftTools
         template.dig('Parameters', 'Environment', 'AllowedValues') || []
       end
 
+      def allowed_environments_regex
+        source = template.dig('Parameters', 'Environment', 'AllowedPattern')
+        Regexp.compile(source) if source
+      end
+
       def environment?(value)
-        allowed_environments.include?(value)
+        return allowed_environments.include?(value) if allowed_environments.any?
+        regex = allowed_environments_regex
+        return regex.match?(value) if regex
       end
 
       ##

data/lib/aws_cft_tools/version.rb

@@ -4,5 +4,5 @@ module AwsCftTools
   ##
   # Version of AwsCftTools.
   #
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cft-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Small Business Administration
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk