terraspace 2.1.3 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 821596efa82fca834084cd1ff1128f2d19e12fcf6b29143eac95c0b160d0724d
-  data.tar.gz: f423fb9b8958619a342783e5bbcd07f61e39301d6faa8b7af7c1c53d59fcccc4
+  metadata.gz: 449ffd121de77d38b64d44f30a56639714f27fd3b0a7c50b00c4f897157c9ef5
+  data.tar.gz: 815fddcc7cfa9b01e335de6d160d941c6d1b4a025b6bab902a1aa4552752b9df
 SHA512:
-  metadata.gz: dec9d3e94b3b3e2ab3eea0c14392729eef461cc2a2c451365a158aaf2f6fe7e619b961dc9ccee3f6a18ed329a6eba199d33164c1857df8d469b4fe0f7b034193
-  data.tar.gz: 3608ca4855cf1a30feb7aa2e2287c97a2f80fbcd5c74e8339076180f34ae54c93eefc13dc57ab6cc74829f9d46b3389ef534659e6804cf98c3d2d21021a61470
+  metadata.gz: dc167ec202e62e70dd129d4ac85dc30a4179576315b880303205569434d7e31a35e5d331df64b2e478efb0459fcb902764ec6c860af650ea7ec8dcbc7caefe47
+  data.tar.gz: da40e6f0760f535a0e604aad16b31ddd708090521c070469739a0e13d0129542676951892e1859fd779b4bcbbda15a168e260cd43dc4e41964bbc0a0a28ffb48

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 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.
 
+## [2.1.6] - 2022-08-19
+- [#258](https://github.com/boltops-tools/terraspace/pull/258) Fix terraform apply/destroy missing some passthrough options
+
+## [2.1.5] - 2022-07-21
+- [#255](https://github.com/boltops-tools/terraspace/pull/255) dont compute git info when not cloud not enabled and warn message improvement
+- pin terraspace to major version in initially generated Gemfile
+
+## [2.1.4] - 2022-07-16
+- [#252](https://github.com/boltops-tools/terraspace/pull/252) puts friendlier user message with terraspace force_unlock suggestion
+- [#253](https://github.com/boltops-tools/terraspace/pull/253) azure repo local git support
+
 ## [2.1.3] - 2022-07-13
 - [#251](https://github.com/boltops-tools/terraspace/pull/251) deprecation warning for `:CACHE_ROOT` in `config.build.cache_dir`
 

data/lib/templates/base/project/Gemfile.tt

@@ -10,5 +10,5 @@ build_gemfile(
 
 # Uncomment the ci and vcs provider you wish to use. Should use both ci and vcs gem
 # Docs: https://terraspace.cloud/docs/ci/
-# gem "terraspace_ci_github"
-# gem "terraspace_vcs_github"
+# gem "terraspace_ci_github"    # gathers info from ci env
+# gem "terraspace_vcs_github"   # post comment on pr

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

@@ -13,7 +13,8 @@ class Terraspace::CLI::New
 
     def gem_line(name)
       if name == "terraspace"
-        %Q|gem "#{name}", '~> #{Terraspace::VERSION}'|
+        major_version = Terraspace::VERSION.split('.').first
+        %Q|gem "#{name}", '~> #{major_version}'|
       else
         %Q|gem "#{name}"|
       end

data/lib/terraspace/cloud/vcs/commenter.rb

@@ -46,6 +46,7 @@ class Terraspace::Cloud::Vcs
     # pr_url
     #
     def vcs_vars
+      return {} unless Terraspace.cloud?
       ci_env = CiEnv.new
       local_git = LocalGit.new
       local_env = LocalEnv.new

data/lib/terraspace/cloud/vcs/local_git/azure.rb

@@ -0,0 +1,62 @@
+class Terraspace::Cloud::Vcs::LocalGit
+  class Azure < Base
+    def vars
+      super.merge(
+        host: host,
+        full_repo: full_repo,
+      )
+    end
+
+    def commit_url
+      # IE: https://dev.azure.com/tongueroo/infra-project/_git/infra-ci/commit/aaa74f96d76053672ff1b91995c903605cd8a245
+      "#{base_repo_url}/commits/#{sha}" if sha
+    end
+
+    def base_repo_url
+      "#{host}/#{org}/#{project}/_git/#{repo}"
+    end
+
+    def branch_url
+      # IE: https://dev.azure.com/tongueroo/infra-project/_git/infra-ci?version=GBmerge
+      "#{base_repo_url}?verison=GB#{sha}" if sha
+    end
+
+    # Also computed in ci plugins which detects it from the ci env.
+    # Also handling here for case when user provides PR_NUMBER and GIT_REPO outside of normal CI env.
+    def pr_url
+      "#{host}/#{full_repo}/pull-requests/#{pr_number}" if pr_number
+    end
+
+    # override to remove ssh
+    # https://ssh.dev.azure.com => https://dev.azure.com
+    def host
+      "https://dev.azure.com"
+    end
+
+    def url_info
+      uri = URI(git_url)
+      # IE: v3/tongueroo/infra-project/infra-ci
+      uri.path.sub(/^\//,'').split('/') # [version, org, project, repo]
+    end
+
+    def org
+      version, org, project, repo = url_info
+      org
+    end
+
+    def repo
+      version, org, project, repo = url_info
+      repo
+    end
+
+    def full_repo
+      version, org, project, repo = url_info
+      "#{org}/#{repo}"
+    end
+
+    def project
+      version, org, project, repo = url_info
+      project
+    end
+  end
+end

data/lib/terraspace/cloud/vcs/local_git/base.rb

@@ -2,8 +2,9 @@ class Terraspace::Cloud::Vcs::LocalGit
   class Base
     extend Memoist
 
-    def initialize(vars)
-      @vars = vars
+    attr_reader :git_url
+    def initialize(vars, git_url)
+      @vars, @git_url = vars, git_url
     end
 
     def vars

data/lib/terraspace/cloud/vcs/local_git.rb

@@ -1,8 +1,8 @@
 class Terraspace::Cloud::Vcs
   class LocalGit < Base
     def vars
-      if git_repo? && git_installed?
-        provider_vars = vcs_class ? vcs_class.new(base_vars).vars : {}
+      if git_repo? && git_installed? && host
+        provider_vars = vcs_class ? vcs_class.new(base_vars, git_url).vars : {}
         base_vars.merge(provider_vars).compact # remove items with nil values
       else
         { build_system: "manual" }
@@ -11,9 +11,10 @@ class Terraspace::Cloud::Vcs
 
     def vcs_class
       case host
-      when /github/ then Github
-      when /gitlab/ then Gitlab
-      when /bitbucket/ then Bitbucket
+      when /github\.com/ then Github
+      when /gitlab\.com/ then Gitlab
+      when /bitbucket\.org/ then Bitbucket
+      when /ssh\.dev\.azure\.com/ then Azure
       end
     end
 
@@ -35,6 +36,15 @@ class Terraspace::Cloud::Vcs
       return nil if git_url.blank?
       uri = URI(git_url)
       "#{uri.scheme}://#{uri.host}"
+    rescue URI::InvalidURIError => e
+      logger.info "WARN: #{e.class} #{e.message}".color(:yellow)
+      logger.info <<~EOL
+        Unable to get the host info from your local .git/config
+        Will not be able to determine local git info.
+        If possible, it would be a useful to provide the remote.url in your .git/config
+        as an issue report or email to improve help improve this logic.
+      EOL
+      nil
     end
 
     def full_repo

data/lib/terraspace/shell/error.rb

@@ -16,6 +16,8 @@ class Terraspace::Shell
         Terraspace::BucketNotFoundError.new(message)
       elsif shared_cache_error?
         Terraspace::SharedCacheError.new(message)
+      elsif state_lock_error?
+        Terraspace::StateLockError.new(message)
       end
     end
 
@@ -43,5 +45,10 @@ class Terraspace::Shell
       message.include?("Failed to install provider from shared cache") ||
       message.include?("Failed to validate installed provider")
     end
+
+    def state_lock_error?
+      # Example: https://gist.github.com/tongueroo/6bcb86f88053c58fa50f434789268b78
+      message.include?("Error acquiring the state lock")
+    end
   end
 end

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

@@ -60,6 +60,17 @@ module Terraspace::Terraform::Args
       result
     end
 
+    def terraform_arg_types
+      arg_types = terraform_arg_types_for_command(@name)
+      # "terraspace apply/destroy" support the same options as "plan", but they don't document
+      # them directly in their "-help" option, so we need to add them.
+      if ["apply", "destroy"].include? @name
+        arg_types.merge! terraform_arg_types_for_command("plan")
+      end
+
+      arg_types
+    end
+
     # Parses terraform COMMAND -help output for arg types.
     # Return Example:
     #
@@ -69,8 +80,8 @@ module Terraspace::Terraform::Args
     #       var: :hash,
     #     }
     #
-    def terraform_arg_types
-      out = terraform_help(@name)
+    def terraform_arg_types_for_command(name)
+      out = terraform_help(name)
       lines = out.split("\n")
       lines.select! do |line|
         line =~ /^  -/

data/lib/terraspace/terraform/runner.rb

@@ -65,6 +65,18 @@ module Terraspace::Terraform
       else
         exit(1)
       end
+    rescue Terraspace::StateLockError => e
+      logger.debug "ERROR: #{e.class}".color(:red)
+      logger.info e.message
+      md = e.message.match(/\s+ID:\s+(.*)/)
+      return unless md
+      return unless lock_id = md[1]
+      logger.info <<~EOL
+        You can force release the lock with:
+
+            terraspace force_unlock #{@mod.name} #{lock_id}
+
+      EOL
     end
 
     @@current_dir_message_shown = false

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "2.1.3"
+  VERSION = "2.1.6"
 end

data/lib/terraspace.rb

@@ -32,9 +32,10 @@ module Terraspace
 
   class BucketNotFoundError < Error; end
   class InitRequiredError < Error; end
+  class NetworkError < Error; end
   class SharedCacheError < Error; end
   class ShellError < Error; end
-  class NetworkError < Error; end
+  class StateLockError < Error; end
 end
 
 Terraspace::Booter.boot

data/spec/terraspace/terraform/args/pass_spec.rb

@@ -51,6 +51,19 @@ describe Terraspace::Terraform::Args::Pass do
     end
   end
 
+  context "indirectly documented args" do
+    # "terraform apply -help" doesn't document "-target" directly, but refers to
+    # "terraform plan -help" documentation.
+    context "-target=resource" do
+      let(:args) { ["-target=foo.bar"] }
+      let(:name) { "apply" }
+      it "pass through args" do
+        args = pass.args
+        expect(args).to eq ["-target=foo.bar"]
+      end
+    end
+  end
+
   context "hash arg" do
     context "-var 'foo=bar'" do
       let(:args) { ["-var 'foo=bar'"] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -670,6 +670,7 @@ files:
 - lib/terraspace/cloud/vcs/interface.rb
 - lib/terraspace/cloud/vcs/local_env.rb
 - lib/terraspace/cloud/vcs/local_git.rb
+- lib/terraspace/cloud/vcs/local_git/azure.rb
 - lib/terraspace/cloud/vcs/local_git/base.rb
 - lib/terraspace/cloud/vcs/local_git/bitbucket.rb
 - lib/terraspace/cloud/vcs/local_git/github.rb