bosh_aws_cpi 1.2989.0 → 1.2992.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2028a63025b046bf83df0de41cbfca8b14e4494a
-  data.tar.gz: fa2ca5b8d2d505f19b7527438efa56794afeff4b
+  metadata.gz: 161bccd1a02f77f5c44caada4be4ace8557996d0
+  data.tar.gz: 244ec285585ea16f80ac0f1919f8cdc999fd225e
 SHA512:
-  metadata.gz: d9d826475b1c094682f780216e6ab4822d5a9bddc8396420cf71b41166fb8d5b662aafcdc0d014002020ba3ac0a016c36be574368aba385801b50d42de97fd85
-  data.tar.gz: c242b1c0e2ef77f7731d6da22587f4e0bb0506204a1e4c8c8855ffb8125388bd9ccc7a99d3fc29f2d0aec754ee7534b39968839844c5d1cfd7f46ad335c5ef34
+  metadata.gz: 8c66e5cd0a0ddd21b5a8f55307ea26ef6aef70510ede200ee0c6b35d7136f1684826f457fef3fff7efd413f65daced7e98ee1e1eb24bdb861ca7dc31cb74c455
+  data.tar.gz: da9f62f7108eb9a4ce5992d5b0b9b5dd6b464c8e500f9385484c677605b7a41582790891165685281d9e724606db5ffd7b43a742ddd11782dbd01b96d1eae63a

data/README.md

@@ -16,7 +16,7 @@ These options are passed to the AWS CPI when it is instantiated.
 * `default_key_name` (required)
   default AWS ssh key name to assign to created virtual machines
 * `default_security_groups` (required)
-  list of AWS security group to assign to created virtual machines
+  list of AWS security group names or ids to assign to created virtual machines, note that name and id can not be used together in this attribute.
 * `ec2_private_key` (required)
   local path to the ssh private key, must match `default_key_name`
 * `region` (required)
@@ -66,6 +66,9 @@ These options are specified under `cloud_options` in the `networks` section of a
   can be either `dynamic` for a DHCP assigned IP by AWS, or `vip` to use an Elastic IP (which needs to be already
   allocated)
 
+* `security_groups` (optional)
+  the AWS security group names or ids to assign to VMs. If not specified, it'll use the default security groups set at the AWS options. Note that name and id can not be used together in this attribute.
+
 ## Example
 
 This is a sample of how AWS specific properties are used in a BOSH deployment manifest:

data/lib/cloud/aws/cloud.rb

@@ -398,7 +398,7 @@ module Bosh::AwsCloud
     # we need to send the InstanceUpdater a request to do it for us
     def compare_security_groups(instance, network_spec)
       actual_group_names = instance.security_groups.collect { |sg| sg.name }
-      specified_group_names = extract_security_group_names(network_spec)
+      specified_group_names = extract_security_groups(network_spec)
       if specified_group_names.empty?
         new_group_names = Array(aws_properties["default_security_groups"])
       else

data/lib/cloud/aws/helpers.rb

@@ -17,7 +17,7 @@ module Bosh::AwsCloud
       raise Bosh::Clouds::CloudError, message
     end
 
-    def extract_security_group_names(networks_spec)
+    def extract_security_groups(networks_spec)
       networks_spec.
           values.
           select { |network_spec| network_spec.has_key? "cloud_properties" }.

data/lib/cloud/aws/instance_manager.rb

@@ -118,11 +118,11 @@ module Bosh::AwsCloud
     end
 
     def set_security_groups_parameter(instance_params, networks_spec, default_security_groups)
-      security_group_names = extract_security_group_names(networks_spec)
-      if security_group_names.empty?
-        instance_params[:security_groups] = default_security_groups
+      security_groups = extract_security_groups(networks_spec)
+      if security_groups.empty?
+        validate_and_prepare_security_groups_parameter(instance_params, default_security_groups)
       else
-        instance_params[:security_groups] = security_group_names
+        validate_and_prepare_security_groups_parameter(instance_params, security_groups)
       end
     end
 
@@ -154,5 +154,27 @@ module Bosh::AwsCloud
 
       instance_params[:user_data] = Yajl::Encoder.encode(user_data)
     end
+
+    def validate_and_prepare_security_groups_parameter(instance_params, security_groups)
+      return if security_groups.nil? || security_groups.empty?
+
+      is_id = is_security_group_id?(security_groups.first)
+
+      security_groups.drop(1).each do |security_group|
+        unless is_security_group_id?(security_group) == is_id
+          raise Bosh::Clouds::CloudError, 'security group names and ids can not be used together in security groups'
+        end
+      end
+
+      if is_id
+        instance_params[:security_group_ids] = security_groups
+      else
+        instance_params[:security_groups] = security_groups
+      end
+    end
+
+    def is_security_group_id?(security_group)
+      security_group.start_with?('sg-') && security_group.size == 11
+    end
   end
 end

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2989.0'
+    VERSION = '1.2992.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2989.0
+  version: 1.2992.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2989.0
+        version: 1.2992.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2989.0
+        version: 1.2992.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2989.0
+        version: 1.2992.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2989.0
+        version: 1.2992.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2989.0
+        version: 1.2992.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2989.0
+        version: 1.2992.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH AWS CPI
-  0c4ecd
+  2996bb
 email: support@cloudfoundry.com
 executables:
 - aws_cpi