Merge branch 'fix/CG-659' into 'main'

tyler-dunkel · tyler-dunkel · commit 32ed3abeca33 · 2022-02-24T21:49:24.000Z
CG-659: fix(connections): naming aliases, pluralize connections

Closes CG-659

See merge request auto-cloud/cloudgraph/provider/cloudgraph-provider-gcp!50
diff --git a/README.md b/README.md
@@ -79,17 +79,17 @@ CloudGraph GCP Provider will ask you what regions you would like to crawl and wi
 | cdnBackendBucket                      | project, cdnUrlMap                                                                                  |
 | cdnBackendService                     | project, cdnUrlMap, network                                                                         |
 | cdnUrlMap                             | project, cdnBackendBucket, cdnBackendService                                                        |
-| cloudFunction                         | project, vpc                                                                                        |
-| cloudRouter                           | project                                                                                             |
+| cloudFunction                         | project, vpcConnectors                                                                              |
+| cloudRouters                          | project                                                                                             |
 | computeProject                        | project                                                                                             |
-| dataprocClusters                      | project, dataprocJobs, dataprocWorkflowTemplate                                                     |
+| dataprocClusters                      | project, dataprocJobs, dataprocWorkflowTemplates                                                    |
 | dataprocAutoscalingPolicies           | project                                                                                             |
 | dataprocJobs                          | project, dataprocClusters                                                                           |
-| dataprocWorkflowTemplate              | project, dataprocClusters                                                                           |
+| dataprocWorkflowTemplates             | project, dataprocClusters                                                                           |
 | kmsCryptoKeys                         | iamPolicy, kmsKeyRing, project                                                                      |
 | dnsManagedZone                        | project                                                                                             |
 | dnsPolicy                             | project, network                                                                                    |
-| firestores                            | project                                                                                             |
+| firestoreDatabases                    | project                                                                                             |
 | firewall                              | network, project                                                                                    |
 | folder                                | iamPolicy, organization, project                                                                    |
 | kmsKeyRing                            | kmsCryptoKeys, project                                                                              |
@@ -98,15 +98,15 @@ CloudGraph GCP Provider will ask you what regions you would like to crawl and wi
 | logMetric                             | project                                                                                             |
 | logSink                               | project                                                                                             |
 | logView                               | logBucket, project                                                                                  |
-| network                               | cloudRouter, dnsPolicy, firewall, project, sqlInstances, subnet, vmInstance, vpc, cdnBackendService |
+| network                               | cloudRouters, dnsPolicy, firewall, project, sqlInstances, subnet, vmInstance, vpcConnectors, cdnBackendService |
 | organization                          | folder, project                                                                                     |
 | project                               | ALL SERVICES                                                                                        |
 | secretManager                         | project                                                                                             |
-| serviceAccount                        | project                                                                                             |
+| serviceAccounts                       | project                                                                                             |
 | sqlInstances                          | project, network                                                                                    |
 | sslPolicies                           | project                                                                                             |
 | storageBucket                         | project                                                                                             |
-| subnet                                | project, network, vmInstance, vpc                                                                   |
+| subnet                                | project, network, vmInstance, vpcConnectors                                                         |
 | targetSslProxies                      | project                                                                                             |
 | targetHttpsProxies                    | project                                                                                             |
 | vmInstance                            | project, network, subnet                                                                            |
diff --git a/src/enums/serviceAliases.ts b/src/enums/serviceAliases.ts
@@ -0,0 +1,16 @@
+export default {
+  alertPolicy: 'alertPolicies',
+  cloudFunction: 'cloudFunctions',
+  dnsManagedZone: 'dnsManagedZones',
+  dnsPolicy: 'dnsPolicies',
+  iamPolicy: 'iamPolicies',
+  logBucket: 'logBuckets',
+  logMetric: 'logMetrics',
+  logView: 'logViews',
+  logSink: 'logSinks',
+  storageBucket: 'storageBuckets',
+  firewall: 'firewalls',
+  network: 'networks',
+  subnet: 'subnets',
+  vmInstance: 'vmInstances',
+}
diff --git a/src/enums/services.ts b/src/enums/services.ts
@@ -81,7 +81,6 @@ export default {
   logView: 'logView',
   organization: 'organization',
   network: 'network',
-  // organizations: 'organizations',
   project: 'project',
   sqlInstances: 'sqlInstances',
   sslPolicies: 'sslPolicies',
diff --git a/src/services/alertPolicy/schema.graphql b/src/services/alertPolicy/schema.graphql
@@ -9,7 +9,7 @@ type gcpAlertPolicy implements gcpBaseResource @key(fields: "id") {
   notificationChannels: [String] @search(by: [hash])
   creationRecord: gcpAlertPolicyMutationRecord
   mutationRecord: gcpAlertPolicyMutationRecord
-  project: [gcpProject] @hasInverse(field: alertPolicy)
+  project: [gcpProject] @hasInverse(field: alertPolicies)
 }
 
 type gcpAlertPolicyDocumentation
diff --git a/src/services/cloudFunction/schema.graphql b/src/services/cloudFunction/schema.graphql
@@ -19,8 +19,8 @@ type gcpCloudFunction implements gcpBaseResource @key(fields: "id") {
   vpcConnectorEgressSettings: String @search(by: [hash, regexp])
   ingressSettings: String @search(by: [hash, regexp])
   buildId: String @search(by: [hash, regexp])
-  project: [gcpProject] @hasInverse(field: cloudFunction)
-  vpcConnectors: [gcpVpcConnector] @hasInverse(field: cloudFunction)
+  project: [gcpProject] @hasInverse(field: cloudFunctions)
+  vpcConnectors: [gcpVpcConnector] @hasInverse(field: cloudFunctions)
 }
 
 type gcpCloudFunctionSourceRepository
diff --git a/src/services/dnsManagedZone/schema.graphql b/src/services/dnsManagedZone/schema.graphql
@@ -63,5 +63,5 @@ type gcpDnsManagedZone implements gcpBaseResource
   serviceDirectoryConfigNamespaceDeactivateTime: String @search(by: [hash, regexp])
   cloudLoggingConfigKind: String @search(by: [hash, regexp])
   cloudLoggingConfigEnableLogging: Boolean @search
-  project: [gcpProject] @hasInverse(field: dnsManagedZone)
+  project: [gcpProject] @hasInverse(field: dnsManagedZones)
 }
diff --git a/src/services/dnsPolicy/schema.graphql b/src/services/dnsPolicy/schema.graphql
@@ -21,6 +21,6 @@ type gcpDnsPolicy implements gcpBaseResource
   alternativeNameServerConfigKind: String @search(by: [hash, regexp])
   alternativeNameServerConfigTargetNameServers: [gcpDnsPolicyAlternativeNameServerConfigTargetNameServer]
   enableLogging: Boolean @search
-  network: [gcpNetwork] @hasInverse(field: dnsPolicy)
-  project: [gcpProject] @hasInverse(field: dnsPolicy)
+  network: [gcpNetwork] @hasInverse(field: dnsPolicies)
+  project: [gcpProject] @hasInverse(field: dnsPolicies)
 }
diff --git a/src/services/firewall/schema.graphql b/src/services/firewall/schema.graphql
@@ -19,8 +19,8 @@ type gcpFirewall {
   sourceTags: [String] @search(by: [hash])
   targetServiceAccounts: [String] @search(by: [hash])
   targetTags: [String] @search(by: [hash])
-  network: [gcpNetwork] @hasInverse(field: firewall)
-  project: [gcpProject] @hasInverse(field: firewall)
+  network: [gcpNetwork] @hasInverse(field: firewalls)
+  project: [gcpProject] @hasInverse(field: firewalls)
 }
 
 type gcpFirewallAccess
diff --git a/src/services/folder/connections.ts b/src/services/folder/connections.ts
@@ -40,7 +40,7 @@ export default ({
           id: policy.id,
           resourceType: services.iamPolicy,
           relation: 'child',
-          field: 'iamPolicy',
+          field: 'iamPolicies',
         })
       }
     }
diff --git a/src/services/folder/schema.graphql b/src/services/folder/schema.graphql
@@ -6,7 +6,7 @@ type gcpFolder implements gcpBaseResource @key(fields: "id") {
   updateTime: String @search(by: [hash, regexp])
   deleteTime: String @search(by: [hash, regexp])
   etag: String @search(by: [hash, regexp])
-  organization: [gcpOrganization] @hasInverse(field: folder)
-  project: [gcpProject] @hasInverse(field: folder)
-  iamPolicy: [gcpIamPolicy] @hasInverse(field: folder)
+  organization: [gcpOrganization] @hasInverse(field: folders)
+  projects: [gcpProject] @hasInverse(field: folder)
+  iamPolicies: [gcpIamPolicy] @hasInverse(field: folder)
 }
diff --git a/src/services/iam/schema.graphql b/src/services/iam/schema.graphql
@@ -9,8 +9,8 @@ type gcpIamPolicy @key(fields: "id") {
   bindings: [gcpIamBinding]
   auditConfigs: [gcpIamPolicyAuditConfig]
   etag: String @search(by: [hash, regexp])
-  project: [gcpProject] @hasInverse(field: iamPolicy)
-  folder: [gcpFolder] @hasInverse(field: iamPolicy)
+  project: [gcpProject] @hasInverse(field: iamPolicies)
+  folder: [gcpFolder] @hasInverse(field: iamPolicies)
   storageBucket: [gcpStorageBucket] @hasInverse(field: iamPolicy)
   kmsCryptoKeys: [gcpKmsCryptoKey] @hasInverse(field: iamPolicy)
 }
diff --git a/src/services/logBucket/schema.graphql b/src/services/logBucket/schema.graphql
@@ -10,5 +10,5 @@ type gcpLogBucket @key(fields: "id") {
   locked: Boolean @search
   lifecycleState: String @search(by: [hash, regexp])
   logView: [gcpLogView] @hasInverse(field: logBucket)
-  project: [gcpProject] @hasInverse(field: logBucket)
+  project: [gcpProject] @hasInverse(field: logBuckets)
 }
diff --git a/src/services/logMetric/schema.graphql b/src/services/logMetric/schema.graphql
@@ -8,7 +8,7 @@ type gcpLogMetric implements gcpBaseResource @key(fields: "id") {
   createTime: String @search(by: [hash, regexp])
   updateTime: String @search(by: [hash, regexp])
   version: String @search(by: [hash, regexp])
-  project: [gcpProject] @hasInverse(field: logMetric)
+  project: [gcpProject] @hasInverse(field: logMetrics)
 }
 
 type gcpLogMetricDescriptor
diff --git a/src/services/logSink/schema.graphql b/src/services/logSink/schema.graphql
@@ -14,7 +14,7 @@ type gcpLogSink @key(fields: "id") {
   bigqueryOptions: gcpBigQueryOptions
   createTime: String @search(by: [hash, regexp])
   updateTime: String @search(by: [hash, regexp])
-  project: [gcpProject] @hasInverse(field: logSink)
+  project: [gcpProject] @hasInverse(field: logSinks)
 }
 
 type gcpLogExclusion {
diff --git a/src/services/logView/schema.graphql b/src/services/logView/schema.graphql
@@ -7,6 +7,6 @@ type gcpLogView {
   createTime: String @search(by: [hash, regexp])
   updateTime: String @search(by: [hash, regexp])
   filter: String @search(by: [hash, regexp])
-  project: [gcpProject] @hasInverse(field: logView)
+  project: [gcpProject] @hasInverse(field: logViews)
   logBucket: [gcpLogBucket] @hasInverse(field: logView)
 }
diff --git a/src/services/network/connections.ts b/src/services/network/connections.ts
@@ -3,6 +3,7 @@ import { rawDataInterface } from '../../types'
 import { RawGcpNetwork } from './data'
 import { GLOBAL_REGION } from '../../config/constants'
 import services from '../../enums/services'
+import aliases from '../../enums/serviceAliases'
 
 export default ({
   account,
@@ -47,7 +48,7 @@ export default ({
                 id,
                 resourceType: serviceName,
                 relation: 'child',
-                field: serviceName,
+                field: aliases[serviceName] ? aliases[serviceName] : serviceName,
               })
             }
           }
diff --git a/src/services/network/schema.graphql b/src/services/network/schema.graphql
@@ -10,13 +10,13 @@ type gcpNetwork implements gcpBaseResource @key(fields: "id") {
   routingConfig: gcpNetworkRoutingConfig
   selfLink: String @search(by: [hash, regexp])
   cdnBackendService: [gcpCdnBackendService] @hasInverse(field: network)
-  dnsPolicy: [gcpDnsPolicy] @hasInverse(field: network)
-  firewall: [gcpFirewall] @hasInverse(field: network)
-  project: [gcpProject] @hasInverse(field: network)
+  dnsPolicies: [gcpDnsPolicy] @hasInverse(field: network)
+  firewalls: [gcpFirewall] @hasInverse(field: network)
+  project: [gcpProject] @hasInverse(field: networks)
   sqlInstances: [gcpSqlInstance] @hasInverse(field: network)
-  subnet: [gcpSubnet] @hasInverse(field: network)
+  subnets: [gcpSubnet] @hasInverse(field: network)
   vpcConnectors: [gcpVpcConnector] @hasInverse(field: network)
-  vmInstance: [gcpVmInstance] @hasInverse(field: network)
+  vmInstances: [gcpVmInstance] @hasInverse(field: network)
   cloudRouters: [gcpCloudRouter] @hasInverse(field: network)
 }
 
diff --git a/src/services/organization/connections.ts b/src/services/organization/connections.ts
@@ -39,7 +39,7 @@ export default ({
         id: view.name,
         resourceType: services.folder,
         relation: 'child',
-        field: 'folder',
+        field: 'folders',
       })
     }
   }
diff --git a/src/services/organization/schema.graphql b/src/services/organization/schema.graphql
@@ -6,6 +6,6 @@ type gcpOrganization implements gcpBaseResource @key(fields: "id") {
   updateTime: String @search(by: [hash, regexp])
   deleteTime: String @search(by: [hash, regexp])
   etag: String @search(by: [hash, regexp])
-  folder: [gcpFolder] @hasInverse(field: organization)
-  project: [gcpProject] @hasInverse(field: organization)
+  folders: [gcpFolder] @hasInverse(field: organization)
+  projects: [gcpProject] @hasInverse(field: organization)
 }
diff --git a/src/services/project/connections.ts b/src/services/project/connections.ts
@@ -3,6 +3,7 @@ import { rawDataInterface } from '../../types'
 import { RawGcpProject } from './data'
 import { GLOBAL_REGION, MULTI_REGIONS } from '../../config/constants'
 import services from '../../enums/services'
+import aliases from '../../enums/serviceAliases'
 
 export default ({
   service,
@@ -40,7 +41,7 @@ export default ({
               id: instance.id,
               resourceType: serviceName,
               relation: 'child',
-              field: serviceName,
+              field: aliases[serviceName] ? aliases[serviceName] : serviceName,
             })
           }
         }
diff --git a/src/services/project/schema.graphql b/src/services/project/schema.graphql
@@ -10,15 +10,15 @@ type gcpProject @key(fields: "id") {
   deleteTime: String @search(by: [hash, regexp])
   etag: String @search(by: [hash, regexp])
   labels: [gcpRawLabel]
-  alertPolicy: [gcpAlertPolicy] @hasInverse(field: project)
+  alertPolicies: [gcpAlertPolicy] @hasInverse(field: project)
   apiKeys: [gcpApiKey] @hasInverse(field: project)
   cdnBackendBucket: [gcpCdnBackendBucket] @hasInverse(field: project)
   cdnBackendService: [gcpCdnBackendService] @hasInverse(field: project)
   cdnUrlMap: [gcpCdnUrlMap] @hasInverse(field: project)
-  cloudFunction: [gcpCloudFunction] @hasInverse(field: project)
+  cloudFunctions: [gcpCloudFunction] @hasInverse(field: project)
   computeProject: [gcpComputeProject] @hasInverse(field: project)
-  dnsManagedZone: [gcpDnsManagedZone] @hasInverse(field: project)
-  dnsPolicy: [gcpDnsPolicy] @hasInverse(field: project)
+  dnsManagedZones: [gcpDnsManagedZone] @hasInverse(field: project)
+  dnsPolicies: [gcpDnsPolicy] @hasInverse(field: project)
   bigQueryDataset: [gcpBigQueryDataset] @hasInverse(field: project)
   bigQueryConnection: [gcpBigQueryConnection] @hasInverse(field: project)
   bigQueryReservation: [gcpBigQueryReservation] @hasInverse(field: project)
@@ -30,22 +30,22 @@ type gcpProject @key(fields: "id") {
   vpcConnectors: [gcpVpcConnector] @hasInverse(field: project)
   kmsKeyRing: [gcpKmsKeyRing] @hasInverse(field: project)
   cloudRouters: [gcpCloudRouter] @hasInverse(field: project)
-  iamPolicy: [gcpIamPolicy] @hasInverse(field: project)
-  logBucket: [gcpLogBucket] @hasInverse(field: project)
-  logMetric: [gcpLogMetric] @hasInverse(field: project)
-  logView: [gcpLogView] @hasInverse(field: project)
-  logSink: [gcpLogSink] @hasInverse(field: project)
-  storageBucket: [gcpStorageBucket] @hasInverse(field: project)
-  firewall: [gcpFirewall] @hasInverse(field: project)
-  folder: [gcpFolder] @hasInverse(field: project)
-  organization: [gcpOrganization] @hasInverse(field: project)
+  iamPolicies: [gcpIamPolicy] @hasInverse(field: project)
+  logBuckets: [gcpLogBucket] @hasInverse(field: project)
+  logMetrics: [gcpLogMetric] @hasInverse(field: project)
+  logViews: [gcpLogView] @hasInverse(field: project)
+  logSinks: [gcpLogSink] @hasInverse(field: project)
+  storageBuckets: [gcpStorageBucket] @hasInverse(field: project)
+  firewalls: [gcpFirewall] @hasInverse(field: project)
+  folder: [gcpFolder] @hasInverse(field: projects)
+  organization: [gcpOrganization] @hasInverse(field: projects)
   secrets: [gcpSecret] @hasInverse(field: project)
   sslPolicies: [gcpSslPolicy] @hasInverse(field: project)
-  network: [gcpNetwork] @hasInverse(field: project)
-  subnet: [gcpSubnet] @hasInverse(field: project)
+  networks: [gcpNetwork] @hasInverse(field: project)
+  subnets: [gcpSubnet] @hasInverse(field: project)
   targetSslProxies: [gcpTargetSslProxy] @hasInverse(field: project)
   targetHttpsProxies: [gcpTargetHttpsProxy] @hasInverse(field: project)
-  vmInstance: [gcpVmInstance] @hasInverse(field: project)
+  vmInstances: [gcpVmInstance] @hasInverse(field: project)
   assets: [gcpAsset] @hasInverse(field: project)
   sqlInstances: [gcpSqlInstance] @hasInverse(field: project)
   serviceAccounts: [gcpServiceAccount] @hasInverse(field: project)
diff --git a/src/services/storageBucket/schema.graphql b/src/services/storageBucket/schema.graphql
@@ -22,7 +22,7 @@ type gcpStorageBucket @key(fields: "id") {
   pollIntervalMs: Int @search
   userProject: String @search(by: [hash, regexp])
   iamPolicy: [gcpIamPolicy] @hasInverse(field: storageBucket)
-  project: [gcpProject] @hasInverse(field: storageBucket)
+  project: [gcpProject] @hasInverse(field: storageBuckets)
 }
 
 type gcpStorageBucketIamConfiguration
diff --git a/src/services/subnet/connections.ts b/src/services/subnet/connections.ts
@@ -3,6 +3,9 @@ import { rawDataInterface } from '../../types'
 import { RawGcpSubnet } from './data'
 import { GLOBAL_REGION } from '../../config/constants'
 import services from '../../enums/services'
+const aliases = {
+  vmInstance: 'vmInstances',
+}
 
 export default ({
   account,
@@ -41,7 +44,7 @@ export default ({
                 id,
                 resourceType: serviceName,
                 relation: 'child',
-                field: serviceName,
+                field: aliases[serviceName] ? aliases[serviceName] : serviceName,
               })
             }
           }
diff --git a/src/services/subnet/schema.graphql b/src/services/subnet/schema.graphql
@@ -15,10 +15,10 @@ type gcpSubnet implements gcpBaseResource @key(fields: "id") {
   secondaryIpRanges: [gcpSubnetSecondaryRange]
   selfLink: String @search(by: [hash, regexp])
   state: String @search(by: [hash, regexp])
-  project: [gcpProject] @hasInverse(field: subnet)
-  network: [gcpNetwork] @hasInverse(field: subnet)
-  vpcConnectors: [gcpVpcConnector] @hasInverse(field: subnet)
-  vmInstance: [gcpVmInstance] @hasInverse(field: subnet)
+  project: [gcpProject] @hasInverse(field: subnets)
+  network: [gcpNetwork] @hasInverse(field: subnets)
+  vpcConnectors: [gcpVpcConnector] @hasInverse(field: subnets)
+  vmInstances: [gcpVmInstance] @hasInverse(field: subnet)
 }
 
 type gcpSubnetLogConfig
diff --git a/src/services/vmInstance/schema.graphql b/src/services/vmInstance/schema.graphql
@@ -35,9 +35,9 @@ type gcpVmInstance implements gcpBaseResource @key(fields: "id") {
   statusMessage: String @search(by: [hash, regexp])
   tags: gcpComputeTags
   zone: String @search(by: [hash, regexp])
-  project: [gcpProject] @hasInverse(field: vmInstance)
-  network: [gcpNetwork] @hasInverse(field: vmInstance)
-  subnet: [gcpSubnet] @hasInverse(field: vmInstance)
+  project: [gcpProject] @hasInverse(field: vmInstances)
+  network: [gcpNetwork] @hasInverse(field: vmInstances)
+  subnet: [gcpSubnet] @hasInverse(field: vmInstances)
 }
 
 type gcpAdvancedMachineFeatures
diff --git a/src/services/vpc/connections.ts b/src/services/vpc/connections.ts
diff --git a/src/services/vpc/schema.graphql b/src/services/vpc/schema.graphql
diff --git a/src/types/generated.ts b/src/types/generated.ts

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ type gcpAlertPolicy implements gcpBaseResource @key(fields: "id") {`
`9`	`9`	`notificationChannels: [String] @search(by: [hash])`
`10`	`10`	`creationRecord: gcpAlertPolicyMutationRecord`
`11`	`11`	`mutationRecord: gcpAlertPolicyMutationRecord`
`12`		`- project: [gcpProject] @hasInverse(field: alertPolicy)`
	`12`	`+ project: [gcpProject] @hasInverse(field: alertPolicies)`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`type gcpAlertPolicyDocumentation`
Original file line number	Diff line number	Diff line change
`@@ -63,5 +63,5 @@ type gcpDnsManagedZone implements gcpBaseResource`
`63`	`63`	`serviceDirectoryConfigNamespaceDeactivateTime: String @search(by: [hash, regexp])`
`64`	`64`	`cloudLoggingConfigKind: String @search(by: [hash, regexp])`
`65`	`65`	`cloudLoggingConfigEnableLogging: Boolean @search`
`66`		`- project: [gcpProject] @hasInverse(field: dnsManagedZone)`
	`66`	`+ project: [gcpProject] @hasInverse(field: dnsManagedZones)`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ type gcpDnsPolicy implements gcpBaseResource`
`21`	`21`	`alternativeNameServerConfigKind: String @search(by: [hash, regexp])`
`22`	`22`	`alternativeNameServerConfigTargetNameServers: [gcpDnsPolicyAlternativeNameServerConfigTargetNameServer]`
`23`	`23`	`enableLogging: Boolean @search`
`24`		`- network: [gcpNetwork] @hasInverse(field: dnsPolicy)`
`25`		`- project: [gcpProject] @hasInverse(field: dnsPolicy)`
	`24`	`+ network: [gcpNetwork] @hasInverse(field: dnsPolicies)`
	`25`	`+ project: [gcpProject] @hasInverse(field: dnsPolicies)`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export default ({`
`40`	`40`	`id: policy.id,`
`41`	`41`	`resourceType: services.iamPolicy,`
`42`	`42`	`relation: 'child',`
`43`		`- field: 'iamPolicy',`
	`43`	`+ field: 'iamPolicies',`
`44`	`44`	`})`
`45`	`45`	`}`
`46`	`46`	`}`