TerraformDevKit 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae1d983c3f18052eecb5a5ce8d8261b45dc66641
-  data.tar.gz: eee21e25fd6086288c9ead20c0315165a5e50fd9
+  metadata.gz: 83160b993699651ff3704a83514b066c05c40ecd
+  data.tar.gz: fc6ff392be1d7ff059c3a65a7668b77940259d8d
 SHA512:
-  metadata.gz: 8acdc4279b72712cccd97753506d6f18d8f0524a5b86355970c7b5e7440a1ff7cbfc945799668b04afc7ad239b0070835dac0cbfa0819abeb9095b82b5af60b0
-  data.tar.gz: c5c73635e8e48c4c053cee9a897d699c6775e0d08962326763f735cbb815f6b4013b1524289e780ae625dfd25e4f77b09d3847fdccb81a43f9204df1ca0c45a3
+  metadata.gz: 7530cce40200f4e8ba2bc2dc725127557e720873e158ab055f9dbf53fefc1f862bfd9eabd8c41d6c524f9505c52e1d74c94b3e8a4faf2707a6c87a485c169641
+  data.tar.gz: 7e34bb9aa5448e9ff903ae66b00366f9dbe2cfef40931352dba80a705cba89151942444ed86369ff0fe0513ea6c462a7ac15d7d212bb6b937e2c7eb7dff45363

data/README.md

