Merge pull request #118 from cloudgraphdev/fix/route-53-data

fix(services): update route53 to have setIdentifier and name in the s…

Author: tyler-dunkel

src/services/route53Record/format.ts

@@ -34,6 +34,8 @@ export default ({
     id,
     accountId: account,
     zoneId: hostedZoneId,
+    name,
+    setIdentifier: identifier,
     type,
     ttl,
     alias: {

src/services/route53Record/schema.graphql

@@ -1,6 +1,8 @@
 type awsRoute53Record implements awsOptionalService @key(fields: "id") {
   zoneId: String @search(by: [hash])
   alias: awsRoute53Alias
+  name: String @search(by: [hash, regexp])
+  setIdentifier: String @search(by: [hash, regexp])
   type: String @search(by: [hash, regexp])
   ttl: Int @search
   records: [String] @search(by: [hash, regexp])

src/services/wafV2WebAcl/data.ts

@@ -22,6 +22,7 @@ const resources = [
 
 export interface RawAwsWafV2WebAcl extends WAFV2.WebACL {
   region: string
+  scope: string
   loggingConfiguration: WAFV2.LoggingConfiguration
   wafResources: { [resource: string]: string[] }
 }
@@ -107,6 +108,7 @@ export default async ({
           loggingConfiguration: wafData?.loggingConfiguration,
           wafResources: wafData?.wafResources,
           region,
+          scope
         })
       }
     }

src/services/wafV2WebAcl/format.ts

@@ -32,6 +32,7 @@ export default ({
     ARN: arn,
     Name: name,
     Description: description,
+    scope,
     Rules,
     DefaultAction,
     Capacity: capacity,
@@ -111,6 +112,7 @@ export default ({
     accountId: account,
     arn,
     name,
+    scope,
     description,
     ManagedByFirewallManager,
     capacity,

src/services/wafV2WebAcl/schema.graphql

@@ -1,6 +1,7 @@
 type awsWafV2WebAcl implements awsBaseService @key(fields: "arn") {
   name: String @search(by: [hash, regexp])
   description: String @search(by: [hash, regexp])
+  scope: String @search(by: [hash, regexp])
   ManagedByFirewallManager: Boolean @search
   capacity: Int @search
   labelNamespace: String @search(by: [hash, regexp])

src/types/generated.ts

@@ -3849,9 +3849,11 @@ export type AwsRoute53Record = AwsOptionalService & {
   alb?: Maybe<Array<Maybe<AwsAlb>>>;
   alias?: Maybe<AwsRoute53Alias>;
   elb?: Maybe<Array<Maybe<AwsElb>>>;
+  name?: Maybe<Scalars['String']>;
   records?: Maybe<Array<Maybe<Scalars['String']>>>;
   restApi?: Maybe<Array<Maybe<AwsApiGatewayRestApi>>>;
   route53HostedZone?: Maybe<Array<Maybe<AwsRoute53HostedZone>>>;
+  setIdentifier?: Maybe<Scalars['String']>;
   ttl?: Maybe<Scalars['Int']>;
   type?: Maybe<Scalars['String']>;
   zoneId?: Maybe<Scalars['String']>;
@@ -4840,6 +4842,7 @@ export type AwsWafV2WebAcl = AwsBaseService & {
   postProcessFirewallManagerRuleGroups?: Maybe<Array<Maybe<AwsWafV2FirewallManagerRuleGroup>>>;
   preProcessFirewallManagerRuleGroups?: Maybe<Array<Maybe<AwsWafV2FirewallManagerRuleGroup>>>;
   rules?: Maybe<Array<Maybe<AwsWafV2Rule>>>;
+  scope?: Maybe<Scalars['String']>;
   visibilityConfig?: Maybe<AwsWafV2VisibilityConfig>;
 };