[fix] better security group integration for all amazon clients / server creation

bmeck · bmeck · commit df6885edb555 · 2012-11-27T13:11:24.000-06:00
diff --git a/lib/pkgcloud/amazon/client.js b/lib/pkgcloud/amazon/client.js
@@ -16,6 +16,8 @@ var Client = exports.Client = function (options) {
 
   // Allow overriding serversUrl in child classes
   this.provider   = 'amazon';
+  this.securityGroup = options.securityGroup;
+  this.securityGroupId = options.securityGroupId;
   this.version = options.version || '2012-04-01';
   this.serversUrl = options.serversUrl 
     || this.serversUrl
diff --git a/lib/pkgcloud/amazon/compute/client/servers.js b/lib/pkgcloud/amazon/compute/client/servers.js
@@ -137,7 +137,8 @@ exports.createServer = function createServer(options, callback) {
         MinCount: 1,
         MaxCount: 1
       },
-      securityGroup;
+      securityGroup,
+      securityGroupId;
 
   if (!options.image) {
     return errs.handle(
@@ -148,6 +149,16 @@ exports.createServer = function createServer(options, callback) {
     );
   }
 
+  securityGroup = this.securityGroup || options['SecurityGroup'];
+  if (securityGroup) {
+    createOptions['SecurityGroup'] = securityGroup;
+  }
+
+  securityGroupId = this.securityGroupId || options['SecurityGroupId'];
+  if (securityGroupId) {
+    createOptions['SecurityGroupId'] = securityGroupId;
+  }
+
   createOptions.ImageId = options.image instanceof base.Image 
     ? options.image.id
     : options.image;
@@ -167,11 +178,6 @@ exports.createServer = function createServer(options, callback) {
       || options['Placement.AvailabilityZone'];
   }
 
-  securityGroup = options.securityGroup || options['SecurityGroup'];
-  if (securityGroup) {
-    createOptions['SecurityGroup'] = securityGroup;
-  }
-
   return this.query(
     'RunInstances',
     createOptions,
