cloudspin-stack 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88fb621c2f7c450bdc5ef3a7a5839be1b1527d0fc15002681eceea7fbd9cb13b
-  data.tar.gz: 613787faf6aac87b43b211ada886b1bb2e3a70d381ca95270b77ddb01f55cdb3
+  metadata.gz: 8d3b0fe384748ee9c1a871ed53c8c0b3002dcc99c5f07ec6f997c1ff329ea982
+  data.tar.gz: 591b10684679c109886bdf67112eb7fb0f2d9e43ea2dcc4544eb93e5932e335a
 SHA512:
-  metadata.gz: 6100cad6cc348bbd2d0e6e984de8ca3084315577c575492b0f728889351e5b30e5ebb2740a12232a045cad0d213602457b8e4fb7ca1e4311be23e1c4b14ba179
-  data.tar.gz: 5f93ac2be468575471bd0edccaecb62e52b301d7be9fefc2439f88f5000af0308ab4868818f31f41560b90e6d5cf3ef8899017844444db17478c0c26aa368b51
+  metadata.gz: 55db31e3c2e88a859171e9ad06aaf3f7df0610b8ac3624107c3886cd98f31ae11a8d6f3105310e0ca5109ff6e8683d33823c7fe70abbbcceb06d27478787d57a
+  data.tar.gz: 15a3b50778ca03e62e41531bdbba7d04b15a8b2bdd3002075a015464e1e139459c88fd1d06da4e98fdb18161879c399d8d8edc8329e158ed86de9658a4504447

data/lib/cloudspin/cli.rb

@@ -14,9 +14,9 @@ module Cloudspin
 
     class_option :source,
       :aliases => '-s',
-      :banner => 'PATH',
+      :banner => 'PATH-OR-URL',
       :default => './src',
-      :desc => 'Folder with the terraform project source files'
+      :desc => 'Path to terraform project source files'
 
     class_option :environment,
       :aliases => '-e',
@@ -72,16 +72,12 @@ module Cloudspin
       def instance
         Cloudspin::Stack::Instance.from_folder(
           instance_configuration_files,
-          definition_location: './src',
+          definition_location: options[:source],
           base_folder: '.',
           base_working_folder: './work'
         )
       end
 
-      def stack_definition
-        Cloudspin::Stack::Definition.from_file(options[:source] + '/stack-definition.yaml')
-      end
-
       def instance_configuration_files
         file_list = options[:file]
         if options[:environment]

data/lib/cloudspin/stack/instance.rb

@@ -26,14 +26,12 @@ module Cloudspin
 
       def self.from_folder(
             *instance_configuration_files,
-            stack_name: nil,
             definition_location:,
             base_folder: '.',
             base_working_folder:
       )
         self.from_files(
             instance_configuration_files,
-            stack_name: stack_name,
             stack_definition: Definition.from_location(definition_location),
             base_folder: base_folder,
             base_working_folder: base_working_folder
@@ -42,14 +40,12 @@ module Cloudspin
 
       def self.from_files(
             *instance_configuration_files,
-            stack_name: nil,
             stack_definition:,
             base_folder: '.',
             base_working_folder:
       )
         instance_configuration = InstanceConfiguration.from_files(
           instance_configuration_files,
-          stack_name: stack_name,
           stack_definition: stack_definition,
           base_folder: base_folder
         )

data/lib/cloudspin/stack/instance_configuration.rb

@@ -6,28 +6,39 @@ module Cloudspin
     class InstanceConfiguration
 
       attr_reader :stack_definition
-      attr_reader :stack_name
       attr_reader :base_folder
 
       attr_reader :instance_values
       attr_reader :parameter_values
       attr_reader :resource_values
+      attr_reader :stack_values
 
+      attr_reader :stack_name
+      attr_reader :instance_identifier
       attr_reader :terraform_backend
 
       def initialize(
           configuration_values: {},
-          stack_name: nil,
           stack_definition:,
           base_folder: '.'
       )
         @stack_definition = stack_definition
-        @stack_name = stack_name || stack_definition.name
         @base_folder = base_folder
+
+        @stack_values = configuration_values['stack'] || {}
         @instance_values = configuration_values['instance'] || {}
         @parameter_values = configuration_values['parameters'] || {}
         @resource_values = configuration_values['resources'] || {}
 
+        @stack_name = @stack_values['name'] || stack_definition.name
+        @instance_identifier = if @instance_values['identifier']
+          instance_values['identifier']
+        elsif @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
@@ -38,7 +49,6 @@ module Cloudspin
 
       def self.from_files(
           *configuration_files,
-          stack_name: nil,
           stack_definition:,
           base_folder: '.'
       )
@@ -49,7 +59,6 @@ module Cloudspin
         }
         self.new(
           stack_definition: stack_definition,
-          stack_name: stack_name,
           base_folder: base_folder,
           configuration_values: configuration_values
         )
@@ -85,15 +94,15 @@ 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 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
         {

data/lib/cloudspin/stack/remote_definition.rb

@@ -35,11 +35,11 @@ module Cloudspin
           request = Net::HTTP::Get.new(remote_file_uri)
           http.request(request) do |response|
             case response
-              when Net::HTTPSuccess     then write_local_file(response, local_file)
-              when Net::HTTPRedirection then download_file(response['Location'], local_file, tries + 1)
-              else
-                raise "Request to '#{remote_file_uri}' failed: #{response.error} #{response.inspect}"
-              end
+            when Net::HTTPSuccess     then write_local_file(response, local_file)
+            when Net::HTTPRedirection then download_file(response['Location'], local_file, tries + 1)
+            else
+              raise "Request to '#{remote_file_uri}' failed: #{response.error} #{response.inspect}"
+            end
           end
         end
 

data/lib/cloudspin/stack/version.rb

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

metadata

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