Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(location): support RouteCalculator #30682

Merged
merged 19 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions packages/@aws-cdk/aws-location-alpha/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,30 @@ declare const role: iam.Role;
const placeIndex = new location.PlaceIndex(this, 'PlaceIndex');
placeIndex.grantSearch(role);
```

## Route Calculator

Route calculator resources allow you to find routes and estimate travel time based on up-to-date road network and live traffic information from your chosen data provider.

For more information, see [Routes](https://docs.aws.amazon.com/location/latest/developerguide/route-concepts.html).

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.ESRI,
});
```

Use the `grant()` or `grantRead()` method to grant the given identity permissions to perform actions
on the route calculator:

```ts
declare const role: iam.Role;

const routeCalculator = new location.RouteCalculator(this, 'RouteCalculator', {
dataSource: location.DataSource.ESRI,
});
routeCalculator.grantRead(role);
```
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-location-alpha/lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export * from './place-index';
export * from './route-calculator';
export * from './util';

// AWS::Location CloudFormation Resources:
20 changes: 1 addition & 19 deletions packages/@aws-cdk/aws-location-alpha/lib/place-index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -58,25 +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',

/**
* HERE
*
* @see https://docs.aws.amazon.com/location/latest/developerguide/HERE.html
*/
HERE = 'Here',
}

/**
* Intend use for the results of an operation
*/
Expand Down
158 changes: 158 additions & 0 deletions packages/@aws-cdk/aws-location-alpha/lib/route-calculator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
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 { generateUniqueId, DataSource } from './util';

/**
* A Route Calculator
*/
export interface IRouteCalculator extends IResource {
/**
* The name of the route calculator
*
* @attribute
*/
readonly routeCalculatorName: string;

/**
* The Amazon Resource Name (ARN) of the route calculator resource
*
* @attribute Arn,CalculatorArn
*/
readonly routeCalculatorArn: string;
}

/**
* Properties for a route calculator
*/
export interface RouteCalculatorProps {
/**
* A name for the route calculator
*
* Must be between 1 and 100 characters and contain only alphanumeric characters,
* hyphens, periods and underscores.
*
* @default - A name is automatically generated
*/
readonly routeCalculatorName?: string;

/**
* Data source for the route calculator
*/
readonly dataSource: DataSource;

/**
* A description for the route calculator
*
* @default - no description
*/
readonly description?: string;
}

/**
* A Route Calculator
*
* @see https://docs.aws.amazon.com/location/latest/developerguide/places-concepts.html
*/
export class RouteCalculator extends Resource implements IRouteCalculator {
/**
* Use an existing route calculator by name
*/
public static fromRouteCalculatorName(scope: Construct, id: string, routeCalculatorName: string): IRouteCalculator {
const routeCalculatorArn = Stack.of(scope).formatArn({
service: 'geo',
resource: 'route-calculator',
resourceName: routeCalculatorName,
});

return RouteCalculator.fromRouteCalculatorArn(scope, id, routeCalculatorArn);
}

/**
* Use an existing route calculator by ARN
*/
public static fromRouteCalculatorArn(scope: Construct, id: string, routeCalculatorArn: string): IRouteCalculator {
const parsedArn = Stack.of(scope).splitArn(routeCalculatorArn, ArnFormat.SLASH_RESOURCE_NAME);

if (!parsedArn.resourceName) {
throw new Error(`Route Calculator Arn ${routeCalculatorArn} does not have a resource name.`);
}

class Import extends Resource implements IRouteCalculator {
public readonly routeCalculatorName = parsedArn.resourceName!;
public readonly routeCalculatorArn = routeCalculatorArn;
}

return new Import(scope, id, {
account: parsedArn.account,
region: parsedArn.region,
});
}

public readonly routeCalculatorName: string;

public readonly routeCalculatorArn: string;

/**
* The timestamp for when the route calculator resource was created in ISO 8601 format
*
* @attribute
*/
public readonly routeCalculatorCreateTime: string;

/**
* The timestamp for when the route calculator resource was last updated in ISO 8601 format
*
* @attribute
*/
public readonly routeCalculatorUpdateTime: string;

constructor(scope: Construct, id: string, props: RouteCalculatorProps) {

if (props.description && !Token.isUnresolved(props.description) && props.description.length > 1000) {
throw new Error(`\`description\` must be between 0 and 1000 characters. Received: ${props.description.length} characters`);
}

if (props.routeCalculatorName && !Token.isUnresolved(props.routeCalculatorName) && !/^[-.\w]{1,100}$/.test(props.routeCalculatorName)) {
throw new Error(`Invalid route calculator name. The route calculator name must be between 1 and 100 characters and contain only alphanumeric characters, hyphens, periods and underscores. Received: ${props.routeCalculatorName}`);
}

mazyu36 marked this conversation as resolved.
Show resolved Hide resolved
super(scope, id, {
physicalName: props.routeCalculatorName ?? Lazy.string({ produce: () => generateUniqueId(this) }),
});

const routeCalculator = new CfnRouteCalculator(this, 'Resource', {
calculatorName: this.physicalName,
dataSource: props.dataSource ?? DataSource.ESRI,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think CFN doc didn't specify a default value. I'm not familiar with this service/resource, can you briefly explain the reasoning of choosing ESRI as the default behaviour?

Copy link
Contributor Author

@mazyu36 mazyu36 Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I aligned it with the already implemented PlaceIndex class.
https://github.com/aws/aws-cdk/blob/main/packages/%40aws-cdk/aws-location-alpha/lib/place-index.ts#L42

However, since it's listed as a required item in the CFn documentation, I've adjusted it to match that.

I think the DataSource for PlaceIndex should also be required, but I haven't made that change this time.

description: props.description,
});

this.routeCalculatorName = routeCalculator.ref;
this.routeCalculatorArn = routeCalculator.attrArn;
this.routeCalculatorCreateTime = routeCalculator.attrCreateTime;
this.routeCalculatorUpdateTime = routeCalculator.attrUpdateTime;
}

/**
* Grant the given principal identity permissions to perform the actions on this route calculator.
*/
public grant(grantee: iam.IGrantable, ...actions: string[]): iam.Grant {
return iam.Grant.addToPrincipal({
grantee: grantee,
actions: actions,
resourceArns: [this.routeCalculatorArn],
});
}

/**
* Grant the given identity permissions to access to a route calculator resource to calculate a route.
*
* @see https://docs.aws.amazon.com/location/latest/developerguide/security_iam_id-based-policy-examples.html#security_iam_id-based-policy-examples-calculate-route
*/
public grantRead(grantee: iam.IGrantable): iam.Grant {
return this.grant(grantee,
'geo:CalculateRoute',
);
}
}
36 changes: 36 additions & 0 deletions packages/@aws-cdk/aws-location-alpha/lib/util.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { Names } from 'aws-cdk-lib/core';
import { IConstruct } from 'constructs';

export function generateUniqueId(context: IConstruct): string {
const name = Names.uniqueId(context);
if (name.length > 100) {
return name.substring(0, 50) + name.substring(name.length - 50);
}
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',
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"Resources": {
"RouteCalculator0F2D109D": {
"Type": "AWS::Location::RouteCalculator",
"Properties": {
"CalculatorName": "cdkinteglocationroutecalculatorRouteCalculator916939B5",
"DataSource": "Esri"
}
}
},
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading