TerraformDevKit 0.3.3 → 0.3.4

data/lib/TerraformDevKit/aws/terraform_remote_state.rb

@@ -1,67 +1,67 @@
-require 'aws-sdk-dynamodb'
-require 'aws-sdk-s3'
-
-module TerraformDevKit
-  module Aws
-    class TerraformRemoteState
-      ATTRIBUTES = [
-          {
-            attribute_name: 'LockID',
-            attribute_type: 'S'
-          }
-        ]
-      KEYS = [
-          {
-            attribute_name: 'LockID',
-            key_type: 'HASH'
-          }
-        ]
-
-      def initialize(dynamodb, s3)
-        @dynamodb = dynamodb
-        @s3 = s3
-      end
-
-      def init(environment, project)
-        table_name = table_name(environment, project)
-        return if lock_table_exists_and_is_active(table_name)
-
-        @dynamodb.create_table(table_name, ATTRIBUTES, KEYS, 1, 1)
-
-        begin
-          @s3.create_bucket(state_bucket_name(environment, project))
-        rescue ::Aws::S3::Errors::BucketAlreadyOwnedByYou
-          return
-        end
-
-        sleep(0.2) until lock_table_exists_and_is_active(table_name)
-      end
-
-      def destroy(environment, project)
-        table_name = table_name(environment, project)
-
-        @dynamodb.delete_table(table_name)
-        @s3.delete_bucket(state_bucket_name(environment, project))
-      end
-
-      private_class_method
-      def lock_table_exists_and_is_active(table_name)
-        begin
-          return @dynamodb.get_table_status(table_name) == 'ACTIVE'
-        rescue ::Aws::DynamoDB::Errors::ResourceNotFoundException
-          return false
-        end
-      end
-
-      private_class_method
-      def table_name(environment, project)
-        "#{project.acronym}-#{environment.name}-lock-table"
-      end
-
-      private_class_method
-      def state_bucket_name(environment, project)
-        "#{project.name}-#{environment.name}-state"
-      end
-    end
-  end
-end
+require 'aws-sdk-dynamodb'
+require 'aws-sdk-s3'
+
+module TerraformDevKit
+  module Aws
+    class TerraformRemoteState
+      ATTRIBUTES = [
+          {
+            attribute_name: 'LockID',
+            attribute_type: 'S'
+          }
+        ]
+      KEYS = [
+          {
+            attribute_name: 'LockID',
+            key_type: 'HASH'
+          }
+        ]
+
+      def initialize(dynamodb, s3)
+        @dynamodb = dynamodb
+        @s3 = s3
+      end
+
+      def init(environment, project)
+        table_name = table_name(environment, project)
+        return if lock_table_exists_and_is_active(table_name)
+
+        @dynamodb.create_table(table_name, ATTRIBUTES, KEYS, 1, 1)
+
+        begin
+          @s3.create_bucket(state_bucket_name(environment, project))
+        rescue ::Aws::S3::Errors::BucketAlreadyOwnedByYou
+          return
+        end
+
+        sleep(0.2) until lock_table_exists_and_is_active(table_name)
+      end
+
+      def destroy(environment, project)
+        table_name = table_name(environment, project)
+
+        @dynamodb.delete_table(table_name)
+        @s3.delete_bucket(state_bucket_name(environment, project))
+      end
+
+      private_class_method
+      def lock_table_exists_and_is_active(table_name)
+        begin
+          return @dynamodb.get_table_status(table_name) == 'ACTIVE'
+        rescue ::Aws::DynamoDB::Errors::ResourceNotFoundException
+          return false
+        end
+      end
+
+      private_class_method
+      def table_name(environment, project)
+        "#{project.acronym}-#{environment.name}-lock-table"
+      end
+
+      private_class_method
+      def state_bucket_name(environment, project)
+        "#{project.name}-#{environment.name}-state"
+      end
+    end
+  end
+end

data/lib/TerraformDevKit/backup_state.rb

@@ -1,18 +1,18 @@
-require 'fileutils'
-
-require_relative 'zip_file_generator'
-
-module TerraformDevKit
-  class BackupState
-    def self.backup(prefix)
-      backup_path = ENV['TM_STATE_BACKUP_PATH']
-      return if backup_path.nil?
-
-      filename = "#{prefix}failure_state.zip"
-      ZipFileGenerator.new('.', filename).write
-
-      FileUtils.cp(filename, backup_path)
-      puts "Copied state to #{File.join(backup_path, filename)}"
-    end
-  end
-end
+require 'fileutils'
+
+require_relative 'zip_file_generator'
+
+module TerraformDevKit
+  class BackupState
+    def self.backup(prefix)
+      backup_path = ENV['TM_STATE_BACKUP_PATH']
+      return if backup_path.nil?
+
+      filename = "#{prefix}failure_state.zip"
+      ZipFileGenerator.new('.', filename).write
+
+      FileUtils.cp(filename, backup_path)
+      puts "Copied state to #{File.join(backup_path, filename)}"
+    end
+  end
+end

data/lib/TerraformDevKit/environment.rb

@@ -30,6 +30,7 @@ module TerraformDevKit
     end
 
     def working_dir
+      # TODO: get rid of ROOT_PATH
       File.join(ROOT_PATH, 'envs', @name)
     end
 

data/lib/TerraformDevKit/extended_file_utils.rb

@@ -1,14 +1,14 @@
-require 'fileutils'
-require 'TerraformDevKit/command'
-require 'TerraformDevKit/os'
-
-module TerraformDevKit::ExtendedFileUtils
-  def self.rm_rf(list, options = {})
-    if TerraformDevKit::OS.host_os == 'windows'
-      windows_path = TerraformDevKit::OS.convert_to_local_path(list)
-      TerraformDevKit::Command.run("rmdir /s/q \"#{windows_path}\"")
-    else
-      FileUtils.rm_rf(list, options)
-    end
-  end
-end
+require 'fileutils'
+require 'TerraformDevKit/command'
+require 'TerraformDevKit/os'
+
+module TerraformDevKit::ExtendedFileUtils
+  def self.rm_rf(list, options = {})
+    if TerraformDevKit::OS.host_os == 'windows'
+      windows_path = TerraformDevKit::OS.convert_to_local_path(list)
+      TerraformDevKit::Command.run("rmdir /s/q \"#{windows_path}\"")
+    else
+      FileUtils.rm_rf(list, options)
+    end
+  end
+end

data/lib/TerraformDevKit/terraform_config_manager.rb

@@ -1,11 +1,8 @@
 require 'fileutils'
-require 'TerraformDevKit/terraform_project_config'
-require 'TerraformDevKit/terraform_template_config_file'
+require 'TerraformDevKit/terraform_template_renderer'
 
 module TerraformDevKit
   class TerraformConfigManager
-    @extra_vars_proc = proc { {} }
-
     def self.register_extra_vars_proc(p)
       @extra_vars_proc = p
     end
@@ -13,7 +10,9 @@ module TerraformDevKit
     def self.setup(env, project)
       fix_configuration(env)
       create_environment_directory(env)
-      render_template_config_files(env, project)
+      TerraformTemplateRenderer
+        .new(env, project, @extra_vars_proc)
+        .render_files
     end
 
     def self.update_modules?
@@ -41,25 +40,6 @@ module TerraformDevKit
       FileUtils.makedirs(env.working_dir)
     end
 
-    private_class_method
-    def self.render_template_config_files(env, project)
-      aws_config = Configuration.get('aws')
-      file_list = Dir['*.tf.mustache'] + Dir['*.tfvars.mustache']
-      file_list.each do |fname|
-        template_file = TerraformTemplateConfigFile.new(
-          File.read(fname),
-          project,
-          env,
-          aws_config,
-          extra_vars: @extra_vars_proc.call(env)
-        )
-        config_fname = File.basename(fname, File.extname(fname))
-        Dir.chdir(env.working_dir) do
-          File.open(config_fname, 'w') { |f| f.write(template_file.render) }
-        end
-      end
-    end
-
     private_class_method
     def self.request_profile(env)
       puts "Environment #{env.name} requires manual input of AWS credentials"

data/lib/TerraformDevKit/terraform_project_config.rb

@@ -1,10 +1,10 @@
-module TerraformDevKit
-  class TerraformProjectConfig
-    attr_reader :name, :acronym
-
-    def initialize(project_name, project_acronym = nil)
-      @name = project_name.tr(' ', '-').downcase
-      @acronym = project_acronym || project_name.scan(/\b[a-z]/i).join.upcase
-    end
-  end
-end
+module TerraformDevKit
+  class TerraformProjectConfig
+    attr_reader :name, :acronym
+
+    def initialize(project_name, project_acronym = nil)
+      @name = project_name.tr(' ', '-').downcase
+      @acronym = project_acronym || project_name.scan(/\b[a-z]/i).join.upcase
+    end
+  end
+end

