remove unnecessary files

.vscode/settings.json

@@ -24,5 +24,10 @@
 	"formatFiles.excludePattern": "*.log,*.tsbuildinfo",
 	"[shellscript]": {
 		"editor.defaultFormatter": "foxundermoon.shell-format"
-	}
+	},
+
+    "files.exclude": {
+        "**/*.js": true,
+        "**/*.map": true
+    }
 }

README.md

@@ -31,7 +31,9 @@ To dive deep into AGIE components, please visit the following links:
 - [UI Module](typescript/packages/apps/ui)
 
 ### Success
+
 Upon successful deployment of this guidance, you will be able to do the following:
+
 - Enroll polygons (areas of interest, farm fields, geographical areas of land) for processing and analysis
 - Schedule the frequency of polygon analysis, for each polygon, to support one-time and recurring automated processing
 - Automate the searching, downloading, clipping, and processing of earth observation data into NDVI maps and meta data, per polygon
@@ -64,13 +66,12 @@ You will need to pay for the AWS services used while running this guidance. As o
 In order to deploy `AGIE` from your local workstation, you need to install the following dependencies:
 
 - Active AWS Account
-- Node.js 20.x
+- [Node.js 20.x](https://nodejs.org/en/download/package-manager)
 - [AWS Command Line Interface](https://aws.amazon.com/cli/)
 - [Docker](https://docs.docker.com/engine/install/)
 - [Rush.js](https://rushjs.io/)
-- [pnpm 9.0.2](https://www.npmjs.com/package/pnpm/v/9.0.2)
-- [tsx](https://www.npmjs.com/package/tsx/v/4.18.0)
-- NOTE: AWS AGIE includes an optional UI module. The optional and integrated UI module includes functionality provided by Amazon Location Service. As of 7/24, Amazon Location Service is not available in certain AWS Regions, including us-west-1. Please review the most current list of Region availability of Amazon Location Service to ensure the optional UI module can be deployed within a Region that meets your company requirements.
+
+> NOTE: AWS AGIE includes an optional UI module. The optional and integrated UI module includes functionality provided by Amazon Location Service. As of 7/24, Amazon Location Service is not available in certain AWS Regions, including us-west-1. Please review the most current list of Region availability of Amazon Location Service to ensure the optional UI module can be deployed within a Region that meets your company requirements.
 
 ## Deployment
 
@@ -79,10 +80,10 @@ In order to deploy `AGIE` from your local workstation, you need to install the f
 Run the following command to clone the solution repository into your local workstation:
 
 ```shell
-$ git clone https://github.com/aws-solutions-library-samples/guidance-for-automated-geospatial-insights-engine-on-aws
-$ cd guidance-for-automated-geospatial-insights-engine-on-aws
-$ export AGIE_FOLDER=$PWD
-$ export CLI_FOLDER="$PWD/typescript/packages/apps/cli"
+git clone https://github.com/aws-solutions-library-samples/guidance-for-automated-geospatial-insights-engine-on-aws
+cd guidance-for-automated-geospatial-insights-engine-on-aws
+export AGIE_FOLDER=$PWD
+export CLI_FOLDER="$PWD/typescript/packages/apps/cli"
 ```
 
 ### 2. Build the solution

typescript/packages/apps/cli/bin/dev.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env tsx --trace-warnings
+#!/usr/bin/env npx tsx --trace-warnings
 
 /*
  *  Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
@@ -12,16 +12,13 @@
  *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
  *  and limitations under the License.
  */
-import path from 'path';
 import oclif from '@oclif/core';
-import { fileURLToPath } from 'url';
+import path from 'path';
 import tsNode from 'ts-node';
-import dotenv from 'dotenv';
-import loadValidatorFunction from './validator';
+import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-dotenv.config({ path: path.join(__dirname, '../.env') });
 
 const project = path.join(__dirname, '../', 'tsconfig.json');
 
@@ -33,7 +30,5 @@ tsNode.register({ project });
 // In dev mode, always show stack traces
 oclif.settings.debug = true;
 
-loadValidatorFunction();
-
 // Start the CLI
 await oclif.execute({ development: true, dir: project });

typescript/packages/apps/cli/package.json

@@ -106,7 +106,8 @@
 		"simple-git": "~3",
 		"replace-in-file": "~7",
 		"validator": "~13",
-		"rxjs": "~7"
+		"rxjs": "~7",
+		"tsx": "~4"
 	},
 	"devDependencies": {
 		"@oclif/test": "~3",

typescript/packages/apps/cli/src/commands/auth.ts

@@ -19,7 +19,7 @@ import { getParameterValue } from '../utils/ssm.js';
 
 export interface AuthorizerUserProps {
 	environment: string;
-	region?: string;
+	region: string;
 	username: string;
 	password: string;
 	newPassword?: string;
@@ -64,8 +64,8 @@ export class Auth extends DeploymentCommand<typeof Auth> {
 	];
 
 	private async generateAuthToken(props: AuthorizerUserProps): Promise<string> {
-		const userPoolClientId = await getParameterValue(userPoolClientIdParameter(props.environment));
-		const userPoolId = await getParameterValue(userPoolIdParameter(props.environment));
+		const userPoolClientId = await getParameterValue(userPoolClientIdParameter(props.environment), props.region);
+		const userPoolId = await getParameterValue(userPoolIdParameter(props.environment), props.region);
 
 		Amplify.configure({
 			Auth: {
@@ -117,6 +117,7 @@ export class Auth extends DeploymentCommand<typeof Auth> {
 				username: flags.username,
 				password: flags.password,
 				newPassword: flags.newPassword,
+				region: flags.region,
 			});
 			console.log(token);
 		} catch (error) {

typescript/packages/apps/cli/src/commands/install.ts

@@ -53,7 +53,6 @@ export class AgieInstall extends AgieCommand<typeof AgieInstall> {
 			char: 'h',
 			description: 'If provided, bypass the questions. You will also need to specify the path configuration file using -c',
 			dependsOn: ['config'],
-			default: false,
 		}),
 		role: Flags.string({
 			description: 'The RoleArn for the CLI to assume for deployment.',
@@ -69,7 +68,7 @@ export class AgieInstall extends AgieCommand<typeof AgieInstall> {
 
 		const installTasks = await this.getAgieInstallTask(flags.role!, region, rest);
 
-		const taskRunner: Listr = new Listr([this.getStacServerBundleTask(), ...installTasks]);
+		const taskRunner: Listr = new Listr([this.getStacServerBundleTask(), ...installTasks], { exitOnError: true });
 
 		await taskRunner.run({ answers });
 	}
@@ -118,6 +117,8 @@ export class AgieInstall extends AgieCommand<typeof AgieInstall> {
 				task: async (_, task) => {
 					try {
 						await getDeployedStackByName('CDKToolkit', region, role);
+						task.skip('Skip boostrapping cdk');
+						return;
 					} catch (error) {
 						if ((error as Error).message === 'Stack with id CDKToolkit does not exist') {
 							task.output = `CDK has not been bootstrapped in ${region}, running bootstrap...`;
@@ -134,7 +135,7 @@ export class AgieInstall extends AgieCommand<typeof AgieInstall> {
 			},
 			{
 				title: 'Deploying AGIE stacks',
-				task: async () => {
+				task: async (ctx, task) => {
 					return new Observable((observer) => {
 						shell.cd(infrastructureFolder);
 
@@ -151,8 +152,12 @@ export class AgieInstall extends AgieCommand<typeof AgieInstall> {
 							observer.next(data);
 						});
 
-						child.on('exit', function () {
-							observer.complete();
+						child.on('exit', function (code: number) {
+							if (code === 1) {
+								observer.error('Encountered error when deploying AGIE stacks');
+							} else {
+								observer.complete();
+							}
 						});
 					});
 				},
@@ -170,8 +175,13 @@ export class AgieInstall extends AgieCommand<typeof AgieInstall> {
 						child?.stderr?.on('data', function (data) {
 							observer.next(data);
 						});
-						child.on('exit', function () {
-							observer.complete();
+
+						child.on('exit', function (code: number) {
+							if (code === 1) {
+								observer.error('Encountered error when deploying the demo UI');
+							} else {
+								observer.complete();
+							}
 						});
 					});
 				},

typescript/packages/apps/cli/src/commands/remove.ts

@@ -78,8 +78,12 @@ export class AgieRemove extends AgieCommand<typeof AgieRemove> {
 							observer.next(data);
 						});
 
-						child.on('exit', function () {
-							observer.complete();
+						child.on('exit', function (code: number) {
+							if (code === 1) {
+								observer.error('Encountered error when removing AGIE stacks');
+							} else {
+								observer.complete();
+							}
 						});
 					});
 				},