cloudspin-stack 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1363b9d4f696c0820332e7ea1c24611c7f094f44
-  data.tar.gz: 7fc99227a54475c3bc850825cef71c81a93af347
+  metadata.gz: 7367da5398e58437223ee59141a3acfde89306c4
+  data.tar.gz: c7d4175e095df03cbd6e51bb8ba81a7cb9e9bef4
 SHA512:
-  metadata.gz: 8fcfbd2f253bbf7447b89555b9479bf45bbe0347eefaa1a6382b2052768f7cc915a3f2706270e1590e009b9cf198f0a0f9d85672dc5327b7edf0face8d8601c7
-  data.tar.gz: ead9896dc17751e16d04422f8a4e0cbadc9a814fd00a49cce4861c741fef38ac7466f5838087dbad429908db5db9ae9928723432d64431cb8c870de012e90029
+  metadata.gz: 8677124654c9c41f12a14c60d825d565d2574ae98ae07bc6fba1fdb86d9b60c0aefadc392dde3e54ceae77260519e05f7bb8b17fe633c3c0e23eb85f88a84732
+  data.tar.gz: c6f53cae6e58db92b63b72a32d869a5a40557affbc5d6c78d17387953c8235a442fbc3321432e2494f753959791c6fa12976c425922c01e02b8f64dea17e702b

data/lib/cloudspin/cli.rb

@@ -20,13 +20,15 @@ module Cloudspin
 
     class_option :environment,
       :aliases => '-e',
-      :banner => 'YAML-CONFIG-FILE',
-      :desc => 'An environment instance to manage.'
+      :banner => 'environment_id',
+      :desc => 'An environment instance to manage. File ./environments/stack-instance-ENVIRONMENT_ID.yaml must exist.'
 
     desc 'up', 'Create or update the stack instance'
     option :dry, :type => :boolean, :default => false
     option :plan, :type => :boolean, :default => false
+    option :'show-init', :type => :boolean, :default => true
     def up
+      puts instance.init_dry if options[:'show-init']
       if options[:plan] && options[:dry]
         puts instance.plan_dry
       elsif options[:plan] && ! options[:dry]
@@ -41,7 +43,9 @@ module Cloudspin
     desc 'down', 'Destroy the stack instance'
     option :dry, :type => :boolean, :default => false
     option :plan, :type => :boolean, :default => false
+    option :'show-init', :type => :boolean, :default => true
     def down
+      puts instance.init_dry if options[:'show-init']
       if options[:plan] && options[:dry]
         puts instance.plan_dry(plan_destroy: true)
       elsif options[:plan] && ! options[:dry]
@@ -69,8 +73,7 @@ module Cloudspin
         Cloudspin::Stack::Instance.from_files(
           instance_configuration_files,
           stack_definition: stack_definition,
-          base_working_folder: './work',
-          base_statefile_folder: './state'
+          base_working_folder: './work'
         )
       end
 

data/lib/cloudspin/stack/instance.rb

@@ -9,51 +9,50 @@ module Cloudspin
 
       attr_reader :id,
           :working_folder,
-          :statefile_folder,
           :configuration
 
       def initialize(
             id:,
             stack_definition:,
             working_folder:,
-            statefile_folder:,
             configuration:
       )
         validate_id(id)
         @id = id
         @stack_definition = stack_definition
-        @working_folder = working_folder
-        @statefile_folder = statefile_folder
-        @configuration = configuration
-        @backend_config = {}
+        @working_folder   = working_folder
+        @configuration    = configuration
       end
 
       def self.from_folder(
             *instance_configuration_files,
             definition_folder:,
-            base_working_folder:,
-            base_statefile_folder:
+            base_folder: '.',
+            base_working_folder:
       )
         self.from_files(
             instance_configuration_files,
             stack_definition: Definition.from_folder(definition_folder),
-            base_working_folder: base_working_folder,
-            base_statefile_folder: base_statefile_folder
+            base_folder: base_folder,
+            base_working_folder: base_working_folder
           )
       end
 
       def self.from_files(
             *instance_configuration_files,
             stack_definition:,
-            base_working_folder:,
-            base_statefile_folder:
+            base_folder: '.',
+            base_working_folder:
       )
