cloudspin-stack 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3443b901ed3a2055a4b259373a55d90eb5bf59f0
-  data.tar.gz: 3f511b6161a45c8adb0904f7069079460045c050
+  metadata.gz: 52f063b9cb944926767a548fc4e404c6943a5c4c
+  data.tar.gz: daf3e7c38fa7d9373541d7b3b68d2d618fede492
 SHA512:
-  metadata.gz: 0e6428a7ac5751a3dcba61b8aea159e122f16df830785b19b87ba4e92dc6688ee0a4fcfb927ff916a0c97c9be7d5b57fe1fc1ca3838bcc2573db8d43db10a7e5
-  data.tar.gz: 2613f8a1d6602d0d4eb45121f8659561052950b368058a9d4ce46753c0eab07edd1694703bec34b7476390b81a9018b54db8fc02c31610990ed0daa046850e08
+  metadata.gz: 135e7bb6999312d2028af2bee79348a154b0f0f65a5a256f30064fe24b7e73e0817e476aca0cb51e33ba5bad30df3fa3466313dcf5c2fc95823ecc7bb03ff661
+  data.tar.gz: cb2d6e3b39bb4fff1f69bf89aa32b41f291bc491f21b620fad0a944251b3c6a7bf56b42baefa37b0ab4ed0161aa0aba4d17e2e0cc59c21cb881eb590eedbc8a1

data/lib/cloudspin/stack/definition.rb

@@ -6,43 +6,33 @@ module Cloudspin
 
       attr_reader :name
       attr_reader :version
-      attr_reader :parameter_names
-      attr_reader :resource_names
-      attr_reader :terraform_source_path
-
-      def initialize(terraform_source_path: '',
-                     parameter_names: [],
-                     resource_names: [],
-                     stack: {})
-        @terraform_source_path = terraform_source_path
-        @parameter_names = parameter_names
-        @resource_names = resource_names
-        @name = stack[:name] || 'NO_NAME'
-        @version = stack[:version] || '0'
+      attr_reader :source_path
+
+      def initialize(source_path:, stack_name:, stack_version: '0')
+        @source_path = source_path
+        @name = stack_name
+        @version = stack_version
       end
 
       def self.from_file(specfile)
-        raise "Cloudspin definition file not found: #{specfile}" unless File.exists?(specfile)
+        raise NoStackDefinitionConfigurationFile unless File.exists?(specfile)
+        source_path = File.dirname(specfile)
         spec_hash = YAML.load_file(specfile)
-        stack_spec = symbolize(spec_hash)
-        terraform_source_path = File.dirname(specfile)
-        self.new(terraform_source_path: terraform_source_path, **stack_spec)
+        self.new(
+          source_path: source_path,
+          stack_name: spec_hash.dig('stack', 'name'),
+          stack_version: spec_hash.dig('stack', 'version')
+        )
       end
 
-      private
-
-      def self.symbolize(obj)
-          return obj.inject({}){ |memo, (k,v)|
-            memo[k.to_sym] = symbolize(v)
-            memo
-          } if obj.is_a? Hash
-          return obj.inject([]) { |memo, v|
-            memo << symbolize(v)
-            memo
-          } if obj.is_a? Array
-          return obj
+      def self.from_folder(definition_folder)
+        from_file("#{definition_folder}/stack-definition.yaml")
       end
 
     end
+
+
+    class NoStackDefinitionConfigurationFile < StandardError; end
+
   end
 end

data/lib/cloudspin/stack/instance.rb

@@ -11,33 +11,57 @@ module Cloudspin
           :working_folder,
           :backend_config,
           :statefile_folder,
-          :parameter_values,
-          :resource_values
-
-      def initialize(id:,
-                     stack_definition:,
-                     backend_config:,
-                     working_folder:,
-                     statefile_folder:
-                    )
+          :configuration
+
+      def initialize(
+            id:,
+            stack_definition:,
+            backend_config:,
+            working_folder:,
+            statefile_folder:,
+            configuration:
+      )
         validate_id(id)
         @id = id
         @stack_definition = stack_definition
         @backend_config = backend_config
         @working_folder = working_folder
         @statefile_folder = Pathname.new(statefile_folder).realdirpath.to_s
-        @parameter_values = {}
-        @resource_values = {}
+        @configuration = configuration
       end
 
-      def self.from_definition_folder(id:, definition_folder:, instance_folder: '.')
+      def self.from_folder(
+            *instance_configuration_files,
+            definition_folder:,
+            backend_config:,
+            working_folder:,
+            statefile_folder:
+      )
+        self.from_files(
+            instance_configuration_files,
+            stack_definition: Definition.from_folder(definition_folder),
+            backend_config: backend_config,
+            working_folder: working_folder,
+            statefile_folder: statefile_folder
+          )
+      end
+
+      def self.from_files(
+            *instance_configuration_files,
+            stack_definition:,
+            backend_config:,
+            working_folder:,
+            statefile_folder:
+      )
+        instance_configuration = InstanceConfiguration.from_files(stack_definition, instance_configuration_files)
         self.new(
-          id: id,
-          stack_definition: Definition.from_file(definition_folder + '/stack-definition.yaml'),
-          backend_config: {},
-          working_folder: instance_folder + '/work',
-          statefile_folder: instance_folder + '/state'
-        )
+            id: instance_configuration.instance_identifier,
+            stack_definition: stack_definition,
+            backend_config: backend_config,
+            working_folder: working_folder,
+            statefile_folder: statefile_folder,
+            configuration: instance_configuration
+          )
       end
 
       def validate_id(raw_id)
@@ -46,33 +70,18 @@ module Cloudspin
         raise "Stack instance ID '#{raw_id}' won't work. First character should be a letter." if /^[^A-Za-z]/ =~ raw_id
       end
 
-      def add_parameter_values(new_parameter_values)
-        @parameter_values.merge!(new_parameter_values)
-      end
-
-      def add_resource_values(new_resource_values)
-        @resource_values.merge!(new_resource_values)
+      def parameter_values
+        configuration.parameter_values
       end
 
-      def add_config_from_yaml(yaml_file)
-        config = load_config_file(yaml_file)
-        add_parameter_values(config['parameters']) if config['parameters']
-        add_resource_values(config['resources']) if config['resources']
+      def resource_values
+        configuration.resource_values
       end
 
-      def load_config_file(yaml_file)
-        if File.exists?(yaml_file)
-          YAML.load_file(yaml_file) || {}
-        else
-          {}
-        end
-      end
-
-
       def plan(plan_destroy: false)
         RubyTerraform.clean(directory: working_folder)
         mkdir_p File.dirname(working_folder)
-        cp_r @stack_definition.terraform_source_path, working_folder
+        cp_r @stack_definition.source_path, working_folder
         Dir.chdir(working_folder) do
           RubyTerraform.init(backend_config: backend_config)
           RubyTerraform.plan(
@@ -98,7 +107,7 @@ module Cloudspin
       def up
         RubyTerraform.clean(directory: working_folder)
         mkdir_p File.dirname(working_folder)
-        cp_r @stack_definition.terraform_source_path, working_folder
+        cp_r @stack_definition.source_path, working_folder
         Dir.chdir(working_folder) do
           RubyTerraform.init(backend_config: backend_config)
           RubyTerraform.apply(
@@ -123,7 +132,7 @@ module Cloudspin
       def down
         RubyTerraform.clean(directory: working_folder)
         mkdir_p File.dirname(working_folder)
-        cp_r @stack_definition.terraform_source_path, working_folder
+        cp_r @stack_definition.source_path, working_folder
         Dir.chdir(working_folder) do
           RubyTerraform.init(backend_config: backend_config)
           RubyTerraform.destroy(
@@ -146,9 +155,9 @@ module Cloudspin
       end
 
       def terraform_variables
-        @parameter_values.merge(@resource_values) { |key, oldval, newval|
+        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

data/lib/cloudspin/stack/instance_configuration.rb

@@ -0,0 +1,66 @@
+require 'ruby_terraform'
+require 'fileutils'
+
+module Cloudspin
+  module Stack
+    class InstanceConfiguration
+
+      attr_reader :stack_definition
+      attr_reader :stack_name
+
+      attr_reader :instance_values
+      attr_reader :parameter_values
+      attr_reader :resource_values
+
+      def initialize(stack_definition)
+        @stack_definition = stack_definition
+        @stack_name = stack_definition.name
+        @instance_values = {}
+        @parameter_values = {}
+        @resource_values = {}
+      end
+
+      def self.from_files(stack_definition, *configuration_files)
+        config = self.new(stack_definition)
+        configuration_files.flatten.each { |config_file|
+          config.add_values(load_file(config_file))
+        }
+        config
+      end
+
+      def self.load_file(yaml_file)
+        if File.exists?(yaml_file)
+          YAML.load_file(yaml_file) || {}
+        else
+          {}
+        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
+      end
+
+      def instance_identifier
+        if instance_values['identifier']
+          instance_values['identifier']
+        else
+          stack_name
+        end
+      end
+
+      def to_s
+        {
+          'instance' => instance_values,
+          'parameters' => parameter_values,
+          'resources' => resource_values
+        }.to_s
+      end
+
+    end
+
+  end
+end
+

data/lib/cloudspin/stack/version.rb

@@ -1,5 +1,5 @@
 module Cloudspin
   module Stack
-    VERSION = '0.1.14'
+    VERSION = '0.1.15'
   end
 end

data/lib/cloudspin/stack.rb

@@ -1,3 +1,4 @@
 require 'cloudspin/stack/version'
 require 'cloudspin/stack/definition'
+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.14
+  version: 0.1.15
 platform: ruby
 authors:
 - 'kief '
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terraform
@@ -104,6 +104,7 @@ files:
 - lib/cloudspin/stack.rb
 - lib/cloudspin/stack/definition.rb
 - lib/cloudspin/stack/instance.rb
+- lib/cloudspin/stack/instance_configuration.rb
 - lib/cloudspin/stack/version.rb
 homepage: https://github.com/cloudspinners
 licenses: