terraspace 1.1.7 → 2.0.2

data/lib/terraspace/all/summary.rb

@@ -31,6 +31,7 @@ module Terraspace::All
         line.include?("complete! Resources:") || # success: handles both apply and destroy output
         line.include?("Changes to Outputs") ||
         line.include?("No changes") ||
+        line.include?("Terraspace Cloud ") ||
         line.include?("Error: ")  # error
       end
     end
@@ -53,6 +54,7 @@ module Terraspace::All
         line.include?("Changes to Outputs") ||
         line.include?("Plan:") ||
         line.include?("Changes to ") ||
+        line.include?("Terraspace Cloud ") ||
         line.include?("Error: ")  # error
       end
     end

data/lib/terraspace/app.rb

@@ -36,33 +36,52 @@ module Terraspace
       config.auto_create_backend = true
       config.autodetect = ActiveSupport::OrderedOptions.new
       config.autodetect.expander = nil
+
       config.build = ActiveSupport::OrderedOptions.new
-      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.cache_dir = ":REGION/:APP/:ROLE/:ENV/:BUILD_DIR"
+      config.build.clean_cache = nil # defaults to true
       config.build.default_pass_files = ["/files/"]
       config.build.pass_files = []
+
       config.bundle = ActiveSupport::OrderedOptions.new
       config.bundle.logger = ts_logger
+
+      config.cloud = ActiveSupport::OrderedOptions.new
+      config.cloud.project = "main"
+      config.cloud.org = ENV['TS_ORG'] # required for Terraspace cloud
+      config.cloud.record = "changes" # IE: changes or all
+      config.cloud.stack = ":APP-:ROLE-:MOD_NAME-:ENV-:EXTRA-:REGION"
+
+      config.hooks = ActiveSupport::OrderedOptions.new
+      config.hooks.show = true
+
       config.init = ActiveSupport::OrderedOptions.new
       config.init.mode = "auto" # auto, never, always
+
       config.log = ActiveSupport::OrderedOptions.new
       config.log.root = Terraspace.log_root
       config.logger = ts_logger
       config.logger.formatter = Logger::Formatter.new
       config.logger.level = ENV['TS_LOG_LEVEL'] || :info
+
       config.layering = ActiveSupport::OrderedOptions.new
-      config.layering.names = {}
       config.layering.enable_names = ActiveSupport::OrderedOptions.new
       config.layering.enable_names.expansion = true
+      config.layering.names = {}
+      config.layering.show = false
+      config.layering.mode = ENV['TS_LAYERING_MODE'] || "simple" # simple, namespace, provider
+
       config.summary = ActiveSupport::OrderedOptions.new
       config.summary.prune = false
+
       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 = false
       config.terraform.plugin_cache.purge_on_error = true
+
       config.test_framework = "rspec"
+
       config.tfc = ActiveSupport::OrderedOptions.new
       config.tfc.auto_sync = true
       config.tfc.hostname = nil

data/lib/terraspace/builder.rb

@@ -44,7 +44,7 @@ module Terraspace
       run_hooks("terraspace.rb", "build") do
         build_dir("modules") if modules
         build_stacks
-        logger.info "Built in #{build_dir}" unless @options[:quiet] # from terraspace all
+        logger.debug "Built in #{build_dir}"
       end
     end
 

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

@@ -0,0 +1,8 @@
+module Terraspace::CLI::Concerns
+  module PlanPath
+    # Use when --out option not used
+    def plan_path
+      ".terraspace-cache/_cache2/plan/plan.binary"
+    end
+  end
+end

data/lib/terraspace/cli/down.rb

@@ -1,6 +1,7 @@
 class Terraspace::CLI
   class Down < Base
     include TfcConcern
+    include Concerns::PlanPath
 
     def run
       plan if @options[:yes] && !tfc?
@@ -9,6 +10,9 @@ class Terraspace::CLI
 
   private
     def plan
+      if Terraspace.cloud? && !@options[:out]
+        @options[:out] = plan_path
+      end
       Commander.new("plan", @options.merge(destroy: true)).run
     end
 

data/lib/terraspace/cli/init.rb

@@ -65,7 +65,7 @@ class Terraspace::CLI
     end
 
     def auto_init?
-      # terraspace commands not terraform commands. included some extra terraform commands here in case terrapace adds those later
+      # terraspace commands not terraform commands. included some extra terraform commands here in case terraspace adds those later
       commands = %w[all apply console down output plan providers refresh show state up validate]
       commands.include?(calling_command)
     end

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

@@ -0,0 +1,121 @@
+class Terraspace::CLI::New
+  class Ci < Sequence
+    argument :name, required: false
+
+    def self.options
+      [
+        [:force, aliases: %w[y], type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+      ]
+    end
+    options.each { |args| class_option(*args) }
+
+    def generate
+      unless template_root_exist? # template not provided in the CI plugin
+        puts "This CI plugin did not include template. CI plugin: #{meta[:name]}"
+        puts "Searched path: #{template_root}"
+        exit 1
+      end
+      set_source_paths(template_root)
+      directory ".", exclude_pattern: "partials"
+    end
+
+    def make_executable
+      exe = meta[:exe]
+      return unless exe
+      if File.directory?(exe)
+        Dir.glob("#{exe}/*").each do |path|
+          chmod path, 0755
+        end
+      else
+        chmod exe, 0755
+      end
+    end
+
+    def message
+      puts <<~EOL
+        A CI structure has been generated for #{meta[:name]}.
+        It's a starter example and should be adjusted for your needs.
+      EOL
+    end
+
+  private
+    def cloud
+    # dont use memoize :cloud as Thor Sequence hides the private methods from Memoist
+      @cloud ||= Terraspace::Plugin.meta.keys.first # IE: aws azurerm google
+    end
+
+    def template_root
+      if meta[:root]
+        ["#{meta[:root]}/template", @options[:folder]].compact.join('/')
+      end
+    end
+
+    def template_root_exist?
+      template_root && File.exist?(template_root)
+    end
+
+    def set_source_paths(*paths)
+      # https://github.com/erikhuda/thor/blob/34df888d721ecaa8cf0cea97d51dc6c388002742/lib/thor/actions.rb#L128
+      instance_variable_set(:@source_paths, nil) # unset instance variable cache
+      # Using string with instance_eval because block doesnt have access to path at runtime.
+      self.class.instance_eval %{
+        def self.source_paths
+          #{paths.flatten.inspect}
+        end
+      }
+    end
+
+    def meta
+      if @name
+        find_meta
+      else
+        first_meta
+      end
+    end
+
+    def find_meta
+      found = Terraspace::Cloud::Ci.meta.find do |m|
+        m[:name] == @name
+      end
+      return found if found
+
+      logger.error "Unable to find CI plugin to handle #{@name}".color(:red)
+      exit 1
+    end
+
+    def first_meta
+      first = Terraspace::Cloud::Ci.meta.first
+      return first if first
+
+      logger.error "Unable to find Ci class".color(:red)
+      logger.error <<~EOL
+        Maybe you need to add one of the terraspace_ci_* gems to the Gemfile. IE:
+
+        Gemfile
+
+            gem "terraspace_ci_github"
+
+      EOL
+      exit 1
+    end
+
+    def partial(path)
+      RenderMePretty.result("#{template_root}/partials/#{path}", context: self)
+    end
+
+    def plugin_env_vars(indent: 6)
+      lines = plugin_env_vars_data.map do |k,v|
+        " " * indent + "#{k}: #{v}"
+      end
+      lines.join("\n") + "\n"
+    end
+
+    def plugin_env_vars_data
+      name = Terraspace::Plugin.autodetect
+      meta = Terraspace::Plugin.meta[name]
+      ci_class = meta[:ci_class]
+      return {} unless ci_class
+      ci_class.new.vars
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ class Terraspace::CLI::New
 
   private
     def cli_args
-      plugin = @options[:plugin] || Terraspace::Autodetect.new.plugin
+      plugin = @options[:plugin] || Terraspace::Plugin.autodetect
       args = if plugin
         ['--plugin', plugin]
       else

data/lib/terraspace/cli/new/helpers/plugin_gem.rb

@@ -5,7 +5,7 @@ module Terraspace::CLI::New::Helpers
       if @options[:plugin_gem]
         @options[:plugin_gem]
       else
-        plugin = @options[:plugin] || Terraspace::Autodetect.new.plugin
+        plugin = @options[:plugin] || Terraspace::Plugin.autodetect
         "terraspace_plugin_#{plugin}" if plugin and plugin != "none"
       end
     end

data/lib/terraspace/cli/new/plugin/ci.rb

@@ -0,0 +1,46 @@
+class Terraspace::CLI::New::Plugin
+  class Ci < Terraspace::CLI::New::Sequence
+    include Helper
+
+    argument :name
+
+    def self.options
+      [
+        [:force, aliases: %w[y], type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+        [:pr, type: :boolean, desc: "Generate pr code also. Most CI systems don't have PR support"],
+      ]
+    end
+    options.each { |args| class_option(*args) }
+
+    def create_plugin
+      puts "=> Creating new ci plugin: #{name}"
+      core_template_source("plugin/ci")
+      exclude_pattern = "pr\.rb" unless options[:pr]
+      directory ".", "terraspace_ci_#{name}", exclude_pattern: exclude_pattern
+    end
+
+    def finish_message
+      files = [
+        "#{gem_name}.gemspec",
+        "lib/#{gem_name}.rb",
+        "lib/#{gem_name}/vars.rb",
+        "lib/#{gem_name}/interface.rb",
+        "README.md",
+      ]
+      files << "lib/#{gem_name}/pr.rb" if @options[:pr]
+      files.sort!
+      list = files.map { |file| "    #{file}" }.join("\n")
+      puts <<~EOL
+      Files in #{gem_name} to review and update:
+
+      #{list}
+      EOL
+    end
+
+  private
+    def gem_name
+      "terraspace_ci_#{name}"
+    end
+
+  end
+end

data/lib/terraspace/cli/new/plugin/core.rb

@@ -0,0 +1,26 @@
+class Terraspace::CLI::New::Plugin
+  class Core < Terraspace::CLI::New::Sequence
+    include Helper
+
+    argument :name
+
+    def self.options
+      [
+        [:force, aliases: %w[y], type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+      ]
+    end
+    options.each { |args| class_option(*args) }
+
+    def create_plugin
+      puts "=> Creating new plugin: #{name}"
+      core_template_source("plugin/core")
+      directory ".", "terraspace_plugin_#{name}"
+    end
+
+  private
+    def gem_name
+      "terraspace_plugin_#{name}"
+    end
+
+  end
+end

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

@@ -1,7 +1,10 @@
 class Terraspace::CLI::New::Plugin
   module Helper
   private
-    # helper
+    def gem_class_name
+      gem_name.camelize
+    end
+
     def camel_name
       name.camelize
     end

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

@@ -1,20 +1,13 @@
 class Terraspace::CLI::New
-  class Plugin < Sequence
-    include Helper
+  class Plugin < Terraspace::Command
+    Help = Terraspace::CLI::Help
 
-    argument :name
+    long_desc Help.text("new/plugin/ci")
+    Ci.options.each { |args| option(*args) }
+    register(Ci, "ci", "ci NAME", "Generates CI Plugin.")
 
-    def self.options
-      [
-        [:force, aliases: %w[y], type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
-      ]
-    end
-    options.each { |args| class_option(*args) }
-
-    def create_plugin
-      puts "=> Creating new plugin: #{name}"
-      core_template_source("plugin")
-      directory ".", "terraspace_plugin_#{name}"
-    end
+    long_desc Help.text("new/plugin/core")
+    Core.options.each { |args| option(*args) }
+    register(Core, "core", "core NAME", "Generates Core plugin.")
   end
 end

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

@@ -54,7 +54,7 @@ class Terraspace::CLI::New
     # Used in ERB template
     # rspec-terraspace/lib/templates/stack/test/spec/fixtures/config/terraform/provider.tf.tt
     def autodetect_provider
-      Terraspace::Autodetect.new.plugin
+      Terraspace::Plugin.autodetect
     end
   end
 end

data/lib/terraspace/cli/new.rb

@@ -2,11 +2,15 @@ class Terraspace::CLI
   class New < Terraspace::Command
     long_desc Help.text("new/arg")
     Arg.options.each { |args| option(*args) }
-    register(Arg, "arg", "arg NAME", "Generates new arg.")
+    register(Arg, "arg", "arg NAME", "Generates arg.")
+
+    long_desc Help.text("new/ci")
+    Ci.options.each { |cis| option(*cis) }
+    register(Ci, "ci", "ci NAME", "Generates ci starter structure.")
 
     long_desc Help.text("new/git_hook")
     GitHook.cli_options.each { |args| option(*args) }
-    register(GitHook, "git_hook", "git_hook", "Generates new git hook.")
+    register(GitHook, "git_hook", "git_hook", "Generates git hook.")
 
     long_desc Help.text("new/shim")
     Shim.cli_options.each { |args| option(*args) }
@@ -14,37 +18,37 @@ class Terraspace::CLI
 
     long_desc Help.text("new/helper")
     Helper.options.each { |args| option(*args) }
-    register(Helper, "helper", "helper NAME", "Generates new helper.")
+    register(Helper, "helper", "helper NAME", "Generates helper.")
 
     long_desc Help.text("new/hook")
     Hook.options.each { |args| option(*args) }
-    register(Hook, "hook", "hook NAME", "Generates new hook.")
+    register(Hook, "hook", "hook NAME", "Generates hook.")
 
     long_desc Help.text("new/module")
     Module.base_options.each { |args| option(*args) }
     Module.component_options.each { |args| option(*args) }
-    register(Module, "module", "module NAME", "Generates new module.")
+    register(Module, "module", "module NAME", "Generates module.")
 
     long_desc Help.text("new/project")
     Project.base_options.each { |args| option(*args) }
     Project.project_options.each { |args| option(*args) }
-    register(Project, "project", "project NAME", "Generates new project.")
-
-    long_desc Help.text("new/plugin")
-    Plugin.options.each { |args| option(*args) }
-    register(Plugin, "plugin", "plugin NAME", "Generates plugin.")
+    register(Project, "project", "project NAME", "Generates project.")
 
     long_desc Help.text("new/stack")
     Stack.base_options.each { |args| option(*args) }
     Stack.component_options.each { |args| option(*args) }
-    register(Stack, "stack", "stack NAME", "Generates new stack.")
+    register(Stack, "stack", "stack NAME", "Generates stack.")
 
     long_desc Help.text("new/test")
     Test.options.each { |args| option(*args) }
-    register(Test, "test", "test NAME", "Generates new test.")
+    register(Test, "test", "test NAME", "Generates test.")
 
     long_desc Help.text("new/example")
     Example.options.each { |args| option(*args) }
-    register(Example, "example", "example [NAME]", "Generates new example.")
+    register(Example, "example", "example [NAME]", "Generates example.")
+
+    desc "plugin SUBCOMMAND", "plugin subcommands"
+    long_desc Help.text("new/plugin")
+    subcommand "plugin", Plugin
   end
 end

data/lib/terraspace/cli/plan.rb

@@ -0,0 +1,13 @@
+class Terraspace::CLI
+  class Plan < Base
+    include TfcConcern
+    include Concerns::PlanPath
+
+    def run
+      if Terraspace.cloud? && !@options[:out]
+        @options[:out] = plan_path
+      end
+      Commander.new("plan", @options).run
+    end
+  end
+end

data/lib/terraspace/cli/setup/check.rb

@@ -93,6 +93,14 @@ class Terraspace::CLI::Setup
     end
     memoize :terraform_version_message
 
+    def terraform_version
+      terraform_version_message.sub(/.*v/,'')
+    end
+
+    def terraspace_version
+      Terraspace::VERSION
+    end
+
     class << self
       # Used as library call
       def check!

data/lib/terraspace/cli/up.rb

@@ -3,12 +3,18 @@ require 'securerandom'
 class Terraspace::CLI
   class Up < Base
     include TfcConcern
+    include Concerns::PlanPath
 
     def run
       build
       if @options[:yes] && !@options[:plan] && !tfc?
-        plan
-        Commander.new("apply", @options.merge(plan: plan_path)).run
+        if Terraspace.cloud? && !@options[:plan]
+          @options[:plan] = plan_path # for terraform apply
+          @options[:out] = plan_path  # for terraform plan
+        end
+        Commander.new("plan", @options).run
+        return unless File.exist?(plan_path) if Terraspace.cloud? # happens if plan fails
+        Commander.new("apply", @options).run
       else
         Commander.new("apply", @options).run
       end
@@ -20,15 +26,5 @@ class Terraspace::CLI
       Terraspace::Builder.new(@options).run
       @options[:build] = false
     end
-
-    def plan
-      FileUtils.mkdir_p(File.dirname(plan_path))
-      Commander.new("plan", @options.merge(out: plan_path)).run
-    end
-
-    def plan_path
-      @@random ||= SecureRandom.hex
-      "#{Terraspace.tmp_root}/plans/#{@mod.name}-#{@@random}.plan"
-    end
   end
 end

data/lib/terraspace/cli.rb

@@ -21,7 +21,7 @@ module Terraspace
       option :instance, aliases: %w[i], desc: "Instance of stack"
     }
     init_option = Proc.new {
-      option :init, type: :boolean, default: true, desc: "Instance of stack"
+      option :init, type: :boolean, default: true, desc: "Whether or not to run init"
     }
     reconfigure_option = Proc.new {
       option :reconfigure, type: :boolean, desc: "Add terraform -reconfigure option"
@@ -152,7 +152,7 @@ module Terraspace
     reconfigure_option.call
     option :copy_to_root, type: :boolean, default: true, desc: "Copy plan file generated in the cache folder back to project root"
     def plan(mod, *args)
-      Commander.new("plan", options.merge(mod: mod, args: args)).run
+      Plan.new(options.merge(mod: mod, args: args)).run
     end
 
     desc "providers STACK", "Show providers."

data/lib/terraspace/cloud/api/cani.rb

@@ -0,0 +1,30 @@
+class Terraspace::Cloud::Api
+  class Cani
+    include Terraspace::Util::Logging
+
+    def initialize(result)
+      @result = result
+    end
+
+    # {"data":{"attributes":{"detail":"You are authorized to perform this action.","status":200,"title":"Authoriz
+    # {"errors":[{"detail":"You are not authorized to perform this action. Double check your token or check with your admin that you have permissions.","status":403,"title":"Forbidden"}]}
+    def handle
+      yes = false # assume do not have permission
+      detail = @result&.dig('data', 'attributes', 'detail')
+      if detail&.include?('You are authorized to perform this action')
+        yes = true # confirm have permission
+      end
+      return if yes
+
+      if @result.nil? # 400 Bad Request
+        logger.info "ERROR: It doesn't look like TS_TOKEN is valid".color(:red)
+      else
+        errors = @result.dig('errors')
+        detail = errors.first['detail']
+        # {"errors":[{"detail":"You are not authorized to perform this action. Double check your token or check with your admin that you have permissions.","status":403,"title":"Forbidden"}]}
+        logger.info "ERROR: #{detail}".color(:red)
+      end
+      exit 1
+    end
+  end
+end

data/lib/terraspace/cloud/api/concern/errors.rb

@@ -0,0 +1,12 @@
+module Terraspace::Cloud::Api::Concern
+  module Errors
+    def errors?(result)
+      result.is_a?(Hash) && result.key?("errors")
+    end
+
+    def error_message(result)
+      $stderr.puts "ERROR: #{result["errors"]}"
+      $stderr.puts "Your current settings. org: #{@org} project: #{@project}"
+    end
+  end
+end

data/lib/terraspace/cloud/api/concern/record.rb

@@ -0,0 +1,18 @@
+module Terraspace::Cloud::Api::Concern
+  module Record
+    def load_record(result)
+      record = {}
+      data = result['data']
+      record['id'] = data['id']
+      record.merge!(data['attributes'])
+      record
+    end
+
+    def load_records(result)
+      result['data'].map do |item|
+        record = { id: item['id'] }
+        record.merge(item['attributes'])
+      end
+    end
+  end
+end

data/lib/terraspace/cloud/api/concern.rb

@@ -0,0 +1,38 @@
+class Terraspace::Cloud::Api
+  module Concern
+    extend Memoist
+    include Errors
+    include Record
+    include Validate
+
+    def api
+      validate("stack", cloud_stack_name)
+      @options = @options.merge(
+        app: Terraspace.app,
+        role: Terraspace.role,
+        env: Terraspace.env,
+        extra: Terraspace.extra,
+        region: region,
+        name: cloud_stack_name,
+      )
+      @options.reject! { |k,v| v.nil? }
+      Terraspace::Cloud::Api.new(@options) # @options are CLI options
+    end
+
+    def cloud_stack_name
+      pattern = Terraspace.config.cloud.stack
+      expanded = expander.expansion(pattern) # pattern is a String that contains placeholders for substitutions
+      expanded.gsub(%r{-+},'-') # remove double dashes are more. IE: -- -> -
+              .sub(/^-+/,'').sub(/-+$/,'') # remove leading and trailing -
+    end
+
+    def region
+      expander.expansion(":REGION")
+    end
+
+    def expander
+      Terraspace::Compiler::Expander.autodetect(@mod)
+    end
+    memoize :expander
+  end
+end