cfn-toml 1.0.4 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae9bc1c1b290518289f35114d0bcb93699f1b36c782efe0bcf5774d562e75a00
-  data.tar.gz: b37be42117520546fcf181d85dbb245420a49f8f9ce9d709d20c4519084f8e58
+  metadata.gz: 35b41b356e026ef8b7597a74a5dc56a3ae1eeb45e5fb222500eb7d0d9846a6b4
+  data.tar.gz: 1b58334686de2ed7c1b25c5a9cd79db33f484ef00d37828ef9720e0a15be8727
 SHA512:
-  metadata.gz: 40a1f5c6b1569b58e360bfba8e06df90549f852f32205af9ba14d4a6b587d2a2c0df343d3baf1b56db9c571264eec1cad0c3deb4b560ade655509f0fd8994bc2
-  data.tar.gz: a86cd3a80aee41f5f74fca6db84995cf49de56978cca04160beeb13956c8b9cdaca525ba1eb02a7cd19783c4e89c5d92510acd2e636ae33b25e02790d938945a
+  metadata.gz: 2bd730055d08800f0ef9e927bfcd3751b2837688428e28a45dfb7d84ab088cdee05c7cad3f2e7c8a1e18929afda4622726b91386bf7b8094cc3291d00b319b0d
+  data.tar.gz: dfbf00132a62886dac073e01c7cffc2be21b9fcad0093fe6c21676dc04512d3eca0a00c3495e7419ff9dbb2a4dff1034fc64e654d7aff9c331d8efa8efd66c30

data/bin/cfn-toml

@@ -3,7 +3,6 @@ $LOAD_PATH << File.expand_path('lib')
 
 require 'optparse'
 require 'cfn_toml'
-require 'pry'
 require 'pathname'
 
 def show_version
@@ -15,9 +14,10 @@ def show_help
   puts <<~HELP
     Usage: cfn-toml [options]
     Options:
-     -t,    --toml   path to toml file
+     -t,    --toml  path to toml file
      -p,    --profile profile name (only used with cfn-toml init)
-     -v,    --version   show version
+     -f,    --cloudformation-template populate toml parameters (only used with cfn-toml init)
+     -v,    --version show version
 
     Initialize:
      cfn-toml init mystack --profile myprofile
@@ -26,7 +26,7 @@ def show_help
      REGION=$(cfn-toml key deploy.region)
      PARAMETERS=$(cfn-toml params v1)
      OVERRIDE_PARAMETERS=$(cfn-toml params v2)
-     BUCKET=$(cfn-toml key bucket --tom /path/to/conf.prod.toml)
+     BUCKET=$(cfn-toml key bucket --toml /path/to/conf.prod.toml)
   HELP
   exit 0
 end
@@ -42,6 +42,10 @@ parser = OptionParser.new do|opts|
     options[:profile] = name
   end
 
+  opts.on('-f PATH', '--cloudformation-template PATH') do |path|
+    options[:cfn_filepath] = path
+  end
+
   opts.on('-h', '--help') do
     show_help
   end
@@ -59,6 +63,16 @@ begin
   options[:toml_filepath] = File.expand_path options[:toml_filepath]
   options[:profile] ||= 'default'
 
+  if options[:cfn_filepath].nil?
+    if File.exists?(File.expand_path('template.yaml'))
+      options[:cfn_filepath] = "template.yaml"
+    elsif File.exists?(File.expand_path('template.yml'))
+      options[:cfn_filepath] = "template.yml"
+    end
+    options[:cfn_filepath] ||= "template.yaml"
+  end
+  options[:cfn_filepath] = File.expand_path options[:cfn_filepath]
+
   if arg1 == 'key'
     result = CfnToml.key options[:toml_filepath], arg2
     STDOUT.puts result
@@ -70,7 +84,7 @@ begin
     # arg3 - profile
     stackname = nil
     stackname = arg2 if !arg2.nil? || !arg2 == ''
-    CfnToml.init options[:toml_filepath], arg2, options[:profile]
+    CfnToml.init options[:toml_filepath], options[:cfn_filepath], arg2, options[:profile]
     STDOUT.puts options[:toml_filepath]
   end
 

data/lib/cfn_toml/version.rb

@@ -1,3 +1,3 @@
 module CfnToml
-  VERSION = '1.0.4'
+  VERSION = '1.0.7'
 end

data/lib/cfn_toml.rb

@@ -1,10 +1,11 @@
 require 'toml-rb'
 require 'fileutils'
+require 'yaml'
 
 module CfnToml
-  def self.init toml_filepath, stackname, profile
+  def self.init toml_filepath, cfn_filepath, stackname, profile
     region = `aws configure get region --profile #{profile}`
-    region ||= 'us-east-1'
+    region = 'us-east-1' if region.nil? || region == ''
     stackname ||= 'stackname'
 
     toml_path = File.dirname toml_filepath
@@ -16,6 +17,28 @@ module CfnToml
       f.write "stack_name = '#{stackname}'\n"
       f.write "region = '#{region.chomp}'\n\n"
       f.write "[parameters]\n"
+      self.init_parameters f, cfn_filepath
+    end
+  end
+
+  def self.init_parameters f, cfn_filepath
+    return unless File.exists?(cfn_filepath)
+    contents = File.open(cfn_filepath).read
+    hash = YAML.load(contents)
+    return unless hash.key?('Parameters')
+
+    hash['Parameters'].each do |name, values|
+      if values.key?('Description')
+        lines = values['Description'].split("\n")
+        lines.each do |line|
+          f.write "# #{line} \n"
+        end
+      end
+      if values.key?('Default')
+        f.write "##{name} = '#{values['Default']}' # #{values['Type']}\n"
+      else
+        f.write "#{name} = '' # #{values['Type']}\n"
+      end
     end
   end
 
@@ -25,14 +48,14 @@ module CfnToml
     data[namespace][key]
   end
 
-  def self.params toml_filepath, params_version
+  def self.params toml_filepath, params_version, parameters_name='parameters'
     data = TomlRB.load_file(toml_filepath)
     if params_version == 'v1'
-      data['parameters'].map do |k,v|
+      data[parameters_name].map do |k,v|
         "ParameterKey=#{k},ParameterValue=#{v}"
       end.join(' ')
     elsif params_version == 'v2'
-      data['parameters'].map do |k,v|
+      data[parameters_name].map do |k,v|
         "#{k}=#{v}"
       end.join(' ')
     end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cfn-toml
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.7
 platform: ruby
 authors:
 - Andrew Brown
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: toml-rb
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +54,7 @@ homepage: https://github.com/teacherseat/cfn-toml
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,8 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Configuration file parsing for CFN Bash scripting
 test_files: []