Fix/geo location services config

packages/core/__tests__/parseAWSExports.test.ts

@@ -27,6 +27,10 @@ describe('parseAWSExports', () => {
 			items: ['geoJSSearchExample'],
 			default: 'geoJSSearchExample',
 		},
+		geofenceCollections: {
+			items: ['geofenceCollection-dev'],
+			default: 'geofenceCollection-dev',
+		},
 		region,
 	};
 	const amazonLocationServiceV4 = {
@@ -49,6 +53,10 @@ describe('parseAWSExports', () => {
 			items: ['geoJSSearchExample'],
 			default: 'geoJSSearchExample',
 		},
+		geofenceCollections: {
+			items: ['geofenceCollection-dev'],
+			default: 'geofenceCollection-dev',
+		},
 		region,
 	};
 	const restEndpoint1 = {
@@ -189,6 +197,29 @@ describe('parseAWSExports', () => {
 		).toStrictEqual(expected);
 	});
 
+	it('should parse valid aws-exports.js for Geo', () => {
+		const expected = {
+			Geo: {
+				LocationService: amazonLocationServiceV4,
+			},
+		};
+		// aws-exports.js has geo "search_indices" in snake_case
+		expect(
+			parseAWSExports({
+				aws_project_region: 'us-west-2',
+				geo: { amazon_location_service: amazonLocationService },
+			}),
+		).toStrictEqual(expected);
+
+		// aws-exports.js has geo "searchIndices" in camelCase
+		expect(
+			parseAWSExports({
+				aws_project_region: 'us-west-2',
+				geo: { amazon_location_service: amazonLocationServiceV4 },
+			}),
+		).toStrictEqual(expected);
+	});
+
 	it('should fallback to IAM auth mode if Appsync auth type is invalid', () => {
 		expect(
 			parseAWSExports({

packages/core/src/parseAWSExports.ts

@@ -253,7 +253,11 @@ export const parseAWSExports = (
 			? {
 					LocationService: {
 						...amazon_location_service,
-						searchIndices: amazon_location_service.search_indices,
+						maps: amazon_location_service.maps,
+						geofenceCollections: amazon_location_service.geofenceCollections,
+						searchIndices:
+							amazon_location_service.search_indices ??
+							amazon_location_service.searchIndices,
 						region: amazon_location_service.region,
 					},
 				}

packages/geo/src/providers/location-service/AmazonLocationServiceProvider.ts

@@ -151,7 +151,7 @@ export class AmazonLocationServiceProvider implements GeoProvider {
 		 */
 		let locationServiceInput: SearchPlaceIndexForTextCommandInput = {
 			Text: text,
-			IndexName: this._config.search_indices.default,
+			IndexName: this._config.searchIndices.default,
 		};
 
 		/**
@@ -217,7 +217,7 @@ export class AmazonLocationServiceProvider implements GeoProvider {
 		 */
 		let locationServiceInput: SearchPlaceIndexForSuggestionsCommandInput = {
 			Text: text,
-			IndexName: this._config.search_indices.default,
+			IndexName: this._config.searchIndices.default,
 		};
 
 		/**
@@ -286,8 +286,7 @@ export class AmazonLocationServiceProvider implements GeoProvider {
 
 		const searchByPlaceIdInput: GetPlaceCommandInput = {
 			PlaceId: placeId,
-			IndexName:
-				options?.searchIndexName || this._config.search_indices.default,
+			IndexName: options?.searchIndexName || this._config.searchIndices.default,
 		};
 		const command = new GetPlaceCommand(searchByPlaceIdInput);
 
@@ -325,7 +324,7 @@ export class AmazonLocationServiceProvider implements GeoProvider {
 
 		const locationServiceInput: SearchPlaceIndexForPositionCommandInput = {
 			Position: coordinates,
-			IndexName: this._config.search_indices.default,
+			IndexName: this._config.searchIndices.default,
 		};
 
 		if (options) {