terradactyl-terraform 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4027e42749bc30e77a4601aae086542e62d4ed9c50913a480d7ff6bc7973c5a5
-  data.tar.gz: d5ab49216b9e1e7bbf34b213026e6ef4c851c74f3c03ac830ab11fd62419f3af
+  metadata.gz: a4c248e4fe981818a665e02636456e0cd6e88049d0e0495fe1cc3e2487c933ff
+  data.tar.gz: 37c74ac64e91d4697f00776c3b3e5491f065d2ef008bf0b813785593131008dc
 SHA512:
-  metadata.gz: 3ecd70785e909819604b60023ed3dc71eaecd3c852dbcd404b0e6d8c93d962c83256f8b9f57706dd6a9b1c3b3a2dbb95b7d994ca18da33a7db4276a6c62bc9b4
-  data.tar.gz: 6183727083d3e6284574669732d01532b9b36fbadfc6fcea700b9a788c3e84875c9d035cc88dd6c8fc13c88bdfea36cd4b02da243dc47e30f5cd1f7936d8bbfa
+  metadata.gz: 340b3e0c1ddfa250c5f04dbc59c4fdc4d6a25077f1097d41a5ab1588fbaa3467a20dbb1232baed536cd4c2e8deba7873e5841f914a2a97af26b245af775f33b3
+  data.tar.gz: 98c08dcd41f886c6d43f8921a84795b555585b2b923f07ff438610060eb0785ae266cbec381dddb079c3a580680b644174c027ccec9d9574ee9e45bca283de44

data/.github/workflows/build-and-release.yml

@@ -7,6 +7,9 @@ on:
     paths:
       - lib/terradactyl/terraform/version.rb
 
+# Using the Ruby teams https://github.com/ruby/setup-ruby, not the Github
+# team's https://github.com/actions/setup-ruby
+
 jobs:
   release:
     env:
@@ -20,7 +23,7 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v2
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -39,7 +42,7 @@ jobs:
         with:
           tag_name: v${{ env.RELEASE_VERSION }}
           release_name: v${{ env.RELEASE_VERSION }}
-          body: ${{ env.RELEASE_BODY }}
+          body_path: ${{ env.RELEASE_BODY_PATH }}
           draft: false
           prerelease: false
       - name: Upload Asset

data/.github/workflows/build-status.yml

@@ -0,0 +1,26 @@
+name: Build Status
+
+on:
+  push:
+    branches:
+      - main
+
+# Using the Ruby teams https://github.com/ruby/setup-ruby, not the Github
+# team's https://github.com/actions/setup-ruby
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git clone
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.7'
+          bundler-cache: true
+      - name: Run tests
+        id: test
+        run: bundle exec rake spec

data/.github/workflows/validate-pullrequest.yml

@@ -5,6 +5,9 @@ on:
     paths:
       - '**.rb'
 
+# Using the Ruby teams https://github.com/ruby/setup-ruby, not the Github
+# team's https://github.com/actions/setup-ruby
+
 jobs:
   validate:
     runs-on: ubuntu-latest
@@ -14,15 +17,13 @@ jobs:
         with:
           fetch-depth: 2
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.7'
           bundler-cache: true
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
       - name: Run lint
+        id: lint
         run: bundle exec rake lint
       - name: Run tests
+        id: test
         run: bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 0.15.0 (2021-04-27)
+
+NEW FEATURES:
+
+* adds support for Terraform version `0.14.x`
+* adds support for Terraform version `0.15.x`
+
+BUG FIXES:
+
+* fix broken version expression resolution
+
 ## 0.13.0 (2020-11-23)
 
 NEW FEATURES:

data/README.md

@@ -1,12 +1,15 @@
 # Terradactyl::Terraform
 
