cloudspin-stack 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d3b0fe384748ee9c1a871ed53c8c0b3002dcc99c5f07ec6f997c1ff329ea982
-  data.tar.gz: 591b10684679c109886bdf67112eb7fb0f2d9e43ea2dcc4544eb93e5932e335a
+  metadata.gz: 1a0cac1862741e42e43595507f3013533717bbfd7927c449fd3dd61428008040
+  data.tar.gz: b3bcc54327a0a33d64185d4c9441f96a995fc7ca16bd735c7b3501e8f4abf0a1
 SHA512:
-  metadata.gz: 55db31e3c2e88a859171e9ad06aaf3f7df0610b8ac3624107c3886cd98f31ae11a8d6f3105310e0ca5109ff6e8683d33823c7fe70abbbcceb06d27478787d57a
-  data.tar.gz: 15a3b50778ca03e62e41531bdbba7d04b15a8b2bdd3002075a015464e1e139459c88fd1d06da4e98fdb18161879c399d8d8edc8329e158ed86de9658a4504447
+  metadata.gz: f5d3fd779e9faf9c3a7e05023147006974a41b28978c792dc24fb831b9890e344cddbec786e2a06b7f16b724b70dcb10ac72a06e20abb902a311c309da8a1250
+  data.tar.gz: 9eb450340c002f38f675542952359bfbe8611c7cd53b78623c5f0e60bc5af3e7677d6c780cca667162fd6214d59f59d3c1ccd107cdb228818efb09a2ecd7712b

data/lib/cloudspin/cli.rb

@@ -15,8 +15,7 @@ module Cloudspin
     class_option :source,
       :aliases => '-s',
       :banner => 'PATH-OR-URL',
-      :default => './src',
-      :desc => 'Path to terraform project source files'
+      :desc => 'Path to terraform project source files. Defaults to ./src'
 
     class_option :environment,
       :aliases => '-e',

data/lib/cloudspin/stack/definition.rb

@@ -27,15 +27,28 @@ module Cloudspin
         )
       end
 
-      def self.from_location(definition_location, definition_cache_folder: '.cloudspin/definitions')
-        # puts "DEBUG: get definition from location #{definition_location}"
-        if RemoteDefinition.is_remote?(definition_location)
+      def self.from_location(definition_location = nil,
+          definition_cache_folder: '.cloudspin/definitions',
+          stack_configuration: nil
+      )
+        resolved_definition_location = if ! definition_location.nil?
+          # puts "DEBUG: definition_location has been explicitly set to #{definition_location}"
+          definition_location
+        elsif ! stack_configuration.nil? && stack_configuration['definition_location']
+          # puts "DEBUG: definition_location comes from the stack configuration (#{stack_configuration})"
+          stack_configuration['definition_location']
+        else
+          './src'
+        end
+
+        # puts "DEBUG: get definition from location #{resolved_definition_location}"
+        if RemoteDefinition.is_remote?(resolved_definition_location)
           # puts "DEBUG: Downloading remote stack definition"
-          local_definition_folder = RemoteDefinition.new(definition_location).fetch(definition_cache_folder)
+          local_definition_folder = RemoteDefinition.new(resolved_definition_location).fetch(definition_cache_folder)
           from_file("#{local_definition_folder}/stack-definition.yaml", from_remote: true)
         else
-          # puts "DEBUG: Using local stack definition source: #{definition_location}/stack-definition.yaml"
-          from_file("#{definition_location}/stack-definition.yaml")
+          # puts "DEBUG: Using local stack definition source: #{resolved_definition_location}/stack-definition.yaml"
+          from_file("#{resolved_definition_location}/stack-definition.yaml")
         end
       end
 

data/lib/cloudspin/stack/instance.rb

@@ -32,7 +32,11 @@ module Cloudspin
       )
         self.from_files(
             instance_configuration_files,
-            stack_definition: Definition.from_location(definition_location),
+            stack_definition: Definition.from_location(
+                definition_location,
+                definition_cache_folder: "#{base_folder}/.cloudspin/definitions",
+                stack_configuration: InstanceConfiguration.load_configuration_values(instance_configuration_files)['stack']
+            ),
             base_folder: base_folder,
             base_working_folder: base_working_folder
           )
@@ -68,7 +72,7 @@ module Cloudspin
       end
 
       def self.add_terraform_backend_source(terraform_source_folder)
-        puts "DEBUG: Creating file #{terraform_source_folder}/_cloudspin_created_backend.tf"
+        # 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
             terraform {

data/lib/cloudspin/stack/instance_configuration.rb

@@ -52,11 +52,7 @@ module Cloudspin
           stack_definition:,
           base_folder: '.'
       )
-        configuration_values = {}
-        configuration_files.flatten.each { |config_file|
-          # puts "DEBUG: Reading configuration file: #{config_file}"
-          configuration_values = configuration_values.deep_merge(yaml_file_to_hash(config_file))
-        }
+        configuration_values = load_configuration_values(configuration_files)
         self.new(
           stack_definition: stack_definition,
           base_folder: base_folder,
@@ -64,6 +60,15 @@ module Cloudspin
         )
       end
 
+      def self.load_configuration_values(configuration_files)
+        configuration_values = {}
+        configuration_files.flatten.each { |config_file|
+          # puts "DEBUG: Reading configuration file: #{config_file}"
+          configuration_values = configuration_values.deep_merge(yaml_file_to_hash(config_file))
+        }
+        configuration_values
+      end
+
       def self.yaml_file_to_hash(yaml_file)
         if File.exists?(yaml_file)
           YAML.load_file(yaml_file) || {}
@@ -94,16 +99,6 @@ module Cloudspin
         "#{instance_identifier}.tfstate"
       end
 
-      # def instance_identifier
-      #   if instance_values['identifier']
-      #     instance_values['identifier']
-      #   elsif instance_values['group']
-      #     stack_name + '-' + instance_values['group']
-      #   else
-      #     stack_name
-      #   end
-      # end
-
       def to_s
         {
           'instance_identifier' => instance_identifier,

data/lib/cloudspin/stack/remote_definition.rb

@@ -72,7 +72,7 @@ module Cloudspin
       end
 
       def clear_folder(folder_to_clear)
-        FileUtils.remove_entry_secure(folder_to_clear)
+        FileUtils.remove_entry_secure(folder_to_clear) if File.exists?(folder_to_clear)
       end
 
       def path_of_source_in(zipfile_path)

data/lib/cloudspin/stack/version.rb

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

metadata

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