From 73793b44411d329c52bed9337c0933d7066ee4de Mon Sep 17 00:00:00 2001
From: Zeyu Li <lizeyu@amazon.com>
Date: Tue, 2 Nov 2021 09:57:45 -0700
Subject: [PATCH] feat: headless command for geo -- map (#8403)

* feat: headless command for geo

* feat: add headless support for update map

* fix: lgtm alert

* test: add unit tests for geo headless validator

* fix: duplicate import

* fix: refactor methods and add check for exisitence

* fix: move existence check

* test: restructure unit tests
---
 packages/amplify-category-geo/package.json    |  4 +-
 packages/amplify-category-geo/src/index.ts    | 21 ++++-
 .../src/provider-controllers/index.ts         | 54 ++++++++++-
 .../src/provider-controllers/map.ts           | 86 ++++++++++++-----
 .../schemas/geo/1/AddGeoRequest.schema.json   | 93 +++++++++++++++++++
 .../geo/1/UpdateGeoRequest.schema.json        | 66 +++++++++++++
 .../amplify-headless-interface/src/index.ts   |  2 +
 .../src/interface/geo/add.ts                  | 48 ++++++++++
 .../src/interface/geo/update.ts               | 25 +++++
 .../assets/geo/add/validRequest.map.json      | 11 +++
 .../assets/geo/update/validRequest.map.json   |  9 ++
 .../geo/add/__snapshots__/index.test.ts.snap  | 15 +++
 .../src/__tests__/geo/add/index.test.ts       | 18 ++++
 .../update/__snapshots__/index.test.ts.snap   | 13 +++
 .../src/__tests__/geo/update/index.test.ts    | 18 ++++
 .../amplify-util-headless-input/src/index.ts  | 13 +++
 .../src/schemaSuppliers.ts                    |  8 ++
 17 files changed, 479 insertions(+), 25 deletions(-)
 create mode 100644 packages/amplify-headless-interface/schemas/geo/1/AddGeoRequest.schema.json
 create mode 100644 packages/amplify-headless-interface/schemas/geo/1/UpdateGeoRequest.schema.json
 create mode 100644 packages/amplify-headless-interface/src/interface/geo/add.ts
 create mode 100644 packages/amplify-headless-interface/src/interface/geo/update.ts
 create mode 100644 packages/amplify-util-headless-input/src/__tests__/assets/geo/add/validRequest.map.json
 create mode 100644 packages/amplify-util-headless-input/src/__tests__/assets/geo/update/validRequest.map.json
 create mode 100644 packages/amplify-util-headless-input/src/__tests__/geo/add/__snapshots__/index.test.ts.snap
 create mode 100644 packages/amplify-util-headless-input/src/__tests__/geo/add/index.test.ts
 create mode 100644 packages/amplify-util-headless-input/src/__tests__/geo/update/__snapshots__/index.test.ts.snap
 create mode 100644 packages/amplify-util-headless-input/src/__tests__/geo/update/index.test.ts

diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
index 1e7b5b4e272..92a8a52fea6 100644
--- a/packages/amplify-category-geo/package.json
+++ b/packages/amplify-category-geo/package.json
@@ -36,7 +36,9 @@
     "lodash": "^4.17.19",
     "mime-types": "^2.1.26",
     "promise-sequential": "^1.1.1",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "amplify-util-headless-input": "1.5.4",
+    "amplify-headless-interface": "1.10.0"
   },
   "jest": {
     "collectCoverage": true,
diff --git a/packages/amplify-category-geo/src/index.ts b/packages/amplify-category-geo/src/index.ts
index 770377a1413..d25b3702c1b 100644
--- a/packages/amplify-category-geo/src/index.ts
+++ b/packages/amplify-category-geo/src/index.ts
@@ -8,6 +8,7 @@ import * as helpCommand from './commands/geo/help';
 import { getServicePermissionPolicies } from './service-utils/resourceUtils';
 import { ServiceName } from './service-utils/constants';
 import { printer } from 'amplify-prompts';
+import { addResourceHeadless, updateResourceHeadless } from './provider-controllers';
 
 export const executeAmplifyCommand = async (context: $TSContext) => {
   switch (context.input.command) {
@@ -59,5 +60,23 @@ export const getPermissionPolicies = (context: $TSContext, resourceOpsMapping: $
     }
   });
 
-  return { permissionPolicies, resourceAttributes };
+    return { permissionPolicies, resourceAttributes };
+}
+
+/**
+ * Entry point for headless commands
+ * @param {any} context The amplify context object
+ * @param {string} headlessPayload The serialized payload from the platform
+ */
+ export const executeAmplifyHeadlessCommand = async (context: $TSContext, headlessPayload: string) => {
+  switch (context.input.command) {
+    case 'add':
+      await addResourceHeadless(context, headlessPayload);
+      break;
+    case 'update':
+      await updateResourceHeadless(context, headlessPayload);
+      break;
+    default:
+      printer.error(`Headless mode for ${context.input.command} geo is not implemented yet`);
+  }
 };
diff --git a/packages/amplify-category-geo/src/provider-controllers/index.ts b/packages/amplify-category-geo/src/provider-controllers/index.ts
index 965db65ef9a..8021bf40063 100644
--- a/packages/amplify-category-geo/src/provider-controllers/index.ts
+++ b/packages/amplify-category-geo/src/provider-controllers/index.ts
@@ -3,10 +3,13 @@ import { ServiceName, provider } from '../service-utils/constants';
 import { $TSObject, open, stateManager } from 'amplify-cli-core';
 import { $TSContext } from 'amplify-cli-core';
 import { addPlaceIndexResource, updatePlaceIndexResource, removePlaceIndexResource } from './placeIndex';
-import { addMapResource, updateMapResource, removeMapResource } from './map';
+import { addMapResource, updateMapResource, removeMapResource, addMapResourceHeadless, updateMapResourceHeadless } from './map';
 import { printer, prompter } from 'amplify-prompts';
 import { getServiceFriendlyName } from '../service-walkthroughs/resourceWalkthrough';
 import { TemplateMappings } from '../service-stacks/baseStack';
+import { validateAddGeoRequest, validateUpdateGeoRequest } from 'amplify-util-headless-input';
+import { MapConfiguration, MapModification } from 'amplify-headless-interface';
+import { checkGeoResourceExists } from '../service-utils/resourceUtils';
 
 /**
  * Entry point for creating a new Geo resource
@@ -105,7 +108,7 @@ const badServiceError = (service: string) => {
 };
 
 export const insufficientInfoForUpdateError = (service: ServiceName) => {
-  new Error(`Insufficient information to update ${getServiceFriendlyName(service)}. Please re-try and provide all inputs.`);
+  return new Error(`Insufficient information to update ${getServiceFriendlyName(service)}. Please re-try and provide all inputs.`);
 };
 
 export const getTemplateMappings = async (context: $TSContext): Promise<TemplateMappings> => {
@@ -122,3 +125,50 @@ export const getTemplateMappings = async (context: $TSContext): Promise<Template
   });
   return Mappings;
 };
+
+/**
+ * Entry point for headless command of creating a new Geo resource
+ */
+export const addResourceHeadless = async (
+  context: $TSContext,
+  headlessPayload: string
+): Promise<string | undefined> => {
+  if(!projectHasAuth()) {
+    throw new Error('Please add auth (Amazon Cognito) to your project using "amplify add auth"');
+  }
+  const { serviceConfiguration } = await validateAddGeoRequest(headlessPayload);
+  const { serviceName,name } = serviceConfiguration;
+  if (await checkGeoResourceExists(name)) {
+    throw new Error(`Geo resource with name '${name}' already exists.`)
+  }
+  switch (serviceName) {
+    case ServiceName.Map:
+      return addMapResourceHeadless(context, serviceConfiguration as MapConfiguration);
+    default:
+      throw badHeadlessServiceError(serviceName);
+  }
+};
+
+/**
+ * Entry point for headless command of updating an existing Geo resource
+ */
+export const updateResourceHeadless = async (
+  context: $TSContext,
+  headlessPayload: string
+): Promise<string | undefined> => {
+  const { serviceModification } = await validateUpdateGeoRequest(headlessPayload);
+  const { serviceName, name } = serviceModification;
+  if (!await checkGeoResourceExists(name)) {
+    throw new Error(`Geo resource with name '${name}' does not exist.`)
+  }
+  switch (serviceName) {
+    case ServiceName.Map:
+      return updateMapResourceHeadless(context, serviceModification as MapModification);
+    default:
+      throw badHeadlessServiceError(serviceName);
+  }
+};
+
+const badHeadlessServiceError = (service: string) => {
+  return new Error(`Headless mode for service type ${service} is not supported`);
+}
diff --git a/packages/amplify-category-geo/src/provider-controllers/map.ts b/packages/amplify-category-geo/src/provider-controllers/map.ts
index 1df1b85f12c..675d42e44e3 100644
--- a/packages/amplify-category-geo/src/provider-controllers/map.ts
+++ b/packages/amplify-category-geo/src/provider-controllers/map.ts
@@ -7,6 +7,9 @@ import { $TSAny, $TSContext } from 'amplify-cli-core';
 import { printNextStepsSuccessMessage, setProviderContext, insufficientInfoForUpdateError } from './index';
 import { ServiceName } from '../service-utils/constants';
 import { printer } from 'amplify-prompts';
+import { getMapStyleComponents } from '../service-utils/mapParams';
+import { MapConfiguration, MapModification } from 'amplify-headless-interface';
+import { checkAnyGeoResourceExists, checkGeoResourceExists } from '../service-utils/resourceUtils';
 
 export const addMapResource = async (
   context: $TSContext
@@ -17,13 +20,7 @@ export const addMapResource = async (
   };
   // populate the parameters for the resource
   await createMapWalkthrough(context, mapParams);
-  const completeParameters: MapParameters = convertToCompleteMapParams(mapParams);
-
-  await createMapResource(context, completeParameters);
-
-  printer.success(`Successfully added resource ${completeParameters.name} locally.`);
-  printNextStepsSuccessMessage(context);
-  return completeParameters.name;
+  return await addMapResourceWithParams(context, mapParams)
 };
 
 export const updateMapResource = async (
@@ -35,20 +32,7 @@ export const updateMapResource = async (
   };
   // populate the parameters for the resource
   await updateMapWalkthrough(context, mapParams);
-
-  if (mapParams.name && mapParams.isDefault !== undefined && mapParams.accessType) {
-    modifyMapResource(context, {
-      accessType: mapParams.accessType,
-      name: mapParams.name,
-      isDefault: mapParams.isDefault
-    });
-  } else {
-    throw insufficientInfoForUpdateError(ServiceName.Map);
-  }
-
-  printer.success(`Successfully updated resource ${mapParams.name} locally.`);
-  printNextStepsSuccessMessage(context);
-  return mapParams.name;
+  return await updateMapResourceWithParams(context, mapParams);
 };
 
 export const removeMapResource = async (
@@ -82,3 +66,63 @@ export const removeMapResource = async (
   printNextStepsSuccessMessage(context);
   return resourceToRemove;
 };
+
+export const addMapResourceHeadless = async (
+  context: $TSContext,
+  config: MapConfiguration
+): Promise<string> => {
+  // initialize the Map parameters
+  let mapParams: Partial<MapParameters> = {
+    providerContext: setProviderContext(context, ServiceName.Map),
+    name: config.name,
+    accessType: config.accessType,
+    pricingPlan: config.pricingPlan,
+    isDefault: config.setAsDefault,
+    ...getMapStyleComponents(config.mapStyle)
+  };
+
+  return await addMapResourceWithParams(context, mapParams);
+}
+
+export const updateMapResourceHeadless = async (
+  context: $TSContext,
+  config: MapModification
+): Promise<string> => {
+  // initialize the Map parameters
+  let mapParams: Partial<MapParameters> = {
+    providerContext: setProviderContext(context, ServiceName.Map),
+    name: config.name,
+    accessType: config.accessType,
+    isDefault: config.setAsDefault,
+  };
+  return await updateMapResourceWithParams(context, mapParams);
+}
+
+export const addMapResourceWithParams = async (
+  context: $TSContext,
+  mapParams: Partial<MapParameters>
+): Promise<string> => {
+  const completeParameters: MapParameters = convertToCompleteMapParams(mapParams);
+  await createMapResource(context, completeParameters);
+  printer.success(`Successfully added resource ${completeParameters.name} locally.`);
+  printNextStepsSuccessMessage(context);
+  return completeParameters.name;
+}
+
+export const updateMapResourceWithParams = async (
+  context: $TSContext,
+  mapParams: Partial<MapParameters>
+): Promise<string> => {
+  if (mapParams.name && mapParams.isDefault !== undefined && mapParams.accessType) {
+    modifyMapResource(context, {
+      accessType: mapParams.accessType,
+      name: mapParams.name,
+      isDefault: mapParams.isDefault
+    });
+  } else {
+    throw insufficientInfoForUpdateError(ServiceName.Map);
+  }
+  printer.success(`Successfully updated resource ${mapParams.name} locally.`);
+  printNextStepsSuccessMessage(context);
+  return mapParams.name;
+}
diff --git a/packages/amplify-headless-interface/schemas/geo/1/AddGeoRequest.schema.json b/packages/amplify-headless-interface/schemas/geo/1/AddGeoRequest.schema.json
new file mode 100644
index 00000000000..2686236f7c7
--- /dev/null
+++ b/packages/amplify-headless-interface/schemas/geo/1/AddGeoRequest.schema.json
@@ -0,0 +1,93 @@
+{
+  "description": "Defines the json object expected by `amplify add geo --headless` with map service",
+  "type": "object",
+  "properties": {
+      "version": {
+          "description": "The schema version.",
+          "type": "number",
+          "enum": [
+              1
+          ]
+      },
+      "serviceConfiguration": {
+          "description": "The service configuration that will be interpreted by Amplify.",
+          "oneOf": [
+              {"$ref": "#/definitions/MapServiceConfiguration"}
+          ]
+      }
+  },
+  "required": [
+      "serviceConfiguration",
+      "version"
+  ],
+  "definitions": {
+      "MapServiceConfiguration": {
+          "description": "Configuration exposed by Map.",
+          "type": "object",
+          "properties": {
+              "serviceName": {
+                "description": "The service name of the resource provider.",
+                "type": "string",
+                "enum": [
+                    "Map"
+                ]
+              },
+              "name": {
+                  "description": "The name of the map that will be created.",
+                  "type": "string"
+              },
+              "mapStyle": {
+                  "description": "The map style type.",
+                  "type": "string",
+                  "enum": [
+                      "VectorEsriNavigation",
+                      "VectorEsriStreets",
+                      "VectorEsriTopographic",
+                      "VectorEsriDarkGrayCanvas",
+                      "VectorEsriLightGrayCanvas",
+                      "VectorHereBerlin"
+                  ]
+              },
+              "pricingPlan": {
+                  "$ref": "#/definitions/PricingPlan"
+              },
+              "accessType": {
+                  "$ref": "#/definitions/AccessType"
+              },
+              "setAsDefault": {
+                  "$ref": "#/definitions/SetAsDefault"
+              }
+          },
+          "required": [
+              "serviceName",
+              "name",
+              "mapStyle",
+              "accessType",
+              "pricingPlan",
+              "setAsDefault"
+          ]
+      },
+      "PricingPlan": {
+          "description": "The pricing plan for amazon location service.",
+          "type": "string",
+          "enum": [
+              "RequestBasedUsage",
+              "MobileAssetTracking",
+              "MobileAssetManagement"
+          ]
+      },
+      "AccessType": {
+          "description": "The access policy for geo resources.",
+          "type": "string",
+          "enum": [
+              "AuthorizedUsers",
+              "AuthorizedAndGuestUsers"
+          ]
+      },
+      "SetAsDefault": {
+          "description": "Whether the geo resource added is set to default.",
+          "type": "boolean"
+      }
+  },
+  "$schema": "http://json-schema.org/draft-07/schema#"
+} 
\ No newline at end of file
diff --git a/packages/amplify-headless-interface/schemas/geo/1/UpdateGeoRequest.schema.json b/packages/amplify-headless-interface/schemas/geo/1/UpdateGeoRequest.schema.json
new file mode 100644
index 00000000000..45db5b7cbbe
--- /dev/null
+++ b/packages/amplify-headless-interface/schemas/geo/1/UpdateGeoRequest.schema.json
@@ -0,0 +1,66 @@
+{
+  "type": "object",
+  "properties": {
+      "version": {
+          "description": "The schema version.",
+          "type": "number",
+          "enum": [
+              1
+          ]
+      },
+      "serviceModification": {
+          "description": "Service modifications that will be interpreted by Amplify.",
+          "oneOf": [
+            {"$ref": "#/definitions/MapModification"}
+        ]      
+      }
+  },
+  "required": [
+      "serviceModification",
+      "version"
+  ],
+  "definitions": {
+    "MapModification": {
+      "description": "Modification exposed by Map.",
+      "type": "object",
+      "properties": {
+          "serviceName": {
+            "description": "The service name of the resource provider.",
+            "type": "string",
+            "enum": [
+                "Map"
+            ]
+          },
+          "name": {
+              "description": "The name of the map that will be modified.",
+              "type": "string"
+          },
+          "accessType": {
+              "$ref": "#/definitions/AccessType"
+          },
+          "setAsDefault": {
+              "$ref": "#/definitions/SetAsDefault"
+          }
+      },
+      "required": [
+          "serviceName",
+          "name",
+          "accessType",
+          "setAsDefault"
+      ]
+  },
+  "AccessType": {
+      "description": "The access policy for geo resources.",
+      "type": "string",
+      "enum": [
+          "AuthorizedUsers",
+          "AuthorizedAndGuestUsers"
+      ]
+  },
+  "SetAsDefault": {
+      "description": "Whether the geo resource added is set to default.",
+      "type": "boolean"
+  }
+  },
+  "$schema": "http://json-schema.org/draft-07/schema#"
+}
\ No newline at end of file
diff --git a/packages/amplify-headless-interface/src/index.ts b/packages/amplify-headless-interface/src/index.ts
index a6bbbdea4f3..9de4cebd98f 100644
--- a/packages/amplify-headless-interface/src/index.ts
+++ b/packages/amplify-headless-interface/src/index.ts
@@ -4,3 +4,5 @@ export * from './interface/auth/add';
 export * from './interface/auth/update';
 export * from './interface/auth/import';
 export * from './interface/storage';
+export * from './interface/geo/add';
+export * from './interface/geo/update';
diff --git a/packages/amplify-headless-interface/src/interface/geo/add.ts b/packages/amplify-headless-interface/src/interface/geo/add.ts
new file mode 100644
index 00000000000..4b72bd27ece
--- /dev/null
+++ b/packages/amplify-headless-interface/src/interface/geo/add.ts
@@ -0,0 +1,48 @@
+/**
+ * Defines the json object expected by `amplify add geo --headless`
+ */
+ export interface AddGeoRequest {
+  /**
+   * The schema version.
+   */
+  version: 1;
+  /**
+   * The service configuration that will be interpreted by Amplify.
+   */
+  serviceConfiguration: GeoServiceConfiguration;
+}
+
+export interface GeoServiceConfiguration {
+  serviceName: string;
+  name: string;
+  accessType: AccessType;
+  pricingPlan: PricingPlan;
+  setAsDefault: boolean;
+}
+export interface MapConfiguration extends GeoServiceConfiguration {
+  serviceName: "Map";
+  mapStyle: MapStyle;
+}
+
+export enum PricingPlan {
+  RequestBasedUsage = "RequestBasedUsage",
+  MobileAssetTracking = "MobileAssetTracking",
+  MobileAssetManagement = "MobileAssetManagement"
+}
+
+export enum AccessType {
+  AuthorizedUsers = "AuthorizedUsers",
+  AuthorizedAndGuestUsers = "AuthorizedAndGuestUsers"
+}
+
+/**
+ * Supported Geo Map Styles
+ */
+ export enum MapStyle {
+  VectorEsriNavigation = "VectorEsriNavigation",
+  VectorEsriStreets = "VectorEsriStreets",
+  VectorEsriTopographic = "VectorEsriTopographic",
+  VectorEsriDarkGrayCanvas = "VectorEsriDarkGrayCanvas",
+  VectorEsriLightGrayCanvas = "VectorEsriLightGrayCanvas",
+  VectorHereBerlin = "VectorHereBerlin",
+}
\ No newline at end of file
diff --git a/packages/amplify-headless-interface/src/interface/geo/update.ts b/packages/amplify-headless-interface/src/interface/geo/update.ts
new file mode 100644
index 00000000000..3b1e692ddd2
--- /dev/null
+++ b/packages/amplify-headless-interface/src/interface/geo/update.ts
@@ -0,0 +1,25 @@
+import { AccessType } from "./add";
+/**
+ * Defines the json object expected by `amplify update geo --headless`
+ */
+ export interface UpdateGeoRequest {
+  /**
+   * The schema version.
+   */
+  version: 1;
+  /**
+   * The service configuration that will be interpreted by Amplify.
+   */
+  serviceModification: GeoModification;
+}
+
+export interface GeoModification {
+  serviceName: string;
+  name: string;
+  setAsDefault: boolean;
+  accessType: AccessType
+}
+
+export interface MapModification extends GeoModification {
+  serviceName: "Map";
+}
\ No newline at end of file
diff --git a/packages/amplify-util-headless-input/src/__tests__/assets/geo/add/validRequest.map.json b/packages/amplify-util-headless-input/src/__tests__/assets/geo/add/validRequest.map.json
new file mode 100644
index 00000000000..893f8c20437
--- /dev/null
+++ b/packages/amplify-util-headless-input/src/__tests__/assets/geo/add/validRequest.map.json
@@ -0,0 +1,11 @@
+{
+  "version": 1,
+  "serviceConfiguration":{
+    "serviceName": "Map",
+    "accessType": "AuthorizedUsers",
+    "setAsDefault": true,
+    "mapStyle": "VectorEsriNavigation",
+    "name": "mymapname",
+    "pricingPlan": "MobileAssetManagement"
+  }
+}
\ No newline at end of file
diff --git a/packages/amplify-util-headless-input/src/__tests__/assets/geo/update/validRequest.map.json b/packages/amplify-util-headless-input/src/__tests__/assets/geo/update/validRequest.map.json
new file mode 100644
index 00000000000..0c24e87efe7
--- /dev/null
+++ b/packages/amplify-util-headless-input/src/__tests__/assets/geo/update/validRequest.map.json
@@ -0,0 +1,9 @@
+{
+  "version": 1,
+  "serviceModification":{
+    "serviceName": "Map",
+    "accessType": "AuthorizedAndGuestUsers",
+    "setAsDefault": true,
+    "name": "mymapname"
+  }
+}
\ No newline at end of file
diff --git a/packages/amplify-util-headless-input/src/__tests__/geo/add/__snapshots__/index.test.ts.snap b/packages/amplify-util-headless-input/src/__tests__/geo/add/__snapshots__/index.test.ts.snap
new file mode 100644
index 00000000000..344928586df
--- /dev/null
+++ b/packages/amplify-util-headless-input/src/__tests__/geo/add/__snapshots__/index.test.ts.snap
@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`validate add geo request returns valid payload for map 1`] = `
+Object {
+  "serviceConfiguration": Object {
+    "accessType": "AuthorizedUsers",
+    "mapStyle": "VectorEsriNavigation",
+    "name": "mymapname",
+    "pricingPlan": "MobileAssetManagement",
+    "serviceName": "Map",
+    "setAsDefault": true,
+  },
+  "version": 1,
+}
+`;
diff --git a/packages/amplify-util-headless-input/src/__tests__/geo/add/index.test.ts b/packages/amplify-util-headless-input/src/__tests__/geo/add/index.test.ts
new file mode 100644
index 00000000000..d08000fb966
--- /dev/null
+++ b/packages/amplify-util-headless-input/src/__tests__/geo/add/index.test.ts
@@ -0,0 +1,18 @@
+import fs from 'fs-extra';
+import path from 'path';
+import { validateAddGeoRequest } from '../../../index';
+
+const assetRoot = path.resolve(path.join(__dirname, '..', '..', 'assets'));
+
+describe('validate add geo request', () => {
+  it('returns valid payload for map', async () => {
+    const rawRequest = fs.readFileSync(path.join(assetRoot, 'geo', 'add', 'validRequest.map.json'), 'utf8');
+    const result = await validateAddGeoRequest(rawRequest);
+    expect(result).toMatchSnapshot();
+  });
+
+  it('rejects promise when invalid payload', async () => {
+    const resultPromise = validateAddGeoRequest('garbage');
+    expect(resultPromise).rejects.toBeTruthy();
+  });
+});
\ No newline at end of file
diff --git a/packages/amplify-util-headless-input/src/__tests__/geo/update/__snapshots__/index.test.ts.snap b/packages/amplify-util-headless-input/src/__tests__/geo/update/__snapshots__/index.test.ts.snap
new file mode 100644
index 00000000000..fc8f5913021
--- /dev/null
+++ b/packages/amplify-util-headless-input/src/__tests__/geo/update/__snapshots__/index.test.ts.snap
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`validate update geo request returns valid payload for map 1`] = `
+Object {
+  "serviceModification": Object {
+    "accessType": "AuthorizedAndGuestUsers",
+    "name": "mymapname",
+    "serviceName": "Map",
+    "setAsDefault": true,
+  },
+  "version": 1,
+}
+`;
diff --git a/packages/amplify-util-headless-input/src/__tests__/geo/update/index.test.ts b/packages/amplify-util-headless-input/src/__tests__/geo/update/index.test.ts
new file mode 100644
index 00000000000..38d44c2aae2
--- /dev/null
+++ b/packages/amplify-util-headless-input/src/__tests__/geo/update/index.test.ts
@@ -0,0 +1,18 @@
+import fs from 'fs-extra';
+import path from 'path';
+import { validateAddGeoRequest, validateUpdateGeoRequest } from '../../../index';
+
+const assetRoot = path.resolve(path.join(__dirname, '..', '..', 'assets'));
+
+describe('validate update geo request', () => {
+  it('returns valid payload for map', async () => {
+    const rawRequest = fs.readFileSync(path.join(assetRoot, 'geo', 'update', 'validRequest.map.json'), 'utf8');
+    const result = await validateUpdateGeoRequest(rawRequest);
+    expect(result).toMatchSnapshot();
+  });
+
+  it('rejects promise when invalid payload', async () => {
+    const resultPromise = validateUpdateGeoRequest('garbage');
+    expect(resultPromise).rejects.toBeTruthy();
+  });
+});
\ No newline at end of file
diff --git a/packages/amplify-util-headless-input/src/index.ts b/packages/amplify-util-headless-input/src/index.ts
index dde62f525d8..9ce6a3e43fd 100644
--- a/packages/amplify-util-headless-input/src/index.ts
+++ b/packages/amplify-util-headless-input/src/index.ts
@@ -8,6 +8,8 @@ import {
   UpdateApiRequest,
   UpdateAuthRequest,
   UpdateStorageRequest,
+  AddGeoRequest,
+  UpdateGeoRequest
 } from 'amplify-headless-interface';
 import { HeadlessInputValidator } from './HeadlessInputValidator';
 import {
@@ -20,6 +22,8 @@ import {
   updateApiRequestSchemaSupplier,
   updateAuthRequestSchemaSupplier,
   updateStorageRequestSchemaSupplier,
+  addGeoRequestSchemaSupplier,
+  updateGeoRequestSchemaSupplier
 } from './schemaSuppliers';
 import { noopUpgradePipeline } from './upgradePipelines';
 
@@ -61,3 +65,12 @@ export const validateRemoveStorageRequest = (raw: string) => {
 export const validateUpdateStorageRequest = (raw: string) => {
   return new HeadlessInputValidator(updateStorageRequestSchemaSupplier, noopUpgradePipeline).validate<UpdateStorageRequest>(raw);
 };
+
+//Geo category
+export const validateAddGeoRequest = (raw: string) => {
+  return new HeadlessInputValidator(addGeoRequestSchemaSupplier, noopUpgradePipeline).validate<AddGeoRequest>(raw);
+};
+
+export const validateUpdateGeoRequest = (raw: string) => {
+  return new HeadlessInputValidator(updateGeoRequestSchemaSupplier, noopUpgradePipeline).validate<UpdateGeoRequest>(raw);
+};
diff --git a/packages/amplify-util-headless-input/src/schemaSuppliers.ts b/packages/amplify-util-headless-input/src/schemaSuppliers.ts
index c615897c760..d6e2dc30d83 100644
--- a/packages/amplify-util-headless-input/src/schemaSuppliers.ts
+++ b/packages/amplify-util-headless-input/src/schemaSuppliers.ts
@@ -36,6 +36,14 @@ export const updateApiRequestSchemaSupplier: VersionedSchemaSupplier = version =
   return getSchema('UpdateApiRequest', 'api', version);
 };
 
+export const addGeoRequestSchemaSupplier: VersionedSchemaSupplier = version => {
+  return getSchema('AddGeoRequest', 'geo', version);
+}
+
+export const updateGeoRequestSchemaSupplier: VersionedSchemaSupplier = version => {
+  return getSchema('UpdateGeoRequest', 'geo', version);
+}
+
 const getSchema = async (type: string, category: string, version: number) => {
   try {
     return {