build-cloud 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTBkMTNmNzg0OTkyNjViOTZkNWQxOGM0NjNlNmI5MDZiZWM4Yjg4Mw==
+    MzNmNjcyYmQxZDhkNGY1NTNkYTJhMmI1MDI4YjQ5NzJjOTg4MzUyMQ==
   data.tar.gz: !binary |-
-    YWQ2YTBkZTdlZjAxYTUxMWQwNDg4NzY5YTM1N2MyYTI4YzQ0MDk4Mg==
+    MTNhZTJlMDAzYmYzODFiMjgwOWVjZTEwN2IzZDA3Mjg5M2YyODljMw==
 SHA512:
   metadata.gz: !binary |-
-    OTVhZjUxYTQ1MDY4OGEzZmI3MzFmZDI1OTBhOTNhNGZlN2Q3NTk3NWIyZTA5
-    ZDUwNDViOGFjNmJmYTE3NjViNzA4ODAyMjcwNjhmMDhiYmQyMzJmMGIzZDlk
-    OTRlMTViMGJlZDhiNzVlNGJjNjdlZGM2ZjNmOTNhMDUxMWU4MGI=
+    ZTI2ZTQ4MTBhMWU0MTFkMmEyOGI4NTUxNzJmMThmZDg0MTRhNjNlMjRmZTdk
+    OTZjOWE3NTA3NDUxMjc1ZDI5YmIxYjUzY2E1ZTc3NDhmY2M1YmQ1NWM1ODRm
+    OWI1YTM1MjI3MmZlZmI4YzkwODZhYmQxOTNmZmM1Y2RjYzVjYzg=
   data.tar.gz: !binary |-
-    ZDFiNDU2MjVjM2U1NjVhZDg2NWEwMGY4MzYzOTFmOTAwODA0NDQ0ZjNmNmY5
-    MTc2OWYzMmEzZWE3NmExMDY5ZWNhMDZhYTVjZWJkNWE2NTgwODZlMDIwZmZj
-    Nzc0ODhlODMyYWI3YjBlOWQwNDVmYThlNzFjMDMxNDlkYTgyMmQ=
+    OTA1Y2NhZWI3ZTIwM2U2MzBiOTlmMWQ4NGQ5Yjc1Y2RlYTZmOGQyYTFlODdm
+    YWI2MTJjMmNlYTc5OThjNTMzYjkyNjcyY2U2MDc4MzcwZGRlYTk4YTU3YmI1
+    ZTY5M2QxM2JkMjYzMzVlODM2ZDJjNjc0YmYyYjY2ZmU4ZmIxMjQ=

data/README.md

@@ -1,6 +1,6 @@
 # Build::Cloud
 
-Tools for building resources in AWS}
+Tools for building resources in AWS
 
 ## Installation
 
@@ -22,6 +22,8 @@ See the command line help for `build-cloud`.
 
 ## Changelog
 
+2014-12-12 - version 0.0.9 - bugfixes to file path resolution. It is worth noting that when multiple files are passed to `--config` they're treated as relative to the CWD - this is what you'd expect from referencing a file in a command line option. When file(s) are specified in an `:include` key in the given YAML file, relative paths given there are considered to be relative to the location of the YAML file given to `--config` - this is to ensure consistent behaviour regardless of what $CWD is when calling build-cloud.
+
 2014-12-01 - version 0.0.8 - when multiple files are passed to `--config`, any top-level elements in the second and subsequent files which are arrays are merged into the arrays from previously read in files. This means, for examples, that you can have lists of instances or security groups in multiple files, and they will all be read in. Previously, subsequent files overwrote what was in previous files. Note that this only applies for top level elements of YAML files which are arrays - the previous overwriting behaviour applies still to strings.
 
 2014-10-03 - version 0.0.7 - instance creation previously had a 30 second wait to transition from pending to running state. This was insufficient, and has been increased to 60 seconds.

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       = "0.0.8"
+  spec.version       = "0.0.9"
   spec.authors       = ["The Scale Factory"]
   spec.email         = ["info@scalefactory.com"]
   spec.summary       = %q{Tools for building resources in AWS}

data/lib/build-cloud.rb

@@ -3,7 +3,6 @@ require 'yaml'
 require 'pry'
 require 'logger'
 require 'pp'
-require 'pathname'
 
 class BuildCloud
 
@@ -16,29 +15,77 @@ class BuildCloud
 
         @log = options[:logger] or Logger.new( STDERR )
         @mock = options[:mock] or false
-        
-        first_config_file = options[:config].shift
 
+        # Parse the first config file. We'll merge the remainder (if any) into
+        # this one, regardless of whether they're passed on the command line
+        # or in the YAML for this file itself.
+        first_config_file = options[:config].shift
         @config = YAML::load( File.open( first_config_file ) )
 
-        include_files = options[:config]
+        # include_files is going to be a list of files that we're going to
+        # merge in to the first file.
+        include_files = []
+
+        # Work out the full, standardised pathnames for any further files
+        # specified on the command line.  note that options[:config] only
+        # contains the extra files at this point, as we shifted the first
+        # one off the array earlier.
+        #
+        # IMPORTANT: relative paths given on the command line are considered
+        # to be relative to $CWD. This decision is based on the principle of
+        # least surprise, as that is how everything else works.
+        cli_include_files = options[:config]
+        cli_include_files.each do |inc|
+            include_files << File.absolute_path( inc )
+        end
+
+        # Now look in the :include key in the YAML of the first file for
+        # either a single, or an array of files to include. Work out the
+        # standardised paths for each of these files, and push them onto
+        # the include_files array.
+        #
+        # IMPORTANT: relative paths given in the :include key in the YAML
+        # are considered to be relative to the config file specified, not
+        # $CWD. This is to ensure consistency of application and backwards
+        # compatibility. If this were relative to $CWD, a relative path
+        # specified in the file could have different meanings, and would end
+        # up being unpredictable.
         if include_yaml = @config.delete(:include)
             if include_yaml.is_a?(Array)
-                include_files.concat(include_yaml)
+                # the :include key is an array, we need to iterate over it
+                include_yaml.each do |yml|
+                    include_files << File.expand_path( yml, File.dirname( File.absolute_path(first_config_file) ) )
+                end
             else
-                include_files.push(include_yaml)
+                # the :include key is a scalar, so just standardise that path
+                include_files.push( File.expand_path( include_yaml, File.dirname( File.absolute_path(first_config_file) ) ) )
             end
         end
         
-        include_files.each do |include_file|
-
-            include_path = Pathname.new(File.join( File.dirname( first_config_file ), include_file)).realpath
+        include_files.each do |include_path|
 
             if File.exists?( include_path )
                 @log.info( "Including YAML file #{include_path}" )
                 included_conf = YAML::load( File.open( include_path ) )
                 @config = @config.merge(included_conf) do |keys, oldval, newval|
-                    (newval.is_a?(Array) ? (oldval + newval) : (oldval << newval)).uniq
+                    # we're iterating over elements that are in both the
+                    # config we've parsed so far, and the new file.
+                    (newval.is_a?(Array) ? (oldval + newval).uniq : newval)
+                    # oldval is from the existing config, newval is the incoming
+                    # value from this file. if newval is an array, merge it in with
+                    # what we already have, and make it unique. if newval is a
+                    # string, the new value takes precedence over what we have
+                    # already.
+                    #
+                    # edge cases:
+                    # 1. if we have a key :foo which is a scalar, and then a
+                    # :foo in a subsequent file which is an array (or v.v.)
+                    # then this will blow up. I think this is acceptable.
+                    # 2. if we have, eg. an instance, defined twice in
+                    # separate files, then the behaviour of uniq is to use
+                    # the entire hash as a test for uniqueness. Therefore
+                    # if the definition of those instances varies slightly,
+                    # the attempt to create those instances will likely fail.
                 end
 
             end

data/lib/build-cloud/networkinterface.rb

@@ -99,6 +99,11 @@ class BuildCloud::NetworkInterface
             @compute.associate_address(nil, ip.public_ip, interface.network_interface_id, allocation_id )
         end
 
+        unless options[:source_dest_check].nil?
+            ### Need to use the request here, since the model doesn't support the source_dest_check attribute
+            @compute.modify_network_interface_attribute(interface.network_interface_id, 'sourceDestCheck', options[:source_dest_check])
+        end
+
         @log.debug( interface.inspect )
         @log.debug( interface_tag.inspect )
         @log.debug( ip.inspect ) unless ! options[:assign_new_public_ip]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - The Scale Factory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Tools for building resources in AWS