Merge pull request #16 from cloudgraphdev/fix/ccn-ccn-attachment

fix(ccn): fix ccn and ccnAttachment

Author: tyler-dunkel

src/services/ccn/connections.ts

@@ -3,8 +3,6 @@ import { RawTencentCcn } from './data'
 import services from '../../enums/services'
 import aliases from '../../enums/serviceAliases'
 
-const serviceName = 'ccn'
-
 export default ({
   service,
   data,
@@ -16,7 +14,7 @@ export default ({
 }): {
   [property: string]: ServiceConnection[]
 } => {
-  const { id } = service
+  const { id, CcnId } = service
   const connections: ServiceConnection[] = []
 
   const instances: {
@@ -26,12 +24,12 @@ export default ({
 
   if (instances?.data?.[region]) {
     for (const service of instances.data[region]) {
-      if (id === service.CcnId) {
+      if (CcnId === service.CcnId) {
         connections.push({
           id: service.id,
-          resourceType: serviceName,
+          resourceType: services.ccnAttachment,
           relation: 'child',
-          field: aliases[serviceName] ? aliases[serviceName] : serviceName,
+          field: aliases[services.ccnAttachment] ? aliases[services.ccnAttachment] : services.ccnAttachment,
         })
       }
     }

src/services/ccn/data.ts

@@ -4,6 +4,7 @@ import CloudGraph from '@cloudgraph/sdk'
 import groupBy from 'lodash/groupBy'
 import isEmpty from 'lodash/isEmpty'
 import { CCN } from 'tencentcloud-sdk-nodejs/tencentcloud/services/vpc/v20170312/vpc_models'
+import cuid from 'cuid'
 import loggerText from '../../properties/logger'
 import { TencentServiceInput } from '../../types'
 import { initTestEndpoint, generateTencentErrorLog } from '../../utils'
@@ -37,7 +38,7 @@ export default async ({
         if (response && !isEmpty(response.CcnSet)) {
           for (const instance of response.CcnSet) {
             ccnList.push({
-              id: instance.CcnId,
+              id: cuid(),
               ...instance,
               region,
             })

src/services/ccn/format.ts

@@ -11,7 +11,8 @@ export default ({
 }): TencentCcn => {
   const {
     id,
-    CcnName: ccnName,
+    CcnId: ccnId,
+    CcnName: name,
     CcnDescription: ccnDescription,
     InstanceCount: instanceCount,
     CreateTime: createTime,
@@ -28,7 +29,8 @@ export default ({
   return {
     id,
     region,
-    ccnName,
+    ccnId,
+    name,
     ccnDescription,
     instanceCount,
     createTime,

src/services/ccn/schema.graphql

@@ -1,5 +1,6 @@
 type tencentCcn implements tencentBaseService @key(fields: "id") {
-  ccnName: String @search(by: [hash, regexp])
+  ccnId: String @search(by: [hash, regexp])
+  name: String @search(by: [hash, regexp])
   ccnDescription: String @search(by: [hash, regexp])
   instanceCount: Int @search
   createTime: String @search(by: [hash, regexp])

src/services/ccnAttachment/data.ts

@@ -4,6 +4,7 @@ import CloudGraph from '@cloudgraph/sdk'
 import groupBy from 'lodash/groupBy'
 import isEmpty from 'lodash/isEmpty'
 import { CcnAttachedInstance } from 'tencentcloud-sdk-nodejs/tencentcloud/services/vpc/v20170312/vpc_models'
+import cuid from 'cuid'
 import loggerText from '../../properties/logger'
 import { TencentServiceInput } from '../../types'
 import { initTestEndpoint, generateTencentErrorLog } from '../../utils'
@@ -37,7 +38,7 @@ export default async ({
         if (response && !isEmpty(response.InstanceSet)) {
           for (const instance of response.InstanceSet) {
             ccnAttachmentList.push({
-              id: `${instance.CcnId}-${instance.InstanceId}`,
+              id: cuid(),
               ...instance,
               region,
             })

src/types/generated.ts

@@ -51,10 +51,11 @@ export type TencentCcn = TencentBaseService & {
   bandwidthLimitType?: Maybe<Scalars['String']>;
   ccnAttachments?: Maybe<Array<Maybe<TencentCcnAttachment>>>;
   ccnDescription?: Maybe<Scalars['String']>;
-  ccnName?: Maybe<Scalars['String']>;
+  ccnId?: Maybe<Scalars['String']>;
   createTime?: Maybe<Scalars['String']>;
   instanceChargeType?: Maybe<Scalars['String']>;
   instanceCount?: Maybe<Scalars['Int']>;
+  name?: Maybe<Scalars['String']>;
   qosLevel?: Maybe<Scalars['String']>;
   routePriorityFlag?: Maybe<Scalars['Boolean']>;
   routeTableCount?: Maybe<Scalars['Int']>;