terradactyl 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a88b521150fa75bede628b6a89642b308b873439b8ab1c321c5c0c4f223670
-  data.tar.gz: ac90f280fec5f7f3ce98b734c407f335b158863df5c324b577dce98e34878f91
+  metadata.gz: 0bc592a89bdefefae6460b67cf305a20c9a204f7960d8f7adc060e6b45352d20
+  data.tar.gz: c2f4083336586251254b15970c97c00f63dd0d07c5354e14f00b2c9ee6fb840c
 SHA512:
-  metadata.gz: 525638ac61294ee05b8cbc0618b467fb4b32910c09bb5c6f8269e690ae2f70ae9764543bc2923fa3d1629591a5b9d952019fbfee0326202f39514bdf234c087a
-  data.tar.gz: ff919fb3c9b2bc11227d0c1d6668aa270d05e273af136a96d85d7afe67139c26979d1e375f51a69792101c50d8acf400f2e3f6629b009b928491f07c43213aa6
+  metadata.gz: 48283e55d2f375e71b4aef40e831cb4f973f98a42382972db7a2b099735725f633348995fd1cc8e4a9075799add4a1ce8ac0b41ad755fee08e5bcdd6e709499a
+  data.tar.gz: 3eb7984c57b37fc6a72dd350a8deeed2b77b228cf5f7e0ace79cde86b5c3004fb4bc9f78d651a059b0a769ba2572a06db93a58b2c75ace1c7140b3091a930f95

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 0.15.1 (2021-04-28)
+
+BUG FIXES:
+
+* repair broken `upgrade` subcommand
+  * fix malformed HCL substitution
+  * fix regex match order of operations bug
+  * make the feature more robust
+  * add better feedback
+
 ## 0.15.0 (2021-04-27)
 
 NEW FEATURES:

data/lib/terradactyl/cli.rb

@@ -67,6 +67,20 @@ module Terradactyl
       def terraform_latest
         Terradactyl::Terraform::VersionManager.latest
       end
+
+      def upgrade_stack(name)
+        @stack ||= Stack.new(name)
+        print_warning "Upgrading: #{@stack.name}"
+        if @stack.upgrade.zero?
+          print_ok "Upgraded: #{@stack.name}"
+        else
+          Stacks.error!(@stack)
+          print_crit "Failed to upgrade: #{@stack.name}"
+        end
+      rescue Terradactyl::Terraform::Commands::UnsupportedCommandError => e
+        print_crit "Error: #{e.message}"
+        exit 1
+      end
     end
     # rubocop:enable Metrics/BlockLength
 
@@ -153,6 +167,14 @@ module Terradactyl
     # the `quickplan` task is an exception to this rule.
     #################################################################
 
+    desc 'upgrade NAME', 'Cleans, inits, upgrades and formats an individual stack, by name'
+    def upgrade(name)
+      clean(name)
+      init(name)
+      upgrade_stack(name)
+      fmt(name)
+    end
+
     desc 'quickplan NAME', 'Clean, init and plan a stack, by name'
     def quickplan(name)
       print_header "Quick planning #{name} ..."
@@ -358,16 +380,21 @@ module Terradactyl
 
     desc 'install COMPONENT', 'Installs specified component'
     long_desc <<~LONGDESC
-       The `terradactyl install COMPONENT` subcommand perfoms installations of
+      The `terradactyl install COMPONENT` subcommand perfoms installations of
       prerequisties. At present, only Terraform binaries are supported.
-       Here are a few examples:
-       # Install latest
+
+      Here are a few examples:
+
+      # Install latest
       `terradactyl install terraform`
-       # Install pessimistic version
+
+      # Install pessimistic version
       `terradactyl install terraform --version="~> 0.13.0"`
-       # Install ranged version
+
+      # Install ranged version
       `terradactyl install terraform --version=">= 0.14.5, <= 0.14.7"`
-       # Install explicit version
+
+      # Install explicit version
       `terradactyl install terraform --version=0.15.0-beta2`
 
     LONGDESC
@@ -391,21 +418,6 @@ module Terradactyl
       end
     end
     # rubocop:enable Metrics/AbcSize
-
-    desc 'upgrade NAME', 'Upgrade an individual stack, by name'
-    def upgrade(name)
-      @stack ||= Stack.new(name)
-      print_warning "Upgrading: #{@stack.name}"
-      if @stack.upgrade.zero?
-        print_ok "Upgraded: #{@stack.name}"
-      else
-        Stacks.error!(@stack)
-        print_crit "Failed to upgrade: #{@stack.name}"
-      end
-    rescue Terradactyl::Terraform::Commands::UnsupportedCommandError => e
-      print_crit "Error: #{e.message}"
-      exit 1
-    end
   end
   # rubocop:enable Metrics/ClassLength
 end

data/lib/terradactyl/commands.rb

@@ -187,21 +187,70 @@ module Terradactyl
 
     private
 
+    def settings_files
+      Terradactyl::ConfigStack::TERRAFORM_SETTINGS_FILES.select do |file|
+        File.exist?(file)
+      end
+    end
+
+    def update_required_version(upgrade_version)
+      replace_me = /(?<assignment>(?:\n\s)*required_version\s+=\s+)(?<value>".*?")/m
+
+      settings_files.each do |file|
+        settings     = File.read(file)
+        substitution = nil.to_s
+
+        if (req_version = settings.match(replace_me))
+          if file == 'versions.tf'
+            substitution = %(#{req_version[:assignment]}"~> #{upgrade_version}")
+          end
+        end
+
+        settings.sub!(replace_me, substitution)
+
+        File.write(file, settings)
+      end
+    end
+
+    def upgrade_notice
+      output = File.read('versions.tf')
+      insert = output.strip.split("\n").map { |l| "    #{l}" }.join($INPUT_RECORD_SEPARATOR)
+
+      <<~NOTICE
+        This stack has been upgraded to version the described below and its
+        Terradactly config file (if it existed) has been removed.
+
+         #{insert}
+
+         NOTES:
+
+         • ALL Terraform version constraints are now specified in `versions.tf` using
+          the `required_version` directive.
+
+         • If your stack already containedo one or more `required_version` directives,
+          they have been consolidated into a single directive in `versions.tf`.
+
+         • Terraform provider version contraints ARE NOT upgraded automatically. You
+          will need to edit these MANUALLY.
+
+         • Before proceeding. please perform a `terradactyl quickplan` on your stack
+          to ensure the upgraded stack functions.
+      NOTICE
+    end
+
     def perform_upgrade
       options = command_options.tap { |dat| dat.yes = true }
       upgrade = Upgrade.new(dir_or_plan: nil, options: options)
-      req_ver = /((?:\n\s)*required_version\s=\s)".*"/m
-      result  = upgrade.execute
 
-      if result.zero?
-        settings = File.read('versions.tf').lstrip
-        settings.sub!(req_ver, %(#{Regexp.last_match(1)}"~> #{upgrade.version}"))
+      update_required_version(upgrade.version)
 
-        if File.write('versions.tf', settings)
-          FileUtils.rm_rf('terradactyl.yaml') if File.exist?('terradactyl.yaml')
-        end
+      if (result = upgrade.execute).zero?
+        update_required_version(upgrade.version)
+        FileUtils.rm_rf('terradactyl.yaml') if File.exist?('terradactyl.yaml')
       end
 
+      print_content(upgrade_notice)
+
       result
     end
 

data/lib/terradactyl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terradactyl
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Brian Warsing