Merge branch 'fix/lambda-and-kms-fixes' into 'master'

fix(services): fix lambda to include vpcConfig, fix kms to use booleans

See merge request auto-cloud/cloudgraph/provider/cloudgraph-provider-aws!219

Author: tyler-dunkel

src/services/kms/format.ts

@@ -40,10 +40,10 @@ export default ({
     region,
     id,
     description,
-    keyRotationEnabled: keyRotationEnabled ? t.yes : t.no,
+    keyRotationEnabled,
     usage,
     policy: formatIamJsonPolicy(policy),
-    enabled: enabled ? t.yes : t.no,
+    enabled,
     keyState,
     customerMasterKeySpec,
     tags: formatTagsFromMap(Tags),

src/services/kms/schema.graphql

@@ -4,10 +4,10 @@ type awsKms @key(fields: "id"){
   arn: String! @id @search(by: [hash, regexp])
   region: String @search(by: [hash, regexp])
   description: String @search(by: [hash, regexp, fulltext])
-  keyRotationEnabled: String @search(by: [hash, regexp])
+  keyRotationEnabled: Boolean @search
   usage: String @search(by: [hash, regexp])
   policy: awsIamJSONPolicy
-  enabled: String @search(by: [hash, regexp])
+  enabled: Boolean @search
   keyState: String @search(by: [hash, regexp])
   customerMasterKeySpec: String @search(by: [hash, regexp])
   tags: [awsRawTag]

src/services/lambda/format.ts

@@ -31,6 +31,7 @@ export default ({
     TracingConfig: tracing = [],
     Version: version,
     reservedConcurrentExecutions: rawReservedConcurrentExecutions,
+    VpcConfig: vpcConfig
   } = rawData
   const environmentVariables = []
   const secretNames = [t.pass, t.secret, t.private, t.cert]
@@ -56,6 +57,12 @@ export default ({
     .map(([key, value]) => `${key} - ${value}`)
     .join(', ')
 
+  const formattedVpcConfig = {
+    vpcId: vpcConfig?.VpcId,
+    subnetIds: vpcConfig?.SubnetIds,
+    securityGroupIds: vpcConfig?.SecurityGroupIds
+  }
+
   return {
     accountId: account,
     arn,
@@ -74,6 +81,7 @@ export default ({
     tracingConfig,
     version,
     environmentVariables,
+    vpcConfig: formattedVpcConfig,
     tags: formatTagsFromMap(Tags),
   }
 }

src/services/lambda/schema.graphql

@@ -16,6 +16,7 @@ type awsLambda @key(fields: "arn") {
   tracingConfig: String @search(by: [hash, regexp])
   version: String @search(by: [hash, regexp])
   environmentVariables: [awsLambdaEnvironmentVariable]
+  vpcConfig: awsLambdaVpcConfig
   tags: [awsRawTag]
   kms: [awsKms] @hasInverse(field: lambda)
   securityGroups: [awsSecurityGroup] @hasInverse(field: lambda)
@@ -35,3 +36,9 @@ type awsLambdaEnvironmentVariable
   key: String!
   value: String
 }
+
+type awsLambdaVpcConfig {
+  vpcId: String @search(by: [hash, regexp])
+  subnetIds: [String] @search(by: [hash, regexp])
+  securityGroupIds: [String] @search(by: [hash, regexp])
+}

src/types/generated.ts

@@ -3313,10 +3313,10 @@ export type AwsKms = {
   elastiCacheReplicationGroup?: Maybe<Array<Maybe<AwsElastiCacheReplicationGroup>>>;
   elasticSearchDomains?: Maybe<Array<Maybe<AwsElasticSearchDomain>>>;
   emrCluster?: Maybe<Array<Maybe<AwsEmrCluster>>>;
-  enabled?: Maybe<Scalars['String']>;
+  enabled?: Maybe<Scalars['Boolean']>;
   id: Scalars['String'];
   keyManager?: Maybe<Scalars['String']>;
-  keyRotationEnabled?: Maybe<Scalars['String']>;
+  keyRotationEnabled?: Maybe<Scalars['Boolean']>;
   keyState?: Maybe<Scalars['String']>;
   lambda?: Maybe<Array<Maybe<AwsLambda>>>;
   origin?: Maybe<Scalars['String']>;
@@ -3355,6 +3355,7 @@ export type AwsLambda = {
   tracingConfig?: Maybe<Scalars['String']>;
   version?: Maybe<Scalars['String']>;
   vpc?: Maybe<Array<Maybe<AwsVpc>>>;
+  vpcConfig?: Maybe<AwsLambdaVpcConfig>;
 };
 
 export type AwsLambdaEnvironmentVariable = {
@@ -3363,6 +3364,12 @@ export type AwsLambdaEnvironmentVariable = {
   value?: Maybe<Scalars['String']>;
 };
 
+export type AwsLambdaVpcConfig = {
+  securityGroupIds?: Maybe<Array<Maybe<Scalars['String']>>>;
+  subnetIds?: Maybe<Array<Maybe<Scalars['String']>>>;
+  vpcId?: Maybe<Scalars['String']>;
+};
+
 export type AwsLaunchConfiguration = {
   associatePublicIpAddress?: Maybe<Scalars['String']>;
   blockDeviceMappings?: Maybe<Array<Maybe<AwsLcBlockDeviceMapping>>>;