sfn-parameters 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5dff19c967089f79139776c3e592a178614fb79
-  data.tar.gz: 0ba68820d8c71adc5cc6ab9fad5afaadd4e820b8
+  metadata.gz: d0779acdcc6b50972d76987fa3f32c743fd1e54c
+  data.tar.gz: 6c2a45b9c401f596f24768a4bc9f03898f12bbf0
 SHA512:
-  metadata.gz: 44869723132b17dda13a221830edda6d355efa95930f5ff54b24a78d0a2b851798b84bf47214af65862442533f341ba92885d887e00074af5b645c0f4c08002f
-  data.tar.gz: 4a1b69b524e8f040acb78365746d4c137ff36b4871608ea1654a1ed6a6873879d7b6fe50ef808ad1fa41cecb34cd3df3862760c481b28318418c7dc280417f43
+  metadata.gz: c1361a2e0391db409481f56e83dbb4f36cb8ce5a8a8df94c7f0f219201667fbe702a4e3b225526dda4376dff46f0316f8a5c491a893bb4d0c9928fdb07fa5d30
+  data.tar.gz: 09f3d7c096fd47224e4dbc07e4ae03f44984ed308e049c7a2e22b3dbef232bf7baa67c11c8431fb869437a7df324b5cdb0b6d9f9ced68bb72fac45adc5cf4c1d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.4
+* Include `.json` extension on temp file (#8)
+* Add support for `mappings` (#9)
+* Support defining `template` within parameters file
+* Remove casing modifications
+
 # v0.2.2
 * Provide better UI feedback (#3)
 

data/LICENSE

@@ -1,13 +1,201 @@
-   Copyright 2015 Heavy Water Operations LLC.
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-     http://www.apache.org/licenses/LICENSE-2.0
+1. Definitions.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright 2016 Chris Roberts
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -47,7 +47,9 @@ The basic structure of the file in JSON:
   "parameters": {},
   "compile_parameters": {},
   "apply_stacks": [],
-  "stacks": {}
+  "mappings": {},
+  "stacks": {},
+  "template": "template_name"
 }
 ~~~
 
@@ -56,7 +58,9 @@ Break down of the keys:
 * `parameters` - Run time parameters sent to the orchestration API
 * `compile_parameters` - Compile time parameters used to generate the template
 * `apply_stacks` - List of stacks whose outputs should be applied
+* `mappings` - Hash of [STACK\_\_]old\_key new\_key to remap after apply\_stack
 * `stacks`- Nested stack information
+* `template` - Template name for this stack
 
 #### Infrastructure Mode
 

data/lib/sfn-parameters/command.rb

@@ -97,7 +97,7 @@ module Sfn
           item = new_item(item)
         end
         FileUtils.mkdir_p(File.dirname(item))
-        tmp = Bogo::EphemeralFile.new('sfn-parameters')
+        tmp = Bogo::EphemeralFile.new(['sfn-parameters', '.json'])
         content = new_item ? NEW_ITEM_DEFAULT : load_json(File.read(item)).to_smash
         if(content[:sfn_parameters_lock])
           ui.print ui.color(' *', :bold)
@@ -109,8 +109,7 @@ module Sfn
         tmp.write(format_json(content))
         tmp.flush
         system("#{ENV['EDITOR']} #{tmp.path}")
-        tmp.rewind
-        content = load_json(tmp.read).to_smash
+        content = load_json(File.read(tmp.path)).to_smash
         ui.print ui.color(' *', :bold)
         if(lock_enabled)
           ui.print " Locking #{ui.color(item, :bold)} for storage... "
@@ -191,7 +190,7 @@ module Sfn
             ),
             "#{item}.json"
           )
-        ]
+        ].map{|item| File.expand_path(item) }.uniq
         valid = items.find_all do |file|
           File.exist?(file)
         end

data/lib/sfn-parameters/infrastructure.rb

@@ -18,6 +18,7 @@ module Sfn
         config[:parameters] ||= Smash.new
         config[:compile_parameters] ||= Smash.new
         config[:apply_stack] ||= []
+        config[:apply_mapping] ||= Smash.new
         stack_name = arguments.first
         content = load_file_for(stack_name)
         process_information_hash(content, [])
@@ -52,23 +53,37 @@ module Sfn
       # @param path [Array<String>] stack name hierarchy
       # @return [TrueClass]
       def process_information_hash(hash, path=[])
+        if(path.empty? && hash[:template])
+          config[:file] = hash[:template]
+        end
         hash.fetch(:parameters, {}).each do |key, value|
-          key = [*path, Bogo::Utility.camel(key)].compact.map(&:to_s).join('__')
-          config[:parameters][key] = value
+          key = [*path, key].compact.map(&:to_s).join('__')
+          if(current_value = config[:parameters][key])
+            ui.debug "Not setting template parameter `#{key}`. Already set within config. (`#{current_value}`)"
+          else
+            config[:parameters][key] = value
+          end
         end
         hash.fetch(:compile_parameters, {}).each do |key, value|
-          key = [*path, Bogo::Utility.camel(key)].compact.map(&:to_s).join('__')
-          config[:compile_parameters][key] = value
+          key = [*path, key].compact.map(&:to_s).join('__')
+          if(current_value = config[:compile_parameters][key])
+            ui.debug "Not setting compile time parameter `#{key}`. Already set within config. (`#{current_value}`)"
+          else
+            config[:compile_parameters][key] = value
+          end
         end
         hash.fetch(:stacks, {}).each do |key, value|
-          process_information_hash(value, [*path, Bogo::Utility.camel(key)].compact)
+          process_information_hash(value, [*path, key].compact)
+        end
+        hash.fetch(:mappings, {}).each do |key, value|
+          value = [*path, Bogo::Utility.camel(value)].compact.map(&:to_s).join('__')
+          config[:apply_mapping][key] = value
         end
         hash.fetch(:apply_stacks, []).each do |s_name|
           config[:apply_stack] << s_name
         end
         true
       end
-
     end
   end
 end

data/lib/sfn-parameters/version.rb

@@ -1,3 +1,3 @@
 module SfnParameters
-  VERSION = Gem::Version.new('0.2.2')
+  VERSION = Gem::Version.new('0.2.4')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn-parameters
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfn
@@ -69,9 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SparkleFormation Parameters Callback
 test_files: []
-has_rdoc: