terradactyl 0.15.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a988ff3b16d74047633cd66e066673cd2fdf761557939a24bc7a234b0bb26920
-  data.tar.gz: ab15b45df02d228d06a1ede2330048b613b4fb602436020c073d48e2da778b1a
+  metadata.gz: 3e90e3ed91939d1b785c16b83ed60b7a898504094f52e986753fb428aad01d8b
+  data.tar.gz: b690d9c3d25f80a0d3a749793cb374f4b130d86f350fdd6488934fda5bfba91b
 SHA512:
-  metadata.gz: dfd2683371ff4d31f7ba907f6ea497fda420cd8ab5644b32a5efacc2cf6176bfca30c138c679f94e221e30fb8f76c6f06c59b4a7e027762835688894a5d75323
-  data.tar.gz: 36d4db1bc332ed25196a1cf43c31b933397be36764d44bb6521e87fbfd2f173334f5c438046eddb08cdb1923b9cf3b2c92a015f4efd0b1645e2e0cdc29307a63
+  metadata.gz: 994d7dedb38c450899799fbac43bb3ecdd8992c09a0281ab94e8d60648a4d3235c488534f309ddc396590eb833092a2540ded2f384f134d0ebd48c2b147b679b
+  data.tar.gz: 83f2420863792854be2bee4ab32bec5041a818cd149741b24f2001ac16159892344715c5ee3339a58ae352d60a120adb430c1000e018242b26b261f986cc9400

data/.rubocop.yml

@@ -10,6 +10,8 @@ Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/ClassLength:
   Max: 115
+Naming/ClassAndModuleCamelCase:
+  Enabled: false
 Naming/UncommunicativeMethodParamName:
   MinNameLength: 2
 Style/IfUnlessModifier:

data/CHANGELOG.md

@@ -1,5 +1,46 @@
 # CHANGELOG
 
+## 1.1.2 (2021-01-05)
+
+BUG FIX:
+
+* Align with changes to terradactyl-terraform (v1.1.2)
+
+```
+/var/lib/gems/2.7.0/gems/terradactyl-1.1.0/lib/terradactyl/stack.rb:73:in `block in setup_terraform': undefined method `downloads_url=' for Terradactyl::Terraform::VersionManager:Module (NoMethodError)
+```
+
+## 1.1.0 (2021-12-09)
+
+NEW FEATURES:
+
+* add support for Terraform version '~> 1.1.0`
+
+DEPENDENCIES:
+
+* update depends on terradactyl-terraform to '>= 1.1.0'
+
+UPGRADEABLE:
+
+* set '~> 1.0.0` as upgradeable
+
+## 1.0.0 (2021-06-09)
+
+NEW FEATURES:
+
+* add support for Terraform version `~> 1.0.0`
+
+BUG FIXES:
+
+* fix bad test matrix
+
+## 0.15.3 (2021-05-14)
+
+BUG FIXES:
+
+* fix `auto-approve` on `destroy` subcommand for Terraform version 0.15
+* update all tests to use latest minor rev
+
 ## 0.15.2 (2021-05-02)
 
 NEW FEATURES:

data/lib/terradactyl/commands.rb

@@ -98,8 +98,8 @@ module Terradactyl
       end
 
       def revision_constant(tf_version)
-        revision_name = ['Rev', *tf_version.split('.').take(2)].join
-        const_get(revision_name)
+        revision = Terradactyl::Terraform.calc_revision(tf_version)
+        const_get(revision)
       end
     end
 
@@ -387,6 +387,38 @@ module Terradactyl
         Terraform::Rev015::PlanFileParser
       end
     end
+
+    module Rev1_00
+      class << self
+        def upgradeable?
+          false
+        end
+      end
+
+      include Terraform::Commands
+
+      private
+
+      def parser
+        Terraform::Rev1_00::PlanFileParser
+      end
+    end
+
+    module Rev1_01
+      class << self
+        def upgradeable?
+          false
+        end
+      end
+
+      include Terraform::Commands
+
+      private
+
+      def parser
+        Terraform::Rev1_01::PlanFileParser
+      end
+    end
   end
   # rubocop:enable Metrics/ModuleLength
 end

data/lib/terradactyl/config.rb

@@ -26,7 +26,7 @@ module Terradactyl
             input: false
           destroy:
             parallelism: 5
-            force: true
+            auto_approve: true
         environment:
           TF_PLUGIN_CACHE_DIR: ~/.terraform.d/plugins
         misc:
@@ -177,14 +177,20 @@ module Terradactyl
     private
 
     def terraform_required_version
-      matches = TERRAFORM_SETTINGS_FILES.map do |file|
+      matches = TERRAFORM_SETTINGS_FILES.each_with_object([]) do |file, memo|
         path = File.join(stack_path, file)
-        if File.exist?(path)
-          File.read(path).match(Common.required_versions_re)
+        next unless File.exist?(path)
+
+        File.readlines(path).each do |line|
+          next if line =~ /(?:\s*#\s*)/
+
+          if (match = line.match(Common.required_versions_re))
+            memo << match
+          end
         end
       end
 
-      return {} unless matches.compact!.any?
+      return {} unless matches.any?
 
       {
         'terradactyl' => {

data/lib/terradactyl/stack.rb

@@ -69,7 +69,7 @@ module Terradactyl
     end
 
     def setup_terraform
-      %i[install_dir downloads_url releases_url].each do |opt|
+      %i[install_dir releases_url].each do |opt|
         Terraform::VersionManager.send("#{opt}=".to_sym,
                                        config.terraform.send(opt))
       end

data/lib/terradactyl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Terradactyl
-  VERSION = '0.15.2'
+  VERSION = '1.1.2'
 end

data/terradactyl.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deep_merge', '~> 1.2'
   spec.add_dependency 'bundler', '>= 1.16'
   spec.add_dependency 'rake', '>= 10.0'
-  spec.add_dependency 'terradactyl-terraform', '>= 0.15.0'
+  spec.add_dependency 'terradactyl-terraform', '>= 1.1.0'
 
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry', '~> 0.12'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terradactyl
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 1.1.2
 platform: ruby
 authors:
 - Brian Warsing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement