rake_terraform 1.23.0.pre.1 → 1.23.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77a1239bb5d824ac6a39893e6c5fc06f852654982e0877d45514f747161ad8d5
-  data.tar.gz: 6367816db723333eb68da2c8503e4c3b71c22d907a9b724be127ddb43341bb5e
+  metadata.gz: d4ea25d54d9b22e653aa967f95ab25637ce3deba334b14c939a28058c34101c2
+  data.tar.gz: 445c0ddf177a6bf258bd48b67e43ece959f5a32a3107dc5559844e1f2af0b81c
 SHA512:
-  metadata.gz: e7c2c91ce33307d81d06e37df7781128a9c2894d8a129906b11c3dd8f379c82b4096416d23082cfce79a11c6197f2e044a957c5cdd28ebb278319bf63d5c6783
-  data.tar.gz: 074a3135376e10272df8108655a07665f109e40fb508f2598583bb3a4621f92ebfd190d3751cda6e987ea83e6e62b0923bef3bc1478e3dd1e76c5e10b04ce717
+  metadata.gz: 709d8724b84f07690ecd598de375d8a1489804416e4ab74b5dd81acf6230c06cbe111a5724dafbc74d8e7123d8a315b368f39cde464006fb775f7793103bec08
+  data.tar.gz: 06106706f076f87d53ea99a1e82e1383afa04aaaea1b15f11a50627f22e20476230e2f6dd40b641c4878d7736a487201ecb52a654dd41960997785a362bd09f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_terraform (1.23.0.pre.1)
+    rake_terraform (1.23.0.pre.4)
       colored2 (~> 3.1)
       rake_dependencies (~> 3.1)
       rake_factory (~> 0.23)
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -20,11 +20,11 @@ GEM
     ast (2.4.2)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
     excon (0.92.0)
-    fakefs (1.4.1)
+    fakefs (1.8.0)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -89,8 +89,8 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -126,7 +126,7 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.2.1)
+    regexp_parser (2.4.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -141,7 +141,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.26.0)
+    rubocop (1.27.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -150,14 +150,14 @@ GEM
       rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.9.0)
+    rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby-terraform (1.4.0)
+    ruby-terraform (1.6.0)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
     ruby2_keywords (0.0.5)
@@ -180,7 +180,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     webrick (1.7.0)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
 
 PLATFORMS
@@ -207,4 +207,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.9
+   2.3.17

data/Rakefile

@@ -19,6 +19,7 @@ namespace :encryption do
   namespace :passphrase do
     desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
+      FileUtils.mkdir_p('config/secrets/ci/')
       File.write('config/secrets/ci/encryption.passphrase',
                  SecureRandom.base64(36))
     end

data/lib/rake_terraform/task_sets/all.rb

@@ -11,6 +11,8 @@ module RakeTerraform
       parameter :source_directory, required: true
       parameter :work_directory, required: true
 
+      parameter :environment, default: {}
+
       parameter :backend_config
 
       parameter :vars, default: {}

data/lib/rake_terraform/tasks/destroy.rb

@@ -20,6 +20,8 @@ module RakeTerraform
       parameter :source_directory, required: true
       parameter :work_directory, required: true
 
+      parameter :environment, default: {}
+
       parameter :backend_config
 
       parameter :vars, default: {}
@@ -35,42 +37,57 @@ module RakeTerraform
 
       parameter :ensure_task_name, default: :'terraform:ensure'
 
-      # rubocop:disable Metrics/BlockLength
-
-      action do |t|
-        Colored2.disable! if t.no_color
+      action do |task|
+        Colored2.disable! if task.no_color
 
         module_directory =
-          File.join(FileUtils.pwd, t.source_directory)
+          File.join(FileUtils.pwd, task.source_directory)
         configuration_directory =
-          File.join(t.work_directory, t.source_directory)
+          File.join(task.work_directory, task.source_directory)
 