data/lib/TerraformDevKit/terraform_template_renderer.rb

@@ -0,0 +1,41 @@
+require 'fileutils'
+require 'TerraformDevKit/terraform_template_config_file'
+
+module TerraformDevKit
+  class TerraformTemplateRenderer
+    def initialize(env, project, extra_vars_proc = nil)
+      @env = env
+      @project = project
+      @extra_vars_proc = extra_vars_proc || proc { {} }
+    end
+
+    def render_files
+      template_dirs = Configuration.get('template-dirs')
+      render_files_into_path(Dir['*.mustache'])
+      template_dirs.to_h.each do |dest, src|
+        render_files_into_path(Dir[File.join(src, '*.mustache')], dest)
+      end
+    end
+
+    private
+
+    def render_files_into_path(file_list, dest_path = '.')
+      aws_config = Configuration.get('aws')
+      file_list.each do |fname|
+        template_file = TerraformTemplateConfigFile.new(
+          File.read(fname),
+          @project,
+          @env,
+          aws_config,
+          extra_vars: @extra_vars_proc.call(@env)
+        )
+        config_fname = File.basename(fname, File.extname(fname))
+        Dir.chdir(@env.working_dir) do
+          FileUtils.makedirs(dest_path)
+          config_fname = File.join(dest_path, config_fname)
+          File.open(config_fname, 'w') { |f| f.write(template_file.render) }
+        end
+      end
+    end
+  end
+end

data/lib/TerraformDevKit/version.rb

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

data/lib/TerraformDevKit/zip_file_generator.rb

@@ -1,47 +1,47 @@
-require 'zip'
-
-module TerraformDevKit
-  class ZipFileGenerator
-    def initialize(input_dir, output_file)
-      @input_dir = input_dir
-      @output_file = output_file
-    end
-
-    def write
-      entries = Dir.entries(@input_dir)
-      entries.delete('.')
-      entries.delete('..')
-      Zip::File.open(@output_file, Zip::File::CREATE) do |zipfile|
-        write_entries(entries, '', zipfile)
-      end
-    end
-
-    private
-
-    def write_entries(entries, path, zipfile)
-      entries.each do |e|
-        zip_file_path = path == '' ? e : File.join(path, e)
-        disk_file_path = File.join(@input_dir, zip_file_path)
-        if File.directory?(disk_file_path)
-          write_directory(disk_file_path, zip_file_path, zipfile)
-        else
-          write_file(disk_file_path, zip_file_path, zipfile)
-        end
-      end
-    end
-
-    def write_directory(disk_file_path, zip_file_path, zipfile)
-      zipfile.mkdir(zip_file_path)
-      subdir = Dir.entries(disk_file_path)
-      subdir.delete('.')
-      subdir.delete('..')
-      write_entries(subdir, zip_file_path, zipfile)
-    end
-
-    def write_file(disk_file_path, zip_file_path, zipfile)
-      zipfile.get_output_stream(zip_file_path) do |f|
-        f.puts(File.open(disk_file_path, 'rb').read)
-      end
-    end
-  end
-end
+require 'zip'
+
+module TerraformDevKit
+  class ZipFileGenerator
+    def initialize(input_dir, output_file)
+      @input_dir = input_dir
+      @output_file = output_file
+    end
+
+    def write
+      entries = Dir.entries(@input_dir)
+      entries.delete('.')
+      entries.delete('..')
+      Zip::File.open(@output_file, Zip::File::CREATE) do |zipfile|
+        write_entries(entries, '', zipfile)
+      end
+    end
+
+    private
+
+    def write_entries(entries, path, zipfile)
+      entries.each do |e|
+        zip_file_path = path == '' ? e : File.join(path, e)
+        disk_file_path = File.join(@input_dir, zip_file_path)
+        if File.directory?(disk_file_path)
+          write_directory(disk_file_path, zip_file_path, zipfile)
+        else
+          write_file(disk_file_path, zip_file_path, zipfile)
+        end
+      end
+    end
+
+    def write_directory(disk_file_path, zip_file_path, zipfile)
+      zipfile.mkdir(zip_file_path)
+      subdir = Dir.entries(disk_file_path)
+      subdir.delete('.')
+      subdir.delete('..')
+      write_entries(subdir, zip_file_path, zipfile)
+    end
+
+    def write_file(disk_file_path, zip_file_path, zipfile)
+      zipfile.get_output_stream(zip_file_path) do |f|
+        f.puts(File.open(disk_file_path, 'rb').read)
+      end
+    end
+  end
+end