@spinnaker/amazon 0.13.1 → 0.13.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/amazon",
   "license": "Apache-2.0",
-  "version": "0.13.1",
+  "version": "0.13.3",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -13,7 +13,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.22.0",
+    "@spinnaker/core": "^0.22.2",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/core": "6.0.8",
     "@uirouter/react": "1.0.7",
@@ -55,5 +55,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "12dc0b2f8cb61cc6ee529fa1a017890390e69d54"
+  "gitHead": "587b5a7a5fe2121cd93bed86e5e83795ee401be0"
 }

package/src/instance/awsInstanceType.service.spec.js

@@ -254,6 +254,11 @@ describe('Service: InstanceType', function () {
 
   describe('filterInstanceTypes', function () {
     const instanceTypes = [
+      {
+        account: 'test',
+        region: 'us-east-1',
+        name: 'test.type.incomplete',
+      },
       {
         account: 'test',
         region: 'us-west-2',
@@ -301,9 +306,10 @@ describe('Service: InstanceType', function () {
       },
     ];
 
-    it('filters instance types by VPC, virtualization type and architecture', function () {
+    it('filters instance types by VPC, virtualization type and architecture, only if the information exists', function () {
       const service = this.awsInstanceTypeService;
       expect(map(service.filterInstanceTypes(instanceTypes, 'hvm', true, 'x86_64'), 'name')).toEqual([
+        'test.type.incomplete',
         'm1.small',
         'hs1.8xlarge',
         'm2.xlarge',
@@ -316,11 +322,13 @@ describe('Service: InstanceType', function () {
         'm2.xlarge',
       ]);
       expect(map(service.filterInstanceTypes(instanceTypes, 'hvm', true, 'i386'), 'name')).toEqual([
+        'test.type.incomplete',
         'm1.small',
         'hs1.8xlarge',
         't2.nano',
       ]);
       expect(map(service.filterInstanceTypes(instanceTypes, 'paravirtual', true, 'i386'), 'name')).toEqual([
+        'test.type.incomplete',
         'm1.small',
         'hs1.8xlarge',
       ]);

package/src/instance/awsInstanceType.service.ts

@@ -184,10 +184,16 @@ module(AMAZON_INSTANCE_AWSINSTANCETYPE_SERVICE, []).factory('awsInstanceTypeServ
         if (!vpcConfigured && !families.ec2ClassicSupported.includes(i.name.split('.')[0])) {
           return false;
         }
-        if (virtualizationType && !i.supportedVirtualizationTypes.includes(virtualizationType)) {
+
+        if (
+          virtualizationType &&
+          i.supportedVirtualizationTypes &&
+          !i.supportedVirtualizationTypes.includes(virtualizationType)
+        ) {
           return false;
         }
-        if (architecture && !i.supportedArchitectures.includes(architecture)) {
+
+        if (architecture && i.supportedArchitectures && !i.supportedArchitectures.includes(architecture)) {
           return false;
         }