build-cloud 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb00e8848e9205bae96b54c380b62c62159f2f38116ac6f4786ff52efab7173c
-  data.tar.gz: 23375d3dd6df3a8a4a48a36370891e0a2b460b547577c09a83d80d26a0d077eb
+  metadata.gz: ad8c7b556fc7107ea38511b167401391c61b05f7b41b7c690ebf5cb49401c1d3
+  data.tar.gz: 0baf22d231dcab8c8e41312cce20fb616a4e7d50115f30f250e8ea13f2715887
 SHA512:
-  metadata.gz: a019d4ab77af8be41c80502f60980ae3df2655260aa1a0a4552788e87c9b8cf4144736ffdcd3454de635fbc5a7b6b58756b616fdbda9a260f9b6efc0cbd7f603
-  data.tar.gz: 3b31d034ab11827faaba18630962faa13a649dddbed4dd921e71459e120557db1e2700f48d91d4b2215c25f3d3bb3dbfcfde2a561201e43b04645d6400465c45
+  metadata.gz: 833765e82f0b1314bbc8e9a076c1fe9095269d81fa81d465bcb51483304e5a42197c8b8c34117cbfe127707139777bef1acff6cdb4160f7894a046cb733ce554
+  data.tar.gz: e242267e725571e67db99de3a9949871126c09a3a81a1ee1acec0ad279abbe6c102604d4343521dee1ce3f8c5bc4c7a12ad91956237888d150d5906a77ed2733

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
+2018-04-12 - version 1.1.3 - EC2 instances and ASG now add missing tags.
+
 2018-04-12 - version 1.1.2 - version bump.
 
-2018-04-12 - version 1.0.1 - VPC's now lifecycle tags.
+2018-04-12 - version 1.0.1 - VPC's now add missing tags.
 
 2017-11-13 - version 0.0.24 - Fix a bug which prevented working with IAM roles in AWS accounts with more than 100 roles. Thank you @markchalloner!
 

data/build-cloud.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "build-cloud"
-  spec.version       = "1.1.2"
+  spec.version       = "1.1.3"
   spec.authors       = ["The Scale Factory"]
   spec.email         = ["info@scalefactory.com"]
   spec.summary       = %q{Tools for building resources in AWS}

data/lib/build-cloud/asgroup.rb

@@ -19,13 +19,19 @@ class BuildCloud::ASGroup
     end
 
     def create
-        
-        return if exists?
-
-        @log.info( "Creating AS Group #{@options[:id]}" )
 
         options = @options.dup
 
+        if exists?
+            # If exists update tags
+            if options[:tags]
+                create_tags(options[:tags])
+            end
+            return
+        end
+
+        @log.info( "Creating AS Group #{options[:id]}" )
+
         unless options[:vpc_zone_identifier]
 
             subnet_ids = []
@@ -69,4 +75,30 @@ class BuildCloud::ASGroup
 
     end
 
+    def create_tags(tags)
+        @log.debug("Tags passed in: #{tags.inspect}")
+        @log.debug("Current tags: #{fog_object.tags.inspect}")
+        tag_array = fog_object.tags.dup
+        tags.each do |k,v|
+            if tag_array.find {|t| t['Key'] == k }
+                unless tag_array.find {|t| t['Value'] == v }
+                    tag_array.find {|t| t['Value'] = v }
+                end
+            else
+                tag_array << {
+                    "ResourceId"        => fog_object.id,
+                    "PropagateAtLaunch" => true,
+                    "Key"               => k,
+                    "Value"             => v,
+                    "ResourceType"      => "auto-scaling-group"
+                }
+            end
+        end
+        @log.debug("Tags to act on: #{tag_array.inspect}")
+        if tag_array != fog_object.tags
+            @log.info("Updating tags for ASG #{fog_object.id}")
+            @as.create_or_update_tags( tag_array )
+        end
+    end
+
 end

data/lib/build-cloud/instance.rb

@@ -47,13 +47,19 @@ class BuildCloud::Instance
     end
 
     def create
-        
-        return if exists?
-
-        @log.info( "Creating instance #{@options[:name]}" )
 
         options = @options.dup
 
+        if exists?
+            # If exists update tags
+            if options[:tags]
+                create_tags(options[:tags])
+            end
+            return
+        end
+
+        @log.info( "Creating instance #{options[:name]}" )
+
         if options[:security_group_names] or options[:security_group_ids]
             unless options[:security_group_ids]
 
@@ -223,4 +229,13 @@ class BuildCloud::Instance
 
     end
 
+    def create_tags(tags)
+        # force symbols to strings in yaml tags
+        resolved_tags = fog_object.tags.dup.merge(tags.collect{|k,v| [k.to_s, v]}.to_h)
+        if resolved_tags != fog_object.tags
+            @log.info("Updating tags for EC2 instance #{fog_object.id}")
+            @ec2.create_tags( fog_object.id, tags )
+        end
+    end
+
 end

data/lib/build-cloud/vpc.rb

@@ -50,7 +50,7 @@ class BuildCloud::VPC
         end
 
 
-        @log.info( "Creating new VPC for #{@options[:cidr_block]}" )
+        @log.info( "Creating new VPC for #{options[:cidr_block]}" )
 
         vpc = @compute.vpcs.new( options )
         vpc.save
@@ -93,9 +93,11 @@ class BuildCloud::VPC
     end
 
     def create_tags(tags)
-        if tags != fog_object.tags
-            @log.info("Updating tags")
-            @compute.create_tags( fog_object.id, tags )
+        # force symbols to strings in yaml tags
+        resolved_tags = fog_object.tags.dup.merge(tags.collect{|k,v| [k.to_s, v]}.to_h)
+        if resolved_tags != fog_object.tags
+            @log.info("Updating tags for VPC #{fog_object.id}")
+            @ec2.create_tags( fog_object.id, tags )
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-cloud
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - The Scale Factory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Tools for building resources in AWS