cloudspin-stack 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a0cac1862741e42e43595507f3013533717bbfd7927c449fd3dd61428008040
-  data.tar.gz: b3bcc54327a0a33d64185d4c9441f96a995fc7ca16bd735c7b3501e8f4abf0a1
+  metadata.gz: 678301e9078d489fdeb291e89c89b211d00331c49602667ff731ed8b4e890854
+  data.tar.gz: a08a9749c18e6a6ad20f12c4bbb229c32d2c6b6fab8453fd9f078377ccdab2cc
 SHA512:
-  metadata.gz: f5d3fd779e9faf9c3a7e05023147006974a41b28978c792dc24fb831b9890e344cddbec786e2a06b7f16b724b70dcb10ac72a06e20abb902a311c309da8a1250
-  data.tar.gz: 9eb450340c002f38f675542952359bfbe8611c7cd53b78623c5f0e60bc5af3e7677d6c780cca667162fd6214d59f59d3c1ccd107cdb228818efb09a2ecd7712b
+  metadata.gz: 76f814c40a4775c4018ea824c56ace5a39711c336fcd26cf04c9d992f320ea059c5f44cdd5f868fd13086bfe52168b15f4a2c728f48b5e8785f1be156252bd54
+  data.tar.gz: 3942f2712d44d275b154c2f234132e56e124e3cd0583b3693132669aefd9873eee9eed5d4b76a94b7b7ba9690e10f86c89318bb0ea556eb1f73f3ada80ff5965

data/lib/cloudspin/stack/backend_configuration.rb

@@ -0,0 +1,95 @@
+require 'ruby_terraform'
+require 'fileutils'
+
+module Cloudspin
+  module Stack
+    class BackendConfiguration
+
+      attr_reader :local_state_folder
+      attr_reader :local_statefile
+
+      def initialize(
+                      terraform_backend_configuration_values:,
+                      instance_identifier:,
+                      stack_name:,
+                      base_folder:
+                    )
+        @terraform_backend_configuration_values  = terraform_backend_configuration_values
+        @instance_identifier  = instance_identifier
+        @stack_name           = stack_name
+        @base_folder          = base_folder
+
+        @has_remote_state         = ! @terraform_backend_configuration_values['bucket'].nil?
+
+        if @has_remote_state
+          # puts "DEBUG: Using remote state"
+          @local_state_folder = nil
+          @local_statefile = nil
+          @terraform_backend_configuration_values['key'] = default_state_key
+          @migrate_state = initialize_migrate_flag
+        else
+          # puts "DEBUG: Not using remote state"
+          @migrate_state = false
+        end
+
+        if !@has_remote_state || @migrate_state
+          @local_state_folder = intialize_state_folder
+          @local_statefile = "#{@local_state_folder}/#{@instance_identifier}.tfstate"
+          # puts "DEBUG: Local statefile: #{@local_statefile}"
+          # puts "DEBUG: Migrating? #{@migrate_state}"
+        end
+      end
+
+      def terraform_init_parameters
+        if remote_state?
+          {
+            backend: 'true',
+            force_copy: migrate_state?,
+            backend_config: @terraform_backend_configuration_values
+          }
+        else
+          {}
+        end
+      end
+
+      def terraform_command_parameters
+        if remote_state?
+          {}
+        else
+          {
+            :state => @local_statefile
+          }
+        end
+      end
+
+      def intialize_state_folder
+        # TODO: Prefer to not actually create the folder, but seemed necessary to build the full path string.
+        FileUtils.mkdir_p "#{@base_folder}/state"
+        Pathname.new("#{@base_folder}/state/#{@instance_identifier}").realdirpath.to_s
+      end
+
+      def initialize_migrate_flag
+        if @terraform_backend_configuration_values['migrate'].nil?
+          false
+        else
+          migrate_value = @terraform_backend_configuration_values.delete('migrate')
+          migrate_value.to_s.downcase == 'true'
+        end
+      end
+
+      def default_state_key
+        "#{@instance_identifier}.tfstate"
+      end
+
+      def migrate_state?
+        @migrate_state
+      end
+
+      def remote_state?
+        @has_remote_state
+      end
+
+    end
+  end
+end
+

data/lib/cloudspin/stack/instance.rb

@@ -55,7 +55,10 @@ module Cloudspin
         )
 
         if instance_configuration.has_remote_state_configuration? && stack_definition.is_from_remote?
-          add_terraform_backend_source(stack_definition.source_path)
+          # puts "DEBUG: Stack instance is configured to use remote terraform state AND remote stack definition code"
+          add_backend_configuration_source(stack_definition.source_path)
+        # else
+        #   puts "DEBUG: Stack instance is configured to use local terraform state AND/OR local stack definition code"
         end
 
         self.new(
@@ -71,7 +74,7 @@ module Cloudspin
         Pathname.new(folder).realdirpath.to_s
       end
 
-      def self.add_terraform_backend_source(terraform_source_folder)
+      def self.add_backend_configuration_source(terraform_source_folder)
         # puts "DEBUG: Creating file #{terraform_source_folder}/_cloudspin_created_backend.tf"
         File.open("#{terraform_source_folder}/_cloudspin_created_backend.tf", 'w') { |backend_file|
           backend_file.write(<<~TF_BACKEND_SOURCE
@@ -97,6 +100,18 @@ module Cloudspin
         configuration.resource_values
       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 configuration.backend_configuration.local_state_folder
+      #     terraform_init
+      #     # terraform_state_push()
+      #     RubyTerraform.plan(terraform_command_parameters)
+      #   end
+      # end
+
       def plan(plan_destroy: false)
         RubyTerraform.clean(directory: working_folder)
         mkdir_p File.dirname(working_folder)
@@ -168,12 +183,22 @@ module Cloudspin
         end
       end
 
-
       def terraform_init
+        if configuration.backend_configuration.migrate_state?
+          prepare_state_for_migration
+        end
         RubyTerraform.init(terraform_init_params)
       end
 
+      def prepare_state_for_migration
+        # puts "DEBUG: Preparing to migrate state from #{configuration.backend_configuration.local_statefile}"
+        cp configuration.backend_configuration.local_statefile, "#{working_folder}/terraform.tfstate"
+      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(
@@ -185,26 +210,21 @@ module Cloudspin
       end
 
       def terraform_init_params
-        if configuration.has_remote_state_configuration?
-          {
-            backend: 'true',
-            backend_config: backend_parameters
-          }
-        else
-          {}
-        end
+        configuration.backend_configuration.terraform_init_parameters
       end
 
+      # TODO: Redundant? The folder is created in the BackendConfiguration class ...
       def ensure_state_folder
         if configuration.has_local_state_configuration?
-          Instance.ensure_folder(configuration.terraform_backend['statefile_folder'])
+          Instance.ensure_folder(configuration.backend_configuration.local_state_folder)
         end
       end
 
       def terraform_command_parameters(added_parameters = {})
         {
           vars: terraform_variables
-        }.merge(local_state_parameters).merge(added_parameters)
+        }.merge(configuration.backend_configuration.terraform_command_parameters)
+          .merge(added_parameters)
       end
 
       def terraform_variables
@@ -213,22 +233,6 @@ module Cloudspin
         }.merge({ 'instance_identifier' => id })
       end
 
-      def local_state_parameters
-        if configuration.has_local_state_configuration?
-          { state: configuration.local_statefile }
-        else
-          {}
-        end
-      end
-
-      def backend_parameters
-        if configuration.has_remote_state_configuration?
-          configuration.terraform_backend
-        else
-          {}
-        end
-      end
-
     end
   end
 end

data/lib/cloudspin/stack/instance_configuration.rb

@@ -15,13 +15,17 @@ module Cloudspin
 
       attr_reader :stack_name
       attr_reader :instance_identifier
-      attr_reader :terraform_backend
+      attr_reader :backend_configuration
+
+
+      attr_reader :Xterraform_backend
 
       def initialize(
           configuration_values: {},
           stack_definition:,
           base_folder: '.'
       )
+        # puts "DEBUG: InstanceConfiguration configuration_values: #{configuration_values}"
         @stack_definition = stack_definition
         @base_folder = base_folder
 
@@ -29,21 +33,23 @@ module Cloudspin
         @instance_values = configuration_values['instance'] || {}
         @parameter_values = configuration_values['parameters'] || {}
         @resource_values = configuration_values['resources'] || {}
-
         @stack_name = @stack_values['name'] || stack_definition.name
+        init_instance_identifier
+        @backend_configuration = BackendConfiguration.new(
+          terraform_backend_configuration_values: configuration_values['terraform_backend'] || {},
+          instance_identifier: instance_identifier,
+          stack_name: stack_name,
+          base_folder: base_folder
+        )
+      end
+
+      def init_instance_identifier
         @instance_identifier = if @instance_values['identifier']
-          instance_values['identifier']
+          @instance_values['identifier']
         elsif @instance_values['group']
-          stack_name + '-' + @instance_values['group']
+          @stack_name + '-' + @instance_values['group']
         else
-          stack_name
-        end
-
-        @terraform_backend = configuration_values['terraform_backend'] || {}
-        if @terraform_backend.empty?
-          @terraform_backend['statefile_folder'] = default_state_folder
-        else
-          @terraform_backend['key'] = default_state_key
+          @stack_name
         end
       end
 
@@ -73,30 +79,17 @@ module Cloudspin
         if File.exists?(yaml_file)
           YAML.load_file(yaml_file) || {}
         else
-          puts "No configuration file: #{yaml_file}"
+          puts "WARNING: No configuration file: #{yaml_file}"
           {}
         end
       end
 
       def has_local_state_configuration?
-        ! @terraform_backend['statefile_folder'].nil?
-      end
-
-      def local_statefile
-        "#{@terraform_backend['statefile_folder']}/#{instance_identifier}.tfstate"
+        ! @backend_configuration.remote_state?
       end
 
       def has_remote_state_configuration?
-        ! @terraform_backend['key'].nil?
-      end
-
-      def default_state_folder
-        FileUtils.mkdir_p "#{base_folder}/state"
-        Pathname.new("#{base_folder}/state/#{instance_identifier}").realdirpath.to_s
-      end
-
-      def default_state_key
-        "#{instance_identifier}.tfstate"
+        @backend_configuration.remote_state?
       end
 
       def to_s
@@ -105,7 +98,7 @@ module Cloudspin
           'instance' => instance_values,
           'parameters' => parameter_values,
           'resources' => resource_values,
-          'terraform_backend' => terraform_backend
+          'backend_configuration' => backend_configuration
         }.to_s
       end
 

data/lib/cloudspin/stack/version.rb

@@ -1,5 +1,5 @@
 module Cloudspin
   module Stack
-    VERSION = '0.1.30'
+    VERSION = '0.1.31'
   end
 end

data/lib/cloudspin/stack.rb

@@ -1,5 +1,6 @@
 require 'cloudspin/stack/version'
 require 'cloudspin/stack/remote_definition'
 require 'cloudspin/stack/definition'
+require 'cloudspin/stack/backend_configuration'
 require 'cloudspin/stack/instance_configuration'
 require 'cloudspin/stack/instance'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudspin-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - 'kief '
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terraform
@@ -131,6 +131,7 @@ files:
 - exe/stack
 - lib/cloudspin/cli.rb
 - lib/cloudspin/stack.rb
+- lib/cloudspin/stack/backend_configuration.rb
 - lib/cloudspin/stack/definition.rb
 - lib/cloudspin/stack/instance.rb
 - lib/cloudspin/stack/instance_configuration.rb