terraspace 0.6.1 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16315ba36569198d82f525f079e1416e579a53262f36cc50a3ea0ded4128067e
-  data.tar.gz: 8c3546c371860f3e4f4a6326113fd5c93cd99f0e0c436f771ebe4dcab3a0e523
+  metadata.gz: 3d5645441169b979490b844b27b8a6752b2ddddc05ed058c0b2681e34569a899
+  data.tar.gz: 2ce13fabc90ca45ba8b7ff89b452d2c210e12420b7ffbbc1c54ee5403d484a81
 SHA512:
-  metadata.gz: 64ef2db1ea751561446fcc8b6863ce13975a594d25dd9829e7d4c7eae9ba11288e899bca27cfb007465f96ac5c81077841300892e2d9fb920cc465425e05c8a2
-  data.tar.gz: fd1a9d8da45a996513e43fd139d0826bac58564938df4c2668c28e69a2dc2643cda33fb54d0c272a21e0f735f8d5a558a2af26ac993f9fdd2d8272ea6293f27c
+  metadata.gz: 7230e3a06fba98b04a487f9005c6ab635560ac912f48489e35b78883908f83194cf83f567a71a6d928aba6a72498d9ebc37e56c0fdeb3b9564b2794b0d0c2e2d
+  data.tar.gz: 880d907e3366bf7e5af1cd2e2add2646bb44edaf153ee2742cd2f8fc0c3aeb09aed3105d531da0f9aeaa7cbbedf03ae7376e692fca20ca43cebcdf356bc97414

data/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.6.6] - 2021-04-15
+- [#101](https://github.com/boltops-tools/terraspace/pull/101) terraspace force-unlock command
+- [#102](https://github.com/boltops-tools/terraspace/pull/102) fix terraspace all summarized logging
+- [#103](https://github.com/boltops-tools/terraspace/pull/103) config.build.pass_files with default files use pass strategy
+
+## [0.6.5] - 2021-03-24
+- [#96](https://github.com/boltops-tools/terraspace/pull/96) terraspace fmt: ability to specific module or stack
+
+## [0.6.4] - 2021-03-22
+- [#94](https://github.com/boltops-tools/terraspace/pull/94) terraspace fmt command
+
+## [0.6.3] - 2021-03-12
+- [#91](https://github.com/boltops-tools/terraspace/pull/91) Camelcase
+- [#92](https://github.com/boltops-tools/terraspace/pull/92) disable terraform.plugin_cache by default
+- skip build config/helpers
+
+## [0.6.2] - 2021-03-05
+- [#90](https://github.com/boltops-tools/terraspace/pull/90) Boot hooks: new and improved boot hooks interface
+- remove old config.hooks.on_boot
+
 ## [0.6.1] - 2021-03-04
 - [#89](https://github.com/boltops-tools/terraspace/pull/89) rename option to enable_names.expansion
 

data/lib/terraspace/all/runner.rb

@@ -104,7 +104,7 @@ module Terraspace::All
     def run_terraspace(mod_name)
       set_log_path!(mod_name)
       name = command_map(@command)
-      o = @options.merge(mod: mod_name, yes: true, build: false, input: false)
+      o = @options.merge(mod: mod_name, yes: true, build: false, input: false, log_to_stderr: true)
       o.merge!(quiet: false) if @command == "init" # noisy so can filter and summarize output
       case @command
       when "up"

data/lib/terraspace/app.rb

@@ -27,9 +27,10 @@ module Terraspace
       config.build.cache_dir = ":CACHE_ROOT/:REGION/:ENV/:BUILD_DIR"
       config.build.cache_root = nil # defaults to /full/path/to/.terraspace-cache
       config.build.clean_cache = nil # defaults to /full/path/to/.terraspace-cache
+      config.build.default_pass_files = ["/files/"]
+      config.build.pass_files = []
       config.bundle = ActiveSupport::OrderedOptions.new
       config.bundle.logger = ts_logger
-      config.hooks = Hooks.new
       config.init = ActiveSupport::OrderedOptions.new
       config.init.mode = "auto" # auto, never, always
       config.log = ActiveSupport::OrderedOptions.new
@@ -46,7 +47,7 @@ module Terraspace
       config.terraform = ActiveSupport::OrderedOptions.new
       config.terraform.plugin_cache = ActiveSupport::OrderedOptions.new
       config.terraform.plugin_cache.dir = ENV['TF_PLUGIN_CACHE_DIR'] || "#{Terraspace.tmp_root}/plugin_cache"
-      config.terraform.plugin_cache.enabled = true
+      config.terraform.plugin_cache.enabled = false
       config.terraform.plugin_cache.purge_on_error = true
       config.test_framework = "rspec"
       config.tfc = ActiveSupport::OrderedOptions.new

data/lib/terraspace/booter.rb

@@ -1,10 +1,9 @@
 module Terraspace
   module Booter
     def boot
+      run_hooks
       Terraspace::Bundle.require # load plugins
       load_plugin_default_configs
-      Terraspace.config # load project config
-      Terraspace::App::Hooks.run_hook(:on_boot)
       Terraspace::App::Inits.run_all
       set_plugin_cache!
     end
@@ -24,6 +23,23 @@ module Terraspace
       dir
     end
 
+    # Special boot hooks run super early, even before plugins are loaded.
+    # Useful for setting env vars and other early things.
+    #
+    #    config/boot.rb
+    #    config/boot/dev.rb
+    #
+    def run_hooks
+      run_hook
+      run_hook(Terraspace.env)
+    end
+
+    def run_hook(env=nil)
+      name = env ? "boot/#{env}" : "boot"
+      path = "#{Terraspace.root}/config/#{name}.rb"
+      require path if File.exist?(path)
+    end
+
     extend self
   end
 end

data/lib/terraspace/cli.rb

@@ -27,6 +27,9 @@ module Terraspace
     reconfigure_option = Proc.new {
       option :reconfigure, type: :boolean, desc: "Add terraform -reconfigure option"
     }
+    type_option = Proc.new {
+      option :type, default: "stack", aliases: %w[t], desc: "Type: stack, module, or all"
+    }
 
     desc "all SUBCOMMAND", "all subcommands"
     long_desc Help.text(:all)
@@ -82,6 +85,20 @@ module Terraspace
       Down.new(options.merge(mod: mod)).run
     end
 
+    desc "force_unlock", "Calls terrform force-unlock"
+    long_desc Help.text(:force_unlock)
+    instance_option.call
+    def force_unlock(mod, lock_id)
+      Commander.new("force-unlock", options.merge(mod: mod, lock_id: lock_id)).run
+    end
+
+    desc "fmt", "Run terraform fmt"
+    long_desc Help.text(:fmt)
+    type_option.call
+    def fmt(mod=nil)
+      Fmt.new(options.merge(mod: mod)).run
+    end
+
     desc "info STACK", "Get info about stack."
     long_desc Help.text(:info)
     instance_option.call
@@ -100,7 +117,7 @@ module Terraspace
 
     desc "list", "List stacks and modules."
     long_desc Help.text(:list)
-    option :type, default: "stack", aliases: %w[t], desc: "Type: stack, module, or all"
+    type_option.call
     def list
       List.new(options).run
     end

data/lib/terraspace/cli/concerns/source_dirs.rb

@@ -0,0 +1,13 @@
+module Terraspace::CLI::Concerns
+  module SourceDirs
+    # used by list
+    def source_dirs
+      Dir.glob("{app,vendor}/{modules,stacks}/*").select { |p| File.directory?(p) }.sort
+    end
+
+    # dont include vendor: used by fmt
+    def app_source_dirs
+      Dir.glob("{app}/{modules,stacks}/*").select { |p| File.directory?(p) }.sort
+    end
+  end
+end

data/lib/terraspace/cli/fmt.rb

@@ -0,0 +1,40 @@
+class Terraspace::CLI
+  class Fmt
+    include Concerns::SourceDirs
+    include Terraspace::Util::Logging
+
+    def initialize(options={})
+      @options = options
+      @mod_name = options[:mod]
+    end
+
+    def run
+      logger.info "Formating terraform files"
+      dirs.each do |dir|
+        format(dir)
+      end
+    end
+
+    def format(dir)
+      Runner.new(dir).format!
+    end
+
+  private
+    def dirs
+      if @mod_name
+        type_dirs.select { |p| p.include?(@mod_name) }
+      else
+        type_dirs
+      end
+    end
+
+    def type_dirs
+      type = @options[:type]
+      if type
+        app_source_dirs.select { |p| p.include?("/#{type.pluralize}/") }
+      else
+        app_source_dirs
+      end
+    end
+  end
+end

data/lib/terraspace/cli/fmt/runner.rb

@@ -0,0 +1,64 @@
+class Terraspace::CLI::Fmt
+  class Runner
+    include Terraspace::CLI::Concerns::SourceDirs
+    include Terraspace::Util::Logging
+    SKIP_PATTERN = /\.skip$/
+
+    def initialize(dir)
+      @dir = dir
+    end
+
+    def format!
+      logger.info @dir.color(:green)
+      Dir.chdir(@dir) do
+        skip_rename
+        begin
+          terraform_fmt
+        ensure
+          restore_rename
+        end
+      end
+    end
+
+    def skip_rename
+      tf_files.each do |path|
+        if !skip?(path) && erb?(path)
+          FileUtils.mv(path, "#{path}.skip")
+        end
+      end
+    end
+
+    def terraform_fmt
+      sh "terraform fmt"
+    end
+
+    def sh(command)
+      logger.debug("=> #{command}")
+      success = system(command)
+      return if success
+      logger.info "WARN: There were some errors running terraform fmt for files in #{@dir}:".color(:yellow)
+      logger.info "The errors are shown above"
+    end
+
+    def restore_rename
+      tf_files.each do |path|
+        if skip?(path) && erb?(path)
+          FileUtils.mv(path, path.sub(SKIP_PATTERN, '')) # original name
+        end
+      end
+    end
+
+  private
+    def skip?(path)
+      !!(path =~ SKIP_PATTERN)
+    end
+
+    def erb?(path)
+      IO.readlines(path).detect { |l| l.include?('<%') }
+    end
+
+    def tf_files
+      Dir.glob("#{Terraspace.root}/#{@dir}/**/*.{tf,skip}").select { |p| File.file?(p) }
+    end
+  end
+end

data/lib/terraspace/cli/help/fmt.md

@@ -0,0 +1,22 @@
+## Example
+
+Format all source files.
+
+    $ terraspace fmt
+    Formating terraform files
+    app/modules/example
+    main.tf
+    outputs.tf
+    variables.tf
+    app/stacks/demo
+    main.tf
+
+Format specific module or stack.
+
+    $ terraspace fmt stack1
+    $ terraspace fmt module1
+
+Format scoping to module or stack types. In case there's a module and stack with the same name.
+
+    $ terraspace fmt example -t module
+    $ terraspace fmt demo -t stacke

data/lib/terraspace/cli/help/force_unlock.md

@@ -0,0 +1,7 @@
+## Example
+
+    terraspace force_unlock demo ab7f3469-2a5f-07b9-29c5-dec1537ec8b0
+
+Instance option:
+
+    terraspace force_unlock demo -i 2 ab7f3469-2a5f-07b9-29c5-dec1537ec8b0

data/lib/terraspace/cli/list.rb

@@ -1,13 +1,14 @@
 class Terraspace::CLI
   class List
+    include Concerns::SourceDirs
+
     def initialize(options={})
       @options = options
       @type_dir = normalized_type
     end
 
     def run
-      dirs = Dir.glob("{app,vendor}/{modules,stacks}/*").select { |p| File.directory?(p) }
-      dirs.sort.each do |path|
+      source_dirs.each do |path|
         if @type_dir
           puts path if path.include?("/#{@type_dir}/")
         else

data/lib/terraspace/cli/new/helper.rb

@@ -26,9 +26,9 @@ class Terraspace::CLI::New
 
     def helper_class
       if type == "project"
-        "Terraspace::#{type.camelize}::#{name.camelize}Helper"
+        "Terraspace::#{type.camelcase}::#{name.camelcase}Helper"
       else
-        "Terraspace::#{type.camelize}::#{stack.camelize}::#{name.camelize}Helper"
+        "Terraspace::#{type.camelcase}::#{stack.camelcase}::#{name.camelcase}Helper"
       end
     end
 

data/lib/terraspace/compiler/builder.rb

@@ -74,10 +74,11 @@ module Terraspace::Compiler
     def skip?(src_path)
       return true unless File.file?(src_path)
       # certain folders will be skipped
-      src_path.include?("#{@mod.root}/tfvars") ||
       src_path.include?("#{@mod.root}/config/args") ||
+      src_path.include?("#{@mod.root}/config/helpers") ||
       src_path.include?("#{@mod.root}/config/hooks") ||
-      src_path.include?("#{@mod.root}/test")
+      src_path.include?("#{@mod.root}/test") ||
+      src_path.include?("#{@mod.root}/tfvars")
     end
   end
 end

data/lib/terraspace/compiler/helper_extender.rb

@@ -5,7 +5,7 @@ module Terraspace::Compiler
       full_dir = "#{@mod.root}/config/helpers"
       Dir.glob("#{full_dir}/**/*").each do |path|
         regexp = Regexp.new(".*/helpers/")
-        klass = path.sub(regexp, '').sub('.rb','').camelize
+        klass = path.sub(regexp, '').sub('.rb','').camelcase
         klass = "#{mod_namespace}::#{klass}"
         require path # able to use require instead of load since each helper has unique namespace
         send :extend, klass.constantize
@@ -15,8 +15,8 @@ module Terraspace::Compiler
     # IE: mod_namespace = Terraspace::Module::Demo
     # Use separate namespaces scope with module name so custom helper methods from different modules are isolated.
     def mod_namespace
-      mod_name = @mod.name.camelize
-      ns = "Terraspace::#{@mod.type.camelize}".constantize # IE: Terraspace::Module or Terraspace::Stack
+      mod_name = @mod.name.camelcase
+      ns = "Terraspace::#{@mod.type.camelcase}".constantize # IE: Terraspace::Module or Terraspace::Stack
       if ns.const_defined?(mod_name.to_sym)
         "#{ns}::#{mod_name}".constantize
       else

data/lib/terraspace/compiler/strategy/mod.rb

@@ -1,14 +1,15 @@
 module Terraspace::Compiler::Strategy
   class Mod < AbstractBase
     def run
-      ext = File.extname(@src_path).sub('.','')
-      klass = strategy_class(ext)
+      klass = strategy_class(@src_path)
       strategy = klass.new(@mod, @src_path) # IE: Terraspace::Compiler::Strategy::Mod::Rb.new
       strategy.run
     end
 
-    def strategy_class(ext)
+    def strategy_class(path)
+      ext = File.extname(path).sub('.','')
       return Mod::Pass if ext.empty? # infinite loop without this
+      return Mod::Pass if Terraspace.pass_file?(path)
       "Terraspace::Compiler::Strategy::Mod::#{ext.camelize}".constantize rescue Mod::Pass
     end
   end

data/lib/terraspace/compiler/writer.rb

@@ -10,11 +10,17 @@ module Terraspace::Compiler
     end
 
     def dest_path
-      name = @dest_name || @src_path.sub('.rb','.tf.json')
+      name = get_name
       name = basename(name)
       "#{dest_dir}/#{name}"
     end
 
+    def get_name
+      return @dest_name if @dest_name
+      return @src_path if Terraspace.pass_file?(@src_path)
+      @src_path.sub('.rb','.tf.json')
+    end
+
     def dest_dir
       if @mod.is_a?(Terraspace::Mod::Remote)
         File.dirname(@src_path) # for Mod::Remote src is dest

data/lib/terraspace/core.rb

@@ -51,5 +51,12 @@ module Terraspace
     def logger=(v)
       @@logger = v
     end
+
+    def pass_file?(path)
+      pass_files = config.build.pass_files + config.build.default_pass_files
+      pass_files.uniq.detect do |i|
+        i.is_a?(Regexp) ? path =~ i : path.include?(i)
+      end
+    end
   end
 end

data/lib/terraspace/ext.rb

@@ -1,2 +1,3 @@
 require_relative "ext/bundler"
 require_relative "ext/core/module"
+require_relative "ext/core/string"

data/lib/terraspace/ext/core/string.rb

@@ -0,0 +1,5 @@
+class String
+  def camelcase
+    self.underscore.camelize
+  end
+end

data/lib/terraspace/terraform/args/default.rb

@@ -3,7 +3,7 @@ require "tempfile"
 module Terraspace::Terraform::Args
   class Default
     def initialize(mod, name, options={})
-      @mod, @name, @options = mod, name, options
+      @mod, @name, @options = mod, name.underscore, options
       @quiet = @options[:quiet].nil? ? true : @options[:quiet]
     end
 
@@ -11,14 +11,18 @@ module Terraspace::Terraform::Args
       # https://terraspace.cloud/docs/ci-automation/
       ENV['TF_IN_AUTOMATION'] = '1' if @options[:auto]
 
-      if %w[apply destroy init output plan show].include?(@name)
-        meth = "#{@name}_args"
-        send(meth)
+      args_meth = "#{@name}_args"
+      if respond_to?(args_meth)
+        send(args_meth)
       else
         []
       end
     end
 
+    def force_unlock_args
+      [" -force #{@options[:lock_id]}"]
+    end
+
     def apply_args
       args = auto_approve_arg
       var_files = @options[:var_files]

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.6.1"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -461,7 +461,6 @@ files:
 - lib/terraspace/all/runner.rb
 - lib/terraspace/all/summary.rb
 - lib/terraspace/app.rb
-- lib/terraspace/app/hooks.rb
 - lib/terraspace/app/inits.rb
 - lib/terraspace/autoloader.rb
 - lib/terraspace/booter.rb
@@ -483,7 +482,10 @@ files:
 - lib/terraspace/cli/completer.rb
 - lib/terraspace/cli/completer/script.rb
 - lib/terraspace/cli/completer/script.sh
+- lib/terraspace/cli/concerns/source_dirs.rb
 - lib/terraspace/cli/down.rb
+- lib/terraspace/cli/fmt.rb
+- lib/terraspace/cli/fmt/runner.rb
 - lib/terraspace/cli/help.rb
 - lib/terraspace/cli/help/all/down.md
 - lib/terraspace/cli/help/all/graph.md
@@ -505,6 +507,8 @@ files:
 - lib/terraspace/cli/help/completion_script.md
 - lib/terraspace/cli/help/console.md
 - lib/terraspace/cli/help/down.md
+- lib/terraspace/cli/help/fmt.md
+- lib/terraspace/cli/help/force_unlock.md
 - lib/terraspace/cli/help/info.md
 - lib/terraspace/cli/help/init.md
 - lib/terraspace/cli/help/list.md
@@ -624,6 +628,7 @@ files:
 - lib/terraspace/ext.rb
 - lib/terraspace/ext/bundler.rb
 - lib/terraspace/ext/core/module.rb
+- lib/terraspace/ext/core/string.rb
 - lib/terraspace/hooks/builder.rb
 - lib/terraspace/hooks/concern.rb
 - lib/terraspace/hooks/dsl.rb

data/lib/terraspace/app/hooks.rb

@@ -1,18 +0,0 @@
-class Terraspace::App
-  class Hooks
-    class_attribute :hooks
-    self.hooks = {}
-
-    def on_boot(&block)
-      self.class.hooks[:on_boot] = block
-    end
-
-    class << self
-      def run_hook(name)
-        name = name.to_sym
-        hook = hooks[name]
-        hook.call if hook
-      end
-    end
-  end
-end