@@ -205,6 +205,19 @@ template-dirs:
   another-template-dest-folder: yet-another-template-src-folder
 ```
 
+### Copying Files to the Environment Folder
+
+Sometimes it may be desirable to copy files that exist in a given folder into the environment folder. The `copy-files` field makes this possible. See the following configuration for an example:
+
+```yaml
+terraform-version: 0.11.0
+project-name: my super cool project
+copy-files:
+  dest-folder: ../src-folder
+  another-dest-folder: ../../another-src-folder
+  dest-file: src-file
+```
+
 ### Updating Modules
 
 Terraform will get the necessary modules every time a new environment is created. Once the modules are cached, there is generally no need to keep updating the modules each time Terraform is executed. When using a module repository it is possible to select a specific version to use (as shown [here](https://www.terraform.io/docs/modules/sources.html#ref)). In such a case, Terraform will automatically update the modules whenever the version number is changed.

data/lib/TerraformDevKit.rb

@@ -15,7 +15,7 @@ require 'TerraformDevKit/terraform_config_manager'
 require 'TerraformDevKit/terraform_env_manager'
 require 'TerraformDevKit/terraform_installer'
 require 'TerraformDevKit/terraform_log_filter'
-require 'TerraformDevKit/terraform_project_config'
-require 'TerraformDevKit/terraform_template_config_file'
+require 'TerraformDevKit/project_config'
+require 'TerraformDevKit/template_config_file'
 require 'TerraformDevKit/url'
 require 'TerraformDevKit/version'

data/lib/TerraformDevKit/command.rb

@@ -1,26 +1,31 @@
 require 'open3'
 
+require 'TerraformDevKit/errors/command_error'
+
 module TerraformDevKit
   class Command
     def self.run(cmd, directory: Dir.pwd, print_output: true)
-      Open3.popen2e(cmd, chdir: directory) do |_, stdout_and_stderr, thread|
-        output = process_output(stdout_and_stderr, print_output)
-
-        thread.join
-        raise "Error running command #{cmd}" unless thread.value.success?
-        return output
+      out = IO.popen(cmd, err: %i[child out], chdir: directory) do |io|
+        begin
+          out = ''
+          loop do
+            chunk = io.readpartial(4096)
+            print chunk if print_output
+            out += chunk
+          end
+        rescue EOFError; end
+        out
       end
+
+      out = process_output(out)
+      $?.exitstatus.zero? || (raise CommandError.new(cmd, out))
+      out
     end
 
     private_class_method
-    def self.process_output(stream, print_output)
-      lines = []
-
-      until (line = stream.gets).nil?
-        print line if print_output
-        lines << line.strip
-      end
-      lines
+    def self.process_output(out)
+      out.split("\n")
+        .map { |line| line.tr("\r\n", '') }
     end
   end
 end

data/lib/TerraformDevKit/errors/command_error.rb

@@ -0,0 +1,14 @@
+require 'json'
+
+module TerraformDevKit
+  class CommandError < StandardError
+    attr_reader :cmd
+    attr_reader :output
+
+    def initialize(cmd, output)
+      @cmd = cmd
+      @output = output
+      super(JSON.generate({ cmd: @cmd, output: @output.join("\n") }))
+    end
+  end
+end

data/lib/TerraformDevKit/extended_file_utils.rb

@@ -3,6 +3,13 @@ require 'TerraformDevKit/command'
 require 'TerraformDevKit/os'
 
 module TerraformDevKit::ExtendedFileUtils
+  def self.copy(files, dest_base_path)
+    files.to_h.each do |dest, src|
+      dest = File.join(dest_base_path, dest)
+      FileUtils.copy_entry(src, dest)
+    end
+  end
+
   def self.rm_rf(list, options = {})
     if TerraformDevKit::OS.host_os == 'windows'
       windows_path = TerraformDevKit::OS.convert_to_local_path(list)

data/lib/TerraformDevKit/{terraform_project_config.rb → project_config.rb}

@@ -1,5 +1,5 @@
 module TerraformDevKit
-  class TerraformProjectConfig
+  class ProjectConfig
     attr_reader :name, :acronym
 
     def initialize(project_name, project_acronym = nil)

data/lib/TerraformDevKit/{terraform_template_config_file.rb → template_config_file.rb}

@@ -1,7 +1,7 @@
 require 'mustache'
 
 module TerraformDevKit
-  class TerraformTemplateConfigFile
+  class TemplateConfigFile
     def initialize(content, project, env, aws_config, extra_vars: {})
       @content = content
       @project = project

data/lib/TerraformDevKit/{terraform_template_renderer.rb → template_renderer.rb}

@@ -1,8 +1,8 @@
 require 'fileutils'
-require 'TerraformDevKit/terraform_template_config_file'
+require 'TerraformDevKit/template_config_file'
 
 module TerraformDevKit
-  class TerraformTemplateRenderer
+  class TemplateRenderer
     def initialize(env, project, extra_vars_proc = nil)
       @env = env
       @project = project
@@ -10,8 +10,8 @@ module TerraformDevKit
     end
 
     def render_files
-      template_dirs = Configuration.get('template-dirs')
       render_files_into_path(Dir['*.mustache'])
+      template_dirs = Configuration.get('template-dirs')
       template_dirs.to_h.each do |dest, src|
         render_files_into_path(Dir[File.join(src, '*.mustache')], dest)
       end
@@ -22,7 +22,7 @@ module TerraformDevKit
     def render_files_into_path(file_list, dest_path = '.')
       aws_config = Configuration.get('aws')
       file_list.each do |fname|
-        template_file = TerraformTemplateConfigFile.new(
+        template_file = TemplateConfigFile.new(
           File.read(fname),
           @project,
           @env,

data/lib/TerraformDevKit/terraform_config_manager.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
-require 'TerraformDevKit/terraform_template_renderer'
+require 'TerraformDevKit/extended_file_utils'
+require 'TerraformDevKit/template_renderer'
 
 module TerraformDevKit
   class TerraformConfigManager
@@ -10,7 +11,8 @@ module TerraformDevKit
     def self.setup(env, project)
       fix_configuration(env)
       create_environment_directory(env)
-      TerraformTemplateRenderer
+      copy_files(env)
+      TemplateRenderer
         .new(env, project, @extra_vars_proc)
         .render_files
     end
@@ -40,6 +42,11 @@ module TerraformDevKit
       FileUtils.makedirs(env.working_dir)
     end
 
+    private_class_method
+    def self.copy_files(env)
+      ExtendedFileUtils.copy(Configuration.get('copy-files'), env.working_dir)
+    end
+
     private_class_method
     def self.request_profile(env)
       puts "Environment #{env.name} requires manual input of AWS credentials"

data/lib/TerraformDevKit/version.rb

@@ -1,3 +1,3 @@
 module TerraformDevKit
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.5'.freeze
 end

data/tasks/devkit.rake

@@ -66,7 +66,7 @@ task :prepare, [:env] do |_, args|
     directory: BIN_PATH
   )
 
-  project_config = TDK::TerraformProjectConfig.new(
+  project_config = TDK::ProjectConfig.new(
     TDK::Configuration.get('project-name'),
     TDK::Configuration.get('project-acronym')
   )
@@ -176,7 +176,7 @@ task :destroy, [:env] => :prepare do |task, args|
   invoke('pre_destroy', task, args.env, safe_invoke: true)
 
   unless env.local_backend?
-    project_config = TDK::TerraformProjectConfig.new(
+    project_config = TDK::ProjectConfig.new(
       TDK::Configuration.get('project-name'),
       TDK::Configuration.get('project-acronym')
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TerraformDevKit
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Victor Jimenez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -195,17 +195,18 @@ files:
 - lib/TerraformDevKit/config.rb
 - lib/TerraformDevKit/download.rb
 - lib/TerraformDevKit/environment.rb
+- lib/TerraformDevKit/errors/command_error.rb
 - lib/TerraformDevKit/extended_file_utils.rb
 - lib/TerraformDevKit/os.rb
+- lib/TerraformDevKit/project_config.rb
 - lib/TerraformDevKit/request.rb
 - lib/TerraformDevKit/retry.rb
+- lib/TerraformDevKit/template_config_file.rb
+- lib/TerraformDevKit/template_renderer.rb
 - lib/TerraformDevKit/terraform_config_manager.rb
 - lib/TerraformDevKit/terraform_env_manager.rb
 - lib/TerraformDevKit/terraform_installer.rb
 - lib/TerraformDevKit/terraform_log_filter.rb
-- lib/TerraformDevKit/terraform_project_config.rb
-- lib/TerraformDevKit/terraform_template_config_file.rb
-- lib/TerraformDevKit/terraform_template_renderer.rb
 - lib/TerraformDevKit/url.rb
 - lib/TerraformDevKit/version.rb
 - lib/TerraformDevKit/zip_file_generator.rb