-        Kernel.puts "Destroying #{t.configuration_name}".cyan
+        Kernel.puts "Destroying #{task.configuration_name}".cyan
+
+        prepare_configuration_directory(configuration_directory)
+        init_configuration(configuration_directory, module_directory, task)
+        destroy_configuration(configuration_directory, task)
+      end
 
+      def prepare_configuration_directory(configuration_directory)
         FileUtils.rm_rf(configuration_directory)
         FileUtils.mkdir_p(configuration_directory)
+      end
 
+      def init_configuration(configuration_directory, module_directory, task)
         RubyTerraform.init(
-          chdir: configuration_directory,
-          from_module: module_directory,
-          backend_config: t.backend_config,
-          no_color: t.no_color,
-          input: t.input
+          {
+            chdir: configuration_directory,
+            from_module: module_directory,
+            backend_config: task.backend_config,
+            no_color: task.no_color,
+            input: task.input
+          },
+          { environment: task.environment }
         )
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def destroy_configuration(configuration_directory, task)
         RubyTerraform.destroy(
-          chdir: configuration_directory,
-          auto_approve: true,
-          input: t.input,
-          no_color: t.no_color,
-          no_backup: t.no_backup,
-          backup: t.backup_file,
-          state: t.state_file,
-          vars: t.vars,
-          var_file: t.var_file
+          {
+            chdir: configuration_directory,
+            auto_approve: true,
+            input: task.input,
+            no_color: task.no_color,
+            no_backup: task.no_backup,
+            backup: task.backup_file,
+            state: task.state_file,
+            vars: task.vars,
+            var_file: task.var_file
+          },
+          { environment: task.environment }
         )
       end
-
-      # rubocop:enable Metrics/BlockLength
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/rake_terraform/tasks/output.rb

@@ -20,6 +20,8 @@ module RakeTerraform
       parameter :source_directory, required: true
       parameter :work_directory, required: true
 
+      parameter :environment, default: {}
+
       parameter :backend_config
 
       parameter :state_file
@@ -31,35 +33,52 @@ module RakeTerraform
 
       parameter :ensure_task_name, default: :'terraform:ensure'
 
-      action do |t|
-        Colored2.disable! if t.no_color
+      action do |task|
+        Colored2.disable! if task.no_color
 
         module_directory =
-          File.join(FileUtils.pwd, t.source_directory)
+          File.join(FileUtils.pwd, task.source_directory)
         configuration_directory =
-          File.join(t.work_directory, t.source_directory)
+          File.join(task.work_directory, task.source_directory)
+
+        Kernel.puts("Output of #{task.configuration_name}".cyan)
+
+        prepare_configuration_directory(configuration_directory)
+        init_configuration(configuration_directory, module_directory, task)
+        output = output_configuration(configuration_directory, task)
 
-        Kernel.puts("Output of #{t.configuration_name}".cyan)
+        Kernel.puts(output) unless task.no_print_output
+
+        output
+      end
 
+      def prepare_configuration_directory(configuration_directory)
         FileUtils.rm_rf(configuration_directory)
         FileUtils.mkdir_p(configuration_directory)
+      end
 
+      def init_configuration(configuration_directory, module_directory, task)
         RubyTerraform.init(
-          chdir: configuration_directory,
-          from_module: module_directory,
-          backend_config: t.backend_config,
-          no_color: t.no_color,
-          input: t.input
-        )
-        output = RubyTerraform.output(
-          chdir: configuration_directory,
-          no_color: t.no_color,
-          state: t.state_file
+          {
+            chdir: configuration_directory,
+            from_module: module_directory,
+            backend_config: task.backend_config,
+            no_color: task.no_color,
+            input: task.input
+          },
+          { environment: task.environment }
         )
+      end
 
-        Kernel.puts(output) unless t.no_print_output
-
-        output
+      def output_configuration(configuration_directory, task)
+        RubyTerraform.output(
+          {
+            chdir: configuration_directory,
+            no_color: task.no_color,
+            state: task.state_file
+          },
+          { environment: task.environment }
+        )
       end
     end
   end

data/lib/rake_terraform/tasks/plan.rb

@@ -20,6 +20,8 @@ module RakeTerraform
       parameter :source_directory, required: true
       parameter :work_directory, required: true
 
+      parameter :environment, default: {}
+
       parameter :backend_config
 
       parameter :vars, default: {}
@@ -35,37 +37,56 @@ module RakeTerraform
 
       parameter :ensure_task_name, default: :'terraform:ensure'
 
-      action do |t|
-        Colored2.disable! if t.no_color
+      action do |task|
+        Colored2.disable! if task.no_color
 
         module_directory =
-          File.join(FileUtils.pwd, t.source_directory)
+          File.join(FileUtils.pwd, task.source_directory)
         configuration_directory =
-          File.join(t.work_directory, t.source_directory)
+          File.join(task.work_directory, task.source_directory)
 
         Kernel.puts("Planning #{configuration_name}".cyan)
 
+        prepare_configuration_directory(configuration_directory)
+        init_configuration(configuration_directory, module_directory, task)
+        plan_configuration(configuration_directory, task)
+      end
+
+      def prepare_configuration_directory(configuration_directory)
         FileUtils.rm_rf(configuration_directory)
         FileUtils.mkdir_p(configuration_directory)
+      end
 
+      def init_configuration(configuration_directory, module_directory, task)
         RubyTerraform.init(
-          chdir: configuration_directory,
-          from_module: module_directory,
-          backend_config: t.backend_config,
-          no_color: t.no_color,
-          input: t.input
+          {
+            chdir: configuration_directory,
+            from_module: module_directory,
+            backend_config: task.backend_config,
+            no_color: task.no_color,
+            input: task.input
+          },
+          { environment: task.environment }
         )
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def plan_configuration(configuration_directory, task)
         RubyTerraform.plan(
-          chdir: configuration_directory,
-          input: t.input,
-          no_color: t.no_color,
-          destroy: t.destroy,
-          state: t.state_file,
-          plan: t.plan_file,
-          vars: t.vars,
-          var_file: t.var_file
+          {
+            chdir: configuration_directory,
+            input: task.input,
+            no_color: task.no_color,
+            destroy: task.destroy,
+            state: task.state_file,
+            plan: task.plan_file,
+            vars: task.vars,
+            var_file: task.var_file
+          },
+          { environment: task.environment }
         )
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/rake_terraform/tasks/provision.rb

@@ -20,6 +20,8 @@ module RakeTerraform
       parameter :source_directory, required: true
       parameter :work_directory, required: true
 
+      parameter :environment, default: {}
+
       parameter :backend_config
 
       parameter :vars, default: {}
@@ -35,42 +37,57 @@ module RakeTerraform
 
       parameter :ensure_task_name, default: :'terraform:ensure'
 
-      # rubocop:disable Metrics/BlockLength
-
-      action do |t|
-        Colored2.disable! if t.no_color
+      action do |task|
+        Colored2.disable! if task.no_color
 
         module_directory =
-          File.join(FileUtils.pwd, t.source_directory)
+          File.join(FileUtils.pwd, task.source_directory)
         configuration_directory =
-          File.join(t.work_directory, t.source_directory)
+          File.join(task.work_directory, task.source_directory)
 
-        Kernel.puts("Provisioning #{t.configuration_name}".cyan)
+        Kernel.puts("Provisioning #{task.configuration_name}".cyan)
+
+        prepare_configuration_directory(configuration_directory)
+        init_configuration(configuration_directory, module_directory, task)
+        apply_configuration(configuration_directory, task)
+      end
 
+      def prepare_configuration_directory(configuration_directory)
         FileUtils.rm_rf(configuration_directory)
         FileUtils.mkdir_p(configuration_directory)
+      end
 
+      def init_configuration(configuration_directory, module_directory, task)
         RubyTerraform.init(
-          chdir: configuration_directory,
-          from_module: module_directory,
-          backend_config: t.backend_config,
-          no_color: t.no_color,
-          input: t.input
+          {
+            chdir: configuration_directory,
+            from_module: module_directory,
+            backend_config: task.backend_config,
+            no_color: task.no_color,
+            input: task.input
+          },
+          { environment: task.environment }
         )
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def apply_configuration(configuration_directory, task)
         RubyTerraform.apply(
-          chdir: configuration_directory,
-          auto_approve: true,
-          input: t.input,
-          no_color: t.no_color,
-          no_backup: t.no_backup,
-          backup: t.backup_file,
-          state: t.state_file,
-          vars: t.vars,
-          var_file: t.var_file
+          {
+            chdir: configuration_directory,
+            auto_approve: true,
+            input: task.input,
+            no_color: task.no_color,
+            no_backup: task.no_backup,
+            backup: task.backup_file,
+            state: task.state_file,
+            vars: task.vars,
+            var_file: task.var_file
+          },
+          { environment: task.environment }
         )
       end
-
-      # rubocop:enable Metrics/BlockLength
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/rake_terraform/tasks/validate.rb

@@ -20,6 +20,8 @@ module RakeTerraform
       parameter :source_directory, required: true
       parameter :work_directory, required: true
 
+      parameter :environment, default: {}
+
       parameter :backend_config
 
       parameter :debug, default: false
@@ -28,29 +30,46 @@ module RakeTerraform
 
       parameter :ensure_task_name, default: :'terraform:ensure'
 
-      action do |t|
-        Colored2.disable! if t.no_color
+      action do |task|
+        Colored2.disable! if task.no_color
 
         module_directory =
-          File.join(FileUtils.pwd, t.source_directory)
+          File.join(FileUtils.pwd, task.source_directory)
         configuration_directory =
-          File.join(t.work_directory, t.source_directory)
+          File.join(task.work_directory, task.source_directory)
+
+        Kernel.puts("Validating #{task.configuration_name}".cyan)
 
-        Kernel.puts("Validating #{t.configuration_name}".cyan)
+        prepare_configuration_directory(configuration_directory)
+        init_configuration(configuration_directory, module_directory, task)
+        validate_configuration(configuration_directory, task)
+      end
 
+      def prepare_configuration_directory(configuration_directory)
         FileUtils.rm_rf(configuration_directory)
         FileUtils.mkdir_p(configuration_directory)
+      end
 
+      def init_configuration(configuration_directory, module_directory, task)
         RubyTerraform.init(
-          chdir: configuration_directory,
-          from_module: module_directory,
-          backend_config: t.backend_config,
-          no_color: t.no_color,
-          input: t.input
+          {
+            chdir: configuration_directory,
+            from_module: module_directory,
+            backend_config: task.backend_config,
+            no_color: task.no_color,
+            input: task.input
+          },
+          { environment: task.environment }
         )
+      end
+
+      def validate_configuration(configuration_directory, task)
         RubyTerraform.validate(
-          chdir: configuration_directory,
-          no_color: t.no_color
+          {
+            chdir: configuration_directory,
+            no_color: task.no_color
+          },
+          { environment: task.environment }
         )
       end
     end

data/lib/rake_terraform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RakeTerraform
-  VERSION = '1.23.0.pre.1'
+  VERSION = '1.23.0.pre.4'
 end

data/rake_terraform.gemspec

@@ -59,4 +59,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'yard'
+
+  spec.metadata['rubygems_mfa_required'] = 'false'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_terraform
 version: !ruby/object:Gem::Version
-  version: 1.23.0.pre.1
+  version: 1.23.0.pre.4
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -336,7 +336,8 @@ files:
 homepage: https://github.com/infrablocks/rake_terraform
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'false'
 post_install_message: 
 rdoc_options: []
 require_paths: