Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 7 additions & 1 deletion javascriptv3/biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"./example_code/medical-imaging/scenarios/health-image-sets/pixel-data-verification",
"./example_code/kinesis/kinesis-cdk",
"./example_code/medical-imaging/scenarios/health-image-sets/pixel-data-verification/openjphjs/openjphjs.js",
"./example_code/cross-services/textract-react",
"**/dist"
]
},
Expand All @@ -25,7 +26,12 @@
"linter": {
"enabled": true,
"rules": {
"recommended": true
"recommended": true,
"correctness": {
"noUndeclaredVariables": {
"level": "error"
}
}
}
},
"javascript": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { afterAll, beforeAll, describe, expect, it } from "vitest";

import { getRandomAlphanumericString } from "@aws-doc-sdk-examples/lib/utils/util-string.js";
import { wait } from "@aws-doc-sdk-examples/lib/utils/util-timers.js";
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";

import {
CreateRoleCommand,
Expand Down Expand Up @@ -97,7 +97,7 @@ describe("create-list-get-delete", () => {
}),
);
} catch (err) {
log(err);
logger.error(err);
throw err;
}
});
Expand Down Expand Up @@ -152,7 +152,7 @@ describe("create-list-get-delete", () => {
);
await iam.send(new DeleteRoleCommand({ RoleName: agentRoleName }));
} catch (err) {
log(err);
logger.error(err);
throw err;
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import { getFirstEntry } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { adminGetUser } from "../../../actions/admin-get-user.js";
import { FILE_USER_POOLS } from "./constants.js";

Expand Down Expand Up @@ -41,9 +41,9 @@ const adminGetUserHandler = async ([_cmd, username]) => {

const user = await getUser(username);

log(formatUser(user));
logger.log(formatUser(user));
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
/** snippet-start:[javascript.v3.cognito-idp.scenarios.basic.AdminInitiateAuthHandler] **/
import qrcode from "qrcode-terminal";
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { adminInitiateAuth } from "../../../actions/admin-initiate-auth.js";
import { associateSoftwareToken } from "../../../actions/associate-software-token.js";
import { FILE_USER_POOLS } from "./constants.js";
Expand Down Expand Up @@ -61,7 +61,7 @@ const adminInitiateAuthHandler = async (commands) => {
validateId(userPoolId);
validateClient(clientId);

log("Signing in.");
logger.log("Signing in.");
const { ChallengeName, Session } = await adminInitiateAuth({
clientId,
userPoolId,
Expand All @@ -70,16 +70,16 @@ const adminInitiateAuthHandler = async (commands) => {
});

if (ChallengeName === "MFA_SETUP") {
log("MFA setup is required.");
logger.log("MFA setup is required.");
return handleMfaSetup(Session, username);
}

if (ChallengeName === "SOFTWARE_TOKEN_MFA") {
handleSoftwareTokenMfa(Session);
log(`Run 'admin-respond-to-auth-challenge ${username} <totp>'`);
logger.log(`Run 'admin-respond-to-auth-challenge ${username} <totp>'`);
}
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

/** snippet-start:[javascript.v3.cognito-idp.scenarios.basic.AdminRespondToAuthChallengeHandler] **/
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { adminRespondToAuthChallenge } from "../../../actions/admin-respond-to-auth-challenge.js";
import { getFirstEntry } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
import { FILE_USER_POOLS } from "./constants.js";
Expand Down Expand Up @@ -47,9 +47,9 @@ const adminRespondToAuthChallengeHandler = async (commands) => {

storeAccessToken(AuthenticationResult.AccessToken);

log("Successfully authenticated.");
logger.log("Successfully authenticated.");
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import { deleteFiles } from "@aws-doc-sdk-examples/lib/utils/util-fs.js";
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { deleteUserPool } from "../../../actions/delete-user-pool.js";
import { FILE_USER_POOLS } from "./constants.js";
import { getFirstValuesFromEntries } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
Expand All @@ -12,7 +12,7 @@ import { getFirstValuesFromEntries } from "@aws-doc-sdk-examples/lib/utils/util-
*/
function cleanUpUserPools(userPoolIds) {
const deletePromises = userPoolIds.map((id) =>
deleteUserPool(id).catch((err) => log(err)),
deleteUserPool(id).catch((err) => logger.error(err)),
);
return Promise.all(deletePromises);
}
Expand All @@ -26,24 +26,24 @@ function createUserPoolList(userPoolIds) {

const cleanUpHandler = async () => {
try {
log("Tidying up");
logger.log("Tidying up");

/**
* @type {string[]}
*/
const userPoolIds = getFirstValuesFromEntries(FILE_USER_POOLS);
if (userPoolIds[0].length > 0) {
log(`Deleting user pools: \n${createUserPoolList(userPoolIds)}`);
logger.log(`Deleting user pools: \n${createUserPoolList(userPoolIds)}`);
await cleanUpUserPools(userPoolIds);
log("User pools deleted.");
logger.log("User pools deleted.");
}

log("Removing temporary files.");
logger.log("Removing temporary files.");
await deleteFiles([`./${FILE_USER_POOLS}.tmp`]);

log("All done ✨.");
logger.log("All done ✨.");
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

/** snippet-start:[javascript.v3.cognito-idp.scenarios.basic.ConfirmSignUpHandler] **/
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { confirmSignUp } from "../../../actions/confirm-sign-up.js";
import { FILE_USER_POOLS } from "./constants.js";
import { getSecondValuesFromEntries } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
Expand Down Expand Up @@ -43,13 +43,13 @@ const confirmSignUpHandler = async (commands) => {
const values = getSecondValuesFromEntries(FILE_USER_POOLS);
const clientId = values[0];
validateClient(clientId);
log("Confirming user.");
logger.log("Confirming user.");
await confirmSignUp({ clientId, username, code });
log(
logger.log(
`User confirmed. Run 'admin-initiate-auth ${username} <password>' to sign in.`,
);
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { getTmp, setTmp } from "@aws-doc-sdk-examples/lib/utils/util-fs.js";
import { createUserPool } from "../../../actions/create-user-pool.js";
import { FILE_USER_POOLS, NAME_CLIENT } from "./constants.js";
Expand Down Expand Up @@ -36,26 +36,28 @@ const createUserPoolHandler = async (commands) => {
try {
validateUserPool(poolName);

log(`Creating user pool: ${poolName}`);
logger.log(`Creating user pool: ${poolName}`);

const {
UserPool: { Id },
} = await createUserPool(poolName);
log("User pool created.");
logger.log("User pool created.");

log("Configuring user pool to only allow MFA via an authenticator app.");
logger.log(
"Configuring user pool to only allow MFA via an authenticator app.",
);
await setUserPoolMfaConfig(Id);
log("MFA configured.");
logger.log("MFA configured.");

log(`Creating user pool client: ${NAME_CLIENT}`);
logger.log(`Creating user pool client: ${NAME_CLIENT}`);
const {
UserPoolClient: { ClientId },
} = await createUserPoolClient(NAME_CLIENT, Id);
log("Client created.");
logger.log("Client created.");

storeUserPoolMeta(Id, ClientId, poolName);
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import { getFirstEntry } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { listUsers } from "../../../actions/list-users.js";
import { FILE_USER_POOLS } from "./constants.js";

Expand All @@ -27,9 +27,9 @@ const listUsersHandler = async () => {
try {
const response = await getUsers();

log(formatUsers(response.Users));
logger.log(formatUsers(response.Users));
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
// SPDX-License-Identifier: Apache-2.0

import { getFirstEntry } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { resendConfirmationCode } from "../../../actions/resend-confirmation-code.js";
import { FILE_USER_POOLS } from "./constants.js";

const resendConfirmationCodeHandler = async ([_cmd, username]) => {
try {
const [_userPoolId, clientId] = getFirstEntry(FILE_USER_POOLS);
await resendConfirmationCode({ clientId, username });
log("Confirmation code sent.");
logger.log("Confirmation code sent.");
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

/** snippet-start:[javascript.v3.cognito-idp.scenarios.basic.SignUpHandler] **/
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { signUp } from "../../../actions/sign-up.js";
import { FILE_USER_POOLS } from "./constants.js";
import { getSecondValuesFromEntries } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
Expand Down Expand Up @@ -34,12 +34,14 @@ const signUpHandler = async (commands) => {
const values = getSecondValuesFromEntries(FILE_USER_POOLS);
const clientId = values[0];
validateClient(clientId);
log("Signing up.");
logger.log("Signing up.");
await signUp({ clientId, username, password, email });
log(`Signed up. A confirmation email has been sent to: ${email}.`);
log(`Run 'confirm-sign-up ${username} <code>' to confirm your account.`);
logger.log(`Signed up. A confirmation email has been sent to: ${email}.`);
logger.log(
`Run 'confirm-sign-up ${username} <code>' to confirm your account.`,
);
} catch (err) {
log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

/** snippet-start:[javascript.v3.cognito-idp.scenarios.basic.VerifySoftwareTokenHandler] **/
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { verifySoftwareToken } from "../../../actions/verify-software-token.js";

const validateTotp = (totp) => {
Expand All @@ -18,11 +18,11 @@ const verifySoftwareTokenHandler = async (commands) => {
try {
validateTotp(totp);

log("Verifying TOTP.");
logger.log("Verifying TOTP.");
await verifySoftwareToken(totp);
log("TOTP Verified. Run 'admin-initiate-auth' again to sign-in.");
logger.log("TOTP Verified. Run 'admin-initiate-auth' again to sign-in.");
} catch (err) {
console.log(err);
logger.error(err);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { createInterface } from "node:readline";
import { stdin as input, stdout as output } from "node:process";

import { readCommands } from "@aws-doc-sdk-examples/lib/cmd-runner.js";
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
import { startsWith } from "@aws-doc-sdk-examples/lib/utils/util-array.js";

import { createUserPoolHandler } from "./command-handlers/create-user-pool-handler.js";
Expand Down Expand Up @@ -61,7 +60,7 @@ const help = `
`;

const handlers = [
[startsWith(["help"]), () => log(help)],
[startsWith(["help"]), () => console.log(help)],
[startsWith(["create-user-pool"]), createUserPoolHandler],
[startsWith(["sign-up"]), signUpHandler],
[startsWith(["resend-confirmation-code"]), resendConfirmationCodeHandler],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import type { Handler } from "src/types/handler.js";
import type { DBRecords } from "src/types/db-record.js";
import { command as getAllItemsCommand } from "../statement-commands/get-all-items.js";
import { command as getArchivedItemsCommand } from "../statement-commands/get-archived-items.js";
import { command as getActiveItemsCommand } from "../statement-commands/get-active-items.js";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import type { Item } from "../types/item.js";
import type { DBRecord } from "../types/db-record.js";

const parseItem = (record: DBRecord): Item => {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { SendRawEmailCommand } from "@aws-sdk/client-ses";
import { createMimeMessage, type TextFormat } from "mimetext";
import { format } from "prettier";
import type { Handler } from "src/types/handler.js";
import type { DBRecords } from "src/types/db-record.js";
import { command as getActiveItemsCommand } from "../statement-commands/get-active-items.js";

const makeCsv = (records: DBRecords) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { RequestHandler } from "express";
import { command as createTableCommand } from "../statement-commands/create-table.js";
import { command as getAllItemsCommand } from "../statement-commands/get-all-items.js";
import type { Handler } from "src/types/handler.js";
import type { Sendable } from "src/types/sendable.js";

const errorCodes = {
TABLE_NOT_FOUND: "Error code: 1146",
Expand Down

This file was deleted.

Loading
Loading