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 6 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
25 changes: 25 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,28 @@ 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 place index, define a `RouteCalculator`:
mazyu36 marked this conversation as resolved.
Show resolved Hide resolved

```ts
new location.RouteCalculator(this, 'RouteCalculator', {
routeCalculatorName: 'MyRouteCalculator', // optional, defaults to a generated name
dataSource: location.DataSource.HERE, // optional, defaults to Esri
});
```

Use the `grant()` or `grantRead()` method to grant the given identity permissions to perform actions
on the place index:
mazyu36 marked this conversation as resolved.
Show resolved Hide resolved

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

const routeCalculator = new location.RouteCalculator(this, 'RouteCalculator');
routeCalculator.grantRead(role);
```
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-location-alpha/lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './place-index';
export * from './route-calculator';

// AWS::Location CloudFormation Resources:
7 changes: 7 additions & 0 deletions packages/@aws-cdk/aws-location-alpha/lib/place-index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ export enum DataSource {
*/
ESRI = 'Esri',

/**
* Grab provides routing functionality for Southeast Asia.
*
* @see https://docs.aws.amazon.com/location/latest/developerguide/grab.html
*/
GRAB = 'Grab',

/**
* HERE
*
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 { DataSource } from './place-index';
import { generateUniqueId } 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
*
* @default - A name is automatically generated
*/
readonly routeCalculatorName?: string;

/**
* Data source for the route calculator
*
* @default DataSource.ESRI
*/
readonly dataSource?: DataSource;
Copy link
Contributor Author

@mazyu36 mazyu36 Jun 27, 2024

Choose a reason for hiding this comment

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

Currently, the DataSource for PlaceIndex and RouteCalculator are identical.
Therefore, I decided to reference the DataSource of PlaceIndex.
However, if there's a better approach, please share your opinion.

Ref:

I also considered defining a completely separate Enum like RouteDataSource, but decided against it as I thought it would be redundant.
I also thought about moving PlaceIndex's DataSource to a separate file, but I think it would result in breaking changes...

Copy link
Contributor

Choose a reason for hiding this comment

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

Agree. Let's see if the core team has a different opinion.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see in another PR of yours that you added a util file. I think it would be nice to move PlaceIndex's DataSource to somewhere more generic. Based on the CFN documentation, https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html, it seems that all these three resources should re-use the DataSource prop.

but I think it would result in breaking changes
I don't see why this would be a breaking change. Can you explain that to me please?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, I misunderstood the breaking change. Although I needed to fix unit test within the package, it doesn't actually affect the usage of the package.

I've moved the DataSource to the util module.


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

abstract class RouteCalculatorBase extends Resource implements IRouteCalculator {
Copy link
Contributor

Choose a reason for hiding this comment

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

Same comment to another PR, don't think Base construct class is needed.

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.

Thanks. I've removed base class.

public abstract readonly routeCalculatorName: string;
public abstract readonly routeCalculatorArn: string;

/**
* 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.
*
* https://docs.aws.amazon.com/location/latest/developerguide/security_iam_id-based-policy-examples.html#security_iam_id-based-policy-examples-calculate-route
mazyu36 marked this conversation as resolved.
Show resolved Hide resolved
*/
public grantRead(grantee: iam.IGrantable): iam.Grant {
return this.grant(grantee,
'geo:CalculateRoute',
);
}
}

/**
* A Route Calculator
*
* @see https://docs.aws.amazon.com/location/latest/developerguide/places-concepts.html
*/
export class RouteCalculator extends RouteCalculatorBase {
/**
* 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 RouteCalculatorBase {
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 forma
mazyu36 marked this conversation as resolved.
Show resolved Hide resolved
*
* @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.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;
}
}
9 changes: 9 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,9 @@
import { Names } from 'aws-cdk-lib/core';

export function generateUniqueId(context: any): string {
const name = Names.uniqueId(context);
if (name.length > 100) {
return name.substring(0, 50) + name.substring(name.length - 50);
}
return name;
}

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.

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

Loading