add datasource to util

aws · Aug 29, 2024 · 5761669 · 5761669
1 parent 6c8dff4
commit 5761669
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 31 deletions.
diff --git a/packages/@aws-cdk/aws-location-alpha/README.md b/packages/@aws-cdk/aws-location-alpha/README.md
@@ -61,7 +61,7 @@ To create a route calculator, define a `RouteCalculator`:
 ```ts
 new location.RouteCalculator(this, 'RouteCalculator', {
   routeCalculatorName: 'MyRouteCalculator', // optional, defaults to a generated name
-  dataSource: location.DataSource.HERE, // optional, defaults to Esri
+  dataSource: location.DataSource.ESRI,
 });
 ```
 
@@ -71,6 +71,8 @@ on the route calculator:
 ```ts
 declare const role: iam.Role;
 
-const routeCalculator = new location.RouteCalculator(this, 'RouteCalculator');
+const routeCalculator = new location.RouteCalculator(this, 'RouteCalculator', {
+  dataSource: location.DataSource.ESRI,
+});
 routeCalculator.grantRead(role);
 ```
diff --git a/packages/@aws-cdk/aws-location-alpha/lib/index.ts b/packages/@aws-cdk/aws-location-alpha/lib/index.ts
@@ -1,4 +1,5 @@
 export * from './place-index';
 export * from './route-calculator';
+export * from './util';
 
 // AWS::Location CloudFormation Resources:
diff --git a/packages/@aws-cdk/aws-location-alpha/lib/place-index.ts b/packages/@aws-cdk/aws-location-alpha/lib/place-index.ts
@@ -2,6 +2,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
 import { ArnFormat, IResource, Lazy, Names, Resource, Stack, Token } from 'aws-cdk-lib/core';
 import { Construct } from 'constructs';
 import { CfnPlaceIndex } from 'aws-cdk-lib/aws-location';
+import { DataSource } from './util';
 
 /**
  * A Place Index
@@ -58,32 +59,6 @@ export interface PlaceIndexProps {
   readonly description?: string;
 }
 
-/**
- * Data source for a place index
- */
-export enum DataSource {
-  /**
-   * Esri
-   *
-   * @see https://docs.aws.amazon.com/location/latest/developerguide/esri.html
-   */
-  ESRI = 'Esri',
-
-  /**
-   * Grab provides routing functionality for Southeast Asia.
-   *
-   * @see https://docs.aws.amazon.com/location/latest/developerguide/grab.html
-   */
-  GRAB = 'Grab',
-
-  /**
-   * HERE
-   *
-   * @see https://docs.aws.amazon.com/location/latest/developerguide/HERE.html
-   */
-  HERE = 'Here',
-}
-
 /**
  * Intend use for the results of an operation
  */

diff --git a/packages/@aws-cdk/aws-location-alpha/lib/route-calculator.ts b/packages/@aws-cdk/aws-location-alpha/lib/route-calculator.ts
@@ -2,8 +2,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
 import { ArnFormat, IResource, Lazy, Resource, Stack, Token } from 'aws-cdk-lib/core';
 import { Construct } from 'constructs';
 import { CfnRouteCalculator } from 'aws-cdk-lib/aws-location';
-import { DataSource } from './place-index';
-import { generateUniqueId } from './util';
+import { generateUniqueId, DataSource } from './util';
 
 /**
  * A Route Calculator

diff --git a/packages/@aws-cdk/aws-location-alpha/lib/util.ts b/packages/@aws-cdk/aws-location-alpha/lib/util.ts
@@ -8,3 +8,29 @@ export function generateUniqueId(context: IConstruct): string {
   }
   return name;
 }
+
+/**
+ * Data source for a place index
+ */
+export enum DataSource {
+  /**
+   * Esri
+   *
+   * @see https://docs.aws.amazon.com/location/latest/developerguide/esri.html
+   */
+  ESRI = 'Esri',
+
+  /**
+   * Grab provides routing functionality for Southeast Asia.
+   *
+   * @see https://docs.aws.amazon.com/location/latest/developerguide/grab.html
+   */
+  GRAB = 'Grab',
+
+  /**
+   * HERE
+   *
+   * @see https://docs.aws.amazon.com/location/latest/developerguide/HERE.html
+   */
+  HERE = 'Here',
+}
diff --git a/packages/@aws-cdk/aws-location-alpha/test/place-index.test.ts b/packages/@aws-cdk/aws-location-alpha/test/place-index.test.ts
@@ -1,7 +1,8 @@
 import { Match, Template } from 'aws-cdk-lib/assertions';
 import * as iam from 'aws-cdk-lib/aws-iam';
 import { Stack } from 'aws-cdk-lib';
-import { DataSource, IntendedUse, PlaceIndex } from '../lib/place-index';
+import { IntendedUse, PlaceIndex } from '../lib/place-index';
+import { DataSource } from '../lib';
 
 let stack: Stack;
 beforeEach(() => {