iapi-idlc-sdk-pfm 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02b07d40dc69b2bf36a0c8708bdf91683c9e89992229ecdd55b29837741f0d80
-  data.tar.gz: c9f9143e6ffc323c7a0353b8d300dee681d8e33074c9a4cf822941593561e3e7
+  metadata.gz: 01fa98360adc8121e20c60cd777e3b07374319edfddd280dccd34458ded69db6
+  data.tar.gz: ab6612bae1f8e4837eadb9a5474b1dd1f40e15c8c2181f48b7a2bf0c56624e95
 SHA512:
-  metadata.gz: '083b8e87d34376cc679047624985c5527e3f32d67e992d3bf3c15e12db7cd20135408106f721e967b48cc9945596b9b5c4adcfeb0f83ea5933ec5f93e05cc7cf'
-  data.tar.gz: 1220c987e218f151dd26c60241f9b869900d8b5d3780ea6c91cc66ffbba49181e147e647ce0b2b0796abdfa03ae44c6ce8f1b81c8c53eb7ee26ceed04b999772
+  metadata.gz: fa516af19c5b4750073ff0d7c17d40f6fac5eebc4332194463d43fe48e06e073bd9af9b8b94b099ec31af7ba191019a6a40e8c41673b8ab5733bd92ca7569af6
+  data.tar.gz: f9064c8865c6c1c651edbcdd71b62bc191879b6d0ca711fd676446f568d4e4e0da0c35634529dd1de3d0ef07a01777f8ad083f99c8ef1852faa86ac57481ad8b

data/lib/iapi-idlc-sdk-pfm/command/apply.rb

@@ -62,7 +62,11 @@ module Pfm
       end
 
       def apply(dir)
-        Terraform::Binary.apply(dir.to_s) || raise
+        if upgraded_terraform?
+          Terraform::Binary::Command.run("-chdir #{dir} apply")
+        else
+          Terraform::Binary.apply(dir.to_s) || raise
+        end
       rescue
         raise DeploymentFailure, 'Finished with errors'
       end

data/lib/iapi-idlc-sdk-pfm/command/base.rb

@@ -33,12 +33,6 @@ module Pfm
              boolean:      true,
              default:      false
 
-      option :skip_tfvar_file,
-             long:         '--skip-tfvar-file',
-             description:  'Skip TF Var File',
-             boolean:      true,
-             default:      false
-
       def initialize
         super
 
@@ -200,7 +194,7 @@ module Pfm
 
             # add to vars file and record key for dups
             keys[key] = 'parsed'
-            unless @config[:skip_tfvar_file]
+            unless upgraded_terraform?
               vars_file += <<~EOH
                 variable "#{key}" {}
 
@@ -213,7 +207,7 @@ module Pfm
         end
 
         # write vars file
-        unless @config[:skip_tfvar_file]
+        unless upgraded_terraform?
           File.open("#{config[:working_dir]}/#{env_metadata['environment_key']}-tfvars.tf", 'w') { |file| file.write(vars_file) }
         end
 
@@ -241,6 +235,11 @@ module Pfm
         "#{__dir__}/templates/#{@build_metadata.attributes['build_stage'].value}"
       end
 
+      def upgraded_terraform?
+        major version = Terraform::Binary.config.version.split(".")[0]
+        major_version > 0
+      end
+
       def build_base_dir
         "#{SETTINGS['BUILD_BASE_DIR']}/#{@params.first}"
       end

data/lib/iapi-idlc-sdk-pfm/command/destroy.rb

@@ -53,7 +53,11 @@ module Pfm
         Idlc::Deploy::Config.add_deployment_var('build', ENV['SERVER_BUILD'])
         Idlc::Deploy::Config.add_deployment_var('app_release', 'null')
 
-        Terraform::Binary.destroy("#{dir}")
+        if upgraded_terraform?
+          Terraform::Binary::Command.run("-chdir #{dir} destroy")
+        else
+          Terraform::Binary.destroy("#{dir}")
+        end
       rescue
         raise DeploymentFailure, 'Finished with errors'
       end

data/lib/iapi-idlc-sdk-pfm/command/format.rb

@@ -36,9 +36,13 @@ module Pfm
         tf_paths = %W[#{inf_base_dir}/tf lib/tf/modules]
 
         begin
-          tf_paths.each do |path|
-            # Format the file to a canonical syntax
-            Terraform::Binary.fmt(path)
+          if upgraded_terraform?
+            Terraform::Binary::Command.run("-chdir #{inf_base_dir}/tf fmt")
+          else
+            tf_paths.each do |path|
+              # Format the file to a canonical syntax
+              Terraform::Binary.fmt(path)
+            end
           end
         rescue
           raise DeploymentFailure, 'Finished with errors'

data/lib/iapi-idlc-sdk-pfm/command/plan.rb

@@ -70,8 +70,13 @@ module Pfm
 
       def plan(dir)
         begin
-          Terraform::Binary.plan(dir.to_s) unless @config[:landscape]
-          Terraform::Binary.plan("#{dir} | landscape") if @config[:landscape]
+          if upgraded_terraform?
+            Terraform::Binary::Command.run("-chdir #{dir} plan") unless @config[:landscape]
+            Terraform::Binary::Command.run("-chdir #{dir} plan | landscape") if @config[:landscape]
+          else
+            Terraform::Binary.plan(dir.to_s) unless @config[:landscape]
+            Terraform::Binary.plan("#{dir} | landscape") if @config[:landscape]
+          end
         rescue
           raise DeploymentFailure, 'Finished with errors'
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iapi-idlc-sdk-pfm
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Nathan Cazell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler