terraspace 2.1.2 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03096c453bba884de848aa0eaa9fe82204f6a5e66efd1fda10a512dfe6509747'
-  data.tar.gz: c9d9df2c2188457f06247b603ca0e39b7197c8f7286fcf3dfe8ef659e356254b
+  metadata.gz: 786aaa7595dab99d8ffb03635a1bbdac8ac8f05f9bf8d54ac233df032e2656e8
+  data.tar.gz: bdc2ac26c76de54170a7627b9437e4a08535de61a81d868e0b29c8606db80c7a
 SHA512:
-  metadata.gz: 7cece8de2acae3e9c3d4fcb88e7a89c3bbad55a135f246426c54d5ab5176f467b3c4dcdc1a0b288b03f15266088b7dec27c71373b7ce70e1f9313110ec236ca0
-  data.tar.gz: bd251ca2dd8baea3739c2cb69cfb2d144916f2a80ccd1eaad22d30401c4bf6de32938263438ebb4d334dfb262ca49801aad46cd0293ea56e102082686f50d1f7
+  metadata.gz: 2f57094e1b29721f0948e1e94ac264cafa2b57dde3c55e4d5c5807cfff5c4ebf5ef044f8ca8a2b1132be13294c03f5a350ccc70db6fc4642226445fc4346c9c1
+  data.tar.gz: 8b700ec6b2543b0388d6be8989cee3bdeb14e814b927c93b6aa6855a00e31cf6117587d8300cf875b44771bd24e4d5a6aa0d260456f453a8ee73625cefa32a91

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.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`
+
 ## [2.1.2] - 2022-07-13
 - [#249](https://github.com/boltops-tools/terraspace/pull/249) fix cost.enabled setting when nil
 

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/mod.rb

@@ -128,6 +128,27 @@ module Terraspace
           raise "ERROR: config.build.cache_dir is not a String or responds to the .call method."
         end
 
+      if pattern.include?(":CACHE_ROOT")
+        old_pattern = pattern
+        pattern = pattern.sub(':CACHE_ROOT/', '')
+        logger.info "WARN: Detected :CACHE_ROOT in config.build.cache_dir".color(:yellow)
+        logger.info <<~EOL
+          This has been deprecated and :CACHE_ROOT should not be in the config.build.cache_dir setting.
+          The :CACHE_ROOT pattern has been removed from config.build.cache_dir automatically.
+
+          To remove this warning, remove the :CACHE_ROOT. For example:
+
+          config/app.rb
+
+              config.build.cache_dir = "#{old_pattern}"
+
+          Update it to:
+
+              config.build.cache_dir = "#{pattern}"
+
+        EOL
+      end
+
       path = expansion(pattern)
       path = "#{Terraspace.cache_root}/#{path}"
       path.gsub!(%r{/+},'/') # remove double slashes are more. IE: // -> / Useful since region is '' in generic expander

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/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.2"
+  VERSION = "2.1.5"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-07-21 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