covalence 0.9.4 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e582e052d83a662baeed4667865ec554342ec1f9577f8a64dc5f6aa392ba4fd7
-  data.tar.gz: 1d7322252f3bda71c44da746ef0e7b287d2bf8f22dd1f175097ead702ca56e5f
+  metadata.gz: a1b7249a87a530a5f4fe459276b5a19a91a81ffc3c89dbae36ea04701c1b44d7
+  data.tar.gz: 280e25c48b7c45c91081f272c432ff10314f5b45b8437edf690abd6b068dd99b
 SHA512:
-  metadata.gz: 7a67fb51176b299bf7ccf58683d4d1a9f33c1bc7c10c3b388e7c72103bbe40582b902b74c3d0419a262a80cfb1f37993792efafd4b3bb24fc2bf3a13ef17f5d1
-  data.tar.gz: dbb26cb3f24ac7df90ff6068cb0121c0e03dadf8f0be530d160844e26b76608a07806790b56484169195fb503782e6c2b006e2da4ece79594b739527eea1a8a1
+  metadata.gz: 430b7d77796d29c5f12e6210176b9085eb09e99d668d0d8568d9c7a07e862ee3696eabe48613ecb6e789f33a9b3a3af7a33d0614dd4cbc2e050bcc898faf502c
+  data.tar.gz: 7458eb37454bff3aee3f73fae29df261e6e5e2f0390c6177aad9e9509166d3875bda84a6501757f83f1b024ee5cde8b0e54d6d2d5093b8f5da17e8afd20dea01

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 0.9.9 (Sept 10, 2020)
+IMPROVEMENTS:
+- Updated all gems to the latest in the Gemfile.lock.
+
+## 0.9.8 (Jun 10, 2020)
+IMPROVEMENTS:
+- Updated all gems to the latest in the Gemfile.lock.
+
+BACKWARDS INCOMPATIBILITIES:
+- Issue [#90](https://github.com/unifio/covalence/issues/90) Removed prefixout dependency from covalence. Directory prefix will no longer be displayed in output. Directory is already output prior to execution.
+
+FIXES:
+- [activesupport](https://github.com/advisories/GHSA-2p68-f74v-9wc6) upgraded activesupport to version 5.2.4.3 or later.
+- [nokogiri](https://github.com/advisories/GHSA-7553-jr98-vx47) Upgrade nokogiri to version 1.10.8 or later.
+
+## 0.9.7 (Sep 14, 2019)
+
+IMPROVEMENTS:
+- Issue [#88](https://github.com/unifio/covalence/issues/88) Add input processing to packer stacks. Allows for shell interpolation processing on inputs for packer stacks.
+- Can use the shell interpolation in the template to generate AWS assume role temporary keys to populate template. This allows for role assumption since role assumption is not supported from `~/.aws/config` attributes.
+
+## 0.9.6 (Sep 9, 2019)
+
+IMPROVEMENTS:
+- Issue [#86](https://github.com/unifio/covalence/issues/86) Add ability to export stacks to a stack_exports directory.
+
+
 ## 0.9.4 (Aug 30, 2019)
 
 FIXES:

data/README.md

@@ -106,7 +106,6 @@ $ bin/covalence spec
 ```
 
 To run the Rspec test locally without container, you will need to install the following:
-* prefixout -- https://github.com/WhistleLabs/prefixout
 * sops -- https://github.com/mozilla/sops
 
 ### UAT
@@ -502,7 +501,6 @@ You will probably need the following packages installed locally
 - Terraform
 - Packer
 - Sops
-- [prefixout](https://github.com/unifio/prefixout/releases)
 
 Execute the following to build the gem:
 

data/lib/covalence.rb

@@ -17,6 +17,7 @@ module Covalence
   # TODO: could use better naming
   PACKER = File.absolute_path(File.join(WORKSPACE, (ENV['COVALENCE_PACKER_DIR'] || '.')))
   TERRAFORM =  File.absolute_path(File.join(WORKSPACE, (ENV['COVALENCE_TERRAFORM_DIR'] || '.')))
+  STACK_EXPORT =  File.absolute_path(File.join(WORKSPACE, (ENV['COVALENCE_STACK_EXPORT_DIR'] || './stack-exports')))
   TEST_ENVS = (ENV['COVALENCE_TEST_ENVS'] || "").split(',')
   # Reserved namespace including default ci and spec
   RESERVED_NS = [(ENV['COVALENCE_RESERVED_NAMESPACE'] || "").split(','), 'ci', 'spec', 'sops']

data/lib/covalence/core/cli_wrappers/popen_wrapper.rb

@@ -77,9 +77,7 @@ module Covalence
         # so when the parent dies, child will know to terminate itself.
         Signal.trap("INT") { logger.info "Trapped Ctrl-c. Disable parent process from exiting, orphaning the child fork below which may or may not work" }
         wait_thread = nil
-        prefix=path.gsub(/^\/workspace*/,'')
-        whole_cmd=['prefixout', '-p', "#{prefix} ", '--'].concat(run_cmd.split)
-        Open3.popen3(env, *whole_cmd, :chdir=>workdir) do |stdin, stdout, stderr, wait_thr|
+        Open3.popen3(env, *run_cmd, :chdir=>workdir) do |stdin, stdout, stderr, wait_thr|
           mappings = { stdin_io => stdin, stdout => stdout_io, stderr => stderr_io }
           wait_thread = wait_thr
 

data/lib/covalence/core/entities/input.rb

@@ -28,6 +28,10 @@ module Covalence
       "#{name} = #{parse_input(value())}"
     end
 
+    def to_command_hash_elements
+       return name, parse_input(value()).delete_prefix('"').delete_suffix('"')
+    end
+
     private
 
     def get_value(input)

data/lib/covalence/core/entities/stack.rb

@@ -51,19 +51,19 @@ module Covalence
         File.open("#{path}/covalence-inputs.tfvars",'w') {|f| f.write(config)}
       elsif type == "packer"
         config = Hash.new
-        inputs.each do |name, input|
-          config[name] = input.value
+        inputs.values.map(&:to_command_hash_elements).each do |name, input|
+          config["#{name}"] = input
         end
         config_json = JSON.generate(config)
-        logger.info "\nStack inputs:\n\n#{config_json}"
-        File.open('covalence-inputs.json','w') {|f| f.write(config_json)}
+        logger.info "path: #{path} module_path: #{module_path}\nStack inputs:\n\n#{config_json}"
+        File.open("#{path}/covalence-inputs.json",'w') {|f| f.write(config_json)}
       end
     end
 
-    def materialize_state_inputs(store: state_stores.first)
+    def materialize_state_inputs(store: state_stores.first, path: '.')
       config = store.get_config
       logger.info "\nState store configuration:\n\n#{config}"
-      File.open('covalence-state.tf','w') {|f| f.write(config)}
+      File.open("#{path}/covalence-state.tf",'w') {|f| f.write(config)}
     end
 
     def logger

data/lib/covalence/core/services/packer_stack_tasks.rb

@@ -62,6 +62,14 @@ module Covalence
       end
     end
 
+    # :reek:TooManyStatements
+    def packer_stack_export()
+        packer_stack_export_init(File.expand_path(File.join(Covalence::STACK_EXPORT,'packer',stack.full_name))).each do |stackdir|
+          populate_workspace(stackdir)
+          stack.materialize_cmd_inputs(stackdir)
+          logger.info "Exported to #{stackdir}:"
+        end
+    end
     private
     attr_reader :template_path, :stack
 
@@ -97,6 +105,23 @@ module Covalence
       args.flatten.compact.reject(&:empty?).map(&:strip)
     end
 
+    # :reek:BooleanParameter
+    def packer_stack_export_init(stackdir, dry_run: false, verbose: true)
+      if(File.exist?(stackdir))
+        logger.info "Deleting before export: #{stackdir}"
+        FileUtils.rm_rf(stackdir, {
+          noop: dry_run,
+          verbose: verbose,
+          secure: true,
+        })
+      end
+      logger.info "Creating stack directory: #{stackdir}"
+      FileUtils.mkdir_p(stackdir, {
+        noop: dry_run,
+        verbose: verbose,
+      })
+    end
+
     def logger
       Covalence::LOGGER
     end

data/lib/covalence/core/services/terraform_stack_tasks.rb

@@ -44,6 +44,18 @@ module Covalence
       end
     end
 
+    # :reek:TooManyStatements
+    def stack_export
+        stack_export_init(File.expand_path(File.join(Covalence::STACK_EXPORT,'terraform',stack.full_name))).each do |stackdir|
+          populate_workspace(stackdir)
+          stack.materialize_state_inputs(path: stackdir)
+          TerraformCli.terraform_get(path=@path, workdir=stackdir)
+          TerraformCli.terraform_init(path: @path, workdir: stackdir)
+          stack.materialize_cmd_inputs(stackdir)
+          logger.info "Exported to #{stackdir}:"
+        end
+    end
+
     # :reek:TooManyStatements
     def stack_verify(tmpdir)
       return false if  !TerraformCli.terraform_check_style(@path)
@@ -229,6 +241,23 @@ module Covalence
       end
     end
 
+    # :reek:BooleanParameter
+    def stack_export_init(stackdir, dry_run: false, verbose: true)
+      if(File.exist?(stackdir))
+        logger.info "Deleting before export: #{stackdir}"
+        FileUtils.rm_rf(stackdir, {
+          noop: dry_run,
+          verbose: verbose,
+          secure: true,
+        })
+      end
+      logger.info "Creating stack directory: #{stackdir}"
+      FileUtils.mkdir_p(stackdir, {
+        noop: dry_run,
+        verbose: verbose,
+      })
+    end
+
     def logger
       Covalence::LOGGER
     end

data/lib/covalence/environment_tasks.rb

@@ -126,6 +126,12 @@ module Covalence
         custom_opts = Slop.parse(get_runtime_args, { suppress_errors: true, banner: false })
         packer_tasks.context_validate(target_args, custom_opts.args)
       end
+
+      desc "Export the #{stack_name} stack of the #{environment_name} environment to #{Covalence::STACK_EXPORT}/packer"
+      task generate_rake_taskname(environment_name, stack_name, "packer_stack_export") do
+        packer_tasks.packer_stack_export()
+      end
+
     end
 
     # :reek:TooManyStatements
@@ -164,6 +170,12 @@ module Covalence
       task generate_rake_taskname(environment_name, stack_name, "shell") do
         tf_tasks.stack_shell
       end
+
+      desc "Export the #{stack_name} stack of the #{environment_name} environment to #{Covalence::STACK_EXPORT}/terraform"
+      task generate_rake_taskname(environment_name, stack_name, "stack_export") do
+        tf_tasks.stack_export
+      end
+
     end
 
     # :reek:TooManyStatements

data/lib/covalence/version.rb

@@ -1,3 +1,3 @@
 module Covalence
-  VERSION = "0.9.4"
+  VERSION = "0.9.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: covalence
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.9
 platform: ruby
 authors:
 - Unif.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -42,16 +42,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.5
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement