feat: Included groupOption and parameterGroup for dbInstance

Author: Marco Franceschi

src/services/rdsDbInstance/format.ts

@@ -1,20 +1,22 @@
+import { generateUniqueId } from '@cloudgraph/sdk'
+
 import upperFirst from 'lodash/upperFirst'
 import { RawAwsRdsDbInstance } from './data'
-import { 
-  AwsRdsDbInstance, 
+import {
+  AwsRdsDbInstance,
 } from '../../types/generated'
 import { formatTagsFromMap } from '../../utils/format'
 
 export default ({
   service,
   account,
   region
-}: 
-{
-  service: RawAwsRdsDbInstance
-  account: string
-  region: string
-}): AwsRdsDbInstance => {
+}:
+  {
+    service: RawAwsRdsDbInstance
+    account: string
+    region: string
+  }): AwsRdsDbInstance => {
   const {
     DBInstanceArn: arn,
     DBInstanceIdentifier: dBInstanceIdentifier,
@@ -46,15 +48,36 @@ export default ({
 
   const subnetGroup = service.DBSubnetGroup?.DBSubnetGroupName || ''
 
-  const parameterGroup = service.DBParameterGroups.map(
-    ({ DBParameterGroupName, ParameterApplyStatus }) =>
-      `${DBParameterGroupName} (${ParameterApplyStatus})`
-  ).join(' | ')
+  const parameterGroups = service.DBParameterGroups.map(
+    (parameter) => {
+      const { DBParameterGroupName, ParameterApplyStatus } = parameter
+      return ({
+        id: generateUniqueId({
+          arn,
+          ...parameter
+        }),
+        description: `${DBParameterGroupName} (${ParameterApplyStatus})`,
+        name: DBParameterGroupName,
+        status: ParameterApplyStatus
+      })
+    }
+  )
 
   const optionsGroups = service.OptionGroupMemberships.map(
-    ({ OptionGroupName, Status }) =>
-      `${OptionGroupName} (${upperFirst(Status)})`
-  ).join(' | ')
+    (option) => {
+      const { OptionGroupName, Status } = option
+      return ({
+        id: generateUniqueId({
+          arn,
+          ...option
+        }),
+        description: `${OptionGroupName} (${upperFirst(Status)})`,
+        groupName: OptionGroupName,
+        status: Status
+      })
+    }
+
+  )
 
   return {
     id: arn,
@@ -77,7 +100,7 @@ export default ({
     autoMinorVersionUpgrade,
     iamDbAuthenticationEnabled,
     optionsGroups,
-    parameterGroup,
+    parameterGroups,
     storageType,
     instanceClass,
     allocatedStorage,

src/services/rdsDbInstance/schema.graphql

@@ -1,3 +1,18 @@
+type awsRdsDbInstanceParameterGroup {
+  id: String! @id
+  name: String @search(by: [hash, regexp])
+  status: String @search(by: [hash, regexp])
+  description: String @search(by: [hash, regexp])
+}
+
+type awsRdsDbInstanceGroupOption {
+  id: String! @id
+  groupName: String @search(by: [hash, regexp])
+  status: String @search(by: [hash, regexp])
+  description: String @search(by: [hash, regexp])
+}
+
+
 type awsRdsDbInstance implements awsBaseService @key(fields: "arn") {
   name: String @search(by: [hash, regexp])
   port: Int @search
@@ -14,8 +29,8 @@ type awsRdsDbInstance implements awsBaseService @key(fields: "arn") {
   performanceInsightsEnabled: Boolean @search
   autoMinorVersionUpgrade: Boolean @search
   iamDbAuthenticationEnabled: Boolean @search
-  optionsGroups: String
-  parameterGroup: String
+  optionsGroups: [awsRdsDbInstanceGroupOption]
+  parameterGroups: [awsRdsDbInstanceParameterGroup]
   storageType: String @search(by: [hash, regexp])
   instanceClass: String @search(by: [hash, regexp])
   allocatedStorage: Int @search

src/types/generated.ts

@@ -4036,8 +4036,8 @@ export type AwsRdsDbInstance = AwsBaseService & {
   licenseModel?: Maybe<Scalars['String']>;
   multiAZ?: Maybe<Scalars['Boolean']>;
   name?: Maybe<Scalars['String']>;
-  optionsGroups?: Maybe<Scalars['String']>;
-  parameterGroup?: Maybe<Scalars['String']>;
+  optionsGroups?: Maybe<Array<Maybe<AwsRdsDbInstanceGroupOption>>>;
+  parameterGroups?: Maybe<Array<Maybe<AwsRdsDbInstanceParameterGroup>>>;
   performanceInsightsEnabled?: Maybe<Scalars['Boolean']>;
   port?: Maybe<Scalars['Int']>;
   publiclyAccessible?: Maybe<Scalars['Boolean']>;
@@ -4053,6 +4053,20 @@ export type AwsRdsDbInstance = AwsBaseService & {
   vpc?: Maybe<Array<Maybe<AwsVpc>>>;
 };
 
+export type AwsRdsDbInstanceGroupOption = {
+  description?: Maybe<Scalars['String']>;
+  groupName?: Maybe<Scalars['String']>;
+  id: Scalars['String'];
+  status?: Maybe<Scalars['String']>;
+};
+
+export type AwsRdsDbInstanceParameterGroup = {
+  description?: Maybe<Scalars['String']>;
+  id: Scalars['String'];
+  name?: Maybe<Scalars['String']>;
+  status?: Maybe<Scalars['String']>;
+};
+
 export type AwsRecorderStatus = {
   lastStartTime?: Maybe<Scalars['String']>;
   lastStatus?: Maybe<Scalars['String']>;