-A collection of libraries for executing Terraform CLI operations, managing Terraform binary versions, and other related tasks.
+[![Gem Version](https://badge.fury.io/rb/terradactyl-terraform.svg)](https://badge.fury.io/rb/terradactyl-terraform)
+![Build Status](https://github.com/vcilabs/terradactyl-terraform/workflows/Build%20Status/badge.svg)
+
+Library for executing Terraform CLI operations, managing Terraform binary versions, and other related tasks.
 
 ## Requirements
 
 Requires Ruby 2.5 or greater.
 
-NOTE: While `VersionManager` can fetch & install ANY available version of Terraform, the Terraform sub-command operations are only supported between stable versions `~> 0.11.x` and `~> 0.13.x`.
+NOTE: While `VersionManager` can fetch & install ANY available version of Terraform, the Terraform sub-command operations are only supported between stable versions `~> 0.11.x` and `~> 0.15.x`.
 
 ## Installation
 
@@ -32,7 +35,7 @@ If you wish to try out some features, launch a `pry` repl and poke around ...
 
     $ bundle exec pry -r 'terradactyl/terraform'
     [1] pry(main)> Terradactyl::Terraform::VERSION
-    => "0.13.0"
+    => "0.15.0"
 
 ### Managing  different Terraform versions
 

data/lib/terradactyl/terraform/commands.rb

@@ -11,10 +11,3 @@ require_relative 'commands/destroy'
 require_relative 'commands/fmt'
 require_relative 'commands/show'
 require_relative 'commands/validate'
-require_relative 'commands/checklist'
-
-module Terradactyl
-  module Terraform
-    Rev013 = Rev012
-  end
-end

data/lib/terradactyl/terraform/commands/apply.rb

@@ -2,7 +2,7 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Apply
         def defaults
           {
@@ -31,12 +31,6 @@ module Terradactyl
       end
     end
 
-    module Rev012
-      module Apply
-        include Rev011::Apply
-      end
-    end
-
     module Commands
       class Apply < Base
       end

data/lib/terradactyl/terraform/commands/base.rb

@@ -8,15 +8,19 @@ module Terradactyl
       end
 
       def revisions
-        contstants.select { |c| c =~ /Rev/ }.sort
+        constants.select { |c| c =~ /Rev/ }.sort
       end
 
       def select_revision(version, object)
         klass_name = object.class.name.split('::').last
-        const_name = "#{revision(version)}::#{klass_name}"
+        revision   = "#{revision(version)}::#{klass_name}"
         return if klass_name == 'Base'
 
-        object.extend(Terradactyl::Terraform.const_get(const_name))
+        if Terradactyl::Terraform.const_defined?(revision)
+          object.extend(Terradactyl::Terraform.const_get(revision))
+        else
+          object.extend(Terradactyl::Terraform.const_get("Subcommands::#{klass_name}"))
+        end
       end
     end
 

data/lib/terradactyl/terraform/commands/destroy.rb

@@ -2,7 +2,7 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Destroy
         def defaults
           {
@@ -32,9 +32,21 @@ module Terradactyl
       end
     end
 
-    module Rev012
+    module Rev015
       module Destroy
-        include Rev011::Destroy
+        include Terradactyl::Terraform::Subcommands::Destroy
+
+        def defaults
+          super.reject { |k, _v| k == 'force' }
+        end
+
+        def switches
+          super.reject { |e| e == 'force' }
+        end
+
+        def arguments
+          super.reject { |k, _v| k == 'force' }
+        end
       end
     end
 

data/lib/terradactyl/terraform/commands/fmt.rb

@@ -2,7 +2,7 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Fmt
         def defaults
           {
@@ -19,12 +19,6 @@ module Terradactyl
       end
     end
 
-    module Rev012
-      module Fmt
-        include Rev011::Fmt
-      end
-    end
-
     module Commands
       class Fmt < Base
       end

data/lib/terradactyl/terraform/commands/init.rb

@@ -2,7 +2,7 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Init
         def defaults
           {
@@ -33,9 +33,17 @@ module Terradactyl
       end
     end
 
-    module Rev012
+    module Rev015
       module Init
-        include Rev011::Init
+        include Terradactyl::Terraform::Subcommands::Init
+
+        def defaults
+          super.reject { |k, _v| k == 'lock' }
+        end
+
+        def arguments
+          super.reject { |k, _v| k == 'lock' }
+        end
       end
     end
 

data/lib/terradactyl/terraform/commands/plan.rb

@@ -2,7 +2,7 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Plan
         def defaults
           {
@@ -33,12 +33,6 @@ module Terradactyl
       end
     end
 
-    module Rev012
-      module Plan
-        include Rev011::Plan
-      end
-    end
-
     module Commands
       class Plan < Base
       end

data/lib/terradactyl/terraform/commands/refresh.rb

@@ -2,7 +2,7 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Refresh
         def defaults
           {
@@ -27,12 +27,6 @@ module Terradactyl
       end
     end
 
-    module Rev012
-      module Refresh
-        include Rev011::Refresh
-      end
-    end
-
     module Commands
       class Refresh < Base
       end

data/lib/terradactyl/terraform/commands/show.rb

@@ -2,35 +2,37 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Show
         def defaults
           {
-            'module-depth' => -1,
+            'json' => false,
             'no-color' => false
           }
         end
 
         def switches
           %w[
+            json
             no-color
           ]
         end
       end
     end
 
-    module Rev012
+    module Rev011
+      include Terradactyl::Terraform::Subcommands::Show
+
       module Show
         def defaults
           {
-            'json' => false,
+            'module-depth' => -1,
             'no-color' => false
           }
         end
 
         def switches
           %w[
-            json
             no-color
           ]
         end

data/lib/terradactyl/terraform/commands/validate.rb

@@ -2,7 +2,7 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Validate
         def defaults
           {

data/lib/terradactyl/terraform/commands/version.rb

@@ -2,17 +2,11 @@
 
 module Terradactyl
   module Terraform
-    module Rev011
+    module Subcommands
       module Version
       end
     end
 
-    module Rev012
-      module Version
-        include Rev011::Version
-      end
-    end
-
     module Commands
       class Version < Base
       end

data/lib/terradactyl/terraform/planfile.rb

@@ -8,6 +8,8 @@ module Terradactyl
       class PlanFileParser
         attr_reader :plan_path
 
+        PLAN_FILE_SIGNATURE = 'Terraform will perform the following actions'
+
         def self.load(plan_path)
           new(plan_path)
         end
@@ -24,10 +26,19 @@ module Terradactyl
           @data ||= parse(@plan_path)
         end
 
+        def signature
+          self.class::PLAN_FILE_SIGNATURE
+        end
+
         private
 
+        # rubocop:disable Metrics/AbcSize
         def parse(plan_path)
-          captured = Commands::Show.execute(dir_or_plan: plan_path,
+          file_name  = File.basename(plan_path)
+          stack_name = File.dirname(plan_path)
+          pushd(stack_name)
+
+          captured = Commands::Show.execute(dir_or_plan: file_name,
                                             options: options,
                                             capture: true)
 
@@ -40,7 +51,7 @@ module Terradactyl
           parsed = JSON.parse(captured.stdout)
 
           # The the  `prior_state` node in the JSON returned from the
-          # planfile is not assembled consitently and therefore, never obeys
+          # planfile is not assembled consistently and therefore, never obeys
           # any sort order. It does not appear to be of any consequence when
           # calculating a checksum for the plan, so we excise it in an effort
           # to conform the data. This is sub-optimal, but presently necessary.
@@ -48,7 +59,10 @@ module Terradactyl
           # brian.warsing@visioncritical.com (2020-06-18)
 
           parsed.reject { |k| k == 'prior_state' }.to_json
+        ensure
+          popd
         end
+        # rubocop:enable Metrics/AbcSize
 
         def options
           Commands::Options.new do |opts|
@@ -57,6 +71,30 @@ module Terradactyl
             opts.json        = true
           end
         end
+
+        def pushd(path)
+          @working_dir_last = Dir.pwd
+          Dir.chdir(path)
+        end
+
+        def popd
+          Dir.chdir(@working_dir_last)
+        end
+      end
+    end
+
+    module Rev013
+      class PlanFileParser < Rev012::PlanFileParser
+      end
+    end
+
+    module Rev014
+      class PlanFileParser < Rev012::PlanFileParser
+      end
+    end
+
+    module Rev015
+      class PlanFileParser < Rev012::PlanFileParser
       end
     end
 
@@ -120,20 +158,18 @@ module Terradactyl
       end
       # rubocop:enable Security/MarshalLoad
 
-      attr_reader   :data, :checksum, :file_name, :stack_name
-      attr_writer   :plan_output
+      attr_reader   :data, :checksum, :file_name, :stack_name, :parser
+      attr_writer   :plan_output, :error_output
       attr_accessor :base_folder
 
       WARN_NO_PLAN_OUTPUT = 'WARN: no plan output is available'
 
       def initialize(plan_path:, parser:)
         @plan_path   = plan_path.to_s
-        @parser      = parser
         @file_name   = File.basename(@plan_path)
         @stack_name  = File.basename(@plan_path, '.tfout')
         @base_folder = File.dirname(@plan_path).split('/')[-2]
-
-        parse(@plan_path)
+        @parser      = parse(parser, @plan_path)
       end
 
       def save(artifact_path: artifact)
@@ -150,7 +186,11 @@ module Terradactyl
       end
 
       def plan_output
-        format_output(@plan_output)
+        format_plan_output(@plan_output)
+      end
+
+      def error_output
+        format_error_output(@error_output)
       end
 
       def to_markdown
@@ -172,8 +212,8 @@ module Terradactyl
 
       private
 
-      def parse(plan_path)
-        @parser.load(plan_path).tap do |dat|
+      def parse(parser, plan_path)
+        parser.load(plan_path).tap do |dat|
           @data     = dat.data
           @checksum = dat.checksum
         end
@@ -186,17 +226,18 @@ module Terradactyl
                                 'terradactyl.planfile.data')
       end
 
-      def format_output(string)
+      def format_error_output(string)
+        string.strip
+      end
+
+      def format_plan_output(string)
         return WARN_NO_PLAN_OUTPUT unless string
 
-        delimit = '-' * 72
+        # These hypens are different!
+        delimit = /(?:─|-){72,77}/
         content = string.split(delimit).compact.reject(&:empty?)
 
-        if content.size == 2
-          content.last.strip
-        else
-          content[content.size / 3].strip
-        end
+        content.select { |e| e =~ /#{parser.signature}/ }.first.strip
       end
     end
   end

data/lib/terradactyl/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module Terradactyl
   module Terraform
-    VERSION = '0.13.0'
+    VERSION = '0.15.0'
   end
 end

data/lib/terradactyl/terraform/version_manager.rb

@@ -8,6 +8,7 @@ require_relative 'version_manager/binary'
 
 module Terradactyl
   module Terraform
+    # rubocop:disable Metrics/ModuleLength
     module VersionManager
       class VersionManagerError < RuntimeError
         def initialize(msg)
@@ -17,8 +18,10 @@ module Terradactyl
 
       ERROR_MISSING                = 'Terraform not installed'
       ERROR_INVALID_VERSION_STRING = 'Invalid version string'
+      ERROR_UNRESOLVABLE_VERSION   = 'Unresolvable version string'
+      ERROR_UNPARSEABLE_VERSION    = 'Unparsable version string'
       SEMVER_EXP_RE                = /
-        ^\s*((?<op>(<=|>=|>|<|~>))\s+)?
+        ^\s*((?<op>(=|<=|>=|>|<|~>))\s+)?
         (?<semver>\d+(\.\d+)?(\.\d+)?(-\w+)?)
       /x.freeze
 
@@ -78,12 +81,8 @@ module Terradactyl
         end
 
         def resolve(expression)
-          data   = expression.to_s.match(SEMVER_EXP_RE) || {}
-          op     = data['op']
-          semver = data['semver']
-
-          unless (resolution = resolve_expression(op, semver))
-            raise VersionManagerError, ERROR_INVALID_VERSION_STRING
+          unless (resolution = resolve_expression(expression.to_s.strip))
+            raise VersionManagerError, ERROR_UNRESOLVABLE_VERSION
           end
 
           resolution
@@ -91,19 +90,65 @@ module Terradactyl
 
         private
 
-        def resolve_expression(op, semver)
-          case op
-          when /~>/
-            min = semver
-            max = pessimistic_max(semver)
-            versions(local: false).select { |v| (v >= min && v < max) }.last
-          when />=|>|<=|</
-            versions(local: false).select { |v| v.send(op.to_sym, semver) }.last
+        def resolve_expression(expression)
+          candiates = case expression
+                      when /^~>/
+                        resolve_pessimistic(expression)
+                      when /^(?:>=|>|<=|<)/
+                        resolve_range(expression)
+                      when /^(?:=\s+)?\d+\.\d+\.\d+(?:-.*)?/
+                        return resolve_equality(expression)
+                      else
+                        raise VersionManagerError, ERROR_INVALID_VERSION_STRING
+                      end
+
+          candiates.reject { |v| v =~ /-/ }.last
+        end
+
+        def resolve_equality(expression)
+          expression.split(/\s+/).last
+        end
+
+        # rubocop:disable Metrics/AbcSize
+        def resolve_range(expression)
+          left, right    = expression.split(/\s*,\s*/)
+          l_op, l_semver = parse_expression(left).captures
+
+          if right
+            r_op, r_semver = parse_expression(right).captures
           else
-            versions(local: false).delete(semver)
+            r_op = l_op
+            r_semver = l_semver
+          end
+
+          l_gemver = Gem::Version.new(l_semver)
+          r_gemver = Gem::Version.new(r_semver)
+
+          versions(local: false).select do |v|
+            v = Gem::Version.new(v)
+            (v.send(l_op.to_sym, l_gemver) && v.send(r_op.to_sym, r_gemver))
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        def resolve_pessimistic(expression)
+          semver    = parse_expression(expression).captures.last
+          min       = Gem::Version.new(semver)
+          max       = Gem::Version.new(pessimistic_max(semver))
+
+          versions(local: false).select do |v|
+            v = Gem::Version.new(v)
+            (v >= min && v < max)
           end
         end
 
+        def parse_expression(expression)
+          match = expression.to_s.match(SEMVER_EXP_RE)
+          raise VersionManagerError, ERROR_UNPARSEABLE_VERSION unless match
+
+          match
+        end
+
         def remote_versions
           fh = Downloader.fetch(releases_url)
           re = /terraform_(?<version>\d+\.\d+\.\d+(-\w+)?)/
@@ -127,5 +172,6 @@ module Terradactyl
         end
       end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terradactyl-terraform
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Brian Warsing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -146,6 +146,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/build-and-release.yml"
+- ".github/workflows/build-status.yml"
 - ".github/workflows/validate-pullrequest.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -158,7 +159,6 @@ files:
 - lib/terradactyl/terraform/commands.rb
 - lib/terradactyl/terraform/commands/apply.rb
 - lib/terradactyl/terraform/commands/base.rb
-- lib/terradactyl/terraform/commands/checklist.rb
 - lib/terradactyl/terraform/commands/destroy.rb
 - lib/terradactyl/terraform/commands/fmt.rb
 - lib/terradactyl/terraform/commands/init.rb
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Core functionality for managing a Terraform repo

data/lib/terradactyl/terraform/commands/checklist.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Terradactyl
-  module Terraform
-    module Rev011
-      module Checklist
-        def defaults
-          {}
-        end
-
-        def switches
-          []
-        end
-
-        def subcmd
-          '0.12checklist'
-        end
-      end
-    end
-
-    module Rev012
-      module Checklist
-        include Rev011::Checklist
-      end
-    end
-
-    module Commands
-      class Checklist < Base
-      end
-    end
-  end
-end