fix(galileo-cli): handle outdated aws creds error; fix eslint-staged

aws-samples · Oct 31, 2023 · a4e31ab · a4e31ab
1 parent b61e82f
commit a4e31ab
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 33 deletions.
diff --git a/.projen/tasks.json b/.projen/tasks.json
diff --git a/demo/api/generated/runtime/python/poetry.lock b/demo/api/generated/runtime/python/poetry.lock
diff --git a/demo/api/interceptors/typescript/.projen/tasks.json b/demo/api/interceptors/typescript/.projen/tasks.json
diff --git a/demo/corpus/embeddings/poetry.lock b/demo/corpus/embeddings/poetry.lock
diff --git a/demo/corpus/logic/.projen/tasks.json b/demo/corpus/logic/.projen/tasks.json
diff --git a/demo/infra/.projen/tasks.json b/demo/infra/.projen/tasks.json
diff --git a/demo/sample-dataset/.projen/tasks.json b/demo/sample-dataset/.projen/tasks.json
diff --git a/demo/website/.projen/tasks.json b/demo/website/.projen/tasks.json
diff --git a/packages/galileo-cdk/.projen/tasks.json b/packages/galileo-cdk/.projen/tasks.json
diff --git a/packages/galileo-cli/.projen/deps.json b/packages/galileo-cli/.projen/deps.json
diff --git a/packages/galileo-cli/.projen/tasks.json b/packages/galileo-cli/.projen/tasks.json
diff --git a/packages/galileo-cli/bin/galileo-cli.ts b/packages/galileo-cli/bin/galileo-cli.ts
@@ -2,6 +2,8 @@
 PDX-License-Identifier: Apache-2.0 */
 import * as path from "node:path";
 import { run, flush, Errors } from "@oclif/core";
+import { CredentialsProviderError } from "@smithy/property-provider";
+import chalk from "chalk";
 
 // https://oclif.io/docs/config
 process.env.XDG_DATA_HOME = path.join(__dirname, "..");
@@ -12,6 +14,15 @@ void (async () => {
     await run();
     await flush();
   } catch (err: any) {
+    // handle error when aws creds are outdated
+    if (err instanceof CredentialsProviderError) {
+      console.error(
+        chalk.redBright(
+          "\n\nSeems your AWS credentials are outdated. Please update them and try again.\n\n"
+        )
+      );
+    }
+
     Errors.handle(err);
   }
 })();
diff --git a/packages/galileo-cli/examples/csv-loader/parser-common.ts b/packages/galileo-cli/examples/csv-loader/parser-common.ts
@@ -49,5 +49,6 @@ export const parseCsv = (): DocumentMetadata => {
     return docMetadata;
   } catch (err) {
     console.log(JSON.stringify(err));
+    throw err;
   }
 };
diff --git a/packages/galileo-cli/package.json b/packages/galileo-cli/package.json
diff --git a/packages/galileo-cli/tsconfig.dev.json b/packages/galileo-cli/tsconfig.dev.json
diff --git a/packages/galileo-cli/tsconfig.json b/packages/galileo-cli/tsconfig.json
diff --git a/packages/galileo-sdk/.projen/tasks.json b/packages/galileo-sdk/.projen/tasks.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projenrc/framework/galileo-cli.ts b/projenrc/framework/galileo-cli.ts
@@ -31,7 +31,7 @@ export class GalileoCli extends TypeScriptAppProject {
         outDir: undefined,
         target: "ES2022",
       },
-      include: ["src/**/*.ts", "examples/**/*.ts"],
+      include: ["examples/**/*.ts", "bin/*.ts"],
     };
 
     super({
@@ -44,8 +44,9 @@ export class GalileoCli extends TypeScriptAppProject {
         `@aws-sdk/client-sfn@^${VERSIONS.AWS_SDK}`,
         `@aws-sdk/client-ssm@^${VERSIONS.AWS_SDK}`,
         `@aws-sdk/client-sts@^${VERSIONS.AWS_SDK}`,
-        `@aws-sdk/lib-storage@^${VERSIONS.AWS_SDK}`,
         `@aws-sdk/credential-providers@^${VERSIONS.AWS_SDK}`,
+        `@aws-sdk/lib-storage@^${VERSIONS.AWS_SDK}`,
+        `@smithy/property-provider`,
         "@oclif/core",
         "@oclif/errors",
         "chalk@^4",

diff --git a/projenrc/monorepo.ts b/projenrc/monorepo.ts
@@ -288,7 +288,7 @@ export class MonorepoProject extends MonorepoTsProject {
           description: "Run eslint against the staged files only",
           steps: [
             {
-              exec: `eslint --fix --no-error-on-unmatched-pattern $(git diff --name-only --relative --staged HEAD . | grep -E '^(.*/)?(${dirs.join(
+              exec: `eslint --fix --no-error-on-unmatched-pattern $(git diff --name-only --relative --staged HEAD . | grep -E '^(${dirs.join(
                 "|"
               )})/.*\.(ts|tsx)$' | xargs)`,
             },