terraspace 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ba2f34469d8982d58556de81cc8c4b4c5219a3be341f06465c228750e809c1e
-  data.tar.gz: eb5aebca521115c47593c9467f23ca33bf4043c2891e85de0c4cf3cda4c72dc8
+  metadata.gz: 8aaefa8e220ec2998a8483d12043c9aa998042d3ffa6b7eee76e186db7f11c26
+  data.tar.gz: 33b63a92782d8c52136f8a2f737318ee7ad2ab5bb6f778ce6a494216863a9041
 SHA512:
-  metadata.gz: 5b540849e1756c1761b7e15e2edc9ff3c1e9ed023f01f0b74dd1a7b2a9d8e61a343f4b058fc46dce1bd5d31aa477e5238c37508afac7dc558c71a262f759e0a7
-  data.tar.gz: 7d2a55510b99d65d076b3f5b657af10c4e21fce146cadce2c2732abf530d96ba049dfe3c20f5655ffb7775a8c90a0b1406f40bdbfb10f6ae21896188894b9eb3
+  metadata.gz: ad0378722bd9d64f8d3a91d9289d5b7aa9d29fa6773d5505846e1aa3e45e0ce666d51f81320afad95aa733cfb11cfa09e776ab49980a41d2e4f2c29a832de005
+  data.tar.gz: 359104b53497ab56d219bbb8dec1ac78e23d4c6b6a6b79811918479a5356c1073d831e9a2c4c2653471d3f6def70e7c2d861da836b270420ace2f420ea476abd

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.2.12] - 2023-08-23
+- [#326](https://github.com/boltops-tools/terraspace/pull/326) terraspace check improvements
+- hide deprecated check commands
+
 ## [2.2.11] - 2023-08-23
 - [#325](https://github.com/boltops-tools/terraspace/pull/325) terraspace check improvements
 

data/lib/terraspace/check.rb

@@ -11,7 +11,7 @@ module Terraspace
     end
 
     # Used for the CLI
-    def run
+    def run(cloud: false)
       puts "terraspace version: #{Terraspace::VERSION}"
       if terraform_bin
         puts "#{terraform_bin_name} bin: #{pretty_home(terraform_bin)}"
@@ -20,16 +20,7 @@ module Terraspace
         if allowed_terraform_version?
           puts "You're all set!".color(:green)
         else
-          puts "terraspace requires terraform between v#{@min_terraform_version}.x and #{@max_terraform_version}".color(:red)
-          puts <<~EOL
-            This is because newer versions of terraform has a BSL license
-            If your usage is allowed by the license, you can bypass this check with:
-
-                export TS_VERSION_CHECK=0
-
-            Note: If you're using Terraspace Cloud, you won't be able to bypass this check.
-            See: https://terraspace.cloud/docs/terraform/license/
-          EOL
+          error_message(cloud: cloud)
           exit 1
         end
       else
@@ -39,9 +30,27 @@ module Terraspace
     end
     alias ok! run
 
+    def error_message(cloud: false)
+      name = cloud ? "Terraspace Cloud" : "Terraspace"
+      cloud_note =<<~EOL
+
+        Note: If you're using Terraspace Cloud, you won't be able to bypass this check.
+        See: https://terraspace.cloud/docs/terraform/license/
+      EOL
+
+      puts "ERROR: #{name} requires Terraform between v#{@min_terraform_version}.x and #{@max_terraform_version}".color(:red)
+      puts <<~EOL
+        This is because newer versions of Terraform has a BSL license
+        If your usage is allowed by the license, you can bypass this check with:
+
+            export TS_VERSION_CHECK=0
+        #{cloud_note}
+      EOL
+    end
+
     # aliased with ok?
     def allowed_terraform_version?
-      return true if ENV['TS_VERSION_CHECK'] == '0' && Terraspace.cloud?
+      return true if ENV['TS_VERSION_CHECK'] == '0' && !Terraspace.cloud?
       return false unless terraform_bin
       return true if !terraform_bin.include?("terraform") # IE: allow any version of terraform forks
 
@@ -111,9 +120,10 @@ module Terraspace
     # Note: The -json option is only available in v0.13+
     def terraform_version
       out = `#{terraform_bin} --version`
-      regexp = /(\d+\.\d+\.\d+)/
-      line = out.split("\n").find { |l| l =~ regexp }
-      version = line.match(regexp)[1] if line
+      # 1st regexp is more strict to avoid false positives
+      # 2nd regexp is more lenient in include beta suffixes
+      line = out.split("\n").find { |l| l =~ /(\d+\.\d+\.\d+)/ }
+      version = line.match(/(\d+\.\d+\.\d+.*)/)[1] if line
     end
     memoize :terraform_version
 

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

@@ -0,0 +1,7 @@
+## Example
+
+    $ terraspace check
+    terraspace version: 2.2.11
+    terraform bin: ~/.tfenv/bin/terraform
+    terraform version: 1.5.5
+    You're all set!

data/lib/terraspace/cli/setup.rb

@@ -1,6 +1,6 @@
 class Terraspace::CLI
   class Setup < Terraspace::Command
-    desc "check", "Check setup is ok"
+    desc "check", "Check setup is ok", hide: true
     long_desc Help.text("check")
     def check
       puts <<~EOL

data/lib/terraspace/cli.rb

@@ -42,7 +42,7 @@ module Terraspace
     long_desc Help.text(:new)
     subcommand "new", New
 
-    desc "setup SUBCOMMAND", "setup subcommands"
+    desc "setup SUBCOMMAND", "setup subcommands", hide: true
     long_desc Help.text(:setup)
     subcommand "setup", Setup
 
@@ -66,7 +66,7 @@ module Terraspace
       Bundle.new(options.merge(args: args)).run
     end
 
-    desc "check", "Check setup.", hide: true
+    desc "check", "Check setup."
     long_desc Help.text(:check)
     def check
       Check.new(options).run

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

@@ -7,10 +7,7 @@ class Terraspace::Cloud::Api
     def request(klass, path, data={})
       exit_on_error = data.delete(:exit_on_error) # for cani logic
       url = url(path)
-      unless check.ok?
-        puts "ERROR: terraspace cloud requires terraform between v#{check.min_terraform_version}.x and #{check.max_terraform_version}".color(:red)
-        exit 1
-      end
+      check.ok!(cloud: true)
       data = data.merge(versions: check.versions)
       req = build_request(klass, url, data)
       retries = 0

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "2.2.11"
+  VERSION = "2.2.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.12
 platform: ruby
 authors:
 - Tung Nguyen
@@ -562,6 +562,7 @@ files:
 - lib/terraspace/cli/help/all/validate.md
 - lib/terraspace/cli/help/build.md
 - lib/terraspace/cli/help/bundle.md
+- lib/terraspace/cli/help/check.md
 - lib/terraspace/cli/help/clean/all.md
 - lib/terraspace/cli/help/clean/cache.md
 - lib/terraspace/cli/help/clean/logs.md