Skip to content

Commit 654bd30

Browse files
cpyle0819ford-at-aws
authored andcommitted
JavaScript (v3): Util - Replace log util with logger.
1 parent 4999acb commit 654bd30

27 files changed

+128
-118
lines changed

javascriptv3/example_code/bedrock-agent/tests/bedrock-agent-actions.integration.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { afterAll, beforeAll, describe, expect, it } from "vitest";
55

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

1010
import {
1111
CreateRoleCommand,
@@ -97,7 +97,7 @@ describe("create-list-get-delete", () => {
9797
}),
9898
);
9999
} catch (err) {
100-
log(err);
100+
logger.error(err);
101101
throw err;
102102
}
103103
});
@@ -152,7 +152,7 @@ describe("create-list-get-delete", () => {
152152
);
153153
await iam.send(new DeleteRoleCommand({ RoleName: agentRoleName }));
154154
} catch (err) {
155-
log(err);
155+
logger.error(err);
156156
throw err;
157157
}
158158
});

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/admin-get-user-handler.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

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

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

4242
const user = await getUser(username);
4343

44-
log(formatUser(user));
44+
logger.log(formatUser(user));
4545
} catch (err) {
46-
log(err);
46+
logger.error(err);
4747
}
4848
};
4949

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/admin-initiate-auth-handler.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33
/** snippet-start:[javascript.v3.cognito-idp.scenarios.basic.AdminInitiateAuthHandler] **/
44
import qrcode from "qrcode-terminal";
5-
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
5+
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
66
import { adminInitiateAuth } from "../../../actions/admin-initiate-auth.js";
77
import { associateSoftwareToken } from "../../../actions/associate-software-token.js";
88
import { FILE_USER_POOLS } from "./constants.js";
@@ -61,7 +61,7 @@ const adminInitiateAuthHandler = async (commands) => {
6161
validateId(userPoolId);
6262
validateClient(clientId);
6363

64-
log("Signing in.");
64+
logger.log("Signing in.");
6565
const { ChallengeName, Session } = await adminInitiateAuth({
6666
clientId,
6767
userPoolId,
@@ -70,16 +70,16 @@ const adminInitiateAuthHandler = async (commands) => {
7070
});
7171

7272
if (ChallengeName === "MFA_SETUP") {
73-
log("MFA setup is required.");
73+
logger.log("MFA setup is required.");
7474
return handleMfaSetup(Session, username);
7575
}
7676

7777
if (ChallengeName === "SOFTWARE_TOKEN_MFA") {
7878
handleSoftwareTokenMfa(Session);
79-
log(`Run 'admin-respond-to-auth-challenge ${username} <totp>'`);
79+
logger.log(`Run 'admin-respond-to-auth-challenge ${username} <totp>'`);
8080
}
8181
} catch (err) {
82-
log(err);
82+
logger.error(err);
8383
}
8484
};
8585

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/admin-respond-to-auth-challenge-handler.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

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

4848
storeAccessToken(AuthenticationResult.AccessToken);
4949

