Skip to content

Commit 77aa5c5

Browse files
sdangolsdangol
committed
Fixed merge conflicts
2 parents 70a47a8 + 69727c2 commit 77aa5c5

File tree

10 files changed

+37
-42
lines changed

10 files changed

+37
-42
lines changed

‎docs/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,9 @@ typing-extensions==4.13.2 \
436436
--hash=sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c \
437437
--hash=sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef
438438
# via beautifulsoup4
439-
urllib3==2.5.0 \
440-
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
441-
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
439+
urllib3==2.6.0 \
440+
--hash=sha256:c90f7a39f716c572c4e3e58509581ebd83f9b59cced005b7db7ad2d22b0db99f \
441+
--hash=sha256:cb9bcef5a4b345d5da5d145dc3e30834f58e8018828cbc724d30b4cb7d4d49f1
442442
# via requests
443443
verspec==0.1.0 \
444444
--hash=sha256:741877d5633cc9464c45a469ae2a31e801e6dbbaa85b9675d481cda100f11c31 \

‎examples/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@types/node": "24.10.1",
5353
"aws-cdk": "^2.1033.0",
5454
"constructs": "^10.4.3",
55-
"esbuild": "^0.27.0",
55+
"esbuild": "^0.27.1",
5656
"typescript": "^5.9.3"
5757
}
5858
}

‎examples/snippets/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@aws-sdk/util-dynamodb": "^3.939.0",
4242
"@middy/core": "^4.7.0",
4343
"@redis/client": "^5.10.0",
44-
"@valkey/valkey-glide": "^2.2.0",
44+
"@valkey/valkey-glide": "^2.2.1",
4545
"aws-sdk": "^2.1692.0",
4646
"aws-sdk-client-mock": "^4.1.0",
4747
"zod": "^4.1.13"

‎layers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"dependencies": {
4545
"aws-cdk": "^2.1033.0",
4646
"aws-cdk-lib": "^2.228.0",
47-
"esbuild": "^0.27.0",
47+
"esbuild": "^0.27.1",
4848
"tsx": "^4.21.0"
4949
}
5050
}

‎packages/batch/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"nodejs"
8484
],
8585
"dependencies": {
86-
"@aws/lambda-invoke-store": "0.2.1",
86+
"@aws/lambda-invoke-store": "0.2.2",
8787
"@aws-lambda-powertools/commons": "2.29.0",
8888
"@standard-schema/spec": "^1.0.0"
8989
},

‎packages/commons/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"nodejs"
112112
],
113113
"dependencies": {
114-
"@aws/lambda-invoke-store": "0.2.1"
114+
"@aws/lambda-invoke-store": "0.2.2"
115115
},
116116
"devDependencies": {
117117
"@aws-lambda-powertools/testing-utils": "file:../testing"

‎packages/commons/tests/unit/envUtils.test.ts‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313

1414
describe('Functions: envUtils', () => {
1515
beforeEach(() => {
16+
InvokeStore._testing?.reset();
1617
vi.unstubAllEnvs();
1718
});
1819

@@ -153,22 +154,19 @@ describe('Functions: envUtils', () => {
153154
['t', true],
154155
['TRUE', true],
155156
['on', true],
156-
])(
157-
'returns true if the environment variable is set to a truthy value: %s',
158-
(value, expected) => {
159-
// Prepare
160-
vi.stubEnv('TEST_ENV', value);
161-
162-
// Act
163-
const result = getBooleanFromEnv({
164-
key: 'TEST_ENV',
165-
extendedParsing: true,
166-
});
157+
])('returns true if the environment variable is set to a truthy value: %s', (value, expected) => {
158+
// Prepare
159+
vi.stubEnv('TEST_ENV', value);
167160

168-
// Assess
169-
expect(result).toBe(expected);
170-
}
171-
);
161+
// Act
162+
const result = getBooleanFromEnv({
163+
key: 'TEST_ENV',
164+
extendedParsing: true,
165+
});
166+
167+
// Assess
168+
expect(result).toBe(expected);
169+
});
172170

173171
it.each([
174172
['0', false],
@@ -177,22 +175,19 @@ describe('Functions: envUtils', () => {
177175
['f', false],
178176
['FALSE', false],
179177
['off', false],
180-
])(
181-
'returns false if the environment variable is set to a falsy value: %s',
182-
(value, expected) => {
183-
// Prepare
184-
vi.stubEnv('TEST_ENV', value);
185-
186-
// Act
187-
const result = getBooleanFromEnv({
188-
key: 'TEST_ENV',
189-
extendedParsing: true,
190-
});
178+
])('returns false if the environment variable is set to a falsy value: %s', (value, expected) => {
179+
// Prepare
180+
vi.stubEnv('TEST_ENV', value);
191181

192-
// Assess
193-
expect(result).toBe(expected);
194-
}
195-
);
182+
// Act
183+
const result = getBooleanFromEnv({
184+
key: 'TEST_ENV',
185+
extendedParsing: true,
186+
});
187+
188+
// Assess
189+
expect(result).toBe(expected);
190+
});
196191
});
197192

198193
describe('Function: isDevMode', () => {

‎packages/logger/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"url": "https://github.com/aws-powertools/powertools-lambda-typescript/issues"
100100
},
101101
"dependencies": {
102-
"@aws/lambda-invoke-store": "0.2.1",
102+
"@aws/lambda-invoke-store": "0.2.2",
103103
"@aws-lambda-powertools/commons": "2.29.0",
104104
"lodash.merge": "^4.6.2"
105105
},

‎packages/metrics/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"url": "https://github.com/aws-powertools/powertools-lambda-typescript/issues"
9090
},
9191
"dependencies": {
92-
"@aws/lambda-invoke-store": "0.2.1",
92+
"@aws/lambda-invoke-store": "0.2.2",
9393
"@aws-lambda-powertools/commons": "2.29.0"
9494
},
9595
"keywords": [

‎packages/testing/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@
100100
"dependencies": {
101101
"@aws-cdk/toolkit-lib": "^1.11.0",
102102
"@aws-sdk/client-lambda": "^3.939.0",
103-
"@aws/lambda-invoke-store": "0.2.1",
103+
"@aws/lambda-invoke-store": "0.2.2",
104104
"@smithy/util-utf8": "^4.0.0",
105105
"aws-cdk-lib": "^2.228.0",
106-
"esbuild": "^0.27.0",
106+
"esbuild": "^0.27.1",
107107
"promise-retry": "^2.0.1"
108108
},
109109
"devDependencies": {

0 commit comments

Comments
 (0)