feat(services): rename tables and properties to fix postgres long nam…

package.json

@@ -31,22 +31,22 @@
     "terraform:cleanup": "rimraf ./tests/terraform/{.terraform,.terraform.lock.hcl,tfplan} ./tests/terraform/*.{tfstate,tfplan,backup}"
   },
   "dependencies": {
-    "@cloudgraph/sdk": "0.20.0",
+    "@cloudgraph/sdk": "0.22.0",
     "@fast-csv/parse": "^4.3.6",
-    "@graphql-tools/load-files": "6.3.2",
-    "@graphql-tools/merge": "8.0.1",
+    "@graphql-tools/load-files": "^6.5.3",
+    "@graphql-tools/merge": "^8.2.3",
     "aws-sdk": "^2.1084.0",
     "chalk": "4.1.2",
     "cuid": "2.1.8",
     "dotenv": "10.0.0",
-    "graphql": "^15.7.2",
+    "graphql": "^16.2.0",
     "lodash": "4.17.21",
     "typescript": "4.3.5"
   },
   "devDependencies": {
     "@autocloud/eslint-config": "^0.1.0",
-    "@graphql-codegen/cli": "^2.4.0",
-    "@graphql-codegen/typescript": "1.23.0",
+    "@graphql-codegen/cli": "^2.5.0",
+    "@graphql-codegen/typescript": "^2.4.3",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^8.0.1",

src/services/dynamodb/format.ts

@@ -13,16 +13,16 @@ import {
   AwsDynamoDbTable,
   AwsDynamoDbTableAttributes,
   AwsDynamoDbTableBillingSummary,
-  AwsDynamoDbTableGlobalSecondaryIndexDescription,
+  AwsDynamoDbTableGlobalSecondaryIndex,
   AwsDynamoDbTableIndexKeySchema,
   AwsDynamoDbTableIndexProjection,
-  AwsDynamoDbTableLocalSecondaryIndexDescription,
-  AwsDynamoDbTableProvisionedThroughputDescription,
+  AwsDynamoDbTableLocalSecondaryIndex,
+  AwsDynamoDbTableProvisionedThroughput,
   AwsDynamoDbTableReplicaDescription,
   AwsDynamoDbTableRestoreSummary,
   AwsDynamoDbTableSseDescription,
   AwsDynamoDbTableStreamSpecification,
-  AwsDynamoDbTableAutoScalingSettingsDescription,
+  AwsDynamoDbTableAutoScalingSettings,
 } from '../../types/generated'
 
 const formatKeySchema = (
@@ -39,7 +39,7 @@ const formatKeySchema = (
 
 const formatProvisionedThroughput = (
   provisionedThroughput: ProvisionedThroughputDescription = {}
-): AwsDynamoDbTableProvisionedThroughputDescription => {
+): AwsDynamoDbTableProvisionedThroughput => {
   const {
     LastIncreaseDateTime: lastIncreaseDateTime,
     LastDecreaseDateTime: lastDecreaseDateTime,
@@ -77,7 +77,7 @@ const formatProjection = (
 
 const formatAutoScalingSettingsDescription = (
   setting: AutoScalingSettingsDescription = {}
-): AwsDynamoDbTableAutoScalingSettingsDescription => {
+): AwsDynamoDbTableAutoScalingSettings => {
   if (isEmpty(setting)) {
     return {}
   }
@@ -190,7 +190,7 @@ export default ({
       : {}),
   }
 
-  const globalIndexes: AwsDynamoDbTableGlobalSecondaryIndexDescription[] =
+  const globalIndexes: AwsDynamoDbTableGlobalSecondaryIndex[] =
     GlobalSecondaryIndexes.map(
       ({
         IndexName,
@@ -227,7 +227,7 @@ export default ({
       })
     )
 
-  const localIndexes: AwsDynamoDbTableLocalSecondaryIndexDescription[] =
+  const localIndexes: AwsDynamoDbTableLocalSecondaryIndex[] =
     LocalSecondaryIndexes.map(
       ({
         IndexName,

src/services/dynamodb/schema.graphql

@@ -30,7 +30,7 @@ type awsDynamoDbTableIndexKeySchema
   keyType: String @search(by: [hash, regexp])
 }
 
-type awsDynamoDbTableLocalSecondaryIndexDescription
+type awsDynamoDbTableLocalSecondaryIndex
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
@@ -45,7 +45,7 @@ type awsDynamoDbTableLocalSecondaryIndexDescription
   sizeInBytes: Int64 @search
 }
 
-type awsDynamoDbTableProvisionedThroughputDescription
+type awsDynamoDbTableProvisionedThroughput
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
@@ -58,7 +58,7 @@ type awsDynamoDbTableProvisionedThroughputDescription
   writeCapacityUnits: Int @search
 }
 
-type awsDynamoDbTableGlobalSecondaryIndexDescription
+type awsDynamoDbTableGlobalSecondaryIndex
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
@@ -73,7 +73,7 @@ type awsDynamoDbTableGlobalSecondaryIndexDescription
   sizeInBytes: Int64 @search
   status: String @search(by: [hash, regexp])
   backfilling: Boolean @search
-  provisionedThroughput: awsDynamoDbTableProvisionedThroughputDescription
+  provisionedThroughput: awsDynamoDbTableProvisionedThroughput
 }
 
 type awsDynamoDbTableStreamSpecification
@@ -96,7 +96,7 @@ type awsDynamoDbTableBillingSummary
   lastUpdateToPayPerRequestDateTime: String @search(by: [hash, regexp])
 }
 
-type awsDynamoDbTableReplicaGlobalSecondaryIndexDescription
+type awsDynamoDbTableReplicaGlobalSecondaryIndex
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
@@ -107,7 +107,7 @@ type awsDynamoDbTableReplicaGlobalSecondaryIndexDescription
   readCapacityUnits: Int @search
 }
 
-type awsDynamoDbTableAutoScalingPolicyDescription
+type awsDynamoDbTableAutoScalingPolicy
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
@@ -121,7 +121,7 @@ type awsDynamoDbTableAutoScalingPolicyDescription
   targetValue: Int @search
 }
 
-type awsDynamoDbTableAutoScalingSettingsDescription
+type awsDynamoDbTableAutoScalingSettings
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
@@ -131,7 +131,7 @@ type awsDynamoDbTableAutoScalingSettingsDescription
   maximumUnits: Int @search
   autoScalingDisabled: Boolean @search
   autoScalingRoleArn: String @search(by: [hash, regexp])
-  scalingPolicies: [awsDynamoDbTableAutoScalingPolicyDescription]
+  scalingPolicies: [awsDynamoDbTableAutoScalingPolicy]
 }
 
 type awsDynamoDbTableReplicaDescription
@@ -147,10 +147,10 @@ type awsDynamoDbTableReplicaDescription
   statusPercentProgress: String @search(by: [hash, regexp])
   kmsMasterKeyId: String @search(by: [hash, regexp])
   readCapacityUnits: Int @search
-  globalSecondaryIndexes: [awsDynamoDbTableReplicaGlobalSecondaryIndexDescription]
+  globalSecondaryIndexes: [awsDynamoDbTableReplicaGlobalSecondaryIndex]
   replicaInaccessibleDateTime: String @search(by: [hash, regexp])
-  provisionedReadCapacityAutoScalingSettings: awsDynamoDbTableAutoScalingSettingsDescription
-  provisionedWriteCapacityAutoScalingSettings: awsDynamoDbTableAutoScalingSettingsDescription
+  provisionedReadCapacityAutoScalingSettings: awsDynamoDbTableAutoScalingSettings
+  provisionedWriteCapacityAutoScalingSettings: awsDynamoDbTableAutoScalingSettings
 }
 
 type awsDynamoDbTableRestoreSummary
@@ -181,16 +181,16 @@ type awsDynamoDbTable implements awsBaseService @key(fields: "arn") {
   attributes: [awsDynamoDbTableAttributes]
   billingModeSummary: awsDynamoDbTableBillingSummary
   creationDate: String! @search(by: [hash, regexp])
-  globalIndexes: [awsDynamoDbTableGlobalSecondaryIndexDescription]
+  globalIndexes: [awsDynamoDbTableGlobalSecondaryIndex]
   globalTableVersion: String @search(by: [hash, regexp])
   itemCount: Int @search
   keySchema: [awsDynamoDbTableIndexKeySchema]
   latestStreamArn: String @search(by: [hash, regexp])
   latestStreamLabel: String @search(by: [hash, regexp])
-  localIndexes: [awsDynamoDbTableLocalSecondaryIndexDescription]
+  localIndexes: [awsDynamoDbTableLocalSecondaryIndex]
   name: String @search(by: [hash, regexp])
   pointInTimeRecoveryEnabled: Boolean
-  provisionedThroughput: awsDynamoDbTableProvisionedThroughputDescription
+  provisionedThroughput: awsDynamoDbTableProvisionedThroughput
   replicas: [awsDynamoDbTableReplicaDescription]
   restoreSummary: awsDynamoDbTableRestoreSummary
   sizeInBytes: Int64 @search

src/services/elastiCacheCluster/format.ts

@@ -77,7 +77,7 @@ export default ({
       engineVersion: pendingModifiedValues?.EngineVersion,
       cacheNodeType: pendingModifiedValues?.CacheNodeType,
       authTokenStatus: pendingModifiedValues?.AuthTokenStatus,
-      logDeliveryConfigurations:
+      logDeliveryConfigs:
         pendingModifiedValues?.LogDeliveryConfigurations?.map(config => ({
           id: generateUniqueId({
             arn,

src/services/elastiCacheCluster/schema.graphql

@@ -54,7 +54,7 @@ type awsElastiCachePendingModifiedValues
   engineVersion: String @search(by: [hash, regexp])
   cacheNodeType: String @search(by: [hash, regexp])
   authTokenStatus: String @search(by: [hash, regexp])
-  logDeliveryConfigurations: [awsElastiCachePendingLogDeliveryConfiguration]
+  logDeliveryConfigs: [awsElastiCachePendingLogDeliveryConfig]
 }
 
 type awsElastiCacheNotificationConfiguration

src/services/elastiCacheReplicationGroup/schema.graphql

@@ -4,7 +4,7 @@ type awsElastiCacheReplicationGroup implements awsBaseService
   description: String @search(by: [hash, regexp])
   globalReplicationGroupInfo: awsElastiCacheGlobalReplicationGroupInfo
   status: String @search(by: [hash, regexp])
-  pendingModifiedValues: awsElastiCacheReplicationGroupPendingModifiedValues
+  pendingModifiedValues: awsElastiCachePendingModValues
   memberClusters: [String] @search(by: [hash])
   nodeGroups: [awsElastiCacheNodeGroup]
   snapshottingClusterId: String @search(by: [hash])
@@ -37,7 +37,7 @@ type awsElastiCacheGlobalReplicationGroupInfo
   globalReplicationGroupMemberRole: String @search(by: [hash, regexp])
 }
 
-type awsElastiCacheReplicationGroupPendingModifiedValues
+type awsElastiCachePendingModValues
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
@@ -48,7 +48,7 @@ type awsElastiCacheReplicationGroupPendingModifiedValues
   resharding: awsElastiCacheReshardingStatus
   authTokenStatus: String @search(by: [hash, regexp])
   userGroups: awsElastiCacheUserGroupsUpdateStatus
-  logDeliveryConfigurations: [awsElastiCachePendingLogDeliveryConfiguration]
+  logDeliveryConfigurations: [awsElastiCachePendingLogDeliveryConfig]
 }
 
 type awsElastiCacheReshardingStatus
@@ -79,7 +79,7 @@ type awsElastiCacheUserGroupsUpdateStatus
   userGroupIdsToRemove: [String] @search(by: [hash])
 }
 
-type awsElastiCachePendingLogDeliveryConfiguration
+type awsElastiCachePendingLogDeliveryConfig
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }

src/services/index.ts

@@ -8,7 +8,7 @@ import { loadFilesSync } from '@graphql-tools/load-files'
 import { mergeTypeDefs } from '@graphql-tools/merge'
 import AWS, { Config } from 'aws-sdk'
 import chalk from 'chalk'
-import { print } from 'graphql'
+import { DocumentNode } from 'graphql'
 import STS from 'aws-sdk/clients/sts'
 import { isEmpty, merge } from 'lodash'
 import path from 'path'
@@ -438,12 +438,12 @@ export default class Provider extends CloudGraph.Client {
    * getSchema is used to get the schema for provider
    * @returns A string of graphql sub schemas
    */
-  getSchema(): string {
+  getSchema(): DocumentNode {
     const typesArray = loadFilesSync(path.join(__dirname), {
       recursive: true,
       extensions: ['graphql'],
     })
-    return print(mergeTypeDefs(typesArray))
+    return mergeTypeDefs(typesArray)
   }
 
   /**

src/services/systemsManagerInstance/format.ts

@@ -127,7 +127,7 @@ export default ({
     computerName,
     associationOverview: {
       detailedStatus,
-      instanceAssociationStatusAggregatedCount:
+      ssmAssociationAggCount:
         mappedInstanceAssociationStatusAggregatedCount,
     },
     complianceItems: mappedComplianceItems,

src/services/systemsManagerInstance/schema.graphql

@@ -16,17 +16,17 @@ type awsSystemsManagerInstance implements awsBaseService @key(fields: "arn") {
   lastSuccessfulAssociationExecutionDate: DateTime @search(by: [day])
   ipAddress: String @search(by: [hash, regexp])
   computerName: String @search(by: [hash, regexp])
-  associationOverview: systemsManagerInstanceAssociationOverview
+  associationOverview: systemsManagerInstanceAssociation
   complianceItems: [systemsManagerInstanceComplianceItem]
   sourceId: String @search(by: [hash, regexp])
   sourceType: String @search(by: [hash, regexp])
   iamRole: [awsIamRole] @hasInverse(field: systemsManagerInstances)
   ec2Instance: [awsEc2] @hasInverse(field: systemsManagerInstance)
 }
 
-type systemsManagerInstanceAssociationOverview {
+type systemsManagerInstanceAssociation {
   detailedStatus: String @search(by: [hash, regexp])
-  instanceAssociationStatusAggregatedCount: [ssmAssociationOverviewAggregatedCount]
+  ssmAssociationAggCount: [ssmAssociationOverviewAggregatedCount]
 }
 
 type ssmAssociationOverviewAggregatedCount {

src/services/wafV2WebAcl/schema.graphql

@@ -74,7 +74,7 @@ type awsWafV2Statement {
   geoMatchStatement: awsWafV2StatementGeoMatchStatement
   ruleGroupReferenceStatement: awsWafV2StatementRuleGroupReferenceStatement
   iPSetReferenceStatement: awsWafV2StatementIpSetReferenceStatement
-  regexPatternSetReferenceStatement: awsWafV2StatementRegrexPatternSetReferenceStatement
+  regexPatternSetReferenceStatement: awsWafV2StatementRegrexPattern
   rateBasedStatement: awsWafV2StatementRateBasedStatement
   andStatement: awsWafV2StatementAndStatement
   orStatement: awsWafV2StatementOrStatement
@@ -144,7 +144,7 @@ type awsWafV2StatementIpSetReferenceStatement {
   iPSetForwardedIPConfig: awsWafV2IPSetForwardedIPConfig
 }
 
-type awsWafV2StatementRegrexPatternSetReferenceStatement {
+type awsWafV2StatementRegrexPattern {
   arn: String @search(by: [hash, regexp])
   fieldToMatch: awsWafV2FieldToMatch
   textTransformations: [awsWafV2TextTransformation]