-        instance_configuration = InstanceConfiguration.from_files(stack_definition, instance_configuration_files)
+        instance_configuration = InstanceConfiguration.from_files(
+          instance_configuration_files,
+          stack_definition: stack_definition,
+          base_folder: base_folder
+        )
         self.new(
             id: instance_configuration.instance_identifier,
             stack_definition: stack_definition,
             working_folder: ensure_folder("#{base_working_folder}/#{instance_configuration.instance_identifier}"),
-            statefile_folder: ensure_folder("#{base_statefile_folder}/#{instance_configuration.instance_identifier}"),
             configuration: instance_configuration
           )
       end
@@ -81,24 +80,20 @@ module Cloudspin
         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
-          RubyTerraform.init(backend_config: @backend_config)
-          RubyTerraform.plan(
-            destroy: plan_destroy,
-            state: terraform_statefile,
-            vars: terraform_variables
-          )
+          terraform_init
+          RubyTerraform.plan(terraform_command_parameters(destroy: plan_destroy))
         end
       end
 
       def plan_dry(plan_destroy: false)
         plan_command = RubyTerraform::Commands::Plan.new
         command_line_builder = plan_command.instantiate_builder
-        configured_command = plan_command.configure_command(command_line_builder, {
-          :destroy => plan_destroy,
-          :state => terraform_statefile,
-          :vars => terraform_variables
-        })
+        configured_command = plan_command.configure_command(
+          command_line_builder,
+          terraform_command_parameters(:destroy => plan_destroy)
+        )
         built_command = configured_command.build
         "cd #{working_folder} && #{built_command.to_s}"
       end
@@ -107,23 +102,17 @@ module Cloudspin
         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
-          RubyTerraform.init(backend_config: @backend_config)
-          RubyTerraform.apply(
-            auto_approve: true,
-            state: terraform_statefile,
-            vars: terraform_variables
-          )
+          terraform_init
+          RubyTerraform.apply(terraform_command_parameters(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, {
-          :state => terraform_statefile,
-          :vars => terraform_variables
-        })
+        configured_command = up_command.configure_command(command_line_builder, terraform_command_parameters)
         built_command = configured_command.build
         "cd #{working_folder} && #{built_command.to_s}"
       end
@@ -132,35 +121,82 @@ module Cloudspin
         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
-          RubyTerraform.init(backend_config: @backend_config)
-          RubyTerraform.destroy(
-            force: true,
-            state: terraform_statefile,
-            vars: terraform_variables
-          )
+          terraform_init
+          RubyTerraform.destroy(terraform_command_parameters(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, {
-          :state => terraform_statefile,
-          :vars => terraform_variables
-        })
+        configured_command = down_command.configure_command(command_line_builder, terraform_command_parameters)
         built_command = configured_command.build
         "cd #{working_folder} && #{built_command.to_s}"
       end
 
+      def terraform_init
+        RubyTerraform.init(terraform_init_params)
+      end
+
+      def init_dry
+        init_command = RubyTerraform::Commands::Init.new
+        command_line_builder = init_command.instantiate_builder
+        configured_command = init_command.configure_command(
+          command_line_builder,
+          terraform_init_params
+        )
+        built_command = configured_command.build
+        "cd #{working_folder} && #{built_command.to_s}"
+      end
+
+      def terraform_init_params
+        if configuration.has_remote_state_configuration?
+          {
+            backend: 's3',
+            backend_config: backend_parameters
+          }
+        else
+          {}
+        end
+      end
+
+      def ensure_state_folder
+        if configuration.has_local_state_configuration?
+          Instance.ensure_folder(configuration.terraform_backend['statefile_folder'])
+        end
+      end
+
+      def terraform_command_parameters(added_parameters = {})
+        {
+          vars: terraform_variables
+        }.merge(local_state_parameters).merge(added_parameters)
+      end
+
       def terraform_variables
         parameter_values.merge(resource_values) { |key, oldval, newval|
           raise "Duplicate values for terraform variable '#{key}' ('#{oldval}' and '#{newval}')"
         }.merge({ 'instance_identifier' => id })
       end
 
-      def terraform_statefile
-        statefile_folder + "/stack-#{id}.tfstate"
+      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?
+          {
+            'bucket' => configuration.terraform_backend['bucket'],
+            'key' => configuration.terraform_backend['key']
+          }
+        else
+          {}
+        end
       end
 
     end

data/lib/cloudspin/stack/instance_configuration.rb

@@ -7,28 +7,52 @@ module Cloudspin
 
       attr_reader :stack_definition
       attr_reader :stack_name
+      attr_reader :base_folder
 
       attr_reader :instance_values
       attr_reader :parameter_values
       attr_reader :resource_values
 
-      def initialize(stack_definition)
+      attr_reader :terraform_backend
+
+      def initialize(
+          configuration_values: {},
+          stack_definition:,
+          base_folder: '.'
+      )
         @stack_definition = stack_definition
         @stack_name = stack_definition.name
-        @instance_values = {}
-        @parameter_values = {}
-        @resource_values = {}
+        @base_folder = base_folder
+
+        @instance_values = configuration_values['instance'] || {}
+        @parameter_values = configuration_values['parameters'] || {}
+        @resource_values = configuration_values['resources'] || {}
+
+        @terraform_backend = configuration_values['terraform_backend'] || {}
+        if @terraform_backend.empty?
+          @terraform_backend['statefile_folder'] = default_state_folder
+        else
+          @terraform_backend['key'] = default_state_key
+        end
       end
 
-      def self.from_files(stack_definition, *configuration_files)
-        config = self.new(stack_definition)
+      def self.from_files(
+          *configuration_files,
+          stack_definition:,
+          base_folder: '.'
+      )
+        configuration_values = {}
         configuration_files.flatten.each { |config_file|
-          config.add_values(load_file(config_file))
+          configuration_values = configuration_values.deep_merge(yaml_file_to_hash(config_file))
         }
-        config
+        self.new(
+          stack_definition: stack_definition,
+          base_folder: base_folder,
+          configuration_values: configuration_values
+        )
       end
 
-      def self.load_file(yaml_file)
+      def self.yaml_file_to_hash(yaml_file)
         if File.exists?(yaml_file)
           YAML.load_file(yaml_file) || {}
         else
@@ -36,11 +60,24 @@ module Cloudspin
         end
       end
 
-      def add_values(values)
-        @instance_values.merge!(values['instance']) if values['instance']
-        @parameter_values.merge!(values['parameters']) if values['parameters']
-        @resource_values.merge!(values['resources']) if values['resources']
-        self
+      def has_local_state_configuration?
+        ! @terraform_backend['statefile_folder'].nil?
+      end
+
+      def local_statefile
+        "#{@terraform_backend['statefile_folder']}/#{instance_identifier}.tfstate"
+      end
+
+      def has_remote_state_configuration?
+        ! @terraform_backend['key'].nil?
+      end
+
+      def default_state_folder
+        Pathname.new("#{base_folder}/state/#{instance_identifier}").realdirpath.to_s
+      end
+
+      def default_state_key
+        "/#{instance_identifier}.tfstate"
       end
 
       def instance_identifier
@@ -55,9 +92,11 @@ module Cloudspin
 
       def to_s
         {
+          'instance_identifier' => instance_identifier,
           'instance' => instance_values,
           'parameters' => parameter_values,
-          'resources' => resource_values
+          'resources' => resource_values,
+          'terraform_backend' => terraform_backend
         }.to_s
       end
 
@@ -66,3 +105,10 @@ module Cloudspin
   end
 end
 
+# hat tip: https://stackoverflow.com/questions/9381553/ruby-merge-nested-hash
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+    self.merge(second.to_h, &merger)
+  end
+end

data/lib/cloudspin/stack/version.rb

@@ -1,5 +1,5 @@
 module Cloudspin
   module Stack
-    VERSION = '0.1.19'
+    VERSION = '0.1.20'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudspin-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - 'kief '
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terraform