Merge pull request #47 from cloudgraphdev/feature/CG-1088

feat: Add restrictionType to Cloudfront, geoRestriction

Author: tyler-dunkel

src/services/cloudfront/format.ts

@@ -4,7 +4,6 @@ import {
   Origin,
 } from 'aws-sdk/clients/cloudfront'
 import cuid from 'cuid'
-import isEmpty from 'lodash/isEmpty'
 
 import t from '../../properties/translations'
 import { formatTagsFromMap } from '../../utils/format'
@@ -118,7 +117,7 @@ export default ({
       CallerReference: callerReference,
       DefaultRootObject: defaultRootObject,
       HttpVersion: httpVersion,
-      Restrictions: { GeoRestriction: { Items: geoRestrictions = [] } } = {
+      Restrictions: { GeoRestriction: { Items: locations = [], RestrictionType: restrictionType = ''} } = {
         GeoRestriction: { RestrictionType: '', Items: [], Quantity: 0 },
       },
       Logging: logging,
@@ -237,9 +236,10 @@ export default ({
     domainName,
     enabled: enabled ? t.yes : t.no,
     etag,
-    geoRestrictions: !isEmpty(geoRestrictions)
-      ? geoRestrictions.join(',')
-      : 'none',
+    geoRestriction: {
+      restrictionType,
+      locations,
+    },
     httpVersion,
     ipv6Enabled: isIpv6Enabled ? t.yes : t.no,
     lastModified: lastModified.toISOString(),

src/services/cloudfront/schema.graphql

@@ -10,7 +10,7 @@ type awsCloudfront implements awsBaseService @key(fields: "id") {
   ipv6Enabled: String @search(by: [hash])
   defaultRootObject: String @search(by: [hash])
   webAclId: String @search(by: [hash])
-  geoRestrictions: String @search(by: [hash, regexp])
+  geoRestriction: awsCloudfrontGeoRestriction
   customErrorResponses: [awsCloudfrontCustomErrorResponse]
   defaultCacheBehavior: awsCloudfrontCacheBehavior
   orderedCacheBehaviors: [awsCloudfrontCacheBehavior]
@@ -94,3 +94,8 @@ type awsCloudfrontLoggingConfig {
   bucket: String @search(by: [hash, regexp])
   prefix: String @search(by: [hash, regexp])
 }
+
+type awsCloudfrontGeoRestriction {
+  restrictionType: String @search(by: [hash, regexp])
+  locations: [String] @search(by: [hash, regexp])
+}

src/types/generated.ts

@@ -749,7 +749,7 @@ export type AwsCloudfront = AwsBaseService & {
   elb?: Maybe<Array<Maybe<AwsElb>>>;
   enabled?: Maybe<Scalars['String']>;
   etag?: Maybe<Scalars['String']>;
-  geoRestrictions?: Maybe<Scalars['String']>;
+  geoRestriction?: Maybe<AwsCloudfrontGeoRestriction>;
   httpVersion?: Maybe<Scalars['String']>;
   ipv6Enabled?: Maybe<Scalars['String']>;
   lastModified?: Maybe<Scalars['String']>;
@@ -797,6 +797,11 @@ export type AwsCloudfrontCustomOriginConfig = {
   originSslProtocols?: Maybe<AwsCloudfrontOriginSslProtocols>;
 };
 
+export type AwsCloudfrontGeoRestriction = {
+  locations?: Maybe<Array<Maybe<Scalars['String']>>>;
+  restrictionType?: Maybe<Scalars['String']>;
+};
+
 export type AwsCloudfrontLoggingConfig = {
   bucket?: Maybe<Scalars['String']>;
   enabled?: Maybe<Scalars['Boolean']>;