adding changes after making the build

Author: enriquh

framework/src/consumption/lib/quicksight/quicksight-subscription-props.ts

@@ -28,7 +28,7 @@ export interface QuickSightSubscriptionProps {
   */
 
   readonly edition: QuickSightEdition;
-  
+
   /**
    * The Amazon Web Services account ID of the account that you're using to create your Amazon QuickSight account.
    */
@@ -88,9 +88,5 @@ export enum QuickSightAuthenticationMethod {
 }
 
 export enum QuickSightEdition {
-<<<<<<< HEAD
   ENTERPRISE = 'ENTERPRISE',
-=======
-    ENTERPRISE = 'ENTERPRISE',
->>>>>>> 863576efa2feec2e4e6d4bdc08e4f8f219462432
 }

framework/src/consumption/lib/quicksight/quicksight-subscription.ts

@@ -2,15 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 
-import { Context, TrackedConstruct, TrackedConstructProps } from "../../../utils";
-import { DsfProvider } from '../../../utils/lib/dsf-provider';
-import { QuickSightSubscriptionProps, QuickSightAuthenticationMethod } from './quicksight-subscription-props';
-import { Construct } from 'constructs';
 import { CustomResource, Duration, RemovalPolicy } from 'aws-cdk-lib';
-import { IRole,  PolicyDocument, Role , ServicePrincipal, PolicyStatement, Effect } from 'aws-cdk-lib/aws-iam';
-import { ILogGroup } from 'aws-cdk-lib/aws-logs';
+import { IRole, PolicyDocument, Role, ServicePrincipal, PolicyStatement, Effect } from 'aws-cdk-lib/aws-iam';
 import { IFunction } from 'aws-cdk-lib/aws-lambda';
-
+import { ILogGroup } from 'aws-cdk-lib/aws-logs';
+import { Construct } from 'constructs';
+import { QuickSightSubscriptionProps, QuickSightAuthenticationMethod } from './quicksight-subscription-props';
+import { Context, TrackedConstruct, TrackedConstructProps } from '../../../utils';
+import { DsfProvider } from '../../../utils/lib/dsf-provider';
 
 
 /**
@@ -115,7 +114,7 @@ export class QuickSightSubscription extends TrackedConstruct {
     this.adminGroup = props.adminGroup;
     this.authorGroup = props.authorGroup;
     this.readerGroup = props.readerGroup;
-    this.identityRegion = props.identityRegion;    
+    this.identityRegion = props.identityRegion;
 
     this.policyActions = [
       'quicksight:Subscribe',
@@ -154,7 +153,7 @@ export class QuickSightSubscription extends TrackedConstruct {
     }
 
     this.executionRole = new Role(this, 'Role', {
-      assumedBy: new ServicePrincipal('lambda.amazonaws.com'),      
+      assumedBy: new ServicePrincipal('lambda.amazonaws.com'),
       inlinePolicies: {
         QuickSightSubscription: new PolicyDocument({
           statements: [
@@ -197,7 +196,7 @@ export class QuickSightSubscription extends TrackedConstruct {
           EDITION: props.edition,
           IDENTITY_REGION: props.identityRegion,
         },
-      },      
+      },
       queryInterval: Duration.seconds(10),
       removalPolicy: this.removalPolicy,
     });