Merge branch 'alpha' into feature/CG-1059

Author: m-pizarro

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.78.2-alpha.1](https://github.com/cloudgraphdev/cloudgraph-provider-aws/compare/0.78.1...0.78.2-alpha.1) (2022-04-06)
+
+
+### Bug Fixes
+
+* Standardized aws service schemas using base schema ([f0f7cfd](https://github.com/cloudgraphdev/cloudgraph-provider-aws/commit/f0f7cfdc3b71a202f211ed7255ea6b0aa1e4988d))
+
 ## [0.78.1](https://gitlab.com/auto-cloud/cloudgraph/provider/cloudgraph-provider-aws/compare/0.78.0...0.78.1) (2022-03-29)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgraph/cg-provider-aws",
-  "version": "0.78.1",
+  "version": "0.78.2-alpha.1",
   "description": "cloud-graph provider plugin for AWS used to fetch AWS cloud data.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -76,4 +76,4 @@
       "git add --force"
     ]
   }
-}
+}

src/services/account/schema.graphql

@@ -1,5 +1,4 @@
-type awsAccount @key(fields: "id") {
-  id: String! @id @search(by: [hash])
+type awsAccount implements awsOptionalService @key(fields: "id") {
   regions: [String] @search(by: [hash])
   albs: [awsAlb]
   apiGatewayResources: [awsApiGatewayResource]

src/services/alb/schema.graphql

@@ -1,9 +1,5 @@
-type awsAlb @key(fields: "arn") {
-  id: String! @id @search(by: [hash, regexp])
+type awsAlb implements awsBaseService @key(fields: "arn") {
   name: String @search(by: [hash, regexp])
-  accountId: String! @search(by: [hash, regexp])
-  arn: String! @id @search(by: [hash, regexp])
-  region: String @search(by: [hash, regexp])
   dnsName: String @search(by: [hash, regexp])
   scheme: String @search(by: [hash, regexp])
   type: String @search(by: [hash, regexp])

src/services/apiGatewayResource/schema.graphql

@@ -6,12 +6,8 @@ type awsApiGatewayMethod @key(fields: "arn") {
   apiKeyRequired: Boolean @search
 }
 
-type awsApiGatewayResource @key(fields: "arn") {
-  id: String! @search(by: [hash])
-  accountId: String! @search(by: [hash])
-  arn: String! @id @search(by: [hash, regexp])
-  region: String @search(by: [hash, regexp])
+type awsApiGatewayResource implements awsBaseService @key(fields: "arn") {
   restApi: [awsApiGatewayRestApi] @hasInverse(field: resources) #change to plural
   path: String @search(by: [hash, regexp])
   methods: [awsApiGatewayMethod]
-}
+}

src/services/apiGatewayRestApi/schema.graphql

@@ -4,11 +4,7 @@ type awsApiGatewayEndpointConfiguration {
   vpcEndpointIds: [String] @search(by: [hash])
 }
 
-type awsApiGatewayRestApi @key(fields: "arn") {
-  id: String! @id @search(by: [hash])
-  accountId: String! @search(by: [hash])
-  arn: String! @id @search(by: [hash, regexp])
-  region: String @search(by: [hash, regexp])
+type awsApiGatewayRestApi implements awsBaseService @key(fields: "arn") {
   description: String @search(by: [hash, regexp, fulltext])
   policy: awsIamJSONPolicy
   endpointConfiguration: awsApiGatewayEndpointConfiguration
@@ -21,5 +17,3 @@ type awsApiGatewayRestApi @key(fields: "arn") {
   resources: [awsApiGatewayResource] @hasInverse(field: restApi)
   route53Record: [awsRoute53Record] @hasInverse(field: restApi) #change to plural
 }
-
-

src/services/apiGatewayStage/schema.graphql

@@ -20,11 +20,7 @@ type awsApiGatewayStageVariable
   value: String @search(by: [hash])
 }
 
-type awsApiGatewayStage @key(fields: "arn") {
-  id: String! @search(by: [hash])
-  accountId: String! @search(by: [hash])
-  arn: String! @id @search(by: [hash, regexp])
-  region: String @search(by: [hash, regexp])
+type awsApiGatewayStage implements awsBaseService @key(fields: "arn") {
   name: String @search(by: [hash, regexp])
   description: String @search(by: [hash, regexp, fulltext])
   cacheCluster: Boolean @search

src/services/appSync/schema.graphql

@@ -4,135 +4,131 @@ type awsAppSyncApiKey
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    id: String! @id @search(by: [hash])
-    description: String @search(by: [hash, regexp])
-    expires: Int @search
-  }
+  id: String! @id @search(by: [hash])
+  description: String @search(by: [hash, regexp])
+  expires: Int @search
+}
 
 type awsAppSyncDataSource
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    id: String! @id @search(by: [hash])
-    arn: String! @search(by: [hash])
-    name: String @search(by: [hash, regexp])
-    description: String @search(by: [hash, regexp])
-    type: String @search(by: [hash, regexp])
-    serviceRoleArn: String @search(by: [hash, regexp])
-    dynamodbTableName: String @search(by: [hash, regexp])
-    dynamodbAwsRegion: String @search(by: [hash, regexp])
-    dynamodbUseCallerCredentials: String @search(by: [hash, regexp])
-    dynamodbDeltaSyncBaseTableTTL: Int @search
-    dynamodbDeltaSyncTableName: String @search(by: [hash, regexp])
-    dynamodbDeltaSyncTableTTL: Int @search
-    dynamodbVersioned: String @search(by: [hash, regexp])
-    lambdaFunctionArn: String @search(by: [hash, regexp])
-    elasticsearchEndpoint: String @search(by: [hash, regexp])
-    elasticsearchAwsRegion: String @search(by: [hash, regexp])
-    httpEndpoint: String @search(by: [hash, regexp])
-    httpAuthorizationType: String @search(by: [hash, regexp])
-    httpAuthorizationIamSigningRegion: String @search(by: [hash, regexp])
-    httpAuthorizationIamSigningServiceName: String @search(by: [hash, regexp])
-    relationalDatabaseSourceType: String @search(by: [hash, regexp])
-    relationalDatabaseAwsRegion: String @search(by: [hash, regexp])
-    relationalDatabaseClusterIdentifier: String @search(by: [hash, regexp])
-    relationalDatabaseName: String @search(by: [hash, regexp])
-    relationalDatabaseSchema: String @search(by: [hash, regexp])
-    relationalDatabaseAwsSecretStoreArn: String @search(by: [hash, regexp])
-  }
+  id: String! @id @search(by: [hash])
+  arn: String! @search(by: [hash])
+  name: String @search(by: [hash, regexp])
+  description: String @search(by: [hash, regexp])
+  type: String @search(by: [hash, regexp])
+  serviceRoleArn: String @search(by: [hash, regexp])
+  dynamodbTableName: String @search(by: [hash, regexp])
+  dynamodbAwsRegion: String @search(by: [hash, regexp])
+  dynamodbUseCallerCredentials: String @search(by: [hash, regexp])
+  dynamodbDeltaSyncBaseTableTTL: Int @search
+  dynamodbDeltaSyncTableName: String @search(by: [hash, regexp])
+  dynamodbDeltaSyncTableTTL: Int @search
+  dynamodbVersioned: String @search(by: [hash, regexp])
+  lambdaFunctionArn: String @search(by: [hash, regexp])
+  elasticsearchEndpoint: String @search(by: [hash, regexp])
+  elasticsearchAwsRegion: String @search(by: [hash, regexp])
+  httpEndpoint: String @search(by: [hash, regexp])
+  httpAuthorizationType: String @search(by: [hash, regexp])
+  httpAuthorizationIamSigningRegion: String @search(by: [hash, regexp])
+  httpAuthorizationIamSigningServiceName: String @search(by: [hash, regexp])
+  relationalDatabaseSourceType: String @search(by: [hash, regexp])
+  relationalDatabaseAwsRegion: String @search(by: [hash, regexp])
+  relationalDatabaseClusterIdentifier: String @search(by: [hash, regexp])
+  relationalDatabaseName: String @search(by: [hash, regexp])
+  relationalDatabaseSchema: String @search(by: [hash, regexp])
+  relationalDatabaseAwsSecretStoreArn: String @search(by: [hash, regexp])
+}
 
 type awsAppSyncResolver
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    id: String! @id @search(by: [hash])
-    arn: String! @search(by: [hash])
-    typeName: String @search(by: [hash, regexp])
-    fieldName: String @search(by: [hash, regexp])
-    dataSourceName: String @search(by: [hash, regexp])
-    requestMappingTemplate: String @search(by: [hash, regexp])
-    responseMappingTemplate: String @search(by: [hash, regexp])
-    kind: String @search(by: [hash, regexp])
-    pipelineFunctionIds: [String] @search(by: [hash])
-    syncConflictHandler: String @search(by: [hash, regexp])
-    syncConflictDetection: String @search(by: [hash, regexp])
-    syncLambdaConflictHandlerArn: String @search(by: [hash, regexp])
-    cachingTTL: Int @search
-    cachingKeys: [String] @search(by: [hash])
-  }
+  id: String! @id @search(by: [hash])
+  arn: String! @search(by: [hash])
+  typeName: String @search(by: [hash, regexp])
+  fieldName: String @search(by: [hash, regexp])
+  dataSourceName: String @search(by: [hash, regexp])
+  requestMappingTemplate: String @search(by: [hash, regexp])
+  responseMappingTemplate: String @search(by: [hash, regexp])
+  kind: String @search(by: [hash, regexp])
+  pipelineFunctionIds: [String] @search(by: [hash])
+  syncConflictHandler: String @search(by: [hash, regexp])
+  syncConflictDetection: String @search(by: [hash, regexp])
+  syncLambdaConflictHandlerArn: String @search(by: [hash, regexp])
+  cachingTTL: Int @search
+  cachingKeys: [String] @search(by: [hash])
+}
 
 type awsAppSyncFunction
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    id: String! @id @search(by: [hash])
-    arn: String! @search(by: [hash])
-    name: String @search(by: [hash, regexp])
-    description: String @search(by: [hash, regexp])
-    dataSourceName: String @search(by: [hash, regexp])
-    requestMappingTemplate: String @search(by: [hash, regexp])
-    responseMappingTemplate: String @search(by: [hash, regexp])
-    functionVersion: String @search(by: [hash, regexp])
-    resolvers: [awsAppSyncResolver]
-  }
+  id: String! @id @search(by: [hash])
+  arn: String! @search(by: [hash])
+  name: String @search(by: [hash, regexp])
+  description: String @search(by: [hash, regexp])
+  dataSourceName: String @search(by: [hash, regexp])
+  requestMappingTemplate: String @search(by: [hash, regexp])
+  responseMappingTemplate: String @search(by: [hash, regexp])
+  functionVersion: String @search(by: [hash, regexp])
+  resolvers: [awsAppSyncResolver]
+}
 
 type awsAppSyncType
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    id: String! @id @search(by: [hash])
-    arn: String! @search(by: [hash])
-    name: String @search(by: [hash, regexp])
-    description: String @search(by: [hash, regexp])
-    definition: String @search(by: [hash, regexp])
-    format: String @search(by: [hash, regexp])
-    resolvers: [awsAppSyncResolver]
-  }
+  id: String! @id @search(by: [hash])
+  arn: String! @search(by: [hash])
+  name: String @search(by: [hash, regexp])
+  description: String @search(by: [hash, regexp])
+  definition: String @search(by: [hash, regexp])
+  format: String @search(by: [hash, regexp])
+  resolvers: [awsAppSyncResolver]
+}
 
 type awsAppSyncGraphqlApiUris
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    id: String! @id @search(by: [hash])
-    key: String! @search(by: [hash, regexp])
-    value: String! @search(by: [hash, regexp])
-  }
+  id: String! @id @search(by: [hash])
+  key: String! @search(by: [hash, regexp])
+  value: String! @search(by: [hash, regexp])
+}
 
 type awsAdditionalAuthenticationProvider
   @generate(
     query: { get: false, query: true, aggregate: false }
     mutation: { add: false, delete: false }
     subscription: false
   ) {
-    id: String! @id @search(by: [hash])
-    authenticationType: String @search(by: [hash, regexp])
-    openIDConnectIssuer: String @search(by: [hash, regexp])
-    openIDConnectClientId: String @search(by: [hash, regexp])
-    openIDConnectIatTTL: Int @search
-    openIDConnectAuthTTL: Int @search
-    userPoolId: String @search(by: [hash, regexp])
-    userPoolAwsRegion: String @search(by: [hash, regexp])
-    userPoolAppIdClientRegex: String @search(by: [hash, regexp])
-  }
+  id: String! @id @search(by: [hash])
+  authenticationType: String @search(by: [hash, regexp])
+  openIDConnectIssuer: String @search(by: [hash, regexp])
+  openIDConnectClientId: String @search(by: [hash, regexp])
+  openIDConnectIatTTL: Int @search
+  openIDConnectAuthTTL: Int @search
+  userPoolId: String @search(by: [hash, regexp])
+  userPoolAwsRegion: String @search(by: [hash, regexp])
+  userPoolAppIdClientRegex: String @search(by: [hash, regexp])
+}
 # TODO: add iam role connection
 # TODO: waf web acl connection
 # TODO: add cloudwatchLog connection
-type awsAppSync @key(fields: "arn") {
-  id: String! @id @search(by: [hash])
-  accountId: String! @search(by: [hash])
-  arn: String! @id @search(by: [hash, regexp])
-  region: String! @search(by: [hash, regexp])
-  name: String! @search(by: [hash, regexp])
+type awsAppSync implements awsBaseService @key(fields: "arn") {
+  name: String @search(by: [hash, regexp])
   authenticationType: String @search(by: [hash, regexp])
   logFieldLogLevel: String @search(by: [hash, regexp])
   logCloudWatchLogsRoleArn: String @search(by: [hash, regexp])
@@ -145,14 +141,15 @@ type awsAppSync @key(fields: "arn") {
   openIDConnectClientId: String @search(by: [hash, regexp])
   openIDConnectIatTTL: Int @search
   openIDConnectAuthTTL: Int @search
-  uris: [awsAppSyncGraphqlApiUris] 
+  uris: [awsAppSyncGraphqlApiUris]
   tags: [awsRawTag]
   additionalAuthenticationProviders: [awsAdditionalAuthenticationProvider]
   xrayEnabled: String @search(by: [hash, regexp])
   wafWebAclArn: String @search(by: [hash, regexp])
   lambdaAuthorizerResultTtlInSeconds: Int @search
   lambdaAuthorizerUri: String @search(by: [hash, regexp])
-  lambdaAuthorizerIdentityValidationExpression: String @search(by: [hash, regexp])
+  lambdaAuthorizerIdentityValidationExpression: String
+    @search(by: [hash, regexp])
   apiKeys: [awsAppSyncApiKey]
   dataSources: [awsAppSyncDataSource]
   functions: [awsAppSyncFunction]