cloudspin-stack 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09f576357a24456f36f68485eb0cdfcc4236e953'
-  data.tar.gz: 4d014c6c8978d8e0465174fc313c4d301f614f0e
+  metadata.gz: 4170afe9007ab5cebf6f4e58af38922acc5fce87
+  data.tar.gz: 8c5c4ce80a36b5466f00a6b12c6128a9d39876a8
 SHA512:
-  metadata.gz: 591b428a3e10c2d7e8c753120c7bb29c5bc3a53b336aeb1046359011e0d9ccee679db5a58aec5f6298d072d70c9ce7f4ae363f381fd8fd280279dc194a4cba51
-  data.tar.gz: c8e033b0cff15d03bf9d07086d7aaeb85082a234f5e31439d8ae31142316f837cfe83e62b94c76da6b3ef03f37c48357345629e992163008cd4f8e6ffdd020f6
+  metadata.gz: da540b6e8568124062af22ac849116136ab90bce97ad40ef05a9f3b8dd4689315af237503e4ee4b1453d4d64bc0f593c87c3b2f0245b868a007b0a5334c45ef4
+  data.tar.gz: d31bf8166024b87d4637d5b3519a69e9b95a3a853931bccd0eab9583ca7fd902fb8397c9099a536e2b12cace39eab1759034a93e84ebaca6053f89d4defffe33

data/lib/cloudspin/cli.rb

@@ -33,33 +33,33 @@ module Cloudspin
       :default => Util.full_path_from_local('./state'),
       :desc => 'Folder to create and store local state'
 
-    desc 'up', 'Create or update the stack instance'
+    desc 'up INSTANCE_ID', 'Create or update the stack instance'
     option :dry, :type => :boolean, :default => false
     option :plan, :type => :boolean, :default => false
-    def up
+    def up(id)
       if options[:plan] && options[:dry]
-        puts instance.plan_dry
+        puts instance(id).plan_dry
       elsif options[:plan] && ! options[:dry]
-        puts instance.plan
+        puts instance(id).plan
       elsif ! options[:plan] && options[:dry]
-        puts instance.up_dry
+        puts instance(id).up_dry
       else
-        instance.up
+        instance(id).up
       end
     end
 
     desc 'down', 'Destroy the stack instance'
     option :dry, :type => :boolean, :default => false
     option :plan, :type => :boolean, :default => false
-    def down
+    def down(id)
       if options[:plan] && options[:dry]
-        puts instance.plan_dry(plan_destroy: true)
+        puts instance(id).plan_dry(plan_destroy: true)
       elsif options[:plan] && ! options[:dry]
-        puts instance.plan(plan_destroy: true)
+        puts instance(id).plan(plan_destroy: true)
       elsif ! options[:plan] && options[:dry]
-        puts instance.down_dry
+        puts instance(id).down_dry
       else
-        instance.down
+        instance(id).down
       end
     end
 
@@ -75,8 +75,9 @@ module Cloudspin
 
     no_commands do
 
-      def instance
+      def instance(id)
         stack = Cloudspin::Stack::Instance.new(
+          id: id,
           stack_definition: stack_definition,
           backend_config: {},
           working_folder: options[:work],

data/lib/cloudspin/stack/instance.rb

@@ -7,17 +7,21 @@ module Cloudspin
 
       include FileUtils
 
-      attr_reader :working_folder,
+      attr_reader :id,
+          :working_folder,
           :backend_config,
           :statefile_folder,
           :parameter_values,
           :resource_values
 
-      def initialize(stack_definition:,
+      def initialize(id:,
+                     stack_definition:,
                      backend_config:,
                      working_folder:,
                      statefile_folder:
                     )
+        validate_id(id)
+        @id = id
         @stack_definition = stack_definition
         @backend_config = backend_config
         @working_folder = working_folder
@@ -26,6 +30,12 @@ module Cloudspin
         @resource_values = {}
       end
 
+      def validate_id(raw_id)
+        raise "Stack instance ID '#{raw_id}' won't work. It needs to work as a filename." if /[^0-9A-Za-z.\-\_]/ =~ raw_id
+        raise "Stack instance ID '#{raw_id}' won't work. No double dots allowed." if /\.\./ =~ raw_id
+        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
@@ -123,7 +133,7 @@ module Cloudspin
       end
 
       def terraform_statefile
-        statefile_folder + "/default_name.tfstate"
+        statefile_folder + "/stack-#{id}.tfstate"
       end
 
     end

data/lib/cloudspin/stack/version.rb

@@ -1,5 +1,5 @@
 module Cloudspin
   module Stack
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
   end
 end

metadata

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