terraform-wrapper 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7338d84681486fc0e4e0f7135bdbf48327ed5d074c545b16f4c934ed1601698
-  data.tar.gz: 48a5e381f0dfa34084b65025a6cf2de67e017c1a52bf9fe7f29302a4a50b213a
+  metadata.gz: 55d9fe8e3823828068db9f36f402b43a3a163e13a21eeae6372f4f62d54c8b55
+  data.tar.gz: 815b07b1e492517c8712b9c2f4c604d73dfe30a5ad16c571e77b34bfe6fb6285
 SHA512:
-  metadata.gz: 590c7262c9d433a058c300d5f5f11e5cdbf2f4722f7aa9ea5cb341923c14666cb8ad8dcbee92df81b5d3cd6d3868c4cf635a67ffbcbe8103fbe90e928bb28928
-  data.tar.gz: 9f335a63961bed6a0a807d9ef504b2f44a76748ff7e4459d687d1f40c74085ad0e6dd1767fcd5b68c5bebef8bd7824415a6f17fac83b78075ef0792ee006d355
+  metadata.gz: ea5f272f105000df04c9681d06a46f3cc19e588eefda12560bc3c637f465b0195c94e64477e3a03fb1c4c74084aa0a0b3317ee28fbc27a3d692ad91ecc8022dc
+  data.tar.gz: 9e03e5875feb041349cf51b3ff40a6796d4e1dee8f8e1307b281bca8ab710803cd2d67fc0b83258a2c73048c06db484cb8cb6c8b6ad0ede2961b5c8c380131d5

data/lib/terraform-wrapper/shared/auths/azure.rb

@@ -78,7 +78,7 @@ module TerraformWrapper
           stdout  = `#{cmdline}`
           code    = $?.exitstatus
 
-          logger.fatal("Failed to get secret: #{name} from key vault: #{vault}!") if (code != 0 and stdout.strip.empty?)
+          logger.fatal("Failed to get secret: #{name} from key vault: #{vault}!") if (code != 0 or stdout.strip.empty?)
 
           return(stdout.strip)
         end
@@ -97,11 +97,11 @@ module TerraformWrapper
           details = YAML.load(stdout.strip)
 
           logger.fatal("Returned details did not include the subscription ID!") unless details.key?("id")
-          logger.fatal("Returned subscription ID is not a String!") unless details["id"].kind_of?(String)
+          logger.fatal("Returned subscription ID is not a string!") unless details["id"].kind_of?(String)
           logger.fatal("Returned subscription ID is empty!") if details["id"].strip.empty?
 
           logger.fatal("Returned details did not include the tenant ID!") unless details.key?("tenant")
-          logger.fatal("Returned tenant ID is not a String!") unless details["tenant"].kind_of?(String)
+          logger.fatal("Returned tenant ID is not a string!") unless details["tenant"].kind_of?(String)
           logger.fatal("Returned tenant ID is empty!") if details["tenant"].strip.empty?
 
           details.transform_values! { |value| value.strip }
@@ -120,27 +120,34 @@ module TerraformWrapper
           logger.fatal("Azure CLI must be installed and accessible to use the Azure authenticator.") unless cli
 
           logger.fatal("Azure authenticator mandatory option 'subscription' has not been set!") unless @options.key?("subscription")
+          logger.fatal("Azure authenticator subscription must be a string!") unless @options["subscription"].kind_of?(String)
+          logger.fatal("Azure authenticator subscription must not be blank!") if @options["subscription"].strip.empty?
 
           subscription = @options["subscription"]
 
-          logger.fatal("Azure authenticator subscription must be a String!") unless subscription.kind_of?(String)
-          logger.fatal("Azure authenticator subscription must not be blank!") if subscription.strip.empty?
-
           if @options.key?("keyvault") then
-            keyvault = @options["keyvault"]
+            logger.fatal("Azure authenticator keyvault name must be a string if specified!") unless @options["keyvault"].kind_of?(String)
+            logger.fatal("Azure authenticator keyvault name must not be blank if specified!") if @options["keyvault"].strip.empty?
 
-            logger.fatal("Azure authenticator keyvault name must be a String if specified!") unless keyvault.kind_of?(String)
-            logger.fatal("Azure authenticator keyvault name must not be blank if specified!") if keyvault.strip.empty?
+            keyvault = @options["keyvault"]
 
-            username = @options.key?("username-secret") ? @options["username-secret"] : "terraform-username"
+            if @options.key?("username-secret") then
+              logger.fatal("Azure authenticator keyvault secret for username must be a string if keyvault name is specified!") unless @options["username-secret"].kind_of?(String)
+              logger.fatal("Azure authenticator keyvault secret for username must not be blank if keyvault name is specified!") if @options["username-secret"].strip.empty?
 
-            logger.fatal("Azure authenticator keyvault secret for username must be a String if keyvault name is specified!") unless username.kind_of?(String)
-            logger.fatal("Azure authenticator keyvault secret for username must not be blank if keyvault name is specified!") if username.strip.empty?
+              username = @options["username-secret"]
+            else
+              username = "terraform-username"
+            end
 
-            password = @options.key?("username-password") ? @options["username-password"] : "terraform-password"
+            if @options.key?("password-secret") then
+              logger.fatal("Azure authenticator keyvault secret for password must be a string if keyvault name is specified!") unless @options["password-secret"].kind_of?(String)
+              logger.fatal("Azure authenticator keyvault secret for password must not be blank if keyvault name is specified!") if @options["password-secret"].strip.empty?
 
-            logger.fatal("Azure authenticator keyvault secret for password must be a String if keyvault name is specified!") unless password.kind_of?(String)
-            logger.fatal("Azure authenticator keyvault secret for password must not be blank if keyvault name is specified!") if password.strip.empty?
+              password = @options["password-secret"]
+            else
+              password = "terraform-password"
+            end
           end
 
           begin

data/lib/terraform-wrapper/shared/backends/aws.rb

@@ -70,17 +70,17 @@ module TerraformWrapper
 
           bucket = @options["bucket"]
 
-          logger.fatal("AWS backend S3 bucket name must be a String!") unless bucket.kind_of?(String)
+          logger.fatal("AWS backend S3 bucket name must be a string!") unless bucket.kind_of?(String)
           logger.fatal("AWS backend S3 bucket name must not be blank!") if bucket.strip.empty?
 
           region = @options["region"]
 
-          logger.fatal("AWS backend S3 bucket region must be a String!") unless region.kind_of?(String)
+          logger.fatal("AWS backend S3 bucket region must be a string!") unless region.kind_of?(String)
           logger.fatal("AWS backend S3 bucket region must not be blank!") if region.strip.empty?
 
           key = @options.key?("key") ? @options["key"] : File.join("%{service}", "%{config}", "%{component}" + @@ext)
 
-          logger.fatal("AWS backend S3 bucket key must be a String!") unless key.kind_of?(String)
+          logger.fatal("AWS backend S3 bucket key must be a string!") unless key.kind_of?(String)
           logger.fatal("AWS backend S3 bucket key must not be blank!") if key.strip.empty?
 
           encrypt = @options.key?("encrypt") ? @options["encrypt"] : true
@@ -90,14 +90,14 @@ module TerraformWrapper
           if @options.key?("kms") then
             kms = @options["kms"]
 
-            logger.fatal("AWS backend S3 bucket encryption KMS key ARN must be a String if specified!") unless kms.kind_of?(String)
+            logger.fatal("AWS backend S3 bucket encryption KMS key ARN must be a string if specified!") unless kms.kind_of?(String)
             logger.fatal("AWS backend S3 bucket encryption KMS key ARN must not be blank if specified!") if kms.strip.empty?
           end
 
           if @options.key?("role") then
             role = @options["role"]
 
-            logger.fatal("AWS backend role to assume ARN must be a String if specified!") unless role.kind_of?(String)
+            logger.fatal("AWS backend role to assume ARN must be a string if specified!") unless role.kind_of?(String)
             logger.fatal("AWS backend role to assume ARN must not be blank if specified!") if role.strip.empty?
           end
 

data/lib/terraform-wrapper/shared/backends/azure.rb

@@ -57,22 +57,22 @@ module TerraformWrapper
 
           group = @options["group"]
 
-          logger.fatal("Azure backend group must be a String!") unless group.kind_of?(String)
+          logger.fatal("Azure backend group must be a string!") unless group.kind_of?(String)
           logger.fatal("Azure backend group must not be blank!") if group.strip.empty?
 
           account = @options.key?("account") ? @options["account"] : group + "tf"
 
-          logger.fatal("Azure backend storage account must be a String!") unless account.kind_of?(String)
+          logger.fatal("Azure backend storage account must be a string!") unless account.kind_of?(String)
           logger.fatal("Azure backend storage account must not be blank!") if account.strip.empty?
 
           container = @options.key?("container") ? @options["container"] : "default"
 
-          logger.fatal("Azure backend storage account container must be a String!") unless container.kind_of?(String)
+          logger.fatal("Azure backend storage account container must be a string!") unless container.kind_of?(String)
           logger.fatal("Azure backend storage account container must not be blank!") if container.strip.empty?
 
           key = @options.key?("key") ? @options["key"] : File.join("%{service}", "%{config}", "%{component}" + @@ext)
 
-          logger.fatal("Azure backend storage account key must be a String!") unless key.kind_of?(String)
+          logger.fatal("Azure backend storage account key must be a string!") unless key.kind_of?(String)
           logger.fatal("Azure backend storage account key must not be blank!") if key.strip.empty?
 
           logger.fatal("Azure backend container or key must include %{service}.") unless (container.include?("%{service}") or key.include?("%{service}"))

data/lib/terraform-wrapper/shared/backends/local.rb

@@ -49,7 +49,7 @@ module TerraformWrapper
         def specific()
           path = @options.key?("path") ? @options["path"] : File.join(Dir.pwd, "state", "terraform", "%{config}", "%{component}" + @@ext)
 
-          logger.fatal("Local backend path must be a String!") unless path.kind_of?(String)
+          logger.fatal("Local backend path must be a string!") unless path.kind_of?(String)
           logger.fatal("Local backend path must not be blank!") if path.strip.empty?
 
           logger.fatal("Local backend path must include %{service} or the path to this repository.") unless (path.include?("%{service}") or path.include?(Dir.pwd))

data/lib/terraform-wrapper/shared/binary.rb

@@ -28,12 +28,12 @@ module TerraformWrapper
 ###############################################################################
 
       def initialize(options:)
-        logger.fatal("Binary base path must be a String!") unless options["base"].kind_of?(String)
+        logger.fatal("Binary base path must be a string!") unless options["base"].kind_of?(String)
         logger.fatal("Binary base path must not be blank!") if options["base"].strip.empty?
 
         @base = options["base"]
 
-        logger.fatal("Binary version must be a String!") unless options["version"].kind_of?(String)
+        logger.fatal("Binary version must be a string!") unless options["version"].kind_of?(String)
         logger.fatal("Binary version must not be blank!") if options["version"].strip.empty?
 
         @version = options["version"]

data/lib/terraform-wrapper/shared/code.rb

@@ -23,12 +23,12 @@ module TerraformWrapper
 ###############################################################################
 
       def initialize(options:)
-        logger.fatal("Code base path must be a String!") unless options["base"].kind_of?(String)
+        logger.fatal("Code base path must be a string!") unless options["base"].kind_of?(String)
         logger.fatal("Code base path must not be blank!") if options["base"].strip.empty?
 
         @base = options["base"]
 
-        logger.fatal("Code component name must be a String!") unless options["name"].kind_of?(String)
+        logger.fatal("Code component name must be a string!") unless options["name"].kind_of?(String)
         logger.fatal("Code component name must not be blank!") if options["name"].strip.empty?
 
         @name = options["name"]

data/lib/terraform-wrapper/shared/config.rb

@@ -24,8 +24,8 @@ module TerraformWrapper
 
 ###############################################################################
 
-      @@variable_files_name = "tfvars"
-      @@variable_files_ext  = ".tfvars"
+      @@variable_files_name =   "tfvars"
+      @@variable_files_exts = [ ".tfvars" ]
 
 ###############################################################################
 
@@ -42,17 +42,17 @@ module TerraformWrapper
 ###############################################################################
 
       def initialize(code:, options:)
-        logger.fatal("Configuration base path must be a String!") unless options["base"].kind_of?(String)
+        logger.fatal("Configuration base path must be a string!") unless options["base"].kind_of?(String)
         logger.fatal("Configuration base path must not be blank!") if options["base"].strip.empty?
 
         @base = options["base"]
 
-        logger.fatal("Configuration service name must be a String!") unless options["service"].kind_of?(String)
+        logger.fatal("Configuration service name must be a string!") unless options["service"].kind_of?(String)
         logger.fatal("Configuration service name must not be blank!") if options["service"].strip.empty?
 
         @service = options["service"]
 
-        logger.fatal("Configuration name must be a String!") unless options["name"].kind_of?(String)
+        logger.fatal("Configuration name must be a string!") unless options["name"].kind_of?(String)
         logger.fatal("Configuration name must not be blank!") if options["name"].strip.empty?
 
         @name = options["name"]
@@ -65,7 +65,7 @@ module TerraformWrapper
 
         auth_azure_options = options["auth-azure-options"]
 
-        logger.fatal("Configuration backend name must be a String!") unless options["backend"].kind_of?(String)
+        logger.fatal("Configuration backend name must be a string!") unless options["backend"].kind_of?(String)
         logger.fatal("Configuration backend name must not be blank!") if options["backend"].strip.empty?
 
         backend = options["backend"]
@@ -75,10 +75,9 @@ module TerraformWrapper
         backend_options = options["backend-options"]
 
         @code = code
-        @path = find
+        @path = find(base: @base, name: @name, exts: @@config_exts, description: "Configuration")
 
         yaml = YAML.load(File.read(@path))
-
         logger.fatal("Invalid YAML in configuration file: #{@path}") unless yaml.kind_of?(Hash)
 
         if yaml.key?("variables") then
@@ -110,13 +109,13 @@ module TerraformWrapper
 
 ###############################################################################
 
-      def find
+      def find(base:, name:, exts:, description: "File")
         @@config_exts.each do |config_ext|
-          path = File.join(@base, @name + config_ext)
+          path = File.join(base, name + config_ext)
           return path if File.file?(path)
         end
 
-        logger.fatal("Terraform configuration name: #{@name} not found in location: #{@base}!")
+        logger.fatal("#{description} name: #{@name} not found in location: #{@base}!")
       end
 
 ###############################################################################
@@ -127,14 +126,9 @@ module TerraformWrapper
         result = Array.new
 
         variable_files.each do |variable_file|
-          logger.fatal("All elements of 'variable_files' must be strings!") unless variable_file.kind_of?(String)
-          logger.fatal("All elements of 'variable_files' must not be blank!") if variable_file.strip.empty?
-          path = File.join(@base, @@variable_files_name, variable_file.strip + @@variable_files_ext)
-          if File.file?(path) then
-            result.append(path)
-          else
-            logger.fatal("Terraform variables file: #{variable_file}, path: #{path} does not exist!")
-          end
+          logger.fatal("All elements of 'terraform' must be strings!") unless variable_file.kind_of?(String)
+          logger.fatal("All elements of 'terraform' must not be blank!") if variable_file.strip.empty?
+          result.append(find(base: File.join(@base, @@variable_files_name), name: variable_file.strip, exts: @@variable_files_exts, description: "Terraform values file"))
         end
 
         return result

data/lib/terraform-wrapper/shared/runner.rb

@@ -29,7 +29,6 @@ module TerraformWrapper
         @code   = code
 
         @initialised = false
-        @ready       = false
       end
 
 ###############################################################################
@@ -48,11 +47,11 @@ module TerraformWrapper
       def import(address: nil, id: nil)
         logger.fatal("Cannot Terraform import before initialising backend!") unless initialised
 
-        logger.fatal("Terraform state address for import must be a String!") unless address.kind_of?(String)
-        logger.fatal("Terraform state address for import must be a String!") unless address.kind_of?(String)
+        logger.fatal("Terraform state address for import must be a string!") unless address.kind_of?(String)
+        logger.fatal("Terraform state address for import must be a string!") unless address.kind_of?(String)
         logger.fatal("Terraform state address for import must not be blank!") if address.strip.empty?
 
-        logger.fatal("Identification for infrastructure to import must be a String!") unless id.kind_of?(String)
+        logger.fatal("Identification for infrastructure to import must be a string!") unless id.kind_of?(String)
         logger.fatal("Identification for infrastructure to import must not be blank!") if id.strip.empty?
 
         parameters = Array.new

data/lib/terraform-wrapper/version.rb

@@ -4,7 +4,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
 ###############################################################################
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraform-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake