cloudspin-stack 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5068a21e5f23f92d3b1b193e2b7c7f59f95488643a3c3720508501f2fb473172
-  data.tar.gz: 549543ec361272038346e41cf139b4f94f5d9dc044c3b039c978dff116654e26
+  metadata.gz: acb694792d307f529c684659d7bcc71bdc9680ca296df9b24e454503f5edfc96
+  data.tar.gz: dfd9a5111b9fcf63e810efe4e91669b8662dbc63c57e97708ea87a8b16694e25
 SHA512:
-  metadata.gz: ff1b4c4f407821ab6529a63af72e5947160ae91a62978a7558ddc85c63b5a219fa62ec02885188fcac04a95c7fb4586e2456074f18318b3195771370ce13f53d
-  data.tar.gz: f482061aed3d5b2daab47ceeabf20f80eb0fca74a8ff2950693313b0fa7ed515a143a94977d2d36af7c3f8cb39a692743cc02c871fee427007120f3b9f464a93
+  metadata.gz: ce5a6a97bae9ecd7b8ad9e5fbf38efff3ccb0fd47499925c58450802204b03d6dc4a1decb818496136a98ce3ab352a7d37b12ca45102bc2187e29f6407a30d00
+  data.tar.gz: 16ae531fd2c2c8243efe85f38cca95d8279516823180a00db6292d4f198846cde51e7d013ced7736e08dad390e8ba2415b047161b1eba4e0526263819b93e0d6

data/lib/cloudspin/cli.rb

@@ -95,7 +95,8 @@ module Cloudspin
         Cloudspin::Stack::Terraform.new(
           working_folder: instance.working_folder,
           terraform_variables: instance.terraform_variables,
-          terraform_init_arguments: instance.terraform_init_arguments
+          terraform_init_arguments: instance.terraform_init_arguments,
+          terraform_command_arguments: instance.terraform_command_arguments
         )
       end
 

data/lib/cloudspin/stack/backend_configuration.rb

@@ -19,73 +19,53 @@ module Cloudspin
         @stack_name           = stack_name
         @base_folder          = base_folder
 
-        configure_for_remote_backend
-        configure_to_migrate_backend
-        configure_for_local_backend
+        @has_remote_state = configure_for_remote_backend
+        @has_local_state = configure_for_local_backend
       end
 
       def configure_for_remote_backend
-        @has_remote_state = if @terraform_backend_configuration_values['bucket'].nil?
+        if @terraform_backend_configuration_values['bucket'].nil?
+          # puts "DEBUG: Not using remote state"
           false
         else
           # puts "DEBUG: Using remote state"
-          @local_state_folder = nil
-          @local_statefile = nil
           @terraform_backend_configuration_values['key'] = default_state_key
           true
         end
       end
 
-      def configure_to_migrate_backend
-        @migrate_state = if @terraform_backend_configuration_values['migrate'].nil?
+      def configure_for_local_backend
+        @local_state_folder = "#{@base_folder}/state/#{@instance_identifier}"
+        @local_statefile = "#{@local_state_folder}/#{@instance_identifier}.tfstate"
+        if @has_remote_state && ! File.exists?(@local_statefile)
+          @local_state_folder = nil
+          @local_statefile = nil
+          # puts "DEBUG: Not using local state"
           false
         else
-          migrate_value = @terraform_backend_configuration_values.delete('migrate')
-          migrate_value.to_s.downcase == 'true'
-        end
-      end
-
-      def configure_for_local_backend
-        if !@has_remote_state || @migrate_state
-          # puts "DEBUG: Not using remote state, or else is migrating state"
-          @local_state_folder = "#{@base_folder}/state/#{@instance_identifier}"
-          @local_statefile = "#{@local_state_folder}/#{@instance_identifier}.tfstate"
+          # puts "DEBUG: Using local state"
+          true
         end
       end
 
-      def terraform_init_parameters
+      def prepare(working_folder:)
         if remote_state?
-          {
-            backend: 'true',
-            force_copy: migrate_state?,
-            backend_config: @terraform_backend_configuration_values
-          }
-        else
-          {}
+          add_backend_terraform_file_to(working_folder)
+          # puts "DEBUG: Prepare for use of remote state"
         end
-      end
 
-      def terraform_command_parameters
-        if remote_state?
-          {}
-        else
-          {
-            :state => @local_statefile
-          }
+        if local_state?
+          # puts "DEBUG: Prepare to use local state"
+          create_local_state_folder
         end
-      end
 
-      def prepare(working_folder:)
-        if remote_state?
-          add_backend_terraform_file(working_folder)
-          # puts "DEBUG: Prepare for use of remote state"
-        else
-          # puts "DEBUG: Prepare for use of local state"
-          create_local_state_folder
+        if migrate_state?
+          # puts "DEBUG: Prepare to migrate state from local to remote"
+          copy_statefile_to(working_folder)
         end
       end
 
-      def add_backend_terraform_file(working_folder)
+      def add_backend_terraform_file_to(working_folder)
         # puts "DEBUG: Creating file #{working_folder}/_cloudspin_backend.tf"
         File.open("#{working_folder}/_cloudspin_backend.tf", 'w') { |backend_file|
           backend_file.write(<<~TF_BACKEND_SOURCE
@@ -103,18 +83,48 @@ module Cloudspin
         # Pathname.new(@local_state_folder).realdirpath.to_s
       end
 
+      def copy_statefile_to(working_folder)
+        FileUtils.copy(@local_statefile, "#{working_folder}/terraform.tfstate")
+      end
+
       def default_state_key
         "#{@instance_identifier}.tfstate"
       end
 
-      def migrate_state?
-        @migrate_state
+      def terraform_init_arguments
+        if remote_state?
+          {
+            backend: 'true',
+            force_copy: migrate_state?,
+            backend_config: @terraform_backend_configuration_values
+          }
+        else
+          {}
+        end
+      end
+
+      def terraform_command_arguments
+        if local_state? && !migrate_state?
+          {
+            :state => @local_statefile
+          }
+        else
+          {}
+        end
       end
 
       def remote_state?
         @has_remote_state
       end
 
+      def local_state?
+        @has_local_state
+      end
+
+      def migrate_state?
+        remote_state? && local_state?
+      end
+
     end
   end
 end

data/lib/cloudspin/stack/instance.rb

@@ -9,8 +9,7 @@ module Cloudspin
       attr_reader :id,
         :configuration,
         :working_folder,
-        :backend_configuration,
-        :terraform_command_arguments
+        :backend_configuration
 
       def initialize(
             id:,
@@ -24,7 +23,6 @@ module Cloudspin
         @working_folder   = "#{base_working_folder}/#{id}"
         @configuration    = configuration
         @backend_configuration = configuration.backend_configuration
-        @terraform_command_arguments = {}
         # puts "DEBUG: instance working_folder: #{@working_folder}"
       end
 
@@ -88,7 +86,7 @@ module Cloudspin
       end
 
       def ensure_folder(folder)
-        FileUtils.mkdir_p folder
+        mkdir_p folder
         Pathname.new(folder).realdirpath.to_s
       end
 
@@ -100,11 +98,31 @@ module Cloudspin
         # puts "DEBUG: Creating file #{working_folder}/_cloudspin-#{id}.auto.tfvars"
         File.open("#{working_folder}/_cloudspin-#{id}.auto.tfvars", 'w') { |tfvars_file|
           tfvars_file.write("# Automatically generated by cloudspin\n")
-          tfvars_file.write(terraform_variables.map { |name,value| "#{name} = \"#{value}\"" }.join("\n"))
+          tfvars_file.write(terraform_variables.map { |name,value| "#{name} = #{format_tfvar(value)}" }.join("\n"))
           tfvars_file.write("\n")
         }
       end
 
+      def format_tfvar(raw_value)
+        if [true,false].include? raw_value
+          "#{raw_value}"
+        elsif raw_value.is_a?(Array)
+          '[' +
+          raw_value.map { |raw_item|
+            format_tfvar(raw_item)
+          }.join(', ') +
+          ']'
+        elsif raw_value.is_a?(Hash)
+          '{ ' +
+          raw_value.map { |key,val|
+            "\"#{key}\": #{format_tfvar(val)}"
+          }.join(', ') +
+          ' }'
+        else
+          "\"#{raw_value}\""
+        end
+      end
+
       def validate_id(raw_id)
         raise "Stack instance ID '#{raw_id}' won't work. It needs to work as a filename." if /[^0-9A-Za-z.\-\_]/ =~ raw_id
         raise "Stack instance ID '#{raw_id}' won't work. No double dots allowed." if /\.\./ =~ raw_id
@@ -126,35 +144,12 @@ module Cloudspin
       end
 
       def terraform_init_arguments
-        @backend_configuration.terraform_init_parameters
+        @backend_configuration.terraform_init_arguments
       end
 
       def terraform_command_arguments
-        @backend_configuration.terraform_command_parameters
-      end
-
-      # def migrate
-      #   RubyTerraform.clean(directory: working_folder)
-      #   mkdir_p File.dirname(working_folder)
-      #   cp_r @stack_definition.source_path, working_folder
-      #   Dir.chdir(working_folder) do
-      #   # cp @backend_configuration.local_state_folder
-      #     terraform_init
-      #     # terraform_state_push()
-      #     RubyTerraform.plan(terraform_command_parameters)
-      #   end
-      # end
-
-      # def init
-        # if @backend_configuration.migrate_state?
-        #   prepare_state_for_migration
-        # end
-      # end
-
-      # def prepare_state_for_migration
-      #   # puts "DEBUG: Preparing to migrate state from #{@backend_configuration.local_statefile}"
-      #   cp @backend_configuration.local_statefile, "#{working_folder}/terraform.tfstate"
-      # end
+        @backend_configuration.terraform_command_arguments
+      end
 
     end
   end

data/lib/cloudspin/stack/instance_configuration.rb

@@ -24,8 +24,7 @@ module Cloudspin
       )
         # puts "DEBUG: InstanceConfiguration configuration_values: #{configuration_values}"
         @stack_definition = stack_definition
-        @base_folder = base_folder
-
+        @base_folder = Pathname.new(base_folder).realdirpath.to_s
         @stack_values = configuration_values['stack'] || {}
         @instance_values = configuration_values['instance'] || {}
         @parameter_values = configuration_values['parameters'] || {}
@@ -36,7 +35,7 @@ module Cloudspin
           terraform_backend_configuration_values: configuration_values['terraform_backend'] || {},
           instance_identifier: instance_identifier,
           stack_name: stack_name,
-          base_folder: base_folder
+          base_folder: @base_folder
         )
       end
 

data/lib/cloudspin/stack/terraform.rb

@@ -12,18 +12,20 @@ module Cloudspin
       def initialize(
         working_folder: '.',
         terraform_variables: {},
-        terraform_init_arguments: {}
+        terraform_init_arguments: {},
+        terraform_command_arguments: {}
       )
         @working_folder = working_folder
         # @terraform_variables = terraform_variables
         @terraform_variables = {}
         @terraform_init_arguments = terraform_init_arguments
+        @base_terraform_command_arguments = terraform_command_arguments
       end
 
       def plan(plan_destroy: false)
         Dir.chdir(@working_folder) do
           terraform_init
-          RubyTerraform.plan(terraform_command_parameters(destroy: plan_destroy))
+          RubyTerraform.plan(terraform_command_arguments(destroy: plan_destroy))
         end
       end
 
@@ -32,58 +34,46 @@ module Cloudspin
         command_line_builder = plan_command.instantiate_builder
         configured_command = plan_command.configure_command(
           command_line_builder,
-          terraform_command_parameters(:destroy => plan_destroy)
+          terraform_command_arguments(:destroy => plan_destroy)
         )
         built_command = configured_command.build
         "cd #{@working_folder} && #{built_command.to_s}"
       end
 
       def up
-        # RubyTerraform.clean(directory: @working_folder)
-        # mkdir_p File.dirname(@working_folder)
-        # cp_r @stack_definition.source_path, @working_folder
-        # ensure_state_folder
         Dir.chdir(@working_folder) do
           terraform_init
-          RubyTerraform.apply(terraform_command_parameters(auto_approve: true))
+          RubyTerraform.apply(terraform_command_arguments(auto_approve: true))
         end
       end
 
       def up_dry
         up_command = RubyTerraform::Commands::Apply.new
         command_line_builder = up_command.instantiate_builder
-        configured_command = up_command.configure_command(command_line_builder, terraform_command_parameters)
+        configured_command = up_command.configure_command(command_line_builder, terraform_command_arguments)
         built_command = configured_command.build
         "cd #{@working_folder} && #{built_command.to_s}"
       end
 
       def down
-        # RubyTerraform.clean(directory: @working_folder)
-        # mkdir_p File.dirname(@working_folder)
-        # cp_r @stack_definition.source_path, @working_folder
-        # ensure_state_folder
         Dir.chdir(@working_folder) do
           terraform_init
-          RubyTerraform.destroy(terraform_command_parameters(force: true))
+          RubyTerraform.destroy(terraform_command_arguments(force: true))
         end
       end
 
       def down_dry
         down_command = RubyTerraform::Commands::Destroy.new
         command_line_builder = down_command.instantiate_builder
-        configured_command = down_command.configure_command(command_line_builder, terraform_command_parameters)
+        configured_command = down_command.configure_command(command_line_builder, terraform_command_arguments)
         built_command = configured_command.build
         "cd #{@working_folder} && #{built_command.to_s}"
       end
 
       def refresh
-        # RubyTerraform.clean(directory: @working_folder)
-        # mkdir_p File.dirname(@working_folder)
-        # cp_r @stack_definition.source_path, @working_folder
-        # ensure_state_folder
         Dir.chdir(@working_folder) do
           terraform_init
-          RubyTerraform.refresh(terraform_command_parameters(force: true))
+          RubyTerraform.refresh(terraform_command_arguments(force: true))
         end
       end
 
@@ -98,9 +88,6 @@ module Cloudspin
       end
 
       def init_dry
-        # if configuration.backend_configuration.migrate_state?
-        #   "cp #{configuration.backend_configuration.local_statefile} -> #{@working_folder}/terraform.tfstate"
-        # end
         init_command = RubyTerraform::Commands::Init.new
         command_line_builder = init_command.instantiate_builder
         configured_command = init_command.configure_command(
@@ -116,10 +103,10 @@ module Cloudspin
       # For that matter, should we just call each of the actions on this class as static
       # methods? Does this class really need to hold any kind of state?
 
-      def terraform_command_parameters(added_parameters = {})
-        {
+      def terraform_command_arguments(added_parameters = {})
+        @base_terraform_command_arguments.merge({
           vars: @terraform_variables
-        }.merge(added_parameters)
+        }).merge(added_parameters)
       end
 
     end

data/lib/cloudspin/stack/version.rb

@@ -1,5 +1,5 @@
 module Cloudspin
   module Stack
-    VERSION = '0.1.32'
+    VERSION = '0.1.33'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudspin-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - 'kief '
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terraform