terraspace 2.1.1 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3651e7cf7b8fe679a5266a2bc6bbad9f30d2c98d8636bbf6105ee7d61585d2ed
-  data.tar.gz: 8dd9e2fb0801ea3f4e82711460edbf18cc578932443d7ef9c2844fe644e49a09
+  metadata.gz: 2409bdde16554e4640220d326b2905ebef223d15b06a9ee92e679b8e4da5d228
+  data.tar.gz: 2aac87334644fdb9c7d0d1de547796a8d4719b0c090d9be506fc99494de2ab87
 SHA512:
-  metadata.gz: da083a64468e8b447e10881762d52e52859ce74c72be6d8f7ca0e8a457da1818f99cd3e615a87b7f43758abcc46297b1eec1c2e1550b1b89c96e47c0ad851b96
-  data.tar.gz: 6b51fd61cbdabe1a5e51fac73d3a93fba10143ac040526d8283d48afa90a9c3d26e738e1d50449bfd1a029cce99001a2af0f91edb3f0ca005779f256572eac9c
+  metadata.gz: a3579aef360d7557f69eb4f5db1c3e548b9f8fe788f8bb4a2b13b3e473f3ab0ae6e1d9c0737b7f1e46732b0b81f1b20f7a487baf3d08d936644fc6abb4307448
+  data.tar.gz: cedfeb838b20c0c5e4dbf5cc8d9140013c1f8309c43c1e665a85fd375e65310d20e25f837cfa77748c2ccb1a7edc8483427b3ffd3b850cfa1e596d5a4c7d157e

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 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.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
+
 ## [2.1.1] - 2022-07-12
 - [#248](https://github.com/boltops-tools/terraspace/pull/248) fix destroy success return
 

data/README.md

@@ -118,6 +118,7 @@ To install modules:
 * [Configurable CLI](https://terraspace.cloud/docs/config/args/): Configurable [CLI Hooks](https://terraspace.cloud/docs/config/hooks/) and [CLI Args](https://terraspace.cloud/docs/config/args/) allow you to adjust the underlying terraform command.
 * [Testing](https://terraspace.cloud/docs/testing/): A testing framework that allows you to create test harnesses, deploy real-resources, and have higher confidence that your code works.
 * [Terraform Cloud and Terraform Enterprise Support](https://terraspace.cloud/docs/cloud/): TFC and TFE are both supported. Terraspace adds additional conveniences to make working with Terraform Cloud Workspaces easier.
+* [Terraspace Cloud Support](https://terraspace.cloud/docs/cloud/): Terraspace Cloud adds additional features and conveniences like a Dashboard, History, Team Management, Permissions, Real-time Logging, and Cost Estimates. It's specifically designed for Terraspace. You might also be interested in this blog post: [Terraspace Cloud Intro](https://blog.boltops.com/2022/06/10/terraspace-cloud/)
 
 ## Comparison
 

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

@@ -52,7 +52,7 @@ module Terraspace
       config.cloud.record = "changes" # IE: changes or all
       config.cloud.stack = ":APP-:ROLE-:MOD_NAME-:ENV-:EXTRA-:REGION"
       config.cloud.cost = ActiveSupport::OrderedOptions.new
-      config.cloud.cost.enabled = cast_value(ENV['TS_COST'])
+      config.cloud.cost.enabled = cast_boolean(ENV['TS_COST'])
       config.cloud.vcs = ActiveSupport::OrderedOptions.new
       config.cloud.vcs.name = nil # github, gitlab, bitbucket. Else default to registered terraspace_vcs_* plugin
 
@@ -102,8 +102,8 @@ module Terraspace
     # https://stackoverflow.com/questions/36228873/ruby-how-to-convert-a-string-to-boolean
     # https://github.com/rails/rails/blob/5-1-stable/activemodel/lib/active_model/type/boolean.rb
     # so dont have to add activemodel as a dependency just for this method
-    FALSE_VALUES = [false, 0, "0", "f", "F", "false", "FALSE", "off", "OFF"].to_set
-    def cast_value(value)
+    FALSE_VALUES = [nil, false, 0, "0", "f", "F", "false", "FALSE", "off", "OFF"].to_set
+    def cast_boolean(value)
       if value == ""
         nil
       else

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

@@ -2,7 +2,7 @@ class Terraspace::Cloud::Vcs
   class LocalGit < Base
     def vars
       if git_repo? && git_installed?
-        provider_vars = vcs_class ? vcs_class.new(base_vars).vars : {}
+        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
 

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.1"
+  VERSION = "2.1.4"
 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.1
+  version: 2.1.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-07-16 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