50-
log("Successfully authenticated.");
50+
logger.log("Successfully authenticated.");
5151
} catch (err) {
52-
log(err);
52+
logger.error(err);
5353
}
5454
};
5555

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/clean-up-handler.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
import { deleteFiles } from "@aws-doc-sdk-examples/lib/utils/util-fs.js";
5-
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
5+
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
66
import { deleteUserPool } from "../../../actions/delete-user-pool.js";
77
import { FILE_USER_POOLS } from "./constants.js";
88
import { getFirstValuesFromEntries } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
@@ -12,7 +12,7 @@ import { getFirstValuesFromEntries } from "@aws-doc-sdk-examples/lib/utils/util-
1212
*/
1313
function cleanUpUserPools(userPoolIds) {
1414
const deletePromises = userPoolIds.map((id) =>
15-
deleteUserPool(id).catch((err) => log(err)),
15+
deleteUserPool(id).catch((err) => logger.error(err)),
1616
);
1717
return Promise.all(deletePromises);
1818
}
@@ -26,24 +26,24 @@ function createUserPoolList(userPoolIds) {
2626

2727
const cleanUpHandler = async () => {
2828
try {
29-
log("Tidying up");
29+
logger.log("Tidying up");
3030

3131
/**
3232
* @type {string[]}
3333
*/
3434
const userPoolIds = getFirstValuesFromEntries(FILE_USER_POOLS);
3535
if (userPoolIds[0].length > 0) {
36-
log(`Deleting user pools: \n${createUserPoolList(userPoolIds)}`);
36+
logger.log(`Deleting user pools: \n${createUserPoolList(userPoolIds)}`);
3737
await cleanUpUserPools(userPoolIds);
38-
log("User pools deleted.");
38+
logger.log("User pools deleted.");
3939
}
4040

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

44-
log("All done ✨.");
44+
logger.log("All done ✨.");
4545
} catch (err) {
46-
log(err);
46+
logger.error(err);
4747
}
4848
};
4949

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/confirm-sign-up-handler.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
/** snippet-start:[javascript.v3.cognito-idp.scenarios.basic.ConfirmSignUpHandler] **/
5-
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
5+
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
66
import { confirmSignUp } from "../../../actions/confirm-sign-up.js";
77
import { FILE_USER_POOLS } from "./constants.js";
88
import { getSecondValuesFromEntries } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
@@ -43,13 +43,13 @@ const confirmSignUpHandler = async (commands) => {
4343
const values = getSecondValuesFromEntries(FILE_USER_POOLS);
4444
const clientId = values[0];
4545
validateClient(clientId);
46-
log("Confirming user.");
46+
logger.log("Confirming user.");
4747
await confirmSignUp({ clientId, username, code });
48-
log(
48+
logger.log(
4949
`User confirmed. Run 'admin-initiate-auth ${username} <password>' to sign in.`,
5050
);
5151
} catch (err) {
52-
log(err);
52+
logger.error(err);
5353
}
5454
};
5555

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/create-user-pool-handler.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

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

39-
log(`Creating user pool: ${poolName}`);
39+
logger.log(`Creating user pool: ${poolName}`);
4040

4141
const {
4242
UserPool: { Id },
4343
} = await createUserPool(poolName);
44-
log("User pool created.");
44+
logger.log("User pool created.");
4545

46-
log("Configuring user pool to only allow MFA via an authenticator app.");
46+
logger.log(
47+
"Configuring user pool to only allow MFA via an authenticator app.",
48+
);
4749
await setUserPoolMfaConfig(Id);
48-
log("MFA configured.");
50+
logger.log("MFA configured.");
4951

50-
log(`Creating user pool client: ${NAME_CLIENT}`);
52+
logger.log(`Creating user pool client: ${NAME_CLIENT}`);
5153
const {
5254
UserPoolClient: { ClientId },
5355
} = await createUserPoolClient(NAME_CLIENT, Id);
54-
log("Client created.");
56+
logger.log("Client created.");
5557

5658
storeUserPoolMeta(Id, ClientId, poolName);
5759
} catch (err) {
58-
log(err);
60+
logger.error(err);
5961
}
6062
};
6163

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/list-users-handler.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

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

@@ -27,9 +27,9 @@ const listUsersHandler = async () => {
2727
try {
2828
const response = await getUsers();
2929

30-
log(formatUsers(response.Users));
30+
logger.log(formatUsers(response.Users));
3131
} catch (err) {
32-
log(err);
32+
logger.error(err);
3333
}
3434
};
3535

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/resend-confirmation-code-handler.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
// SPDX-License-Identifier: Apache-2.0
33

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

99
const resendConfirmationCodeHandler = async ([_cmd, username]) => {
1010
try {
1111
const [_userPoolId, clientId] = getFirstEntry(FILE_USER_POOLS);
1212
await resendConfirmationCode({ clientId, username });
13-
log("Confirmation code sent.");
13+
logger.log("Confirmation code sent.");
1414
} catch (err) {
15-
log(err);
15+
logger.error(err);
1616
}
1717
};
1818

javascriptv3/example_code/cognito-identity-provider/scenarios/basic/command-handlers/sign-up-handler.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
/** snippet-start:[javascript.v3.cognito-idp.scenarios.basic.SignUpHandler] **/
5-
import { log } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
5+
import { logger } from "@aws-doc-sdk-examples/lib/utils/util-log.js";
66
import { signUp } from "../../../actions/sign-up.js";
77
import { FILE_USER_POOLS } from "./constants.js";
88
import { getSecondValuesFromEntries } from "@aws-doc-sdk-examples/lib/utils/util-csv.js";
@@ -34,12 +34,14 @@ const signUpHandler = async (commands) => {
3434
const values = getSecondValuesFromEntries(FILE_USER_POOLS);
3535
const clientId = values[0];
3636
validateClient(clientId);
37-
log("Signing up.");
37+
logger.log("Signing up.");
3838
await signUp({ clientId, username, password, email });
39-
log(`Signed up. A confirmation email has been sent to: ${email}.`);
40-
log(`Run 'confirm-sign-up ${username} <code>' to confirm your account.`);
39+
logger.log(`Signed up. A confirmation email has been sent to: ${email}.`);
40+
logger.log(
41+
`Run 'confirm-sign-up ${username} <code>' to confirm your account.`,
42+
);
4143
} catch (err) {
42-
log(err);
44+
logger.error(err);
4345
}
4446
};
4547

0 commit comments

Comments
 (0)