Repository Name
stringlengths 1
28
| Git URL
stringlengths 26
64
| SHA
stringlengths 40
40
| Author
stringlengths 2
37
| Commit Date
stringlengths 19
19
| Description
stringlengths 13
160
| Body
stringlengths 8
30.2k
| Full Commit Message
stringlengths 36
42.6k
| Git Diff
stringlengths 22
22.6M
⌀ |
|---|---|---|---|---|---|---|---|---|
cloud-hypervisor
|
https://github.com/cloud-hypervisor/cloud-hypervisor
|
0eba2d1b817fd6fb0c2691b1ee3f950b66ce76a2
|
dependabot[bot]
|
2024-01-04 05:24:23
|
build: Bump micro_http from `a4d632f` to `e75dfa1`
|
Bumps [micro_http](https://github.com/firecracker-microvm/micro-http) from `a4d632f` to `e75dfa1`.
- [Commits](https://github.com/firecracker-microvm/micro-http/compare/a4d632f2c5ea45712c0d2002dc909a63879e85c3...e75dfa1eeea23b69caa7407bc2c3a76d7b7262fb)
---
|
build: Bump micro_http from `a4d632f` to `e75dfa1`
Bumps [micro_http](https://github.com/firecracker-microvm/micro-http) from `a4d632f` to `e75dfa1`.
- [Commits](https://github.com/firecracker-microvm/micro-http/compare/a4d632f2c5ea45712c0d2002dc909a63879e85c3...e75dfa1eeea23b69caa7407bc2c3a76d7b7262fb)
---
updated-dependencies:
- dependency-name: micro_http
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <[email protected]>
|
diff --git a/Cargo.lock b/Cargo.lock
index acd64a2173..42829099de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,7 +92,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
name = "api_client"
version = "0.1.0"
dependencies = [
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -120,7 +120,7 @@ dependencies = [
"vm-fdt",
"vm-memory",
"vm-migration",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -354,7 +354,7 @@ dependencies = [
"virtio-queue",
"vm-memory",
"vm-virtio",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -463,7 +463,7 @@ dependencies = [
"tracer",
"vm-memory",
"vmm",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
"wait-timeout",
"zbus",
]
@@ -603,7 +603,7 @@ dependencies = [
"vm-device",
"vm-memory",
"vm-migration",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -1023,7 +1023,7 @@ dependencies = [
"thiserror",
"vfio-ioctls",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -1150,7 +1150,7 @@ source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.6.0-
dependencies = [
"serde",
"serde_derive",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -1160,7 +1160,7 @@ source = "git+https://github.com/rust-vmm/kvm-ioctls?branch=main#23a3bb045a467e6
dependencies = [
"kvm-bindings",
"libc",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -1262,10 +1262,10 @@ dependencies = [
[[package]]
name = "micro_http"
version = "0.1.0"
-source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#a4d632f2c5ea45712c0d2002dc909a63879e85c3"
+source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#e75dfa1eeea23b69caa7407bc2c3a76d7b7262fb"
dependencies = [
"libc",
- "vmm-sys-util",
+ "vmm-sys-util 0.12.1",
]
[[package]]
@@ -1295,7 +1295,7 @@ dependencies = [
"libc",
"serde",
"serde_derive",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
"zerocopy",
]
@@ -1306,7 +1306,7 @@ source = "git+https://github.com/rust-vmm/mshv?branch=main#0dd4d3452a7f2e95199f4
dependencies = [
"libc",
"mshv-bindings",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -1322,7 +1322,7 @@ dependencies = [
name = "net_gen"
version = "0.1.0"
dependencies = [
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -1347,7 +1347,7 @@ dependencies = [
"virtio-queue",
"vm-memory",
"vm-virtio",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -1534,7 +1534,7 @@ dependencies = [
"vm-device",
"vm-memory",
"vm-migration",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -1784,7 +1784,7 @@ dependencies = [
"libc",
"log",
"thiserror",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2162,7 +2162,7 @@ dependencies = [
"serde",
"serde_json",
"ssh2",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
"wait-timeout",
]
@@ -2219,7 +2219,7 @@ dependencies = [
"log",
"net_gen",
"thiserror",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2327,7 +2327,7 @@ dependencies = [
"serde_derive",
"syn 1.0.109",
"versionize_derive",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2345,7 +2345,7 @@ name = "vfio-bindings"
version = "0.4.0"
source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475"
dependencies = [
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2363,7 +2363,7 @@ dependencies = [
"thiserror",
"vfio-bindings",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2380,7 +2380,7 @@ dependencies = [
"thiserror",
"vfio-bindings",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2392,7 +2392,7 @@ dependencies = [
"bitflags 2.4.1",
"libc",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2407,7 +2407,7 @@ dependencies = [
"virtio-bindings",
"virtio-queue",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2426,7 +2426,7 @@ dependencies = [
"virtio-bindings",
"virtio-queue",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2444,7 +2444,7 @@ dependencies = [
"vhost-user-backend",
"virtio-bindings",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2484,7 +2484,7 @@ dependencies = [
"vm-memory",
"vm-migration",
"vm-virtio",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2496,7 +2496,7 @@ dependencies = [
"log",
"virtio-bindings",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2518,7 +2518,7 @@ dependencies = [
"thiserror",
"vfio-ioctls",
"vm-memory",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
]
[[package]]
@@ -2614,7 +2614,7 @@ dependencies = [
"vm-memory",
"vm-migration",
"vm-virtio",
- "vmm-sys-util",
+ "vmm-sys-util 0.11.1",
"zbus",
"zerocopy",
]
@@ -2631,6 +2631,16 @@ dependencies = [
"serde_derive",
]
+[[package]]
+name = "vmm-sys-util"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
[[package]]
name = "wait-timeout"
version = "0.2.0"
|
revanced-patches
|
https://github.com/ReVanced/revanced-patches
|
184b403df3d5285aabbe8481fbc52ea32d6e94cb
|
semantic-release-bot
|
2023-01-28 21:53:20
|
chore(release): 2.157.1-dev.2 [skip ci]
|
## [2.157.1-dev.2](https://github.com/revanced/revanced-patches/compare/v2.157.1-dev.1...v2.157.1-dev.2) (2023-01-28)
### Bug Fixes
* **youtube:** resolve duplicate preference keys ([#1550](https://github.com/revanced/revanced-patches/issues/1550)) ([aafdb89](https://github.com/revanced/revanced-patches/commit/aafdb891b2f0f243cb2d997a38ab3e6a7b46aba8))
|
chore(release): 2.157.1-dev.2 [skip ci]
## [2.157.1-dev.2](https://github.com/revanced/revanced-patches/compare/v2.157.1-dev.1...v2.157.1-dev.2) (2023-01-28)
### Bug Fixes
* **youtube:** resolve duplicate preference keys ([#1550](https://github.com/revanced/revanced-patches/issues/1550)) ([aafdb89](https://github.com/revanced/revanced-patches/commit/aafdb891b2f0f243cb2d997a38ab3e6a7b46aba8))
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1ca8c2de5..becd387e8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2.157.1-dev.2](https://github.com/revanced/revanced-patches/compare/v2.157.1-dev.1...v2.157.1-dev.2) (2023-01-28)
+
+
+### Bug Fixes
+
+* **youtube:** resolve duplicate preference keys ([#1550](https://github.com/revanced/revanced-patches/issues/1550)) ([aafdb89](https://github.com/revanced/revanced-patches/commit/aafdb891b2f0f243cb2d997a38ab3e6a7b46aba8))
+
## [2.157.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.157.0...v2.157.1-dev.1) (2023-01-28)
diff --git a/gradle.properties b/gradle.properties
index 423153d618..eeda220f11 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
kotlin.code.style = official
-version = 2.157.1-dev.1
+version = 2.157.1-dev.2
|
node
|
https://github.com/nodejs/node
|
b9a460e6ebff2f255495396884cb1d1d49838f4f
|
Michael Dawson
|
2022-02-18 01:49:39
|
build: allow manual run of feature request action
|
add "workflow_dispatch:" so that action can be run
manuallyl for debugging.
|
build: allow manual run of feature request action
add "workflow_dispatch:" so that action can be run
manuallyl for debugging.
Signed-off-by: Michael Dawson <[email protected]>
PR-URL: https://github.com/nodejs/node/pull/42037
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
|
diff --git a/.github/workflows/close-stale-feature-requests.yml b/.github/workflows/close-stale-feature-requests.yml
index 898dcbdecbb4b0..3e9147fbdd371a 100644
--- a/.github/workflows/close-stale-feature-requests.yml
+++ b/.github/workflows/close-stale-feature-requests.yml
@@ -1,5 +1,6 @@
name: Close stale feature requests
on:
+ workflow_dispatch:
schedule:
# Run every day at 1:00 AM UTC.
- cron: 0 1 * * *
|
vault
|
https://github.com/hashicorp/vault
|
357f5f7a0c6e0669b411b4aaa641aea41481218a
|
Brian Shumate
|
2019-12-03 00:25:59
|
Docs: Update Telemetry (#7959)
|
- Add wal_loadWAL metric
- Create section for Merkle Tree and WAL metrics
- Remove trailing spaces
|
Docs: Update Telemetry (#7959)
- Add wal_loadWAL metric
- Create section for Merkle Tree and WAL metrics
- Remove trailing spaces
|
diff --git a/website/source/docs/internals/telemetry.html.md b/website/source/docs/internals/telemetry.html.md
index 6fdc642babd1..424396b27d12 100644
--- a/website/source/docs/internals/telemetry.html.md
+++ b/website/source/docs/internals/telemetry.html.md
@@ -128,13 +128,11 @@ These metrics relate to policies and tokens.
| `vault.expire.renew-token` | Time taken to renew a token which does not need to invoke a logical backend | ms | summary |
| `vault.expire.register` | Time taken for register operations | ms | summary |
-Thes operations take a request and response with an associated lease and register a lease entry with lease ID
+These operations take a request and response with an associated lease and register a lease entry with lease ID
| Metric | Description | Unit | Type |
| :----- | :---------- | :--- | :--- |
| `vault.expire.register-auth` | Time taken for register authentication operations which create lease entries without lease ID | ms | summary |
-| `vault.merkle_flushdirty` | Time taken to flush any dirty pages to cold storage | ms | summary |
-| `vault.merkle_savecheckpoint` | Time taken to save the checkpoint | ms | summary |
| `vault.policy.get_policy` | Time taken to get a policy | ms | summary |
| `vault.policy.list_policies` | Time taken to list policies | ms | summary |
| `vault.policy.delete_policy` | Time taken to delete a policy | ms | summary |
@@ -145,11 +143,6 @@ Thes operations take a request and response with an associated lease and registe
| `vault.token.revoke` | Time taken to revoke a token | ms | summary |
| `vault.token.revoke-tree` | Time taken to revoke a token tree | ms | summary |
| `vault.token.store` | Time taken to store an updated token entry without writing to the secondary index | ms | summary |
-| `vault.wal_deletewals` | Time taken to delete a Write Ahead Log (WAL) | ms | summary |
-| `vault.wal_gc_deleted` | Number of Write Ahead Logs (WAL) deleted during each garbage collection run | WAL | counter |
-| `vault.wal_gc_total` | Total Number of Write Ahead Logs (WAL) on disk | WAL | counter |
-| `vault.wal_persistwals` | Time taken to persist a Write Ahead Log (WAL) | ms | summary |
-| `vault.wal_flushready` | Time taken to flush a ready Write Ahead Log (WAL) to storage | ms | summary |
## Auth Methods Metrics
@@ -168,13 +161,28 @@ These metrics relate to supported authentication methods.
| `vault.route.rollback.secret` | Time taken to perform a route rollback operation for the [K/V secret backend][kv-secrets-engine] | ms | summary |
| `vault.route.rollback.sys` | Time taken to perform a route rollback operation for the system backend | ms | summary |
+## Merkle Tree and Write Ahead Log Metrics
+
+These metrics relate to internal operations on Merkle Trees and Write Ahead Logs (WAL)
+
+| Metric | Description | Unit | Type |
+| :----- | :---------- | :--- | :--- |
+| `vault.merkle_flushdirty` | Time taken to flush any dirty pages to cold storage | ms | summary |
+| `vault.merkle_savecheckpoint` | Time taken to save the checkpoint | ms | summary |
+| `vault.wal_deletewals` | Time taken to delete a Write Ahead Log (WAL) | ms | summary |
+| `vault.wal_gc_deleted` | Number of Write Ahead Logs (WAL) deleted during each garbage collection run | WAL | counter |
+| `vault.wal_gc_total` | Total Number of Write Ahead Logs (WAL) on disk | WAL | counter |
+| `vault.wal_loadWAL` | Time taken to load a Write Ahead Log (WAL) | ms | summary |
+| `vault.wal_persistwals` | Time taken to persist a Write Ahead Log (WAL) | ms | summary |
+| `vault.wal_flushready` | Time taken to flush a ready Write Ahead Log (WAL) to storage | ms | summary |
+
## Replication Metrics
These metrics relate to [Vault Enterprise Replication](https://www.vaultproject.io/docs/enterprise/replication/index.html).
| Metric | Description | Unit | Type |
| :----- | :---------- | :--- | :--- |
-| `logshipper.streamWALs.missing_guard` | Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is not matched/found | missing guards | counter |
+| `logshipper.streamWALs.missing_guard` | Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is not matched/found | missing guards | counter |
| `logshipper.streamWALs.guard_found` | Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is matched/found | found guards | counter |
| `replication.fetchRemoteKeys` | Time taken to fetch keys from a remote cluster participating in replication prior to Merkle Tree based delta generation | ms | summary |
| `replication.merkleDiff` | Time taken to perform a Merkle Tree based delta generation between the clusters participating in replication | ms | summary |
|
unleash
|
https://github.com/Unleash/unleash
|
f8e34564aa9e2348878262296da00bfbeda36a39
|
Nuno Góis
|
2023-01-27 20:32:39
|
fix: delete variant button tooltip (#3014)
|
Small fix on the tooltip for the "delete variant" button in the new
environment variants form.
|
fix: delete variant button tooltip (#3014)
Small fix on the tooltip for the "delete variant" button in the new
environment variants form.
|
diff --git a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/VariantForm/VariantForm.tsx b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/VariantForm/VariantForm.tsx
index 6caf70b213bb..b8a05773abe6 100644
--- a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/VariantForm/VariantForm.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/VariantForm/VariantForm.tsx
@@ -10,6 +10,7 @@ import {
InputAdornment,
styled,
Switch,
+ Tooltip,
} from '@mui/material';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import { IPayload } from 'interfaces/featureToggle';
@@ -30,7 +31,7 @@ const StyledVariantForm = styled('div')(({ theme }) => ({
borderRadius: theme.shape.borderRadiusLarge,
}));
-const StyledDeleteButton = styled(IconButton)(({ theme }) => ({
+const StyledDeleteButtonTooltip = styled(Tooltip)(({ theme }) => ({
position: 'absolute',
top: theme.spacing(2),
right: theme.spacing(2),
@@ -293,12 +294,23 @@ export const VariantForm = ({
return (
<StyledVariantForm>
- <StyledDeleteButton
- onClick={() => removeVariant(variant.id)}
- disabled={isProtectedVariant(variant)}
+ <StyledDeleteButtonTooltip
+ arrow
+ title={
+ isProtectedVariant(variant)
+ ? 'You need to have at least one variable variant'
+ : 'Delete variant'
+ }
>
- <Delete />
- </StyledDeleteButton>
+ <div>
+ <IconButton
+ onClick={() => removeVariant(variant.id)}
+ disabled={isProtectedVariant(variant)}
+ >
+ <Delete />
+ </IconButton>
+ </div>
+ </StyledDeleteButtonTooltip>
<StyledTopRow>
<StyledNameContainer>
<StyledLabel>Variant name</StyledLabel>
|
rspack
|
https://github.com/web-infra-dev/rspack
|
b89df1d8c8c9c6cb5c60acf89bb8e6d54a1568c6
|
neverland
|
2024-11-04 13:53:55
|
perf(cli): enable Node.js compile cache (#8331)
|
* perf(cli): enable Node.js compile cache
* fix: no need for NODE_DISABLE_COMPILE_CACHE
|
perf(cli): enable Node.js compile cache (#8331)
* perf(cli): enable Node.js compile cache
* fix: no need for NODE_DISABLE_COMPILE_CACHE
|
diff --git a/packages/rspack-cli/bin/rspack.js b/packages/rspack-cli/bin/rspack.js
index 1b1c557b82ac..1510c6b18dc5 100755
--- a/packages/rspack-cli/bin/rspack.js
+++ b/packages/rspack-cli/bin/rspack.js
@@ -1,4 +1,17 @@
#!/usr/bin/env node
+const nodeModule = require("node:module");
+
+// enable on-disk code caching of all modules loaded by Node.js
+// requires Nodejs >= 22.8.0
+const { enableCompileCache } = nodeModule;
+if (enableCompileCache) {
+ try {
+ enableCompileCache();
+ } catch {
+ // ignore errors
+ }
+}
+
const { RspackCLI } = require("../dist/index");
async function runCLI() {
|
redwood
|
https://github.com/redwoodjs/redwood
|
fb306fab56e0ab86717e9f5823c5874fe0b39883
|
Dominic Saadi
|
2023-05-09 05:46:14
|
chore(docs): backport recent fixes to v5 (#8263)
|
* backport #8252
* backport #8243
|
chore(docs): backport recent fixes to v5 (#8263)
* backport #8252
* backport #8243
|
diff --git a/docs/versioned_docs/version-5.0/how-to/build-dashboards-fast-with-tremor.md b/docs/versioned_docs/version-5.0/how-to/build-dashboards-fast-with-tremor.md
index c772a6a32723..36a149b5de4b 100644
--- a/docs/versioned_docs/version-5.0/how-to/build-dashboards-fast-with-tremor.md
+++ b/docs/versioned_docs/version-5.0/how-to/build-dashboards-fast-with-tremor.md
@@ -1,6 +1,6 @@
---
-description: "Learn how to build dashboards fast using the termor React library of data visualization components."
+description: "Learn how to build dashboards fast using the Tremor React library of data visualization components."
---
# Build Dashboards Fast with Tremor
diff --git a/docs/versioned_docs/version-5.0/tutorial/chapter4/authentication.md b/docs/versioned_docs/version-5.0/tutorial/chapter4/authentication.md
index 89aa7591595e..0ad9d366f940 100644
--- a/docs/versioned_docs/version-5.0/tutorial/chapter4/authentication.md
+++ b/docs/versioned_docs/version-5.0/tutorial/chapter4/authentication.md
@@ -490,7 +490,7 @@ And after clicking "Signup" you should end up back on the homepage, where everyt
-Awesome! Signing up will automatically log you in (although this behavior [can be changed](../../authentication.md#signuphandler)) and if you look in the code for the `SignupPage` you'll see where the redirect to the homepage takes place (hint: check out line 21).
+Awesome! Signing up will automatically log you in (although this behavior [can be changed](../../auth/dbauth.md#signuphandler)) and if you look in the code for the `SignupPage` you'll see where the redirect to the homepage takes place (hint: check out line 21).
## Add a Logout Link
|
zitadel
|
https://github.com/zitadel/zitadel
|
c37d55b069f268a87c4ec2c2287345ab2c261324
|
Silvan
|
2020-09-11 18:21:50
|
fix: User grant id key (#731)
|
* fix: log id and error message
* fix: user grant by id correct search field
|
fix: User grant id key (#731)
* fix: log id and error message
* fix: user grant by id correct search field
|
diff --git a/internal/token/repository/view/token.go b/internal/token/repository/view/token.go
index 5a90ad9e1fc..24ae43d8a64 100644
--- a/internal/token/repository/view/token.go
+++ b/internal/token/repository/view/token.go
@@ -1,16 +1,15 @@
package view
import (
- global_model "github.com/caos/zitadel/internal/model"
"time"
- "github.com/jinzhu/gorm"
- "github.com/lib/pq"
-
"github.com/caos/zitadel/internal/errors"
+ global_model "github.com/caos/zitadel/internal/model"
token_model "github.com/caos/zitadel/internal/token/model"
"github.com/caos/zitadel/internal/token/repository/view/model"
"github.com/caos/zitadel/internal/view/repository"
+ "github.com/jinzhu/gorm"
+ "github.com/lib/pq"
)
func TokenByID(db *gorm.DB, table, tokenID string) (*model.Token, error) {
@@ -18,7 +17,7 @@ func TokenByID(db *gorm.DB, table, tokenID string) (*model.Token, error) {
query := repository.PrepareGetByKey(table, model.TokenSearchKey(token_model.TokenSearchKeyTokenID), tokenID)
err := query(db, token)
if errors.IsNotFound(err) {
- return nil, errors.ThrowNotFound(nil, "VIEW-Nqwf1", "Errors.Token.NotFound")
+ return nil, errors.ThrowNotFound(nil, "VIEW-6ub3p", "Errors.Token.NotFound")
}
return token, err
}
diff --git a/internal/usergrant/model/user_grant_view.go b/internal/usergrant/model/user_grant_view.go
index c75495cc75b..e4776ea0b47 100644
--- a/internal/usergrant/model/user_grant_view.go
+++ b/internal/usergrant/model/user_grant_view.go
@@ -48,6 +48,7 @@ const (
UserGrantSearchKeyGrantID
UserGrantSearchKeyOrgName
UserGrantSearchKeyRoleKey
+ UserGrantSearchKeyID
)
type UserGrantSearchQuery struct {
diff --git a/internal/usergrant/repository/view/model/user_grant_query.go b/internal/usergrant/repository/view/model/user_grant_query.go
index b712d81d2d4..a3c3e063005 100644
--- a/internal/usergrant/repository/view/model/user_grant_query.go
+++ b/internal/usergrant/repository/view/model/user_grant_query.go
@@ -65,6 +65,8 @@ func (key UserGrantSearchKey) ToColumnName() string {
return UserGrantKeyOrgName
case grant_model.UserGrantSearchKeyRoleKey:
return UserGrantKeyRole
+ case grant_model.UserGrantSearchKeyID:
+ return UserGrantKeyID
default:
return ""
}
diff --git a/internal/usergrant/repository/view/user_grant_view.go b/internal/usergrant/repository/view/user_grant_view.go
index 57047479362..a3d2d87d356 100644
--- a/internal/usergrant/repository/view/user_grant_view.go
+++ b/internal/usergrant/repository/view/user_grant_view.go
@@ -10,13 +10,13 @@ import (
)
func UserGrantByID(db *gorm.DB, table, grantID string) (*model.UserGrantView, error) {
- user := new(model.UserGrantView)
- query := repository.PrepareGetByKey(table, model.UserGrantSearchKey(grant_model.UserGrantSearchKeyGrantID), grantID)
- err := query(db, user)
+ grant := new(model.UserGrantView)
+ query := repository.PrepareGetByKey(table, model.UserGrantSearchKey(grant_model.UserGrantSearchKeyID), grantID)
+ err := query(db, grant)
if caos_errs.IsNotFound(err) {
- return nil, caos_errs.ThrowNotFound(nil, "VIEW-Nqwf1", "Errors.Token.NotFound")
+ return nil, caos_errs.ThrowNotFound(nil, "VIEW-Nqwf1", "Errors.UserGrant.NotFound")
}
- return user, err
+ return grant, err
}
func UserGrantByIDs(db *gorm.DB, table, resourceOwnerID, projectID, userID string) (*model.UserGrantView, error) {
|
components
|
https://github.com/angular/components
|
46a4db2d4fb6b23278901e6dcbd7d94a4b8b7374
|
Miles Malerba
|
2022-12-14 02:52:41
|
fix(material/form-field): allow getting harness by validity (#26232)
|
* fix(material/form-field): allow getting harness by validity
* fixup! fix(material/form-field): allow getting harness by validity
|
fix(material/form-field): allow getting harness by validity (#26232)
* fix(material/form-field): allow getting harness by validity
* fixup! fix(material/form-field): allow getting harness by validity
|
diff --git a/src/material/form-field/testing/form-field-harness-filters.ts b/src/material/form-field/testing/form-field-harness-filters.ts
index 64809f875db5..ead796b38adf 100644
--- a/src/material/form-field/testing/form-field-harness-filters.ts
+++ b/src/material/form-field/testing/form-field-harness-filters.ts
@@ -14,4 +14,6 @@ export interface FormFieldHarnessFilters extends BaseHarnessFilters {
floatingLabelText?: string | RegExp;
/** Filters based on whether the form field has error messages. */
hasErrors?: boolean;
+ /** Filters based on whether the form field value is valid. */
+ isValid?: boolean;
}
diff --git a/src/material/form-field/testing/form-field-harness.ts b/src/material/form-field/testing/form-field-harness.ts
index cd523d483061..3793c5f4a4ba 100644
--- a/src/material/form-field/testing/form-field-harness.ts
+++ b/src/material/form-field/testing/form-field-harness.ts
@@ -248,6 +248,11 @@ export class MatFormFieldHarness extends _MatFormFieldHarnessBase<
'hasErrors',
options.hasErrors,
async (harness, hasErrors) => (await harness.hasErrors()) === hasErrors,
+ )
+ .addOption(
+ 'isValid',
+ options.isValid,
+ async (harness, isValid) => (await harness.isControlValid()) === isValid,
);
}
diff --git a/src/material/form-field/testing/shared.spec.ts b/src/material/form-field/testing/shared.spec.ts
index a0379870a745..b4e5e0a786f9 100644
--- a/src/material/form-field/testing/shared.spec.ts
+++ b/src/material/form-field/testing/shared.spec.ts
@@ -197,6 +197,17 @@ export function runHarnessTests(
);
});
+ it('should be able to get form-field by validity', async () => {
+ let invalid = await loader.getAllHarnesses(formFieldHarness.with({isValid: false}));
+ expect(invalid.length).toBe(0);
+
+ fixture.componentInstance.requiredControl.setValue('');
+ dispatchFakeEvent(fixture.nativeElement.querySelector('#with-errors input'), 'blur');
+
+ invalid = await loader.getAllHarnesses(formFieldHarness.with({isValid: false}));
+ expect(invalid.length).toBe(1);
+ });
+
it('should be able to get error harnesses from the form-field harness', async () => {
const formFields = await loader.getAllHarnesses(formFieldHarness);
expect(await formFields[1].getErrors()).toEqual([]);
diff --git a/src/material/legacy-form-field/testing/form-field-harness.ts b/src/material/legacy-form-field/testing/form-field-harness.ts
index a38344ddc094..535763a5cdc7 100644
--- a/src/material/legacy-form-field/testing/form-field-harness.ts
+++ b/src/material/legacy-form-field/testing/form-field-harness.ts
@@ -57,6 +57,11 @@ export class MatLegacyFormFieldHarness extends _MatFormFieldHarnessBase<
'hasErrors',
options.hasErrors,
async (harness, hasErrors) => (await harness.hasErrors()) === hasErrors,
+ )
+ .addOption(
+ 'isValid',
+ options.isValid,
+ async (harness, isValid) => (await harness.isControlValid()) === isValid,
);
}
diff --git a/tools/public_api_guard/material/form-field-testing.md b/tools/public_api_guard/material/form-field-testing.md
index 2e92006fbc4c..63bc03460e3c 100644
--- a/tools/public_api_guard/material/form-field-testing.md
+++ b/tools/public_api_guard/material/form-field-testing.md
@@ -28,6 +28,7 @@ export type FormFieldControlHarness = MatInputHarness | MatSelectHarness | MatDa
export interface FormFieldHarnessFilters extends BaseHarnessFilters {
floatingLabelText?: string | RegExp;
hasErrors?: boolean;
+ isValid?: boolean;
}
// @public
|
Files
|
https://github.com/JohnSundell/Files
|
886e170593a8ed9c9fd9b17b87885eb906e960a2
|
Marco Gavelli
|
2022-11-27 21:13:11
|
Fix: Fixed issue where tags loaded slowly (#10577)
|
* Geee
* Downgrade to version 4
* Remove upgrade from connection string
* Recreate DB if version > 4
|
Fix: Fixed issue where tags loaded slowly (#10577)
* Geee
* Downgrade to version 4
* Remove upgrade from connection string
* Recreate DB if version > 4
|
⚠️ HTTP 404: Not Found
|
deno
|
https://github.com/denoland/deno
|
8f854782b13658f169920a1a7a21b8e6b64a0c00
|
Bartek Iwańczuk
|
2023-08-10 09:31:35
|
fix(ext/timers): some timers are not resolved (#20055)
|
Fixes https://github.com/denoland/deno/issues/19866
|
fix(ext/timers): some timers are not resolved (#20055)
Fixes https://github.com/denoland/deno/issues/19866
|
diff --git a/cli/tests/unit/timers_test.ts b/cli/tests/unit/timers_test.ts
index c50cb779c646ff..5c076ad0903351 100644
--- a/cli/tests/unit/timers_test.ts
+++ b/cli/tests/unit/timers_test.ts
@@ -727,3 +727,32 @@ Deno.test({
assertEquals(output, "");
},
});
+
+// Regression test for https://github.com/denoland/deno/issues/19866
+Deno.test({
+ name: "regression for #19866",
+ fn: async () => {
+ const timeoutsFired = [];
+
+ // deno-lint-ignore require-await
+ async function start(n: number) {
+ let i = 0;
+ const intervalId = setInterval(() => {
+ i++;
+ if (i > 2) {
+ clearInterval(intervalId!);
+ }
+ timeoutsFired.push(n);
+ }, 20);
+ }
+
+ for (let n = 0; n < 100; n++) {
+ start(n);
+ }
+
+ // 3s should be plenty of time for all the intervals to fire
+ // but it might still be flaky on CI.
+ await new Promise((resolve) => setTimeout(resolve, 3000));
+ assertEquals(timeoutsFired.length, 300);
+ },
+});
diff --git a/ext/web/02_timers.js b/ext/web/02_timers.js
index cfabdeb98b7ffd..ade1c7123cd0c4 100644
--- a/ext/web/02_timers.js
+++ b/ext/web/02_timers.js
@@ -243,6 +243,7 @@ function runAfterTimeout(task, millis, timerInfo) {
resolved: false,
prev: scheduledTimers.tail,
next: null,
+ task,
};
// Add timerObject to the end of the list.
@@ -286,7 +287,7 @@ function runAfterTimeout(task, millis, timerInfo) {
while (currentEntry !== null) {
if (currentEntry.millis <= timerObject.millis) {
currentEntry.resolved = true;
- ArrayPrototypePush(timerTasks, task);
+ ArrayPrototypePush(timerTasks, currentEntry.task);
removeFromScheduledTimers(currentEntry);
if (currentEntry === timerObject) {
|
zinit
|
https://github.com/zdharma-continuum/zinit
|
64fa4aef3ae517afe5444b24df9603e9d1a77a55
|
vladislav doster
|
2022-11-21 04:38:42
|
fix: remove broken gh-r zunit test for "warp" (#430)
|
* remove broken gh-r zunit test for "warp"
* set LC_CTYPE & LANG env variables for macOS
|
fix: remove broken gh-r zunit test for "warp" (#430)
* remove broken gh-r zunit test for "warp"
* set LC_CTYPE & LANG env variables for macOS
Signed-off-by: Vladislav Doster <[email protected]>
|
diff --git a/tests/gh-r.zunit b/tests/gh-r.zunit
index 0e6b3f6f3..a32168565 100755
--- a/tests/gh-r.zunit
+++ b/tests/gh-r.zunit
@@ -645,12 +645,6 @@ $kopia --version; assert $state equals 0
local volta="$ZBIN/volta"; assert "$volta" is_executable
run $volta --version; assert $state equals 0
}
-@test 'warp' { # Secure and simple terminal sharing
- ! [[ $OSTYPE =~ 'darwin*' ]] && skip 'Warp test skipped on Linux'
- run zinit lbin'!* -> warp' for spolu/warp; assert $state equals 0
- local warp="$ZBIN/warp"; assert "$warp" is_executable
- run $warp --version; assert $state equals 0
-}
@test 'whalebrew' { # Homebrew, but with Docker images
run zinit lbin'!* -> whalebrew' for whalebrew/whalebrew; assert $state equals 0
local whalebrew="$ZBIN/whalebrew"; assert "$whalebrew" is_executable
diff --git a/tests/plugins.zunit b/tests/plugins.zunit
index 59f7c1c7e..e30bda8cd 100755
--- a/tests/plugins.zunit
+++ b/tests/plugins.zunit
@@ -4,6 +4,8 @@
@setup {
zinit default-ice as'null' light-mode nocompile nocompletions
ZBIN=$ZPFX/bin
+ export LC_CTYPE=C
+ export LANG=C
}
# @test 'nnn' {
|
rspack
|
https://github.com/web-infra-dev/rspack
|
061cd7879d030a40195dc36278ff45d4db1daaf2
|
CPunisher
|
2024-07-02 11:33:56
|
fix: align source name conflict handling (#6993)
|
* Remove useless mediate var
* Fix source name conflict detection
* Add testcase
* Fix clippy
* Fix typo
* Sort module_to_source_name before handling conflict
* Update and align testcase with mini-css-extract-plugin
* fix: directly collect HashMap
---------
|
fix: align source name conflict handling (#6993)
* Remove useless mediate var
* Fix source name conflict detection
* Add testcase
* Fix clippy
* Fix typo
* Sort module_to_source_name before handling conflict
* Update and align testcase with mini-css-extract-plugin
* fix: directly collect HashMap
---------
Co-authored-by: Cong-Cong Pan <[email protected]>
|
diff --git a/Cargo.lock b/Cargo.lock
index ee22a1669730..c7a1195a9d60 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3480,6 +3480,7 @@ dependencies = [
"dashmap",
"derivative",
"futures",
+ "itertools 0.12.1",
"once_cell",
"pathdiff",
"rayon",
diff --git a/crates/rspack_plugin_devtool/Cargo.toml b/crates/rspack_plugin_devtool/Cargo.toml
index 588bd61728fe..35977ac2d201 100644
--- a/crates/rspack_plugin_devtool/Cargo.toml
+++ b/crates/rspack_plugin_devtool/Cargo.toml
@@ -12,6 +12,7 @@ async-trait = { workspace = true }
dashmap = { workspace = true }
derivative = { workspace = true }
futures = { workspace = true }
+itertools = { workspace = true }
once_cell = { workspace = true }
pathdiff = { workspace = true }
rayon = { workspace = true }
diff --git a/crates/rspack_plugin_devtool/src/lib.rs b/crates/rspack_plugin_devtool/src/lib.rs
index 95ac7e6b1dce..d8ba84d3e4fd 100644
--- a/crates/rspack_plugin_devtool/src/lib.rs
+++ b/crates/rspack_plugin_devtool/src/lib.rs
@@ -34,6 +34,7 @@ pub struct ModuleFilenameTemplateFnCtx {
pub namespace: String,
}
+#[derive(Debug, PartialEq, Eq, Hash)]
enum ModuleOrSource {
Source(String),
Module(ModuleIdentifier),
diff --git a/crates/rspack_plugin_devtool/src/source_map_dev_tool_plugin.rs b/crates/rspack_plugin_devtool/src/source_map_dev_tool_plugin.rs
index 74add6384a03..10aff0eafa8f 100644
--- a/crates/rspack_plugin_devtool/src/source_map_dev_tool_plugin.rs
+++ b/crates/rspack_plugin_devtool/src/source_map_dev_tool_plugin.rs
@@ -2,6 +2,7 @@ use std::{borrow::Cow, path::Path};
use derivative::Derivative;
use futures::future::{join_all, BoxFuture};
+use itertools::Itertools;
use once_cell::sync::Lazy;
use pathdiff::diff_paths;
use rayon::prelude::*;
@@ -169,8 +170,9 @@ impl SourceMapDevToolPlugin {
let output_options = &compilation.options.output;
let map_options = MapOptions::new(self.columns);
- let mapped_sources = raw_assets
- .par_iter()
+ let mut mapped_asstes: Vec<MappedAsset> = Vec::with_capacity(raw_assets.len());
+ let mut mapped_sources = raw_assets
+ .into_par_iter()
.map(|(file, asset)| {
let is_match = match &self.test {
Some(test) => test(file.to_owned()),
@@ -191,167 +193,166 @@ impl SourceMapDevToolPlugin {
.flatten()
.collect::<Vec<_>>();
- let mut used_names_set = HashSet::<String>::default();
- let mut mapped_buffer: Vec<(String, Vec<u8>, Option<Vec<u8>>)> =
- Vec::with_capacity(mapped_sources.len());
-
- let mut default_filenames = match &self.module_filename_template {
- ModuleFilenameTemplate::String(s) => mapped_sources
- .iter()
- .filter_map(|(_file, _asset, source_map)| source_map.as_ref())
- .flat_map(|source_map| source_map.sources())
- .collect::<Vec<_>>()
- .par_iter()
- .map(|source| {
- let module_or_source = if let Some(stripped) = source.strip_prefix("webpack://") {
- let source = make_paths_absolute(compilation.options.context.as_str(), stripped);
- let identifier = ModuleIdentifier::from(source.clone());
- match compilation
- .get_module_graph()
- .module_by_identifier(&identifier)
- {
- Some(module) => ModuleOrSource::Module(module.identifier()),
- None => ModuleOrSource::Source(source),
- }
- } else {
- ModuleOrSource::Source(source.to_string())
- };
- Some((
- ModuleFilenameHelpers::create_filename_of_string_template(
- &module_or_source,
- compilation,
- s,
- output_options,
- self.namespace.as_str(),
- ),
+ let source_map_modules = mapped_sources
+ .par_iter()
+ .filter_map(|(_file, _asset, source_map)| source_map.as_ref())
+ .flat_map(|source_map| source_map.sources())
+ .map(|source| {
+ let module_or_source = if let Some(stripped) = source.strip_prefix("webpack://") {
+ let source = make_paths_absolute(compilation.options.context.as_str(), stripped);
+ let identifier = ModuleIdentifier::from(source.clone());
+ match compilation
+ .get_module_graph()
+ .module_by_identifier(&identifier)
+ {
+ Some(module) => ModuleOrSource::Module(module.identifier()),
+ None => ModuleOrSource::Source(source),
+ }
+ } else {
+ ModuleOrSource::Source(source.to_string())
+ };
+ (source.to_string(), module_or_source)
+ })
+ .collect::<HashMap<_, _>>();
+
+ let module_source_names = source_map_modules.values().collect::<Vec<_>>();
+ let mut module_to_source_name = match &self.module_filename_template {
+ ModuleFilenameTemplate::String(s) => module_source_names
+ .into_par_iter()
+ .map(|module_or_source| {
+ let source_name = ModuleFilenameHelpers::create_filename_of_string_template(
module_or_source,
- ))
+ compilation,
+ s,
+ output_options,
+ self.namespace.as_str(),
+ );
+ (module_or_source, source_name)
})
- .collect::<Vec<_>>(),
+ .collect::<HashMap<_, _>>(),
ModuleFilenameTemplate::Fn(f) => {
- let features = mapped_sources
- .iter()
- .filter_map(|(_file, _asset, source_map)| source_map.as_ref())
- .flat_map(|source_map| source_map.sources())
- .map(|source| async {
- let module_or_source = if let Some(stripped) = source.strip_prefix("webpack://") {
- let source = make_paths_absolute(compilation.options.context.as_str(), stripped);
- let identifier = ModuleIdentifier::from(source.clone());
- match compilation
- .get_module_graph()
- .module_by_identifier(&identifier)
- {
- Some(module) => ModuleOrSource::Module(module.identifier()),
- None => ModuleOrSource::Source(source),
- }
- } else {
- ModuleOrSource::Source(source.to_string())
- };
-
- let filename = ModuleFilenameHelpers::create_filename_of_fn_template(
- &module_or_source,
+ let features = module_source_names
+ .into_par_iter()
+ .map(|module_or_source| async move {
+ let source_name = ModuleFilenameHelpers::create_filename_of_fn_template(
+ module_or_source,
compilation,
f,
output_options,
self.namespace.as_str(),
)
- .await;
-
- match filename {
- Ok(filename) => Ok(Some((filename, module_or_source))),
- Err(err) => Err(err),
- }
+ .await?;
+ Ok((module_or_source, source_name))
})
.collect::<Vec<_>>();
join_all(features)
.await
.into_iter()
- .collect::<Result<Vec<_>>>()?
+ .collect::<Result<HashMap<_, _>>>()?
}
};
- let mut default_filenames_index = 0;
-
- for (filename, asset, source_map) in mapped_sources {
- let source_map_buffer = match source_map {
- Some(mut source_map) => {
- source_map.set_file(Some(filename.clone()));
-
- let sources = source_map.sources_mut();
- for source in sources {
- let (source_name, module_or_source) = default_filenames[default_filenames_index]
- .take()
- .expect("expected a filename at the given index but found None");
- default_filenames_index += 1;
-
- let mut has_name = used_names_set.contains(&source_name);
- if !has_name {
- used_names_set.insert(source_name.clone());
- *source = Cow::from(source_name);
- continue;
- }
- // Try the fallback name first
- let mut source_name = match &self.fallback_module_filename_template {
- ModuleFilenameTemplate::String(s) => {
- ModuleFilenameHelpers::create_filename_of_string_template(
- &module_or_source,
- compilation,
- s,
- output_options,
- self.namespace.as_str(),
- )
- }
- ModuleFilenameTemplate::Fn(f) => {
- ModuleFilenameHelpers::create_filename_of_fn_template(
- &module_or_source,
- compilation,
- f,
- output_options,
- self.namespace.as_str(),
- )
- .await?
- }
- };
-
- has_name = used_names_set.contains(&source_name);
- if !has_name {
- used_names_set.insert(source_name.clone());
- *source = Cow::from(source_name);
- continue;
- }
+ let mut used_names_set = HashSet::<String>::default();
+ for (module_or_source, source_name) in
+ module_to_source_name
+ .iter_mut()
+ .sorted_by(|(key_a, _), (key_b, _)| {
+ let ident_a = match key_a {
+ ModuleOrSource::Module(identifier) => identifier,
+ ModuleOrSource::Source(source) => source.as_str(),
+ };
+ let ident_b = match key_b {
+ ModuleOrSource::Module(identifier) => identifier,
+ ModuleOrSource::Source(source) => source.as_str(),
+ };
+ ident_a.len().cmp(&ident_b.len())
+ })
+ {
+ let mut has_name = used_names_set.contains(source_name);
+ if !has_name {
+ used_names_set.insert(source_name.clone());
+ continue;
+ }
- // Otherwise, append stars until we have a valid name
- while has_name {
- source_name.push('*');
- has_name = used_names_set.contains(&source_name);
- }
- used_names_set.insert(source_name.clone());
- *source = Cow::from(source_name);
- }
- if self.no_sources {
- for content in source_map.sources_content_mut() {
- *content = Cow::from(String::default());
- }
- }
- if let Some(source_root) = &self.source_root {
- source_map.set_source_root(Some(source_root.clone()));
- }
- let mut source_map_buffer = Vec::new();
- source_map
- .to_writer(&mut source_map_buffer)
- .unwrap_or_else(|e| panic!("{}", e.to_string()));
- Some(source_map_buffer)
+ // Try the fallback name first
+ let mut new_source_name = match &self.fallback_module_filename_template {
+ ModuleFilenameTemplate::String(s) => {
+ ModuleFilenameHelpers::create_filename_of_string_template(
+ module_or_source,
+ compilation,
+ s,
+ output_options,
+ self.namespace.as_str(),
+ )
+ }
+ ModuleFilenameTemplate::Fn(f) => {
+ ModuleFilenameHelpers::create_filename_of_fn_template(
+ module_or_source,
+ compilation,
+ f,
+ output_options,
+ self.namespace.as_str(),
+ )
+ .await?
}
- None => None,
};
- let mut code_buffer = Vec::new();
- asset.to_writer(&mut code_buffer).into_diagnostic()?;
- mapped_buffer.push((filename.to_owned(), code_buffer, source_map_buffer));
+ has_name = used_names_set.contains(&new_source_name);
+ if !has_name {
+ used_names_set.insert(new_source_name.clone());
+ *source_name = new_source_name;
+ continue;
+ }
+
+ // Otherwise, append stars until we have a valid name
+ while has_name {
+ new_source_name.push('*');
+ has_name = used_names_set.contains(&new_source_name);
+ }
+ used_names_set.insert(new_source_name.clone());
+ *source_name = new_source_name;
}
- let mut mapped_asstes: Vec<MappedAsset> = Vec::with_capacity(raw_assets.len());
- for (filename, code_buffer, source_map_buffer) in mapped_buffer {
+ for (filename, _asset, source_map) in mapped_sources.iter_mut() {
+ if let Some(source_map) = source_map {
+ source_map.set_file(Some(filename.clone()));
+
+ let sources = source_map.sources_mut();
+ for source in sources {
+ let module_or_source = source_map_modules
+ .get(source.as_ref())
+ .expect("expected a module or source");
+ let source_name = module_to_source_name
+ .get(module_or_source)
+ .expect("expected a filename at the given index but found None")
+ .clone();
+ *source = Cow::from(source_name);
+ }
+ if self.no_sources {
+ for content in source_map.sources_content_mut() {
+ *content = Cow::from(String::default());
+ }
+ }
+ if let Some(source_root) = &self.source_root {
+ source_map.set_source_root(Some(source_root.clone()));
+ }
+ }
+ }
+
+ for (filename, asset, source_map) in mapped_sources {
+ let code_buffer = {
+ let mut code_buffer = Vec::new();
+ asset.to_writer(&mut code_buffer).into_diagnostic()?;
+ code_buffer
+ };
+ let source_map_buffer = source_map.map(|source_map| {
+ let mut source_map_buffer = Vec::new();
+ source_map
+ .to_writer(&mut source_map_buffer)
+ .unwrap_or_else(|e| panic!("{}", e.to_string()));
+ source_map_buffer
+ });
+
let mut asset = compilation
.assets()
.get(&filename)
diff --git a/packages/rspack-test-tools/tests/configCases/source-map/conflict/a.js b/packages/rspack-test-tools/tests/configCases/source-map/conflict/a.js
new file mode 100644
index 000000000000..59c9329c5d4f
--- /dev/null
+++ b/packages/rspack-test-tools/tests/configCases/source-map/conflict/a.js
@@ -0,0 +1,3 @@
+import test from "./common";
+console.log("a");
+console.log(test());
diff --git a/packages/rspack-test-tools/tests/configCases/source-map/conflict/b.js b/packages/rspack-test-tools/tests/configCases/source-map/conflict/b.js
new file mode 100644
index 000000000000..0425a41680a1
--- /dev/null
+++ b/packages/rspack-test-tools/tests/configCases/source-map/conflict/b.js
@@ -0,0 +1,3 @@
+import test from "./common";
+console.log("b");
+console.log(test());
diff --git a/packages/rspack-test-tools/tests/configCases/source-map/conflict/common.js b/packages/rspack-test-tools/tests/configCases/source-map/conflict/common.js
new file mode 100644
index 000000000000..fc20ead70ac2
--- /dev/null
+++ b/packages/rspack-test-tools/tests/configCases/source-map/conflict/common.js
@@ -0,0 +1,3 @@
+export default function test() {
+ console.log("test");
+}
diff --git a/packages/rspack-test-tools/tests/configCases/source-map/conflict/index.js b/packages/rspack-test-tools/tests/configCases/source-map/conflict/index.js
new file mode 100644
index 000000000000..c2e0e754c622
--- /dev/null
+++ b/packages/rspack-test-tools/tests/configCases/source-map/conflict/index.js
@@ -0,0 +1,18 @@
+import("./a");
+import("./b");
+
+it("conflict", () => {
+ const fs = require("fs");
+ const source_a = fs.readFileSync(__dirname + "/a_js.bundle0.js.map", "utf-8");
+ const source_b = fs.readFileSync(__dirname + "/b_js.bundle0.js.map", "utf-8");
+ const map_a = JSON.parse(source_a);
+ const map_b = JSON.parse(source_b);
+ expect(map_a.sources).toStrictEqual([
+ "webpack:///./a.js",
+ "webpack:///./common.js",
+ ]);
+ expect(map_b.sources).toStrictEqual([
+ "webpack:///./b.js",
+ "webpack:///./common.js",
+ ]);
+});
diff --git a/packages/rspack-test-tools/tests/configCases/source-map/conflict/rspack.config.js b/packages/rspack-test-tools/tests/configCases/source-map/conflict/rspack.config.js
new file mode 100644
index 000000000000..5505ff5d26ec
--- /dev/null
+++ b/packages/rspack-test-tools/tests/configCases/source-map/conflict/rspack.config.js
@@ -0,0 +1,9 @@
+/**
+ * @type {import('webpack').Configuration | import('@rspack/cli').Configuration}
+ */
+module.exports = {
+ mode: "development",
+ devtool: "source-map",
+ externals: ["source-map"],
+ entry: "./index.js",
+};
\ No newline at end of file
diff --git a/tests/plugin-test/css-extract/cases/devtool-source-map-from-loaders/expected/main.css.map b/tests/plugin-test/css-extract/cases/devtool-source-map-from-loaders/expected/main.css.map
index 3eb623ccfa8f..a7a0a9293b6a 100644
--- a/tests/plugin-test/css-extract/cases/devtool-source-map-from-loaders/expected/main.css.map
+++ b/tests/plugin-test/css-extract/cases/devtool-source-map-from-loaders/expected/main.css.map
@@ -1 +1 @@
-{"version":3,"file":"main.css","sources":["webpack:///./style.css?86c4"],"sourcesContent":["body {\n background: red;\n}\n"],"names":[],"mappings":"AAAA;EACE,eAAe;AACjB"}
\ No newline at end of file
+{"version":3,"file":"main.css","sources":["webpack:///./style.css"],"sourcesContent":["body {\n background: red;\n}\n"],"names":[],"mappings":"AAAA;EACE,eAAe;AACjB"}
\ No newline at end of file
diff --git a/tests/plugin-test/css-extract/cases/devtool-source-map/expected/main.css.map b/tests/plugin-test/css-extract/cases/devtool-source-map/expected/main.css.map
index 3eb623ccfa8f..a7a0a9293b6a 100644
--- a/tests/plugin-test/css-extract/cases/devtool-source-map/expected/main.css.map
+++ b/tests/plugin-test/css-extract/cases/devtool-source-map/expected/main.css.map
@@ -1 +1 @@
-{"version":3,"file":"main.css","sources":["webpack:///./style.css?86c4"],"sourcesContent":["body {\n background: red;\n}\n"],"names":[],"mappings":"AAAA;EACE,eAAe;AACjB"}
\ No newline at end of file
+{"version":3,"file":"main.css","sources":["webpack:///./style.css"],"sourcesContent":["body {\n background: red;\n}\n"],"names":[],"mappings":"AAAA;EACE,eAAe;AACjB"}
\ No newline at end of file
diff --git a/tests/plugin-test/css-extract/cases/pathinfo-devtool-source-map/expected/main.css.map b/tests/plugin-test/css-extract/cases/pathinfo-devtool-source-map/expected/main.css.map
index d3c9dd3454e1..dd33a0cd7b12 100644
--- a/tests/plugin-test/css-extract/cases/pathinfo-devtool-source-map/expected/main.css.map
+++ b/tests/plugin-test/css-extract/cases/pathinfo-devtool-source-map/expected/main.css.map
@@ -1 +1 @@
-{"version":3,"file":"main.css","sources":["webpack:///./style.css?86c4","webpack:///./other.css?264c","webpack:///./extra.css?9c40"],"sourcesContent":["body {\n background: red;\n}\n","body {\n background: blue;\n}\n","body {\n background: yellow;\n}\n"],"names":[],"mappings":";;;AAAA;EACE,eAAe;AACjB;;;;;ACFA;EACE,gBAAgB;AAClB;;;;;ACFA;EACE,kBAAkB;AACpB"}
\ No newline at end of file
+{"version":3,"file":"main.css","sources":["webpack:///./style.css","webpack:///./other.css","webpack:///./extra.css"],"sourcesContent":["body {\n background: red;\n}\n","body {\n background: blue;\n}\n","body {\n background: yellow;\n}\n"],"names":[],"mappings":";;;AAAA;EACE,eAAe;AACjB;;;;;ACFA;EACE,gBAAgB;AAClB;;;;;ACFA;EACE,kBAAkB;AACpB"}
\ No newline at end of file
|
skaffold
|
https://github.com/GoogleContainerTools/skaffold
|
71dd5be381080641112b69285a9d959b0ad99627
|
ericzzzzzzz
|
2023-06-23 03:29:15
|
fix: Clean up dev images except the last (#8897)
|
* fix: clean-up-images-in-devloop
* fix: wrap cleaning up logic
* chore: log
* chore: move query artifact back to the main goroutine
* chore: add test
* chore: increase timeout
* chore: delegate clean up job to localpruner to avoid warning logs when cache disabled
|
fix: Clean up dev images except the last (#8897)
* fix: clean-up-images-in-devloop
* fix: wrap cleaning up logic
* chore: log
* chore: move query artifact back to the main goroutine
* chore: add test
* chore: increase timeout
* chore: delegate clean up job to localpruner to avoid warning logs when cache disabled
|
diff --git a/integration/dev_test.go b/integration/dev_test.go
index a9ed6d72161..df7b1e177ea 100644
--- a/integration/dev_test.go
+++ b/integration/dev_test.go
@@ -368,6 +368,50 @@ func TestDevPortForward(t *testing.T) {
}
}
+func TestDevDeletePreviousBuiltImages(t *testing.T) {
+ tests := []struct {
+ name string
+ dir string
+ }{
+ {
+ name: "microservices",
+ dir: "examples/microservices"},
+ }
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ MarkIntegrationTest(t, CanRunWithoutGcp)
+ // Run skaffold build first to fail quickly on a build failure
+ skaffold.Build().InDir(test.dir).RunOrFail(t)
+
+ ns, k8sClient := SetupNamespace(t)
+
+ rpcAddr := randomPort()
+ skaffold.Dev("--status-check=false", "--port-forward", "--rpc-port", rpcAddr).InDir(test.dir).InNs(ns.Name).RunBackground(t)
+
+ _, entries := apiEvents(t, rpcAddr)
+
+ waitForPortForwardEvent(t, entries, "leeroy-app", "service", ns.Name, "leeroooooy app!!\n")
+ deployment := k8sClient.GetDeployment("leeroy-app")
+ image := deployment.Spec.Template.Spec.Containers[0].Image
+
+ original, perms, fErr := replaceInFile("leeroooooy app!!", "test string", fmt.Sprintf("%s/leeroy-app/app.go", test.dir))
+ failNowIfError(t, fErr)
+ defer func() {
+ if original != nil {
+ os.WriteFile(fmt.Sprintf("%s/leeroy-app/app.go", test.dir), original, perms)
+ }
+ }()
+
+ waitForPortForwardEvent(t, entries, "leeroy-app", "service", ns.Name, "test string\n")
+ client := SetupDockerClient(t)
+ ctx := context.TODO()
+ wait.Poll(3*time.Second, time.Minute*2, func() (done bool, err error) {
+ return !client.ImageExists(ctx, image), nil
+ })
+ })
+ }
+}
+
func TestDevPortForwardDefaultNamespace(t *testing.T) {
MarkIntegrationTest(t, CanRunWithoutGcp)
diff --git a/pkg/skaffold/build/local/local.go b/pkg/skaffold/build/local/local.go
index f1cc930ffc3..368894b367b 100644
--- a/pkg/skaffold/build/local/local.go
+++ b/pkg/skaffold/build/local/local.go
@@ -57,6 +57,21 @@ func (b *Builder) PostBuild(ctx context.Context, _ io.Writer) error {
return nil
}
+// Prune uses the docker API client to remove all images built with Skaffold
+func (b *Builder) Prune(ctx context.Context, _ io.Writer) error {
+ var toPrune []string
+ seen := make(map[string]bool)
+
+ for _, img := range b.builtImages {
+ if !seen[img] && !b.localPruner.isPruned(img) {
+ toPrune = append(toPrune, img)
+ seen[img] = true
+ }
+ }
+ _, err := b.localDocker.Prune(ctx, toPrune, b.pruneChildren)
+ return err
+}
+
func (b *Builder) Concurrency() *int { return b.local.Concurrency }
func (b *Builder) PushImages() bool {
@@ -89,6 +104,20 @@ func (b *Builder) buildArtifact(ctx context.Context, out io.Writer, a *latest.Ar
}
imageID := digestOrImageID
+ if b.mode == config.RunModes.Dev {
+ artifacts, err := b.artifactStore.GetArtifacts([]*latest.Artifact{a})
+ if err != nil {
+ log.Entry(ctx).Debugf("failed to get artifacts from store, err: %v", err)
+ }
+ // delete previous built images asynchronously
+ go func() {
+ if len(artifacts) > 0 {
+ bgCtx := context.Background()
+ id, _ := b.getImageIDForTag(bgCtx, artifacts[0].Tag)
+ b.localPruner.runPrune(bgCtx, []string{id})
+ }
+ }()
+ }
b.builtImages = append(b.builtImages, imageID)
return build.TagWithImageID(ctx, tag, imageID, b.localDocker)
}
diff --git a/pkg/skaffold/build/local/types.go b/pkg/skaffold/build/local/types.go
index 94893324846..fef419ae43a 100644
--- a/pkg/skaffold/build/local/types.go
+++ b/pkg/skaffold/build/local/types.go
@@ -123,21 +123,6 @@ func NewBuilder(ctx context.Context, bCtx BuilderContext, buildCfg *latest.Local
}, nil
}
-// Prune uses the docker API client to remove all images built with Skaffold
-func (b *Builder) Prune(ctx context.Context, _ io.Writer) error {
- var toPrune []string
- seen := make(map[string]bool)
-
- for _, img := range b.builtImages {
- if !seen[img] && !b.localPruner.isPruned(img) {
- toPrune = append(toPrune, img)
- seen[img] = true
- }
- }
- _, err := b.localDocker.Prune(ctx, toPrune, b.pruneChildren)
- return err
-}
-
// artifactBuilder represents a per artifact builder interface
type artifactBuilder interface {
Build(ctx context.Context, out io.Writer, a *latest.Artifact, tag string, platforms platform.Matcher) (string, error)
|
influxdb
|
https://github.com/influxdata/influxdb
|
efbc4ae7c18cc10f2bae7e1cef6a05b0b6720bf9
|
Jonathan A. Sternberg
|
2020-06-02 04:27:50
|
feat(storage/flux): implement create empty for the window table reader (#18288)
|
This implements create empty for the window table reader and allows this
table read function to be used when it is specified. It will pass down
the create empty flag from the original window call into the storage
read function.
This also fixes the window table reader so it properly creates
individual tables for each window. Previously, it was constructing one
table for an entire series instead of one table per window.
Tests have been added to verify three edge case behaviors. The first is
the normal read operation where all values are present. The second is
when create empty is specified so null values may be created. The third
is with truncated boundaries to ensure that storage is read from and the
start and stop timestamps get correctly truncated.
|
feat(storage/flux): implement create empty for the window table reader (#18288)
This implements create empty for the window table reader and allows this
table read function to be used when it is specified. It will pass down
the create empty flag from the original window call into the storage
read function.
This also fixes the window table reader so it properly creates
individual tables for each window. Previously, it was constructing one
table for an entire series instead of one table per window.
Tests have been added to verify three edge case behaviors. The first is
the normal read operation where all values are present. The second is
when create empty is specified so null values may be created. The third
is with truncated boundaries to ensure that storage is read from and the
start and stop timestamps get correctly truncated.
|
diff --git a/query/stdlib/influxdata/influxdb/operators.go b/query/stdlib/influxdata/influxdb/operators.go
index 102155a511b..e18577287ed 100644
--- a/query/stdlib/influxdata/influxdb/operators.go
+++ b/query/stdlib/influxdata/influxdb/operators.go
@@ -111,6 +111,7 @@ type ReadWindowAggregatePhysSpec struct {
WindowEvery int64
Aggregates []plan.ProcedureKind
+ CreateEmpty bool
}
func (s *ReadWindowAggregatePhysSpec) Kind() plan.ProcedureKind {
@@ -123,6 +124,7 @@ func (s *ReadWindowAggregatePhysSpec) Copy() plan.ProcedureSpec {
ns.ReadRangePhysSpec = *s.ReadRangePhysSpec.Copy().(*ReadRangePhysSpec)
ns.WindowEvery = s.WindowEvery
ns.Aggregates = s.Aggregates
+ ns.CreateEmpty = s.CreateEmpty
return ns
}
diff --git a/query/stdlib/influxdata/influxdb/rules.go b/query/stdlib/influxdata/influxdb/rules.go
index f8d8b2fae15..92d28024448 100644
--- a/query/stdlib/influxdata/influxdb/rules.go
+++ b/query/stdlib/influxdata/influxdb/rules.go
@@ -766,8 +766,7 @@ func (PushDownWindowAggregateRule) Rewrite(ctx context.Context, pn plan.Node) (p
!window.Offset.IsZero() ||
windowSpec.TimeColumn != "_time" ||
windowSpec.StartColumn != "_start" ||
- windowSpec.StopColumn != "_stop" ||
- windowSpec.CreateEmpty {
+ windowSpec.StopColumn != "_stop" {
return pn, false, nil
}
@@ -776,6 +775,7 @@ func (PushDownWindowAggregateRule) Rewrite(ctx context.Context, pn plan.Node) (p
ReadRangePhysSpec: *fromSpec.Copy().(*ReadRangePhysSpec),
Aggregates: []plan.ProcedureKind{fnNode.Kind()},
WindowEvery: window.Every.Nanoseconds(),
+ CreateEmpty: windowSpec.CreateEmpty,
}), true, nil
}
diff --git a/query/stdlib/influxdata/influxdb/rules_test.go b/query/stdlib/influxdata/influxdb/rules_test.go
index a42d28cff0f..78442acb904 100644
--- a/query/stdlib/influxdata/influxdb/rules_test.go
+++ b/query/stdlib/influxdata/influxdb/rules_test.go
@@ -1224,13 +1224,14 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
}
// construct a simple result
- simpleResult := func(proc plan.ProcedureKind) *plantest.PlanSpec {
+ simpleResult := func(proc plan.ProcedureKind, createEmpty bool) *plantest.PlanSpec {
return &plantest.PlanSpec{
Nodes: []plan.Node{
plan.CreatePhysicalNode("ReadWindowAggregate", &influxdb.ReadWindowAggregatePhysSpec{
ReadRangePhysSpec: readRange,
Aggregates: []plan.ProcedureKind{proc},
WindowEvery: 60000000000,
+ CreateEmpty: createEmpty,
}),
},
}
@@ -1268,7 +1269,7 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
Name: "SimplePassMin",
Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
Before: simplePlanWithWindowAgg(window1m, "min", minProcedureSpec()),
- After: simpleResult("min"),
+ After: simpleResult("min", false),
})
// ReadRange -> window -> max => ReadWindowAggregate
@@ -1277,7 +1278,7 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
Name: "SimplePassMax",
Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
Before: simplePlanWithWindowAgg(window1m, "max", maxProcedureSpec()),
- After: simpleResult("max"),
+ After: simpleResult("max", false),
})
// ReadRange -> window -> mean => ReadWindowAggregate
@@ -1286,7 +1287,7 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
Name: "SimplePassMean",
Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
Before: simplePlanWithWindowAgg(window1m, "mean", meanProcedureSpec()),
- After: simpleResult("mean"),
+ After: simpleResult("mean", false),
})
// ReadRange -> window -> count => ReadWindowAggregate
@@ -1295,7 +1296,7 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
Name: "SimplePassCount",
Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
Before: simplePlanWithWindowAgg(window1m, "count", countProcedureSpec()),
- After: simpleResult("count"),
+ After: simpleResult("count", false),
})
// ReadRange -> window -> sum => ReadWindowAggregate
@@ -1304,7 +1305,7 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
Name: "SimplePassSum",
Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
Before: simplePlanWithWindowAgg(window1m, "sum", sumProcedureSpec()),
- After: simpleResult("sum"),
+ After: simpleResult("sum", false),
})
// Rewrite with successors
@@ -1384,10 +1385,16 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
badWindow5.StopColumn = "_stappp"
simpleMinUnchanged("BadStop", badWindow5)
- // Condition not met: createEmpty is not false
- badWindow6 := window1m
- badWindow6.CreateEmpty = true
- simpleMinUnchanged("BadCreateEmpty", badWindow6)
+ // Condition met: createEmpty is true.
+ window6 := window1m
+ window6.CreateEmpty = true
+ tests = append(tests, plantest.RuleTestCase{
+ Context: haveCaps,
+ Name: "CreateEmptyPassMin",
+ Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
+ Before: simplePlanWithWindowAgg(window6, "min", minProcedureSpec()),
+ After: simpleResult("min", true),
+ })
// Condition not met: duration too long.
simpleMinUnchanged("WindowTooLarge", window1y)
@@ -1554,7 +1561,7 @@ func TestPushDownWindowAggregateRule(t *testing.T) {
Name: "FailNoCaps",
Rules: []plan.Rule{influxdb.PushDownWindowAggregateRule{}},
Before: simplePlanWithWindowAgg(window1m, "count", countProcedureSpec()),
- After: simpleResult("count"),
+ After: simpleResult("count", false),
NoChange: true,
})
diff --git a/query/stdlib/influxdata/influxdb/source.go b/query/stdlib/influxdata/influxdb/source.go
index 7bbbbe9ad1b..c992b0da49b 100644
--- a/query/stdlib/influxdata/influxdb/source.go
+++ b/query/stdlib/influxdata/influxdb/source.go
@@ -351,6 +351,7 @@ func createReadWindowAggregateSource(s plan.ProcedureSpec, id execute.DatasetID,
},
WindowEvery: spec.WindowEvery,
Aggregates: spec.Aggregates,
+ CreateEmpty: spec.CreateEmpty,
},
a,
), nil
diff --git a/query/storage.go b/query/storage.go
index 17e235237ff..5dda7643592 100644
--- a/query/storage.go
+++ b/query/storage.go
@@ -73,6 +73,7 @@ type ReadWindowAggregateSpec struct {
ReadFilterSpec
WindowEvery int64
Aggregates []plan.ProcedureKind
+ CreateEmpty bool
}
// TableIterator is a table iterator that also keeps track of cursor statistics from the storage engine.
diff --git a/storage/flux/reader.go b/storage/flux/reader.go
index 921d7c61e4f..b1b07ccb943 100644
--- a/storage/flux/reader.go
+++ b/storage/flux/reader.go
@@ -592,10 +592,13 @@ func (wai *windowAggregateIterator) Do(f func(flux.Table) error) error {
if rs == nil {
return nil
}
- return wai.handleRead(f, rs, req.WindowEvery)
+ return wai.handleRead(f, rs)
}
-func (wai *windowAggregateIterator) handleRead(f func(flux.Table) error, rs storage.ResultSet, windowEvery int64) error {
+func (wai *windowAggregateIterator) handleRead(f func(flux.Table) error, rs storage.ResultSet) error {
+ windowEvery := wai.spec.WindowEvery
+ createEmpty := wai.spec.CreateEmpty
+
// these resources must be closed if not nil on return
var (
cur cursors.Cursor
@@ -627,19 +630,19 @@ READ:
switch typedCur := cur.(type) {
case cursors.IntegerArrayCursor:
cols, defs := determineTableColsForWindowAggregate(rs.Tags(), flux.TInt)
- table = newIntegerWindowTable(done, typedCur, bnds, windowEvery, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
+ table = newIntegerWindowTable(done, typedCur, bnds, windowEvery, createEmpty, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
case cursors.FloatArrayCursor:
cols, defs := determineTableColsForWindowAggregate(rs.Tags(), flux.TFloat)
- table = newFloatWindowTable(done, typedCur, bnds, windowEvery, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
+ table = newFloatWindowTable(done, typedCur, bnds, windowEvery, createEmpty, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
case cursors.UnsignedArrayCursor:
cols, defs := determineTableColsForWindowAggregate(rs.Tags(), flux.TUInt)
- table = newUnsignedWindowTable(done, typedCur, bnds, windowEvery, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
+ table = newUnsignedWindowTable(done, typedCur, bnds, windowEvery, createEmpty, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
case cursors.BooleanArrayCursor:
cols, defs := determineTableColsForWindowAggregate(rs.Tags(), flux.TBool)
- table = newBooleanWindowTable(done, typedCur, bnds, windowEvery, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
+ table = newBooleanWindowTable(done, typedCur, bnds, windowEvery, createEmpty, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
case cursors.StringArrayCursor:
cols, defs := determineTableColsForWindowAggregate(rs.Tags(), flux.TString)
- table = newStringWindowTable(done, typedCur, bnds, windowEvery, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
+ table = newStringWindowTable(done, typedCur, bnds, windowEvery, createEmpty, key, cols, rs.Tags(), defs, wai.cache, wai.alloc)
default:
panic(fmt.Sprintf("unreachable: %T", typedCur))
}
@@ -647,7 +650,7 @@ READ:
cur = nil
if !table.Empty() {
- if err := f(table); err != nil {
+ if err := splitWindows(wai.ctx, table, f); err != nil {
table.Close()
table = nil
return err
diff --git a/storage/flux/table.gen.go b/storage/flux/table.gen.go
index 490e9b80968..81c5c9101b8 100644
--- a/storage/flux/table.gen.go
+++ b/storage/flux/table.gen.go
@@ -9,6 +9,7 @@ package storageflux
import (
"sync"
+ "github.com/apache/arrow/go/arrow/array"
"github.com/influxdata/flux"
"github.com/influxdata/flux/arrow"
"github.com/influxdata/flux/execute"
@@ -102,7 +103,9 @@ type floatWindowTable struct {
floatTable
windowEvery int64
arr *cursors.FloatArray
+ nextTS int64
idxInArr int
+ createEmpty bool
}
func newFloatWindowTable(
@@ -110,6 +113,7 @@ func newFloatWindowTable(
cur cursors.FloatArrayCursor,
bounds execute.Bounds,
every int64,
+ createEmpty bool,
key flux.GroupKey,
cols []flux.ColMeta,
tags models.Tags,
@@ -123,6 +127,11 @@ func newFloatWindowTable(
cur: cur,
},
windowEvery: every,
+ createEmpty: createEmpty,
+ }
+ if t.createEmpty {
+ start := int64(bounds.Start)
+ t.nextTS = start + (every - start%every)
}
t.readTags(tags)
t.advance()
@@ -130,40 +139,126 @@ func newFloatWindowTable(
return t
}
-func (t *floatWindowTable) advance() bool {
+func (t *floatWindowTable) Do(f func(flux.ColReader) error) error {
+ return t.do(f, t.advance)
+}
+
+// createNextWindow will read the timestamps from the array
+// cursor and construct the values for the next window.
+func (t *floatWindowTable) createNextWindow() (start, stop *array.Int64, ok bool) {
+ var stopT int64
+ if t.createEmpty {
+ stopT = t.nextTS
+ t.nextTS += t.windowEvery
+ } else {
+ if !t.nextBuffer() {
+ return nil, nil, false
+ }
+ stopT = t.arr.Timestamps[t.idxInArr]
+ }
+
+ // Regain the window start time from the window end time.
+ startT := stopT - t.windowEvery
+ if startT < int64(t.bounds.Start) {
+ startT = int64(t.bounds.Start)
+ }
+ if stopT > int64(t.bounds.Stop) {
+ stopT = int64(t.bounds.Stop)
+ }
+
+ // If the start time is after our stop boundary,
+ // we exit here when create empty is true.
+ if t.createEmpty && startT >= int64(t.bounds.Stop) {
+ return nil, nil, false
+ }
+ start = arrow.NewInt([]int64{startT}, t.alloc)
+ stop = arrow.NewInt([]int64{stopT}, t.alloc)
+ return start, stop, true
+}
+
+// nextAt will retrieve the next value that can be used with
+// the given stop timestamp. If no values can be used with the timestamp,
+// it will return the default value and false.
+func (t *floatWindowTable) nextAt(ts int64) (v float64, ok bool) {
+ if !t.nextBuffer() {
+ return
+ } else if !t.isInWindow(ts, t.arr.Timestamps[t.idxInArr]) {
+ return
+ }
+ v, ok = t.arr.Values[t.idxInArr], true
+ t.idxInArr++
+ return v, ok
+}
+
+// isInWindow will check if the given time at stop can be used within
+// the window stop time for ts. The ts may be a truncated stop time
+// because of a restricted boundary while stop will be the true
+// stop time returned by storage.
+func (t *floatWindowTable) isInWindow(ts int64, stop int64) bool {
+ // This method checks if the stop time is a valid stop time for
+ // that interval. This calculation is different from the calculation
+ // of the window itself. For example, for a 10 second window that
+ // starts at 20 seconds, we would include points between [20, 30).
+ // The stop time for this interval would be 30, but because the stop
+ // time can be truncated, valid stop times range from anywhere between
+ // (20, 30]. The storage engine will always produce 30 as the end time
+ // but we may have truncated the stop time because of the boundary
+ // and this is why we are checking for this range instead of checking
+ // if the two values are equal.
+ start := stop - t.windowEvery
+ return start < ts && ts <= stop
+}
+
+// nextBuffer will ensure the array cursor is filled
+// and will return true if there is at least one value
+// that can be read from it.
+func (t *floatWindowTable) nextBuffer() bool {
+ // Discard the current array cursor if we have
+ // exceeded it.
+ if t.arr != nil && t.idxInArr >= t.arr.Len() {
+ t.arr = nil
+ }
+
+ // Retrieve the next array cursor if needed.
if t.arr == nil {
- t.arr = t.cur.Next()
- if t.arr.Len() == 0 {
- t.arr = nil
+ arr := t.cur.Next()
+ if arr.Len() == 0 {
return false
}
- t.idxInArr = 0
+ t.arr, t.idxInArr = arr, 0
+ }
+ return true
+}
+
+// appendValues will scan the timestamps and append values
+// that match those timestamps from the buffer.
+func (t *floatWindowTable) appendValues(intervals []int64, appendValue func(v float64), appendNull func()) {
+ for i := 0; i < len(intervals); i++ {
+ if v, ok := t.nextAt(intervals[i]); ok {
+ appendValue(v)
+ continue
+ }
+ appendNull()
}
+}
+
+func (t *floatWindowTable) advance() bool {
+ // Create the timestamps for the next window.
+ start, stop, ok := t.createNextWindow()
+ if !ok {
+ return false
+ }
+ values := t.mergeValues(stop.Int64Values())
// Retrieve the buffer for the data to avoid allocating
// additional slices. If the buffer is still being used
// because the references were retained, then we will
// allocate a new buffer.
- columnReader := t.allocateBuffer(1)
- // regain the window start time from the window end time
- rangeStart := int64(t.bounds.Start)
- rangeEnd := int64(t.bounds.Stop)
- stop := t.arr.Timestamps[t.idxInArr]
- start := stop - t.windowEvery
- if start < rangeStart {
- start = rangeStart
- }
- if stop > rangeEnd {
- stop = rangeEnd
- }
- columnReader.cols[startColIdx] = arrow.NewInt([]int64{start}, t.alloc)
- columnReader.cols[stopColIdx] = arrow.NewInt([]int64{stop}, t.alloc)
- columnReader.cols[windowedValueColIdx] = t.toArrowBuffer(t.arr.Values[t.idxInArr : t.idxInArr+1])
- t.appendTags(columnReader)
- t.idxInArr++
- if t.idxInArr == t.arr.Len() {
- t.arr = nil
- }
+ cr := t.allocateBuffer(stop.Len())
+ cr.cols[startColIdx] = start
+ cr.cols[stopColIdx] = stop
+ cr.cols[windowedValueColIdx] = values
+ t.appendTags(cr)
return true
}
@@ -363,7 +458,9 @@ type integerWindowTable struct {
integerTable
windowEvery int64
arr *cursors.IntegerArray
+ nextTS int64
idxInArr int
+ createEmpty bool
}
func newIntegerWindowTable(
@@ -371,6 +468,7 @@ func newIntegerWindowTable(
cur cursors.IntegerArrayCursor,
bounds execute.Bounds,
every int64,
+ createEmpty bool,
key flux.GroupKey,
cols []flux.ColMeta,
tags models.Tags,
@@ -384,6 +482,11 @@ func newIntegerWindowTable(
cur: cur,
},
windowEvery: every,
+ createEmpty: createEmpty,
+ }
+ if t.createEmpty {
+ start := int64(bounds.Start)
+ t.nextTS = start + (every - start%every)
}
t.readTags(tags)
t.advance()
@@ -391,40 +494,126 @@ func newIntegerWindowTable(
return t
}
-func (t *integerWindowTable) advance() bool {
+func (t *integerWindowTable) Do(f func(flux.ColReader) error) error {
+ return t.do(f, t.advance)
+}
+
+// createNextWindow will read the timestamps from the array
+// cursor and construct the values for the next window.
+func (t *integerWindowTable) createNextWindow() (start, stop *array.Int64, ok bool) {
+ var stopT int64
+ if t.createEmpty {
+ stopT = t.nextTS
+ t.nextTS += t.windowEvery
+ } else {
+ if !t.nextBuffer() {
+ return nil, nil, false
+ }
+ stopT = t.arr.Timestamps[t.idxInArr]
+ }
+
+ // Regain the window start time from the window end time.
+ startT := stopT - t.windowEvery
+ if startT < int64(t.bounds.Start) {
+ startT = int64(t.bounds.Start)
+ }
+ if stopT > int64(t.bounds.Stop) {
+ stopT = int64(t.bounds.Stop)
+ }
+
+ // If the start time is after our stop boundary,
+ // we exit here when create empty is true.
+ if t.createEmpty && startT >= int64(t.bounds.Stop) {
+ return nil, nil, false
+ }
+ start = arrow.NewInt([]int64{startT}, t.alloc)
+ stop = arrow.NewInt([]int64{stopT}, t.alloc)
+ return start, stop, true
+}
+
+// nextAt will retrieve the next value that can be used with
+// the given stop timestamp. If no values can be used with the timestamp,
+// it will return the default value and false.
+func (t *integerWindowTable) nextAt(ts int64) (v int64, ok bool) {
+ if !t.nextBuffer() {
+ return
+ } else if !t.isInWindow(ts, t.arr.Timestamps[t.idxInArr]) {
+ return
+ }
+ v, ok = t.arr.Values[t.idxInArr], true
+ t.idxInArr++
+ return v, ok
+}
+
+// isInWindow will check if the given time at stop can be used within
+// the window stop time for ts. The ts may be a truncated stop time
+// because of a restricted boundary while stop will be the true
+// stop time returned by storage.
+func (t *integerWindowTable) isInWindow(ts int64, stop int64) bool {
+ // This method checks if the stop time is a valid stop time for
+ // that interval. This calculation is different from the calculation
+ // of the window itself. For example, for a 10 second window that
+ // starts at 20 seconds, we would include points between [20, 30).
+ // The stop time for this interval would be 30, but because the stop
+ // time can be truncated, valid stop times range from anywhere between
+ // (20, 30]. The storage engine will always produce 30 as the end time
+ // but we may have truncated the stop time because of the boundary
+ // and this is why we are checking for this range instead of checking
+ // if the two values are equal.
+ start := stop - t.windowEvery
+ return start < ts && ts <= stop
+}
+
+// nextBuffer will ensure the array cursor is filled
+// and will return true if there is at least one value
+// that can be read from it.
+func (t *integerWindowTable) nextBuffer() bool {
+ // Discard the current array cursor if we have
+ // exceeded it.
+ if t.arr != nil && t.idxInArr >= t.arr.Len() {
+ t.arr = nil
+ }
+
+ // Retrieve the next array cursor if needed.
if t.arr == nil {
- t.arr = t.cur.Next()
- if t.arr.Len() == 0 {
- t.arr = nil
+ arr := t.cur.Next()
+ if arr.Len() == 0 {
return false
}
- t.idxInArr = 0
+ t.arr, t.idxInArr = arr, 0
}
+ return true
+}
+
+// appendValues will scan the timestamps and append values
+// that match those timestamps from the buffer.
+func (t *integerWindowTable) appendValues(intervals []int64, appendValue func(v int64), appendNull func()) {
+ for i := 0; i < len(intervals); i++ {
+ if v, ok := t.nextAt(intervals[i]); ok {
+ appendValue(v)
+ continue
+ }
+ appendNull()
+ }
+}
+
+func (t *integerWindowTable) advance() bool {
+ // Create the timestamps for the next window.
+ start, stop, ok := t.createNextWindow()
+ if !ok {
+ return false
+ }
+ values := t.mergeValues(stop.Int64Values())
// Retrieve the buffer for the data to avoid allocating
// additional slices. If the buffer is still being used
// because the references were retained, then we will
// allocate a new buffer.
- columnReader := t.allocateBuffer(1)
- // regain the window start time from the window end time
- rangeStart := int64(t.bounds.Start)
- rangeEnd := int64(t.bounds.Stop)
- stop := t.arr.Timestamps[t.idxInArr]
- start := stop - t.windowEvery
- if start < rangeStart {
- start = rangeStart
- }
- if stop > rangeEnd {
- stop = rangeEnd
- }
- columnReader.cols[startColIdx] = arrow.NewInt([]int64{start}, t.alloc)
- columnReader.cols[stopColIdx] = arrow.NewInt([]int64{stop}, t.alloc)
- columnReader.cols[windowedValueColIdx] = t.toArrowBuffer(t.arr.Values[t.idxInArr : t.idxInArr+1])
- t.appendTags(columnReader)
- t.idxInArr++
- if t.idxInArr == t.arr.Len() {
- t.arr = nil
- }
+ cr := t.allocateBuffer(stop.Len())
+ cr.cols[startColIdx] = start
+ cr.cols[stopColIdx] = stop
+ cr.cols[windowedValueColIdx] = values
+ t.appendTags(cr)
return true
}
@@ -624,7 +813,9 @@ type unsignedWindowTable struct {
unsignedTable
windowEvery int64
arr *cursors.UnsignedArray
+ nextTS int64
idxInArr int
+ createEmpty bool
}
func newUnsignedWindowTable(
@@ -632,6 +823,7 @@ func newUnsignedWindowTable(
cur cursors.UnsignedArrayCursor,
bounds execute.Bounds,
every int64,
+ createEmpty bool,
key flux.GroupKey,
cols []flux.ColMeta,
tags models.Tags,
@@ -645,6 +837,11 @@ func newUnsignedWindowTable(
cur: cur,
},
windowEvery: every,
+ createEmpty: createEmpty,
+ }
+ if t.createEmpty {
+ start := int64(bounds.Start)
+ t.nextTS = start + (every - start%every)
}
t.readTags(tags)
t.advance()
@@ -652,40 +849,126 @@ func newUnsignedWindowTable(
return t
}
-func (t *unsignedWindowTable) advance() bool {
+func (t *unsignedWindowTable) Do(f func(flux.ColReader) error) error {
+ return t.do(f, t.advance)
+}
+
+// createNextWindow will read the timestamps from the array
+// cursor and construct the values for the next window.
+func (t *unsignedWindowTable) createNextWindow() (start, stop *array.Int64, ok bool) {
+ var stopT int64
+ if t.createEmpty {
+ stopT = t.nextTS
+ t.nextTS += t.windowEvery
+ } else {
+ if !t.nextBuffer() {
+ return nil, nil, false
+ }
+ stopT = t.arr.Timestamps[t.idxInArr]
+ }
+
+ // Regain the window start time from the window end time.
+ startT := stopT - t.windowEvery
+ if startT < int64(t.bounds.Start) {
+ startT = int64(t.bounds.Start)
+ }
+ if stopT > int64(t.bounds.Stop) {
+ stopT = int64(t.bounds.Stop)
+ }
+
+ // If the start time is after our stop boundary,
+ // we exit here when create empty is true.
+ if t.createEmpty && startT >= int64(t.bounds.Stop) {
+ return nil, nil, false
+ }
+ start = arrow.NewInt([]int64{startT}, t.alloc)
+ stop = arrow.NewInt([]int64{stopT}, t.alloc)
+ return start, stop, true
+}
+
+// nextAt will retrieve the next value that can be used with
+// the given stop timestamp. If no values can be used with the timestamp,
+// it will return the default value and false.
+func (t *unsignedWindowTable) nextAt(ts int64) (v uint64, ok bool) {
+ if !t.nextBuffer() {
+ return
+ } else if !t.isInWindow(ts, t.arr.Timestamps[t.idxInArr]) {
+ return
+ }
+ v, ok = t.arr.Values[t.idxInArr], true
+ t.idxInArr++
+ return v, ok
+}
+
+// isInWindow will check if the given time at stop can be used within
+// the window stop time for ts. The ts may be a truncated stop time
+// because of a restricted boundary while stop will be the true
+// stop time returned by storage.
+func (t *unsignedWindowTable) isInWindow(ts int64, stop int64) bool {
+ // This method checks if the stop time is a valid stop time for
+ // that interval. This calculation is different from the calculation
+ // of the window itself. For example, for a 10 second window that
+ // starts at 20 seconds, we would include points between [20, 30).
+ // The stop time for this interval would be 30, but because the stop
+ // time can be truncated, valid stop times range from anywhere between
+ // (20, 30]. The storage engine will always produce 30 as the end time
+ // but we may have truncated the stop time because of the boundary
+ // and this is why we are checking for this range instead of checking
+ // if the two values are equal.
+ start := stop - t.windowEvery
+ return start < ts && ts <= stop
+}
+
+// nextBuffer will ensure the array cursor is filled
+// and will return true if there is at least one value
+// that can be read from it.
+func (t *unsignedWindowTable) nextBuffer() bool {
+ // Discard the current array cursor if we have
+ // exceeded it.
+ if t.arr != nil && t.idxInArr >= t.arr.Len() {
+ t.arr = nil
+ }
+
+ // Retrieve the next array cursor if needed.
if t.arr == nil {
- t.arr = t.cur.Next()
- if t.arr.Len() == 0 {
- t.arr = nil
+ arr := t.cur.Next()
+ if arr.Len() == 0 {
return false
}
- t.idxInArr = 0
+ t.arr, t.idxInArr = arr, 0
+ }
+ return true
+}
+
+// appendValues will scan the timestamps and append values
+// that match those timestamps from the buffer.
+func (t *unsignedWindowTable) appendValues(intervals []int64, appendValue func(v uint64), appendNull func()) {
+ for i := 0; i < len(intervals); i++ {
+ if v, ok := t.nextAt(intervals[i]); ok {
+ appendValue(v)
+ continue
+ }
+ appendNull()
+ }
+}
+
+func (t *unsignedWindowTable) advance() bool {
+ // Create the timestamps for the next window.
+ start, stop, ok := t.createNextWindow()
+ if !ok {
+ return false
}
+ values := t.mergeValues(stop.Int64Values())
// Retrieve the buffer for the data to avoid allocating
// additional slices. If the buffer is still being used
// because the references were retained, then we will
// allocate a new buffer.
- columnReader := t.allocateBuffer(1)
- // regain the window start time from the window end time
- rangeStart := int64(t.bounds.Start)
- rangeEnd := int64(t.bounds.Stop)
- stop := t.arr.Timestamps[t.idxInArr]
- start := stop - t.windowEvery
- if start < rangeStart {
- start = rangeStart
- }
- if stop > rangeEnd {
- stop = rangeEnd
- }
- columnReader.cols[startColIdx] = arrow.NewInt([]int64{start}, t.alloc)
- columnReader.cols[stopColIdx] = arrow.NewInt([]int64{stop}, t.alloc)
- columnReader.cols[windowedValueColIdx] = t.toArrowBuffer(t.arr.Values[t.idxInArr : t.idxInArr+1])
- t.appendTags(columnReader)
- t.idxInArr++
- if t.idxInArr == t.arr.Len() {
- t.arr = nil
- }
+ cr := t.allocateBuffer(stop.Len())
+ cr.cols[startColIdx] = start
+ cr.cols[stopColIdx] = stop
+ cr.cols[windowedValueColIdx] = values
+ t.appendTags(cr)
return true
}
@@ -885,7 +1168,9 @@ type stringWindowTable struct {
stringTable
windowEvery int64
arr *cursors.StringArray
+ nextTS int64
idxInArr int
+ createEmpty bool
}
func newStringWindowTable(
@@ -893,6 +1178,7 @@ func newStringWindowTable(
cur cursors.StringArrayCursor,
bounds execute.Bounds,
every int64,
+ createEmpty bool,
key flux.GroupKey,
cols []flux.ColMeta,
tags models.Tags,
@@ -906,6 +1192,11 @@ func newStringWindowTable(
cur: cur,
},
windowEvery: every,
+ createEmpty: createEmpty,
+ }
+ if t.createEmpty {
+ start := int64(bounds.Start)
+ t.nextTS = start + (every - start%every)
}
t.readTags(tags)
t.advance()
@@ -913,40 +1204,126 @@ func newStringWindowTable(
return t
}
-func (t *stringWindowTable) advance() bool {
+func (t *stringWindowTable) Do(f func(flux.ColReader) error) error {
+ return t.do(f, t.advance)
+}
+
+// createNextWindow will read the timestamps from the array
+// cursor and construct the values for the next window.
+func (t *stringWindowTable) createNextWindow() (start, stop *array.Int64, ok bool) {
+ var stopT int64
+ if t.createEmpty {
+ stopT = t.nextTS
+ t.nextTS += t.windowEvery
+ } else {
+ if !t.nextBuffer() {
+ return nil, nil, false
+ }
+ stopT = t.arr.Timestamps[t.idxInArr]
+ }
+
+ // Regain the window start time from the window end time.
+ startT := stopT - t.windowEvery
+ if startT < int64(t.bounds.Start) {
+ startT = int64(t.bounds.Start)
+ }
+ if stopT > int64(t.bounds.Stop) {
+ stopT = int64(t.bounds.Stop)
+ }
+
+ // If the start time is after our stop boundary,
+ // we exit here when create empty is true.
+ if t.createEmpty && startT >= int64(t.bounds.Stop) {
+ return nil, nil, false
+ }
+ start = arrow.NewInt([]int64{startT}, t.alloc)
+ stop = arrow.NewInt([]int64{stopT}, t.alloc)
+ return start, stop, true
+}
+
+// nextAt will retrieve the next value that can be used with
+// the given stop timestamp. If no values can be used with the timestamp,
+// it will return the default value and false.
+func (t *stringWindowTable) nextAt(ts int64) (v string, ok bool) {
+ if !t.nextBuffer() {
+ return
+ } else if !t.isInWindow(ts, t.arr.Timestamps[t.idxInArr]) {
+ return
+ }
+ v, ok = t.arr.Values[t.idxInArr], true
+ t.idxInArr++
+ return v, ok
+}
+
+// isInWindow will check if the given time at stop can be used within
+// the window stop time for ts. The ts may be a truncated stop time
+// because of a restricted boundary while stop will be the true
+// stop time returned by storage.
+func (t *stringWindowTable) isInWindow(ts int64, stop int64) bool {
+ // This method checks if the stop time is a valid stop time for
+ // that interval. This calculation is different from the calculation
+ // of the window itself. For example, for a 10 second window that
+ // starts at 20 seconds, we would include points between [20, 30).
+ // The stop time for this interval would be 30, but because the stop
+ // time can be truncated, valid stop times range from anywhere between
+ // (20, 30]. The storage engine will always produce 30 as the end time
+ // but we may have truncated the stop time because of the boundary
+ // and this is why we are checking for this range instead of checking
+ // if the two values are equal.
+ start := stop - t.windowEvery
+ return start < ts && ts <= stop
+}
+
+// nextBuffer will ensure the array cursor is filled
+// and will return true if there is at least one value
+// that can be read from it.
+func (t *stringWindowTable) nextBuffer() bool {
+ // Discard the current array cursor if we have
+ // exceeded it.
+ if t.arr != nil && t.idxInArr >= t.arr.Len() {
+ t.arr = nil
+ }
+
+ // Retrieve the next array cursor if needed.
if t.arr == nil {
- t.arr = t.cur.Next()
- if t.arr.Len() == 0 {
- t.arr = nil
+ arr := t.cur.Next()
+ if arr.Len() == 0 {
return false
}
- t.idxInArr = 0
+ t.arr, t.idxInArr = arr, 0
+ }
+ return true
+}
+
+// appendValues will scan the timestamps and append values
+// that match those timestamps from the buffer.
+func (t *stringWindowTable) appendValues(intervals []int64, appendValue func(v string), appendNull func()) {
+ for i := 0; i < len(intervals); i++ {
+ if v, ok := t.nextAt(intervals[i]); ok {
+ appendValue(v)
+ continue
+ }
+ appendNull()
+ }
+}
+
+func (t *stringWindowTable) advance() bool {
+ // Create the timestamps for the next window.
+ start, stop, ok := t.createNextWindow()
+ if !ok {
+ return false
}
+ values := t.mergeValues(stop.Int64Values())
// Retrieve the buffer for the data to avoid allocating
// additional slices. If the buffer is still being used
// because the references were retained, then we will
// allocate a new buffer.
- columnReader := t.allocateBuffer(1)
- // regain the window start time from the window end time
- rangeStart := int64(t.bounds.Start)
- rangeEnd := int64(t.bounds.Stop)
- stop := t.arr.Timestamps[t.idxInArr]
- start := stop - t.windowEvery
- if start < rangeStart {
- start = rangeStart
- }
- if stop > rangeEnd {
- stop = rangeEnd
- }
- columnReader.cols[startColIdx] = arrow.NewInt([]int64{start}, t.alloc)
- columnReader.cols[stopColIdx] = arrow.NewInt([]int64{stop}, t.alloc)
- columnReader.cols[windowedValueColIdx] = t.toArrowBuffer(t.arr.Values[t.idxInArr : t.idxInArr+1])
- t.appendTags(columnReader)
- t.idxInArr++
- if t.idxInArr == t.arr.Len() {
- t.arr = nil
- }
+ cr := t.allocateBuffer(stop.Len())
+ cr.cols[startColIdx] = start
+ cr.cols[stopColIdx] = stop
+ cr.cols[windowedValueColIdx] = values
+ t.appendTags(cr)
return true
}
@@ -1146,7 +1523,9 @@ type booleanWindowTable struct {
booleanTable
windowEvery int64
arr *cursors.BooleanArray
+ nextTS int64
idxInArr int
+ createEmpty bool
}
func newBooleanWindowTable(
@@ -1154,6 +1533,7 @@ func newBooleanWindowTable(
cur cursors.BooleanArrayCursor,
bounds execute.Bounds,
every int64,
+ createEmpty bool,
key flux.GroupKey,
cols []flux.ColMeta,
tags models.Tags,
@@ -1167,6 +1547,11 @@ func newBooleanWindowTable(
cur: cur,
},
windowEvery: every,
+ createEmpty: createEmpty,
+ }
+ if t.createEmpty {
+ start := int64(bounds.Start)
+ t.nextTS = start + (every - start%every)
}
t.readTags(tags)
t.advance()
@@ -1174,40 +1559,126 @@ func newBooleanWindowTable(
return t
}
-func (t *booleanWindowTable) advance() bool {
+func (t *booleanWindowTable) Do(f func(flux.ColReader) error) error {
+ return t.do(f, t.advance)
+}
+
+// createNextWindow will read the timestamps from the array
+// cursor and construct the values for the next window.
+func (t *booleanWindowTable) createNextWindow() (start, stop *array.Int64, ok bool) {
+ var stopT int64
+ if t.createEmpty {
+ stopT = t.nextTS
+ t.nextTS += t.windowEvery
+ } else {
+ if !t.nextBuffer() {
+ return nil, nil, false
+ }
+ stopT = t.arr.Timestamps[t.idxInArr]
+ }
+
+ // Regain the window start time from the window end time.
+ startT := stopT - t.windowEvery
+ if startT < int64(t.bounds.Start) {
+ startT = int64(t.bounds.Start)
+ }
+ if stopT > int64(t.bounds.Stop) {
+ stopT = int64(t.bounds.Stop)
+ }
+
+ // If the start time is after our stop boundary,
+ // we exit here when create empty is true.
+ if t.createEmpty && startT >= int64(t.bounds.Stop) {
+ return nil, nil, false
+ }
+ start = arrow.NewInt([]int64{startT}, t.alloc)
+ stop = arrow.NewInt([]int64{stopT}, t.alloc)
+ return start, stop, true
+}
+
+// nextAt will retrieve the next value that can be used with
+// the given stop timestamp. If no values can be used with the timestamp,
+// it will return the default value and false.
+func (t *booleanWindowTable) nextAt(ts int64) (v bool, ok bool) {
+ if !t.nextBuffer() {
+ return
+ } else if !t.isInWindow(ts, t.arr.Timestamps[t.idxInArr]) {
+ return
+ }
+ v, ok = t.arr.Values[t.idxInArr], true
+ t.idxInArr++
+ return v, ok
+}
+
+// isInWindow will check if the given time at stop can be used within
+// the window stop time for ts. The ts may be a truncated stop time
+// because of a restricted boundary while stop will be the true
+// stop time returned by storage.
+func (t *booleanWindowTable) isInWindow(ts int64, stop int64) bool {
+ // This method checks if the stop time is a valid stop time for
+ // that interval. This calculation is different from the calculation
+ // of the window itself. For example, for a 10 second window that
+ // starts at 20 seconds, we would include points between [20, 30).
+ // The stop time for this interval would be 30, but because the stop
+ // time can be truncated, valid stop times range from anywhere between
+ // (20, 30]. The storage engine will always produce 30 as the end time
+ // but we may have truncated the stop time because of the boundary
+ // and this is why we are checking for this range instead of checking
+ // if the two values are equal.
+ start := stop - t.windowEvery
+ return start < ts && ts <= stop
+}
+
+// nextBuffer will ensure the array cursor is filled
+// and will return true if there is at least one value
+// that can be read from it.
+func (t *booleanWindowTable) nextBuffer() bool {
+ // Discard the current array cursor if we have
+ // exceeded it.
+ if t.arr != nil && t.idxInArr >= t.arr.Len() {
+ t.arr = nil
+ }
+
+ // Retrieve the next array cursor if needed.
if t.arr == nil {
- t.arr = t.cur.Next()
- if t.arr.Len() == 0 {
- t.arr = nil
+ arr := t.cur.Next()
+ if arr.Len() == 0 {
return false
}
- t.idxInArr = 0
+ t.arr, t.idxInArr = arr, 0
}
+ return true
+}
+
+// appendValues will scan the timestamps and append values
+// that match those timestamps from the buffer.
+func (t *booleanWindowTable) appendValues(intervals []int64, appendValue func(v bool), appendNull func()) {
+ for i := 0; i < len(intervals); i++ {
+ if v, ok := t.nextAt(intervals[i]); ok {
+ appendValue(v)
+ continue
+ }
+ appendNull()
+ }
+}
+
+func (t *booleanWindowTable) advance() bool {
+ // Create the timestamps for the next window.
+ start, stop, ok := t.createNextWindow()
+ if !ok {
+ return false
+ }
+ values := t.mergeValues(stop.Int64Values())
// Retrieve the buffer for the data to avoid allocating
// additional slices. If the buffer is still being used
// because the references were retained, then we will
// allocate a new buffer.
- columnReader := t.allocateBuffer(1)
- // regain the window start time from the window end time
- rangeStart := int64(t.bounds.Start)
- rangeEnd := int64(t.bounds.Stop)
- stop := t.arr.Timestamps[t.idxInArr]
- start := stop - t.windowEvery
- if start < rangeStart {
- start = rangeStart
- }
- if stop > rangeEnd {
- stop = rangeEnd
- }
- columnReader.cols[startColIdx] = arrow.NewInt([]int64{start}, t.alloc)
- columnReader.cols[stopColIdx] = arrow.NewInt([]int64{stop}, t.alloc)
- columnReader.cols[windowedValueColIdx] = t.toArrowBuffer(t.arr.Values[t.idxInArr : t.idxInArr+1])
- t.appendTags(columnReader)
- t.idxInArr++
- if t.idxInArr == t.arr.Len() {
- t.arr = nil
- }
+ cr := t.allocateBuffer(stop.Len())
+ cr.cols[startColIdx] = start
+ cr.cols[stopColIdx] = stop
+ cr.cols[windowedValueColIdx] = values
+ t.appendTags(cr)
return true
}
diff --git a/storage/flux/table.gen.go.tmpl b/storage/flux/table.gen.go.tmpl
index f4455d7862e..4b3c0c66c4b 100644
--- a/storage/flux/table.gen.go.tmpl
+++ b/storage/flux/table.gen.go.tmpl
@@ -3,6 +3,7 @@ package storageflux
import (
"sync"
+ "github.com/apache/arrow/go/arrow/array"
"github.com/influxdata/flux"
"github.com/influxdata/flux/arrow"
"github.com/influxdata/flux/execute"
@@ -96,7 +97,9 @@ type {{.name}}WindowTable struct {
{{.name}}Table
windowEvery int64
arr *cursors.{{.Name}}Array
+ nextTS int64
idxInArr int
+ createEmpty bool
}
func new{{.Name}}WindowTable(
@@ -104,6 +107,7 @@ func new{{.Name}}WindowTable(
cur cursors.{{.Name}}ArrayCursor,
bounds execute.Bounds,
every int64,
+ createEmpty bool,
key flux.GroupKey,
cols []flux.ColMeta,
tags models.Tags,
@@ -117,6 +121,11 @@ func new{{.Name}}WindowTable(
cur: cur,
},
windowEvery: every,
+ createEmpty: createEmpty,
+ }
+ if t.createEmpty {
+ start := int64(bounds.Start)
+ t.nextTS = start + (every - start % every)
}
t.readTags(tags)
t.advance()
@@ -124,40 +133,126 @@ func new{{.Name}}WindowTable(
return t
}
-func (t *{{.name}}WindowTable) advance() bool {
+func (t *{{.name}}WindowTable) Do(f func(flux.ColReader) error) error {
+ return t.do(f, t.advance)
+}
+
+// createNextWindow will read the timestamps from the array
+// cursor and construct the values for the next window.
+func (t *{{.name}}WindowTable) createNextWindow() (start, stop *array.Int64, ok bool) {
+ var stopT int64
+ if t.createEmpty {
+ stopT = t.nextTS
+ t.nextTS += t.windowEvery
+ } else {
+ if !t.nextBuffer() {
+ return nil, nil, false
+ }
+ stopT = t.arr.Timestamps[t.idxInArr]
+ }
+
+ // Regain the window start time from the window end time.
+ startT := stopT - t.windowEvery
+ if startT < int64(t.bounds.Start) {
+ startT = int64(t.bounds.Start)
+ }
+ if stopT > int64(t.bounds.Stop) {
+ stopT = int64(t.bounds.Stop)
+ }
+
+ // If the start time is after our stop boundary,
+ // we exit here when create empty is true.
+ if t.createEmpty && startT >= int64(t.bounds.Stop) {
+ return nil, nil, false
+ }
+ start = arrow.NewInt([]int64{startT}, t.alloc)
+ stop = arrow.NewInt([]int64{stopT}, t.alloc)
+ return start, stop, true
+}
+
+// nextAt will retrieve the next value that can be used with
+// the given stop timestamp. If no values can be used with the timestamp,
+// it will return the default value and false.
+func (t *{{.name}}WindowTable) nextAt(ts int64) (v {{.Type}}, ok bool) {
+ if !t.nextBuffer() {
+ return
+ } else if !t.isInWindow(ts, t.arr.Timestamps[t.idxInArr]) {
+ return
+ }
+ v, ok = t.arr.Values[t.idxInArr], true
+ t.idxInArr++
+ return v, ok
+}
+
+// isInWindow will check if the given time at stop can be used within
+// the window stop time for ts. The ts may be a truncated stop time
+// because of a restricted boundary while stop will be the true
+// stop time returned by storage.
+func (t *{{.name}}WindowTable) isInWindow(ts int64, stop int64) bool {
+ // This method checks if the stop time is a valid stop time for
+ // that interval. This calculation is different from the calculation
+ // of the window itself. For example, for a 10 second window that
+ // starts at 20 seconds, we would include points between [20, 30).
+ // The stop time for this interval would be 30, but because the stop
+ // time can be truncated, valid stop times range from anywhere between
+ // (20, 30]. The storage engine will always produce 30 as the end time
+ // but we may have truncated the stop time because of the boundary
+ // and this is why we are checking for this range instead of checking
+ // if the two values are equal.
+ start := stop - t.windowEvery
+ return start < ts && ts <= stop
+}
+
+// nextBuffer will ensure the array cursor is filled
+// and will return true if there is at least one value
+// that can be read from it.
+func (t *{{.name}}WindowTable) nextBuffer() bool {
+ // Discard the current array cursor if we have
+ // exceeded it.
+ if t.arr != nil && t.idxInArr >= t.arr.Len() {
+ t.arr = nil
+ }
+
+ // Retrieve the next array cursor if needed.
if t.arr == nil {
- t.arr = t.cur.Next()
- if t.arr.Len() == 0 {
- t.arr = nil
+ arr := t.cur.Next()
+ if arr.Len() == 0 {
return false
}
- t.idxInArr = 0
+ t.arr, t.idxInArr = arr, 0
}
+ return true
+}
+
+// appendValues will scan the timestamps and append values
+// that match those timestamps from the buffer.
+func (t *{{.name}}WindowTable) appendValues(intervals []int64, appendValue func(v {{.Type}}), appendNull func()) {
+ for i := 0; i < len(intervals); i++ {
+ if v, ok := t.nextAt(intervals[i]); ok {
+ appendValue(v)
+ continue
+ }
+ appendNull()
+ }
+}
+
+func (t *{{.name}}WindowTable) advance() bool {
+ // Create the timestamps for the next window.
+ start, stop, ok := t.createNextWindow()
+ if !ok {
+ return false
+ }
+ values := t.mergeValues(stop.Int64Values())
// Retrieve the buffer for the data to avoid allocating
// additional slices. If the buffer is still being used
// because the references were retained, then we will
// allocate a new buffer.
- columnReader := t.allocateBuffer(1)
- // regain the window start time from the window end time
- rangeStart := int64(t.bounds.Start)
- rangeEnd := int64(t.bounds.Stop)
- stop := t.arr.Timestamps[t.idxInArr]
- start := stop - t.windowEvery
- if start < rangeStart {
- start = rangeStart
- }
- if stop > rangeEnd {
- stop = rangeEnd
- }
- columnReader.cols[startColIdx] = arrow.NewInt([]int64{start}, t.alloc)
- columnReader.cols[stopColIdx] = arrow.NewInt([]int64{stop}, t.alloc)
- columnReader.cols[windowedValueColIdx] = t.toArrowBuffer(t.arr.Values[t.idxInArr : t.idxInArr+1])
- t.appendTags(columnReader)
- t.idxInArr++
- if t.idxInArr == t.arr.Len() {
- t.arr = nil
- }
+ cr := t.allocateBuffer(stop.Len())
+ cr.cols[startColIdx] = start
+ cr.cols[stopColIdx] = stop
+ cr.cols[windowedValueColIdx] = values
+ t.appendTags(cr)
return true
}
diff --git a/storage/flux/table.go b/storage/flux/table.go
index 67950924e8c..063700f7558 100644
--- a/storage/flux/table.go
+++ b/storage/flux/table.go
@@ -224,27 +224,57 @@ func (t *floatTable) toArrowBuffer(vs []float64) *array.Float64 {
func (t *floatGroupTable) toArrowBuffer(vs []float64) *array.Float64 {
return arrow.NewFloat(vs, t.alloc)
}
+func (t *floatWindowTable) mergeValues(intervals []int64) *array.Float64 {
+ b := arrow.NewFloatBuilder(t.alloc)
+ b.Resize(len(intervals))
+ t.appendValues(intervals, b.Append, b.AppendNull)
+ return b.NewFloat64Array()
+}
func (t *integerTable) toArrowBuffer(vs []int64) *array.Int64 {
return arrow.NewInt(vs, t.alloc)
}
func (t *integerGroupTable) toArrowBuffer(vs []int64) *array.Int64 {
return arrow.NewInt(vs, t.alloc)
}
+func (t *integerWindowTable) mergeValues(intervals []int64) *array.Int64 {
+ b := arrow.NewIntBuilder(t.alloc)
+ b.Resize(len(intervals))
+ t.appendValues(intervals, b.Append, b.AppendNull)
+ return b.NewInt64Array()
+}
func (t *unsignedTable) toArrowBuffer(vs []uint64) *array.Uint64 {
return arrow.NewUint(vs, t.alloc)
}
func (t *unsignedGroupTable) toArrowBuffer(vs []uint64) *array.Uint64 {
return arrow.NewUint(vs, t.alloc)
}
+func (t *unsignedWindowTable) mergeValues(intervals []int64) *array.Uint64 {
+ b := arrow.NewUintBuilder(t.alloc)
+ b.Resize(len(intervals))
+ t.appendValues(intervals, b.Append, b.AppendNull)
+ return b.NewUint64Array()
+}
func (t *stringTable) toArrowBuffer(vs []string) *array.Binary {
return arrow.NewString(vs, t.alloc)
}
func (t *stringGroupTable) toArrowBuffer(vs []string) *array.Binary {
return arrow.NewString(vs, t.alloc)
}
+func (t *stringWindowTable) mergeValues(intervals []int64) *array.Binary {
+ b := arrow.NewStringBuilder(t.alloc)
+ b.Resize(len(intervals))
+ t.appendValues(intervals, b.AppendString, b.AppendNull)
+ return b.NewBinaryArray()
+}
func (t *booleanTable) toArrowBuffer(vs []bool) *array.Boolean {
return arrow.NewBool(vs, t.alloc)
}
func (t *booleanGroupTable) toArrowBuffer(vs []bool) *array.Boolean {
return arrow.NewBool(vs, t.alloc)
}
+func (t *booleanWindowTable) mergeValues(intervals []int64) *array.Boolean {
+ b := arrow.NewBoolBuilder(t.alloc)
+ b.Resize(len(intervals))
+ t.appendValues(intervals, b.Append, b.AppendNull)
+ return b.NewBooleanArray()
+}
diff --git a/storage/flux/table_test.go b/storage/flux/table_test.go
index 56a34f0ffec..6af995a09d2 100644
--- a/storage/flux/table_test.go
+++ b/storage/flux/table_test.go
@@ -7,13 +7,19 @@ import (
"math/rand"
"os"
"path/filepath"
+ "sort"
"testing"
"time"
+ "github.com/google/go-cmp/cmp"
"github.com/influxdata/flux"
"github.com/influxdata/flux/execute"
+ "github.com/influxdata/flux/execute/executetest"
"github.com/influxdata/flux/memory"
+ "github.com/influxdata/flux/plan"
+ "github.com/influxdata/flux/stdlib/universe"
"github.com/influxdata/flux/values"
+ "github.com/influxdata/influxdb/v2"
"github.com/influxdata/influxdb/v2/cmd/influxd/generate"
"github.com/influxdata/influxdb/v2/mock"
"github.com/influxdata/influxdb/v2/models"
@@ -25,104 +31,498 @@ import (
"go.uber.org/zap/zaptest"
)
-func BenchmarkReadFilter(b *testing.B) {
+type SetupFunc func(org, bucket influxdb.ID) (gen.SeriesGenerator, gen.TimeRange)
+
+type StorageReader struct {
+ Org influxdb.ID
+ Bucket influxdb.ID
+ Bounds execute.Bounds
+ Close func()
+ query.StorageReader
+}
+
+func NewStorageReader(tb testing.TB, setupFn SetupFunc) *StorageReader {
+ logger := zaptest.NewLogger(tb)
+ rootDir, err := ioutil.TempDir("", "storage-flux-test")
+ if err != nil {
+ tb.Fatal(err)
+ }
+ close := func() { _ = os.RemoveAll(rootDir) }
+
idgen := mock.NewMockIDGenerator()
- tagsSpec := &gen.TagsSpec{
- Tags: []*gen.TagValuesSpec{
- {
- TagKey: "t0",
- Values: func() gen.CountableSequence {
- return gen.NewCounterByteSequence("a-%d", 0, 5)
+ org, bucket := idgen.ID(), idgen.ID()
+ sg, tr := setupFn(org, bucket)
+
+ generator := generate.Generator{}
+ if _, err := generator.Run(context.Background(), rootDir, sg); err != nil {
+ tb.Fatal(err)
+ }
+
+ enginePath := filepath.Join(rootDir, "engine")
+ engine := storage.NewEngine(enginePath, storage.NewConfig())
+ engine.WithLogger(logger)
+
+ if err := engine.Open(context.Background()); err != nil {
+ tb.Fatal(err)
+ }
+ reader := storageflux.NewReader(readservice.NewStore(engine))
+ return &StorageReader{
+ Org: org,
+ Bucket: bucket,
+ Bounds: execute.Bounds{
+ Start: values.ConvertTime(tr.Start),
+ Stop: values.ConvertTime(tr.End),
+ },
+ Close: close,
+ StorageReader: reader,
+ }
+}
+
+func (r *StorageReader) ReadWindowAggregate(ctx context.Context, spec query.ReadWindowAggregateSpec, alloc *memory.Allocator) (query.TableIterator, error) {
+ wr := r.StorageReader.(query.WindowAggregateReader)
+ return wr.ReadWindowAggregate(ctx, spec, alloc)
+}
+
+func TestStorageReader_ReadWindowAggregate(t *testing.T) {
+ reader := NewStorageReader(t, func(org, bucket influxdb.ID) (gen.SeriesGenerator, gen.TimeRange) {
+ tagsSpec := &gen.TagsSpec{
+ Tags: []*gen.TagValuesSpec{
+ {
+ TagKey: "t0",
+ Values: func() gen.CountableSequence {
+ return gen.NewCounterByteSequence("a-%s", 0, 3)
+ },
},
},
- {
- TagKey: "t1",
- Values: func() gen.CountableSequence {
- return gen.NewCounterByteSequence("b-%d", 0, 1000)
+ }
+ spec := gen.Spec{
+ OrgID: org,
+ BucketID: bucket,
+ Measurements: []gen.MeasurementSpec{
+ {
+ Name: "m0",
+ TagsSpec: tagsSpec,
+ FieldValuesSpec: &gen.FieldValuesSpec{
+ Name: "f0",
+ TimeSequenceSpec: gen.TimeSequenceSpec{
+ Count: math.MaxInt32,
+ Delta: 10 * time.Second,
+ },
+ DataType: models.Float,
+ Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
+ return gen.NewTimeFloatValuesSequence(
+ spec.Count,
+ gen.NewTimestampSequenceFromSpec(spec),
+ gen.NewFloatArrayValuesSequence([]float64{1.0, 2.0, 3.0, 4.0}),
+ )
+ },
+ },
},
},
+ }
+ tr := gen.TimeRange{
+ Start: mustParseTime("2019-11-25T00:00:00Z"),
+ End: mustParseTime("2019-11-25T00:02:00Z"),
+ }
+ return gen.NewSeriesGeneratorFromSpec(&spec, tr), tr
+ })
+ defer reader.Close()
+
+ mem := &memory.Allocator{}
+ ti, err := reader.ReadWindowAggregate(context.Background(), query.ReadWindowAggregateSpec{
+ ReadFilterSpec: query.ReadFilterSpec{
+ OrganizationID: reader.Org,
+ BucketID: reader.Bucket,
+ Bounds: reader.Bounds,
+ },
+ WindowEvery: int64(30 * time.Second),
+ Aggregates: []plan.ProcedureKind{
+ universe.CountKind,
},
+ }, mem)
+ if err != nil {
+ t.Fatal(err)
}
- spec := gen.Spec{
- OrgID: idgen.ID(),
- BucketID: idgen.ID(),
- Measurements: []gen.MeasurementSpec{
- {
- Name: "m0",
- TagsSpec: tagsSpec,
- FieldValuesSpec: &gen.FieldValuesSpec{
- Name: "f0",
- TimeSequenceSpec: gen.TimeSequenceSpec{
- Count: math.MaxInt32,
- Delta: time.Minute,
- },
- DataType: models.Float,
- Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
- r := rand.New(rand.NewSource(10))
- return gen.NewTimeFloatValuesSequence(
- spec.Count,
- gen.NewTimestampSequenceFromSpec(spec),
- gen.NewFloatRandomValuesSequence(0, 90, r),
- )
+
+ windowEvery := values.ConvertDuration(30 * time.Second)
+ makeWindowTable := func(t0 string, start execute.Time, value interface{}) *executetest.Table {
+ valueType := flux.ColumnType(values.New(value).Type())
+ stop := start.Add(windowEvery)
+ return &executetest.Table{
+ KeyCols: []string{"_start", "_stop", "_field", "_measurement", "t0"},
+ ColMeta: []flux.ColMeta{
+ {Label: "_start", Type: flux.TTime},
+ {Label: "_stop", Type: flux.TTime},
+ {Label: "_value", Type: valueType},
+ {Label: "_field", Type: flux.TString},
+ {Label: "_measurement", Type: flux.TString},
+ {Label: "t0", Type: flux.TString},
+ },
+ Data: [][]interface{}{
+ {start, stop, value, "f0", "m0", t0},
+ },
+ }
+ }
+
+ var want []*executetest.Table
+ for _, t0 := range []string{"a-0", "a-1", "a-2"} {
+ for i := 0; i < 4; i++ {
+ offset := windowEvery.Mul(i)
+ start := reader.Bounds.Start.Add(offset)
+ want = append(want, makeWindowTable(t0, start, int64(3)))
+ }
+ }
+ executetest.NormalizeTables(want)
+ sort.Sort(executetest.SortedTables(want))
+
+ var got []*executetest.Table
+ if err := ti.Do(func(table flux.Table) error {
+ t, err := executetest.ConvertTable(table)
+ if err != nil {
+ return err
+ }
+ got = append(got, t)
+ return nil
+ }); err != nil {
+ t.Fatal(err)
+ }
+ executetest.NormalizeTables(got)
+ sort.Sort(executetest.SortedTables(got))
+
+ // compare these two
+ if diff := cmp.Diff(want, got); diff != "" {
+ t.Errorf("unexpected results -want/+got:\n%s", diff)
+ }
+}
+
+func TestStorageReader_ReadWindowAggregate_CreateEmpty(t *testing.T) {
+ reader := NewStorageReader(t, func(org, bucket influxdb.ID) (gen.SeriesGenerator, gen.TimeRange) {
+ tagsSpec := &gen.TagsSpec{
+ Tags: []*gen.TagValuesSpec{
+ {
+ TagKey: "t0",
+ Values: func() gen.CountableSequence {
+ return gen.NewCounterByteSequence("a-%s", 0, 3)
},
},
},
- {
- Name: "m0",
- TagsSpec: tagsSpec,
- FieldValuesSpec: &gen.FieldValuesSpec{
- Name: "f1",
- TimeSequenceSpec: gen.TimeSequenceSpec{
- Count: math.MaxInt32,
- Delta: time.Minute,
- },
- DataType: models.Float,
- Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
- r := rand.New(rand.NewSource(11))
- return gen.NewTimeFloatValuesSequence(
- spec.Count,
- gen.NewTimestampSequenceFromSpec(spec),
- gen.NewFloatRandomValuesSequence(0, 180, r),
- )
+ }
+ spec := gen.Spec{
+ OrgID: org,
+ BucketID: bucket,
+ Measurements: []gen.MeasurementSpec{
+ {
+ Name: "m0",
+ TagsSpec: tagsSpec,
+ FieldValuesSpec: &gen.FieldValuesSpec{
+ Name: "f0",
+ TimeSequenceSpec: gen.TimeSequenceSpec{
+ Count: math.MaxInt32,
+ Delta: 15 * time.Second,
+ },
+ DataType: models.Float,
+ Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
+ return gen.NewTimeFloatValuesSequence(
+ spec.Count,
+ gen.NewTimestampSequenceFromSpec(spec),
+ gen.NewFloatArrayValuesSequence([]float64{1.0, 2.0, 3.0, 4.0}),
+ )
+ },
},
},
},
- {
- Name: "m0",
- TagsSpec: tagsSpec,
- FieldValuesSpec: &gen.FieldValuesSpec{
- Name: "f1",
- TimeSequenceSpec: gen.TimeSequenceSpec{
- Count: math.MaxInt32,
- Delta: time.Minute,
+ }
+ tr := gen.TimeRange{
+ Start: mustParseTime("2019-11-25T00:00:00Z"),
+ End: mustParseTime("2019-11-25T00:02:00Z"),
+ }
+ return gen.NewSeriesGeneratorFromSpec(&spec, tr), tr
+ })
+ defer reader.Close()
+
+ mem := &memory.Allocator{}
+ ti, err := reader.ReadWindowAggregate(context.Background(), query.ReadWindowAggregateSpec{
+ ReadFilterSpec: query.ReadFilterSpec{
+ OrganizationID: reader.Org,
+ BucketID: reader.Bucket,
+ Bounds: reader.Bounds,
+ },
+ WindowEvery: int64(10 * time.Second),
+ Aggregates: []plan.ProcedureKind{
+ universe.CountKind,
+ },
+ CreateEmpty: true,
+ }, mem)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ windowEvery := values.ConvertDuration(10 * time.Second)
+ makeWindowTable := func(t0 string, start execute.Time, value interface{}, isNull bool) *executetest.Table {
+ valueType := flux.ColumnType(values.New(value).Type())
+ stop := start.Add(windowEvery)
+ if isNull {
+ value = nil
+ }
+ return &executetest.Table{
+ KeyCols: []string{"_start", "_stop", "_field", "_measurement", "t0"},
+ ColMeta: []flux.ColMeta{
+ {Label: "_start", Type: flux.TTime},
+ {Label: "_stop", Type: flux.TTime},
+ {Label: "_value", Type: valueType},
+ {Label: "_field", Type: flux.TString},
+ {Label: "_measurement", Type: flux.TString},
+ {Label: "t0", Type: flux.TString},
+ },
+ Data: [][]interface{}{
+ {start, stop, value, "f0", "m0", t0},
+ },
+ }
+ }
+
+ var want []*executetest.Table
+ for _, t0 := range []string{"a-0", "a-1", "a-2"} {
+ for i := 0; i < 12; i++ {
+ offset := windowEvery.Mul(i)
+ start := reader.Bounds.Start.Add(offset)
+ isNull := (i+1)%3 == 0
+ want = append(want, makeWindowTable(t0, start, int64(1), isNull))
+ }
+ }
+ executetest.NormalizeTables(want)
+ sort.Sort(executetest.SortedTables(want))
+
+ var got []*executetest.Table
+ if err := ti.Do(func(table flux.Table) error {
+ t, err := executetest.ConvertTable(table)
+ if err != nil {
+ return err
+ }
+ got = append(got, t)
+ return nil
+ }); err != nil {
+ t.Fatal(err)
+ }
+ executetest.NormalizeTables(got)
+ sort.Sort(executetest.SortedTables(got))
+
+ // compare these two
+ if diff := cmp.Diff(want, got); diff != "" {
+ t.Errorf("unexpected results -want/+got:\n%s", diff)
+ }
+}
+
+func TestStorageReader_ReadWindowAggregate_TruncatedBounds(t *testing.T) {
+ reader := NewStorageReader(t, func(org, bucket influxdb.ID) (gen.SeriesGenerator, gen.TimeRange) {
+ tagsSpec := &gen.TagsSpec{
+ Tags: []*gen.TagValuesSpec{
+ {
+ TagKey: "t0",
+ Values: func() gen.CountableSequence {
+ return gen.NewCounterByteSequence("a-%s", 0, 3)
},
- DataType: models.Float,
- Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
- r := rand.New(rand.NewSource(12))
- return gen.NewTimeFloatValuesSequence(
- spec.Count,
- gen.NewTimestampSequenceFromSpec(spec),
- gen.NewFloatRandomValuesSequence(10, 10000, r),
- )
+ },
+ },
+ }
+ spec := gen.Spec{
+ OrgID: org,
+ BucketID: bucket,
+ Measurements: []gen.MeasurementSpec{
+ {
+ Name: "m0",
+ TagsSpec: tagsSpec,
+ FieldValuesSpec: &gen.FieldValuesSpec{
+ Name: "f0",
+ TimeSequenceSpec: gen.TimeSequenceSpec{
+ Count: math.MaxInt32,
+ Delta: 5 * time.Second,
+ },
+ DataType: models.Float,
+ Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
+ return gen.NewTimeFloatValuesSequence(
+ spec.Count,
+ gen.NewTimestampSequenceFromSpec(spec),
+ gen.NewFloatArrayValuesSequence([]float64{1.0, 2.0, 3.0, 4.0}),
+ )
+ },
},
},
},
+ }
+ tr := gen.TimeRange{
+ Start: mustParseTime("2019-11-25T00:00:00Z"),
+ End: mustParseTime("2019-11-25T00:01:00Z"),
+ }
+ return gen.NewSeriesGeneratorFromSpec(&spec, tr), tr
+ })
+ defer reader.Close()
+
+ mem := &memory.Allocator{}
+ ti, err := reader.ReadWindowAggregate(context.Background(), query.ReadWindowAggregateSpec{
+ ReadFilterSpec: query.ReadFilterSpec{
+ OrganizationID: reader.Org,
+ BucketID: reader.Bucket,
+ Bounds: execute.Bounds{
+ Start: values.ConvertTime(mustParseTime("2019-11-25T00:00:05Z")),
+ Stop: values.ConvertTime(mustParseTime("2019-11-25T00:00:25Z")),
+ },
+ },
+ WindowEvery: int64(10 * time.Second),
+ Aggregates: []plan.ProcedureKind{
+ universe.CountKind,
},
+ }, mem)
+ if err != nil {
+ t.Fatal(err)
}
- tr := gen.TimeRange{
- Start: mustParseTime("2019-11-25T00:00:00Z"),
- End: mustParseTime("2019-11-26T00:00:00Z"),
+
+ makeWindowTable := func(t0 string, start, stop time.Duration, value interface{}) *executetest.Table {
+ startT := reader.Bounds.Start.Add(values.ConvertDuration(start))
+ stopT := reader.Bounds.Start.Add(values.ConvertDuration(stop))
+ valueType := flux.ColumnType(values.New(value).Type())
+ return &executetest.Table{
+ KeyCols: []string{"_start", "_stop", "_field", "_measurement", "t0"},
+ ColMeta: []flux.ColMeta{
+ {Label: "_start", Type: flux.TTime},
+ {Label: "_stop", Type: flux.TTime},
+ {Label: "_value", Type: valueType},
+ {Label: "_field", Type: flux.TString},
+ {Label: "_measurement", Type: flux.TString},
+ {Label: "t0", Type: flux.TString},
+ },
+ Data: [][]interface{}{
+ {startT, stopT, value, "f0", "m0", t0},
+ },
+ }
+ }
+
+ var want []*executetest.Table
+ for _, t0 := range []string{"a-0", "a-1", "a-2"} {
+ want = append(want,
+ makeWindowTable(t0, 5*time.Second, 10*time.Second, int64(1)),
+ makeWindowTable(t0, 10*time.Second, 20*time.Second, int64(2)),
+ makeWindowTable(t0, 20*time.Second, 25*time.Second, int64(1)),
+ )
}
- sg := gen.NewSeriesGeneratorFromSpec(&spec, tr)
- benchmarkRead(b, sg, func(r query.StorageReader) error {
+ executetest.NormalizeTables(want)
+ sort.Sort(executetest.SortedTables(want))
+
+ var got []*executetest.Table
+ if err := ti.Do(func(table flux.Table) error {
+ t, err := executetest.ConvertTable(table)
+ if err != nil {
+ return err
+ }
+ got = append(got, t)
+ return nil
+ }); err != nil {
+ t.Fatal(err)
+ }
+ executetest.NormalizeTables(got)
+ sort.Sort(executetest.SortedTables(got))
+
+ // compare these two
+ if diff := cmp.Diff(want, got); diff != "" {
+ t.Errorf("unexpected results -want/+got:\n%s", diff)
+ }
+}
+
+func BenchmarkReadFilter(b *testing.B) {
+ setupFn := func(org, bucket influxdb.ID) (gen.SeriesGenerator, gen.TimeRange) {
+ tagsSpec := &gen.TagsSpec{
+ Tags: []*gen.TagValuesSpec{
+ {
+ TagKey: "t0",
+ Values: func() gen.CountableSequence {
+ return gen.NewCounterByteSequence("a-%s", 0, 5)
+ },
+ },
+ {
+ TagKey: "t1",
+ Values: func() gen.CountableSequence {
+ return gen.NewCounterByteSequence("b-%s", 0, 1000)
+ },
+ },
+ },
+ }
+ spec := gen.Spec{
+ OrgID: org,
+ BucketID: bucket,
+ Measurements: []gen.MeasurementSpec{
+ {
+ Name: "m0",
+ TagsSpec: tagsSpec,
+ FieldValuesSpec: &gen.FieldValuesSpec{
+ Name: "f0",
+ TimeSequenceSpec: gen.TimeSequenceSpec{
+ Count: math.MaxInt32,
+ Delta: time.Minute,
+ },
+ DataType: models.Float,
+ Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
+ r := rand.New(rand.NewSource(10))
+ return gen.NewTimeFloatValuesSequence(
+ spec.Count,
+ gen.NewTimestampSequenceFromSpec(spec),
+ gen.NewFloatRandomValuesSequence(0, 90, r),
+ )
+ },
+ },
+ },
+ {
+ Name: "m0",
+ TagsSpec: tagsSpec,
+ FieldValuesSpec: &gen.FieldValuesSpec{
+ Name: "f1",
+ TimeSequenceSpec: gen.TimeSequenceSpec{
+ Count: math.MaxInt32,
+ Delta: time.Minute,
+ },
+ DataType: models.Float,
+ Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
+ r := rand.New(rand.NewSource(11))
+ return gen.NewTimeFloatValuesSequence(
+ spec.Count,
+ gen.NewTimestampSequenceFromSpec(spec),
+ gen.NewFloatRandomValuesSequence(0, 180, r),
+ )
+ },
+ },
+ },
+ {
+ Name: "m0",
+ TagsSpec: tagsSpec,
+ FieldValuesSpec: &gen.FieldValuesSpec{
+ Name: "f1",
+ TimeSequenceSpec: gen.TimeSequenceSpec{
+ Count: math.MaxInt32,
+ Delta: time.Minute,
+ },
+ DataType: models.Float,
+ Values: func(spec gen.TimeSequenceSpec) gen.TimeValuesSequence {
+ r := rand.New(rand.NewSource(12))
+ return gen.NewTimeFloatValuesSequence(
+ spec.Count,
+ gen.NewTimestampSequenceFromSpec(spec),
+ gen.NewFloatRandomValuesSequence(10, 10000, r),
+ )
+ },
+ },
+ },
+ },
+ }
+ tr := gen.TimeRange{
+ Start: mustParseTime("2019-11-25T00:00:00Z"),
+ End: mustParseTime("2019-11-26T00:00:00Z"),
+ }
+ return gen.NewSeriesGeneratorFromSpec(&spec, tr), tr
+ }
+ benchmarkRead(b, setupFn, func(r *StorageReader) error {
mem := &memory.Allocator{}
tables, err := r.ReadFilter(context.Background(), query.ReadFilterSpec{
- OrganizationID: spec.OrgID,
- BucketID: spec.BucketID,
- Bounds: execute.Bounds{
- Start: values.ConvertTime(tr.Start),
- Stop: values.ConvertTime(tr.End),
- },
+ OrganizationID: r.Org,
+ BucketID: r.Bucket,
+ Bounds: r.Bounds,
}, mem)
if err != nil {
return err
@@ -134,27 +534,9 @@ func BenchmarkReadFilter(b *testing.B) {
})
}
-func benchmarkRead(b *testing.B, sg gen.SeriesGenerator, f func(r query.StorageReader) error) {
- logger := zaptest.NewLogger(b)
- rootDir, err := ioutil.TempDir("", "storage-reads-test")
- if err != nil {
- b.Fatal(err)
- }
- defer func() { _ = os.RemoveAll(rootDir) }()
-
- generator := generate.Generator{}
- if _, err := generator.Run(context.Background(), rootDir, sg); err != nil {
- b.Fatal(err)
- }
-
- enginePath := filepath.Join(rootDir, "engine")
- engine := storage.NewEngine(enginePath, storage.NewConfig())
- engine.WithLogger(logger)
-
- if err := engine.Open(context.Background()); err != nil {
- b.Fatal(err)
- }
- reader := storageflux.NewReader(readservice.NewStore(engine))
+func benchmarkRead(b *testing.B, setupFn SetupFunc, f func(r *StorageReader) error) {
+ reader := NewStorageReader(b, setupFn)
+ defer reader.Close()
b.ResetTimer()
b.ReportAllocs()
diff --git a/storage/flux/window.go b/storage/flux/window.go
new file mode 100644
index 00000000000..c8994d68770
--- /dev/null
+++ b/storage/flux/window.go
@@ -0,0 +1,183 @@
+package storageflux
+
+import (
+ "context"
+ "fmt"
+ "sync/atomic"
+
+ "github.com/apache/arrow/go/arrow/array"
+ "github.com/influxdata/flux"
+ "github.com/influxdata/flux/arrow"
+ "github.com/influxdata/flux/execute"
+ "github.com/influxdata/flux/values"
+ "github.com/influxdata/influxdb/v2"
+)
+
+// splitWindows will split a windowTable by creating a new table from each
+// row and modifying the group key to use the start and stop values from
+// that row.
+func splitWindows(ctx context.Context, in flux.Table, f func(t flux.Table) error) error {
+ wts := &windowTableSplitter{
+ ctx: ctx,
+ in: in,
+ }
+ return wts.Do(f)
+}
+
+type windowTableSplitter struct {
+ ctx context.Context
+ in flux.Table
+}
+
+func (w *windowTableSplitter) Do(f func(flux.Table) error) error {
+ defer w.in.Done()
+
+ startIdx, err := w.getTimeColumnIndex(execute.DefaultStartColLabel)
+ if err != nil {
+ return err
+ }
+
+ stopIdx, err := w.getTimeColumnIndex(execute.DefaultStopColLabel)
+ if err != nil {
+ return err
+ }
+
+ return w.in.Do(func(cr flux.ColReader) error {
+ // Retrieve the start and stop columns for splitting
+ // the windows.
+ start := cr.Times(startIdx)
+ stop := cr.Times(stopIdx)
+
+ // Iterate through each time to produce a table
+ // using the start and stop values.
+ arrs := make([]array.Interface, len(cr.Cols()))
+ for j := range cr.Cols() {
+ arrs[j] = getColumnValues(cr, j)
+ }
+
+ for i, n := 0, cr.Len(); i < n; i++ {
+ startT, stopT := start.Value(i), stop.Value(i)
+
+ // Rewrite the group key using the new time.
+ key := groupKeyForWindow(cr.Key(), startT, stopT)
+
+ // Produce a slice for each column into a new
+ // table buffer.
+ buffer := arrow.TableBuffer{
+ GroupKey: key,
+ Columns: cr.Cols(),
+ Values: make([]array.Interface, len(cr.Cols())),
+ }
+ for j, arr := range arrs {
+ buffer.Values[j] = arrow.Slice(arr, int64(i), int64(i+1))
+ }
+
+ // Wrap these into a single table and execute.
+ done := make(chan struct{})
+ table := &windowTableRow{
+ buffer: buffer,
+ done: done,
+ }
+ if err := f(table); err != nil {
+ return err
+ }
+
+ select {
+ case <-done:
+ case <-w.ctx.Done():
+ return w.ctx.Err()
+ }
+ }
+ return nil
+ })
+}
+
+func (w *windowTableSplitter) getTimeColumnIndex(label string) (int, error) {
+ j := execute.ColIdx(label, w.in.Cols())
+ if j < 0 {
+ return -1, &influxdb.Error{
+ Code: influxdb.EInvalid,
+ Msg: fmt.Sprintf("missing %q column from window splitter", label),
+ }
+ } else if c := w.in.Cols()[j]; c.Type != flux.TTime {
+ return -1, &influxdb.Error{
+ Code: influxdb.EInvalid,
+ Msg: fmt.Sprintf("%q column must be of type time", label),
+ }
+ }
+ return j, nil
+}
+
+type windowTableRow struct {
+ used int32
+ buffer arrow.TableBuffer
+ done chan struct{}
+}
+
+func (w *windowTableRow) Key() flux.GroupKey {
+ return w.buffer.GroupKey
+}
+
+func (w *windowTableRow) Cols() []flux.ColMeta {
+ return w.buffer.Columns
+}
+
+func (w *windowTableRow) Do(f func(flux.ColReader) error) error {
+ if !atomic.CompareAndSwapInt32(&w.used, 0, 1) {
+ return &influxdb.Error{
+ Code: influxdb.EInternal,
+ Msg: "table already read",
+ }
+ }
+ defer close(w.done)
+
+ err := f(&w.buffer)
+ w.buffer.Release()
+ return err
+}
+
+func (w *windowTableRow) Done() {
+ if atomic.CompareAndSwapInt32(&w.used, 0, 1) {
+ w.buffer.Release()
+ close(w.done)
+ }
+}
+
+func (w *windowTableRow) Empty() bool {
+ return false
+}
+
+func groupKeyForWindow(key flux.GroupKey, start, stop int64) flux.GroupKey {
+ cols := key.Cols()
+ vs := make([]values.Value, len(cols))
+ for j, c := range cols {
+ if c.Label == execute.DefaultStartColLabel {
+ vs[j] = values.NewTime(values.Time(start))
+ } else if c.Label == execute.DefaultStopColLabel {
+ vs[j] = values.NewTime(values.Time(stop))
+ } else {
+ vs[j] = key.Value(j)
+ }
+ }
+ return execute.NewGroupKey(cols, vs)
+}
+
+// getColumnValues returns the array from the column reader as an array.Interface.
+func getColumnValues(cr flux.ColReader, j int) array.Interface {
+ switch typ := cr.Cols()[j].Type; typ {
+ case flux.TInt:
+ return cr.Ints(j)
+ case flux.TUInt:
+ return cr.UInts(j)
+ case flux.TFloat:
+ return cr.Floats(j)
+ case flux.TString:
+ return cr.Strings(j)
+ case flux.TBool:
+ return cr.Bools(j)
+ case flux.TTime:
+ return cr.Times(j)
+ default:
+ panic(fmt.Errorf("unimplemented column type: %s", typ))
+ }
+}
|
tabby
|
https://github.com/TabbyML/tabby
|
19bade6e45fc6c240659bc0d2a4fb0854cc7ce9f
|
Meng Zhang
|
2024-10-24 08:27:04
|
chore(ui): tune thread-feeds component (#3308)
|
* chore(ui): enhance thread-feeds component with dynamic class names and add margin to ThreadFeeds in MainPanel
* refactor(ui): replace IconMessagesSquare with IconFiles in thread-feeds component
* [autofix.ci] apply automated fixes
---------
|
chore(ui): tune thread-feeds component (#3308)
* chore(ui): enhance thread-feeds component with dynamic class names and add margin to ThreadFeeds in MainPanel
* refactor(ui): replace IconMessagesSquare with IconFiles in thread-feeds component
* [autofix.ci] apply automated fixes
---------
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
diff --git a/ee/tabby-ui/app/(home)/components/thread-feeds.tsx b/ee/tabby-ui/app/(home)/components/thread-feeds.tsx
index 7a8efa5b6208..6f90375cf8cd 100644
--- a/ee/tabby-ui/app/(home)/components/thread-feeds.tsx
+++ b/ee/tabby-ui/app/(home)/components/thread-feeds.tsx
@@ -10,8 +10,8 @@ import { graphql } from '@/lib/gql/generates'
import { ContextSource, ListThreadsQuery } from '@/lib/gql/generates/graphql'
import { Member, useAllMembers } from '@/lib/hooks/use-all-members'
import { contextInfoQuery, listThreadMessages } from '@/lib/tabby/query'
-import { getTitleFromMessages } from '@/lib/utils'
-import { IconMessagesSquare, IconSpinner } from '@/components/ui/icons'
+import { cn, getTitleFromMessages } from '@/lib/utils'
+import { IconFiles, IconSpinner } from '@/components/ui/icons'
import { Separator } from '@/components/ui/separator'
import { Skeleton } from '@/components/ui/skeleton'
import { LoadMoreIndicator } from '@/components/load-more-indicator'
@@ -134,7 +134,7 @@ export function ThreadFeeds({
onNavigateToThread
}}
>
- <div className="w-full">
+ <div className={cn('w-full', className)}>
<AnimationWrapper delay={0.4} style={{ width: '100%' }}>
<LoadingWrapper
loading={fetching || fetchingUsers}
@@ -229,7 +229,7 @@ function ThreadItem({ data }: ThreadItemProps) {
>
<div className="transform-bg group flex-1 overflow-hidden rounded-lg px-3 py-2 hover:bg-accent">
<div className="mb-1.5 flex items-center gap-2">
- <IconMessagesSquare className="shrink-0" />
+ <IconFiles className="shrink-0" />
<LoadingWrapper
loading={fetching}
fallback={
diff --git a/ee/tabby-ui/app/(home)/page.tsx b/ee/tabby-ui/app/(home)/page.tsx
index dd769124b9ba..5121717b4bfe 100644
--- a/ee/tabby-ui/app/(home)/page.tsx
+++ b/ee/tabby-ui/app/(home)/page.tsx
@@ -138,6 +138,7 @@ function MainPanel() {
)}
<Stats />
<ThreadFeeds
+ className="lg:mt-8"
onNavigateToThread={() => {
if (!scroller.current) return
setHomeScrollPosition(scroller.current.scrollTop)
diff --git a/ee/tabby-ui/components/ui/icons.tsx b/ee/tabby-ui/components/ui/icons.tsx
index f307428339ec..f5cf6ae27260 100644
--- a/ee/tabby-ui/components/ui/icons.tsx
+++ b/ee/tabby-ui/components/ui/icons.tsx
@@ -11,6 +11,7 @@ import {
Bug,
ChevronsDownUp,
CirclePlay,
+ Files,
FileText,
Filter,
GitFork,
@@ -1619,11 +1620,11 @@ function IconHash({ className, ...props }: React.ComponentProps<typeof Hash>) {
return <Hash className={cn('h-4 w-4', className)} {...props} />
}
-function IconMessagesSquare({
+function IconFiles({
className,
...props
}: React.ComponentProps<typeof MessagesSquare>) {
- return <MessagesSquare className={cn('h-4 w-4', className)} {...props} />
+ return <Files className={cn('h-4 w-4', className)} {...props} />
}
export {
@@ -1723,5 +1724,5 @@ export {
IconWrapText,
IconAlignJustify,
IconHash,
- IconMessagesSquare
+ IconFiles
}
|
RSSHub
|
https://github.com/DIYgod/RSSHub
|
c2a886f91d1c38ca5c69cc08b229828e74c36d3c
|
Ethan Shen
|
2022-02-02 01:07:46
|
feat(route): add Whoscall (#8478)
|
* feat(route): add Whoscall
* fix: add docs
|
feat(route): add Whoscall (#8478)
* feat(route): add Whoscall
* fix: add docs
|
diff --git a/docs/blog.md b/docs/blog.md
index 4b0901963e6f68..631ddf2d73bdc6 100644
--- a/docs/blog.md
+++ b/docs/blog.md
@@ -90,6 +90,33 @@ pageClass: routes
<Route author="CitrusIce" example="/phrack" path="/phrack" />
+## Whoscall
+
+### 最新文章
+
+<Route author="nczitzk" example="/whoscall" path="/whoscall"/>
+
+</Route>
+
+### 分類
+
+<Route author="nczitzk" example="/whoscall/categories/5-Whoscall 百科" path="/whoscall/categories/:category?" :paramsDesc="['分类，见下表，可在对应分類页 URL 中找到，默认为最新文章']">
+
+| News | Whoscall 百科 | 防詐小學堂 | Whoscall 日常 |
+| ------ | --------------- | -------------- | --------------- |
+| 1-News | 5-Whoscall 百科 | 4 - 防詐小學堂 | 6-Whoscall 日常 |
+
+</Route>
+
+### 標籤
+
+<Route author="nczitzk" example="/whoscall/tags/whoscall小百科" path="/whoscall/tags/:tag?" :paramsDesc="['標籤，见下表，可在对应標籤页 URL 中找到，默认为最新文章']">
+
+| 防疫也防詐 | 防詐專家 | 來電辨識 | whoscall 日常 |
+| ---------- | -------- | -------- | ------------- |
+
+</Route>
+
## WordPress
<Route author="Lonor" example="/blogs/wordpress/lawrence.code.blog" path="/blogs/wordpress/:domain/:https?" :paramsDesc="['WordPress 博客域名', '默认 https 协议。填写 `http`或`https`']"/>
diff --git a/lib/v2/whoscall/index.js b/lib/v2/whoscall/index.js
new file mode 100644
index 00000000000000..80a7846be22e19
--- /dev/null
+++ b/lib/v2/whoscall/index.js
@@ -0,0 +1,55 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+ const id = ctx.params.id ?? '';
+ const what = ctx.params.what ?? '';
+
+ const rootUrl = 'https://whoscall.com';
+ const currentUrl = `${rootUrl}/zh-hant/blog/${id ? `${what}/${id}` : 'articles'}`;
+
+ const response = await got({
+ method: 'get',
+ url: currentUrl,
+ });
+
+ const $ = cheerio.load(response.data);
+
+ const list = $('.post-card__title a')
+ .map((_, item) => {
+ item = $(item);
+
+ return {
+ title: item.text(),
+ link: `${rootUrl}${item.attr('href')}`,
+ };
+ })
+ .get();
+
+ const items = await Promise.all(
+ list.map((item) =>
+ ctx.cache.tryGet(item.link, async () => {
+ const detailResponse = await got({
+ method: 'get',
+ url: item.link,
+ });
+
+ const content = cheerio.load(detailResponse.data);
+
+ item.description = content('.blog-article__body').html();
+ item.pubDate = parseDate(detailResponse.data.match(/"datePublished":"(.*)","dateModified"/)[1]);
+
+ return item;
+ })
+ )
+ );
+
+ ctx.state.data = {
+ title: $('title')
+ .text()
+ .replace(/ - 第\d+頁/, ''),
+ link: currentUrl,
+ item: items,
+ };
+};
diff --git a/lib/v2/whoscall/maintainer.js b/lib/v2/whoscall/maintainer.js
new file mode 100644
index 00000000000000..dd4f9e28d470f2
--- /dev/null
+++ b/lib/v2/whoscall/maintainer.js
@@ -0,0 +1,5 @@
+module.exports = {
+ '/': ['nczitzk'],
+ '/tags/:tag?': ['nczitzk'],
+ '/categories/:category?': ['nczitzk'],
+};
diff --git a/lib/v2/whoscall/radar.js b/lib/v2/whoscall/radar.js
new file mode 100644
index 00000000000000..e13c42e266c69b
--- /dev/null
+++ b/lib/v2/whoscall/radar.js
@@ -0,0 +1,25 @@
+module.exports = {
+ 'whoscall.com': {
+ _name: 'Whoscall',
+ '.': [
+ {
+ title: '最新文章',
+ docs: 'https://docs.rsshub.app/blog.html#whoscall-zui-xin-wen-zhang',
+ source: ['/zh-hant/blog/articles', '/'],
+ target: '/whoscall',
+ },
+ {
+ title: '分類',
+ docs: 'https://docs.rsshub.app/blog.html#whoscall-fen-lei',
+ source: ['/zh-hant/blog/categories/:category', '/'],
+ target: '/whoscall/categories/:category?',
+ },
+ {
+ title: '標籤',
+ docs: 'https://docs.rsshub.app/blog.html#whoscall-biao-qian',
+ source: ['/zh-hant/blog/tags/:tag', '/'],
+ target: '/whoscall/tags/:tag?',
+ },
+ ],
+ },
+};
diff --git a/lib/v2/whoscall/router.js b/lib/v2/whoscall/router.js
new file mode 100644
index 00000000000000..73d31c4be5affc
--- /dev/null
+++ b/lib/v2/whoscall/router.js
@@ -0,0 +1,3 @@
+module.exports = function (router) {
+ router.get('/:what?/:id?', require('./index'));
+};
|
tilt
|
https://github.com/tilt-dev/tilt
|
f5b6d303e01c4e980f1b174a460f006b912afa4e
|
dependabot[bot]
|
2022-12-08 06:43:11
|
build(deps): bump decode-uri-component from 0.2.0 to 0.2.2 in /web (#5985)
|
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)
---
|
build(deps): bump decode-uri-component from 0.2.0 to 0.2.2 in /web (#5985)
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)
---
updated-dependencies:
- dependency-name: decode-uri-component
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
diff --git a/web/yarn.lock b/web/yarn.lock
index 4e903f0261..6432a0d6fe 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -6034,9 +6034,9 @@ decimal.js@^10.2.1, decimal.js@^10.3.1:
integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
decode-uri-component@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
- integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+ integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
dedent@^0.7.0:
version "0.7.0"
|
angular
|
https://github.com/angular/angular
|
182e2c7449a347b50142d1d462578abb59a42e51
|
Alex Rickabaugh
|
2019-04-19 23:45:25
|
feat(ivy): add backwards compatibility config to template type-checking (#29698)
|
View Engine's implementation of naive template type-checking is less
advanced than the current Ivy implementation. As a result, Ivy catches lots
of typing bugs which VE does not. As a result, it's necessary to tone down
the Ivy template type-checker in the default case.
This commit introduces a mechanism for doing that, by passing a config to
the template type-checking engine. Through this configuration, particular
checks can be loosened or disabled entirely.
Testing strategy: TCB tests included.
PR Close #29698
|
feat(ivy): add backwards compatibility config to template type-checking (#29698)
View Engine's implementation of naive template type-checking is less
advanced than the current Ivy implementation. As a result, Ivy catches lots
of typing bugs which VE does not. As a result, it's necessary to tone down
the Ivy template type-checker in the default case.
This commit introduces a mechanism for doing that, by passing a config to
the template type-checking engine. Through this configuration, particular
checks can be loosened or disabled entirely.
Testing strategy: TCB tests included.
PR Close #29698
|
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
index 3ce128cf5e8e6..52e2490b8cfe7 100644
--- a/packages/compiler-cli/src/ngtsc/program.ts
+++ b/packages/compiler-cli/src/ngtsc/program.ts
@@ -31,7 +31,7 @@ import {FactoryGenerator, FactoryInfo, GeneratedShimsHostWrapper, ShimGenerator,
import {ivySwitchTransform} from './switch';
import {IvyCompilation, declarationTransformFactory, ivyTransformFactory} from './transform';
import {aliasTransformFactory} from './transform/src/alias';
-import {TypeCheckContext, TypeCheckProgramHost} from './typecheck';
+import {TypeCheckContext, TypeCheckProgramHost, TypeCheckingConfig} from './typecheck';
import {normalizeSeparators} from './util/src/path';
import {getRootDirs, isDtsPath} from './util/src/typescript';
@@ -191,7 +191,12 @@ export class NgtscProgram implements api.Program {
const compilation = this.ensureAnalyzed();
const diagnostics = [...compilation.diagnostics];
if (!!this.options.fullTemplateTypeCheck) {
- const ctx = new TypeCheckContext(this.refEmitter !);
+ const config: TypeCheckingConfig = {
+ applyTemplateContextGuards: true,
+ checkTemplateBodies: true,
+ checkTypeOfBindings: true,
+ };
+ const ctx = new TypeCheckContext(config, this.refEmitter !);
compilation.typeCheck(ctx);
diagnostics.push(...this.compileTypeCheckProgram(ctx));
}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/api.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/api.ts
index 65225aefdd487..3f4269b4d1da0 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/api.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/api.ts
@@ -54,3 +54,25 @@ export interface TypeCtorMetadata {
*/
fields: {inputs: string[]; outputs: string[]; queries: string[];};
}
+
+export interface TypeCheckingConfig {
+ /**
+ * Whether to check the left-hand side type of binding operations.
+ *
+ * For example, if this is `false` then the expression `[input]="expr"` will have `expr` type-
+ * checked, but not the assignment of the resulting type to the `input` property of whichever
+ * directive or component is receiving the binding. If set to `true`, both sides of the assignment
+ * are checked.
+ */
+ checkTypeOfBindings: boolean;
+
+ /**
+ * Whether to narrow the types of template contexts.
+ */
+ applyTemplateContextGuards: boolean;
+
+ /**
+ * Whether to descend into template bodies and check any bindings there.
+ */
+ checkTemplateBodies: boolean;
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts
index 1942b5440b2de..71035f4809cb9 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts
@@ -13,7 +13,7 @@ import {NoopImportRewriter, ReferenceEmitter} from '../../imports';
import {ClassDeclaration} from '../../reflection';
import {ImportManager} from '../../translator';
-import {TypeCheckBlockMetadata, TypeCheckableDirectiveMeta, TypeCtorMetadata} from './api';
+import {TypeCheckBlockMetadata, TypeCheckableDirectiveMeta, TypeCheckingConfig, TypeCtorMetadata} from './api';
import {generateTypeCheckBlock} from './type_check_block';
import {generateTypeCtor} from './type_constructor';
@@ -27,7 +27,7 @@ import {generateTypeCtor} from './type_constructor';
* checking code.
*/
export class TypeCheckContext {
- constructor(private refEmitter: ReferenceEmitter) {}
+ constructor(private config: TypeCheckingConfig, private refEmitter: ReferenceEmitter) {}
/**
* A `Map` of `ts.SourceFile`s that the context has seen to the operations (additions of methods
@@ -141,7 +141,7 @@ export class TypeCheckContext {
this.opMap.set(sf, []);
}
const ops = this.opMap.get(sf) !;
- ops.push(new TcbOp(node, tcbMeta));
+ ops.push(new TcbOp(node, tcbMeta, this.config));
}
}
@@ -171,8 +171,8 @@ interface Op {
*/
class TcbOp implements Op {
constructor(
- readonly node: ClassDeclaration<ts.ClassDeclaration>, readonly meta: TypeCheckBlockMetadata) {
- }
+ readonly node: ClassDeclaration<ts.ClassDeclaration>, readonly meta: TypeCheckBlockMetadata,
+ readonly config: TypeCheckingConfig) {}
/**
* Type check blocks are inserted immediately after the end of the component class.
@@ -181,7 +181,7 @@ class TcbOp implements Op {
execute(im: ImportManager, sf: ts.SourceFile, refEmitter: ReferenceEmitter, printer: ts.Printer):
string {
- const tcb = generateTypeCheckBlock(this.node, this.meta, im, refEmitter);
+ const tcb = generateTypeCheckBlock(this.node, this.meta, this.config, im, refEmitter);
return printer.printNode(ts.EmitHint.Unspecified, tcb, sf);
}
}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
index 32d7946a61356..15e24fe3276cb 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts
@@ -9,6 +9,7 @@
import {AST, ASTWithSource, Binary, Conditional, Interpolation, KeyedRead, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, NonNullAssert, PropertyRead} from '@angular/compiler';
import * as ts from 'typescript';
+import {TypeCheckingConfig} from './api';
const BINARY_OPS = new Map<string, ts.SyntaxKind>([
['+', ts.SyntaxKind.PlusToken],
['-', ts.SyntaxKind.MinusToken],
@@ -34,7 +35,8 @@ const BINARY_OPS = new Map<string, ts.SyntaxKind>([
* AST.
*/
export function astToTypescript(
- ast: AST, maybeResolve: (ast: AST) => ts.Expression | null): ts.Expression {
+ ast: AST, maybeResolve: (ast: AST) => ts.Expression | null,
+ config: TypeCheckingConfig): ts.Expression {
const resolved = maybeResolve(ast);
if (resolved !== null) {
return resolved;
@@ -42,17 +44,17 @@ export function astToTypescript(
// Branch based on the type of expression being processed.
if (ast instanceof ASTWithSource) {
// Fall through to the underlying AST.
- return astToTypescript(ast.ast, maybeResolve);
+ return astToTypescript(ast.ast, maybeResolve, config);
} else if (ast instanceof PropertyRead) {
// This is a normal property read - convert the receiver to an expression and emit the correct
// TypeScript expression to read the property.
- const receiver = astToTypescript(ast.receiver, maybeResolve);
+ const receiver = astToTypescript(ast.receiver, maybeResolve, config);
return ts.createPropertyAccess(receiver, ast.name);
} else if (ast instanceof Interpolation) {
- return astArrayToExpression(ast.expressions, maybeResolve);
+ return astArrayToExpression(ast.expressions, maybeResolve, config);
} else if (ast instanceof Binary) {
- const lhs = astToTypescript(ast.left, maybeResolve);
- const rhs = astToTypescript(ast.right, maybeResolve);
+ const lhs = astToTypescript(ast.left, maybeResolve, config);
+ const rhs = astToTypescript(ast.right, maybeResolve, config);
const op = BINARY_OPS.get(ast.operation);
if (op === undefined) {
throw new Error(`Unsupported Binary.operation: ${ast.operation}`);
@@ -67,30 +69,30 @@ export function astToTypescript(
return ts.createLiteral(ast.value);
}
} else if (ast instanceof MethodCall) {
- const receiver = astToTypescript(ast.receiver, maybeResolve);
+ const receiver = astToTypescript(ast.receiver, maybeResolve, config);
const method = ts.createPropertyAccess(receiver, ast.name);
- const args = ast.args.map(expr => astToTypescript(expr, maybeResolve));
+ const args = ast.args.map(expr => astToTypescript(expr, maybeResolve, config));
return ts.createCall(method, undefined, args);
} else if (ast instanceof Conditional) {
- const condExpr = astToTypescript(ast.condition, maybeResolve);
- const trueExpr = astToTypescript(ast.trueExp, maybeResolve);
- const falseExpr = astToTypescript(ast.falseExp, maybeResolve);
+ const condExpr = astToTypescript(ast.condition, maybeResolve, config);
+ const trueExpr = astToTypescript(ast.trueExp, maybeResolve, config);
+ const falseExpr = astToTypescript(ast.falseExp, maybeResolve, config);
return ts.createParen(ts.createConditional(condExpr, trueExpr, falseExpr));
} else if (ast instanceof LiteralArray) {
- const elements = ast.expressions.map(expr => astToTypescript(expr, maybeResolve));
+ const elements = ast.expressions.map(expr => astToTypescript(expr, maybeResolve, config));
return ts.createArrayLiteral(elements);
} else if (ast instanceof LiteralMap) {
const properties = ast.keys.map(({key}, idx) => {
- const value = astToTypescript(ast.values[idx], maybeResolve);
+ const value = astToTypescript(ast.values[idx], maybeResolve, config);
return ts.createPropertyAssignment(ts.createStringLiteral(key), value);
});
return ts.createObjectLiteral(properties, true);
} else if (ast instanceof KeyedRead) {
- const receiver = astToTypescript(ast.obj, maybeResolve);
- const key = astToTypescript(ast.key, maybeResolve);
+ const receiver = astToTypescript(ast.obj, maybeResolve, config);
+ const key = astToTypescript(ast.key, maybeResolve, config);
return ts.createElementAccess(receiver, key);
} else if (ast instanceof NonNullAssert) {
- const expr = astToTypescript(ast.expression, maybeResolve);
+ const expr = astToTypescript(ast.expression, maybeResolve, config);
return ts.createNonNullExpression(expr);
} else {
throw new Error(`Unknown node type: ${Object.getPrototypeOf(ast).constructor}`);
@@ -102,13 +104,14 @@ export function astToTypescript(
* and separating them with commas.
*/
function astArrayToExpression(
- astArray: AST[], maybeResolve: (ast: AST) => ts.Expression | null): ts.Expression {
+ astArray: AST[], maybeResolve: (ast: AST) => ts.Expression | null,
+ config: TypeCheckingConfig): ts.Expression {
// Reduce the `asts` array into a `ts.Expression`. Multiple expressions are combined into a
// `ts.BinaryExpression` with a comma separator. First make a copy of the input array, as
// it will be modified during the reduction.
const asts = astArray.slice();
return asts.reduce(
- (lhs, ast) =>
- ts.createBinary(lhs, ts.SyntaxKind.CommaToken, astToTypescript(ast, maybeResolve)),
- astToTypescript(asts.pop() !, maybeResolve));
+ (lhs, ast) => ts.createBinary(
+ lhs, ts.SyntaxKind.CommaToken, astToTypescript(ast, maybeResolve, config)),
+ astToTypescript(asts.pop() !, maybeResolve, config));
}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
index 3a2e4732e61f1..3b0dd0a2bf4db 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts
@@ -13,7 +13,7 @@ import {NOOP_DEFAULT_IMPORT_RECORDER, Reference, ReferenceEmitter} from '../../i
import {ClassDeclaration} from '../../reflection';
import {ImportManager, translateExpression, translateType} from '../../translator';
-import {TypeCheckBlockMetadata, TypeCheckableDirectiveMeta} from './api';
+import {TypeCheckBlockMetadata, TypeCheckableDirectiveMeta, TypeCheckingConfig} from './api';
import {astToTypescript} from './expression';
/**
@@ -29,8 +29,10 @@ import {astToTypescript} from './expression';
*/
export function generateTypeCheckBlock(
node: ClassDeclaration<ts.ClassDeclaration>, meta: TypeCheckBlockMetadata,
- importManager: ImportManager, refEmitter: ReferenceEmitter): ts.FunctionDeclaration {
- const tcb = new Context(meta.boundTarget, node.getSourceFile(), importManager, refEmitter);
+ config: TypeCheckingConfig, importManager: ImportManager,
+ refEmitter: ReferenceEmitter): ts.FunctionDeclaration {
+ const tcb =
+ new Context(config, meta.boundTarget, node.getSourceFile(), importManager, refEmitter);
const scope = Scope.forNodes(tcb, null, tcb.boundTarget.target.template !);
return ts.createFunctionDeclaration(
@@ -187,7 +189,7 @@ class TcbTemplateBodyOp extends TcbOp {
// The second kind of guard is a template context guard. This guard narrows the template
// rendering context variable `ctx`.
- if (dir.hasNgTemplateContextGuard) {
+ if (dir.hasNgTemplateContextGuard && this.tcb.config.applyTemplateContextGuards) {
const ctx = this.scope.resolve(this.template);
const guardInvoke = tsCallMethod(dirId, 'ngTemplateContextGuard', [dirInstId, ctx]);
directiveGuards.push(guardInvoke);
@@ -288,7 +290,13 @@ class TcbUnclaimedInputsOp extends TcbOp {
continue;
}
- const expr = tcbExpression(binding.value, this.tcb, this.scope);
+ let expr = tcbExpression(binding.value, this.tcb, this.scope);
+
+ // If checking the type of bindings is disabled, cast the resulting expression to 'any' before
+ // the assignment.
+ if (!this.tcb.config.checkTypeOfBindings) {
+ expr = tsCastToAny(expr);
+ }
if (binding.type === BindingType.Property) {
if (binding.name !== 'style' && binding.name !== 'class') {
@@ -331,6 +339,7 @@ class Context {
private nextId = 1;
constructor(
+ readonly config: TypeCheckingConfig,
readonly boundTarget: BoundTarget<TypeCheckableDirectiveMeta>,
private sourceFile: ts.SourceFile, private importManager: ImportManager,
private refEmitter: ReferenceEmitter) {}
@@ -605,9 +614,11 @@ class Scope {
} else if (node instanceof TmplAstTemplate) {
// Template children are rendered in a child scope.
this.appendDirectivesAndInputsOfNode(node);
- const ctxIndex = this.opQueue.push(new TcbTemplateContextOp(this.tcb, this)) - 1;
- this.templateCtxOpMap.set(node, ctxIndex);
- this.opQueue.push(new TcbTemplateBodyOp(this.tcb, this, node));
+ if (this.tcb.config.checkTemplateBodies) {
+ const ctxIndex = this.opQueue.push(new TcbTemplateContextOp(this.tcb, this)) - 1;
+ this.templateCtxOpMap.set(node, ctxIndex);
+ this.opQueue.push(new TcbTemplateBodyOp(this.tcb, this, node));
+ }
} else if (node instanceof TmplAstBoundText) {
this.opQueue.push(new TcbTextInterpolationOp(this.tcb, this, node));
}
@@ -681,7 +692,7 @@ function tcbExpression(ast: AST, tcb: Context, scope: Scope): ts.Expression {
// `astToTypescript` actually does the conversion. A special resolver `tcbResolve` is passed which
// interprets specific expression nodes that interact with the `ImplicitReceiver`. These nodes
// actually refer to identifiers within the current scope.
- return astToTypescript(ast, (ast) => tcbResolve(ast, tcb, scope));
+ return astToTypescript(ast, (ast) => tcbResolve(ast, tcb, scope), tcb.config);
}
/**
@@ -695,7 +706,12 @@ function tcbCallTypeCtor(
// Construct an array of `ts.PropertyAssignment`s for each input of the directive that has a
// matching binding.
- const members = bindings.map(b => ts.createPropertyAssignment(b.field, b.expression));
+ const members = bindings.map(({field, expression}) => {
+ if (!tcb.config.checkTypeOfBindings) {
+ expression = tsCastToAny(expression);
+ }
+ return ts.createPropertyAssignment(field, expression);
+ });
// Call the `ngTypeCtor` method on the directive class, with an object literal argument created
// from the matched inputs.
@@ -874,3 +890,8 @@ function tcbResolve(ast: AST, tcb: Context, scope: Scope): ts.Expression|null {
return null;
}
}
+
+function tsCastToAny(expr: ts.Expression): ts.Expression {
+ return ts.createParen(
+ ts.createAsExpression(expr, ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)));
+}
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
index 0b31ee3ea689c..f874654f8a1da 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_check_block_spec.ts
@@ -12,7 +12,7 @@ import * as ts from 'typescript';
import {ImportMode, Reference, ReferenceEmitStrategy, ReferenceEmitter} from '../../imports';
import {ClassDeclaration, isNamedClassDeclaration} from '../../reflection';
import {ImportManager} from '../../translator';
-import {TypeCheckBlockMetadata, TypeCheckableDirectiveMeta} from '../src/api';
+import {TypeCheckBlockMetadata, TypeCheckableDirectiveMeta, TypeCheckingConfig} from '../src/api';
import {generateTypeCheckBlock} from '../src/type_check_block';
@@ -74,6 +74,66 @@ describe('type check blocks', () => {
expect(block).not.toContain('.class = ');
expect(block).not.toContain('.style = ');
});
+
+ describe('config', () => {
+ const DIRECTIVES: TestDirective[] = [{
+ name: 'Dir',
+ selector: '[dir]',
+ exportAs: ['dir'],
+ inputs: {'dirInput': 'dirInput'},
+ hasNgTemplateContextGuard: true,
+ }];
+ const BASE_CONFIG: TypeCheckingConfig = {
+ applyTemplateContextGuards: true,
+ checkTemplateBodies: true,
+ checkTypeOfBindings: true,
+ };
+
+ describe('config.applyTemplateContextGuards', () => {
+ const TEMPLATE = `<div *dir></div>`;
+ const GUARD_APPLIED = 'if (i0.Dir.ngTemplateContextGuard(';
+
+ it('should apply template context guards when enabled', () => {
+ const block = tcb(TEMPLATE, DIRECTIVES);
+ expect(block).toContain(GUARD_APPLIED);
+ });
+ it('should not apply template context guards when disabled', () => {
+ const DISABLED_CONFIG = {...BASE_CONFIG, applyTemplateContextGuards: false};
+ const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
+ expect(block).not.toContain(GUARD_APPLIED);
+ });
+ });
+
+ describe('config.checkTemplateBodies', () => {
+ const TEMPLATE = `<ng-template>{{a}}</ng-template>`;
+
+ it('should descend into template bodies when enabled', () => {
+ const block = tcb(TEMPLATE, DIRECTIVES);
+ expect(block).toContain('ctx.a;');
+ });
+ it('should not descend into template bodies when disabled', () => {
+ const DISABLED_CONFIG = {...BASE_CONFIG, checkTemplateBodies: false};
+ const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
+ expect(block).not.toContain('ctx.a;');
+ });
+ });
+
+ describe('config.checkTypeOfBindings', () => {
+ const TEMPLATE = `<div dir [dirInput]="a" [nonDirInput]="a"></div>`;
+
+ it('should check types of bindings when enabled', () => {
+ const block = tcb(TEMPLATE, DIRECTIVES);
+ expect(block).toContain('i0.Dir.ngTypeCtor({ dirInput: ctx.a })');
+ expect(block).toContain('.nonDirInput = ctx.a;');
+ });
+ it('should not check types of bindings when disabled', () => {
+ const DISABLED_CONFIG = {...BASE_CONFIG, checkTypeOfBindings: false};
+ const block = tcb(TEMPLATE, DIRECTIVES, DISABLED_CONFIG);
+ expect(block).toContain('i0.Dir.ngTypeCtor({ dirInput: (ctx.a as any) })');
+ expect(block).toContain('.nonDirInput = (ctx.a as any);');
+ });
+ });
+ });
});
it('should generate a circular directive reference correctly', () => {
@@ -128,7 +188,8 @@ type TestDirective =
Partial<Pick<TypeCheckableDirectiveMeta, Exclude<keyof TypeCheckableDirectiveMeta, 'ref'>>>&
{selector: string, name: string};
-function tcb(template: string, directives: TestDirective[] = []): string {
+function tcb(
+ template: string, directives: TestDirective[] = [], config?: TypeCheckingConfig): string {
const classes = ['Test', ...directives.map(dir => dir.name)];
const code = classes.map(name => `class ${name} {}`).join('\n');
@@ -161,9 +222,15 @@ function tcb(template: string, directives: TestDirective[] = []): string {
fnName: 'Test_TCB',
};
+ config = config || {
+ applyTemplateContextGuards: true,
+ checkTypeOfBindings: true,
+ checkTemplateBodies: true,
+ };
+
const im = new ImportManager(undefined, 'i');
- const tcb =
- generateTypeCheckBlock(clazz, meta, im, new ReferenceEmitter([new FakeReferenceStrategy()]));
+ const tcb = generateTypeCheckBlock(
+ clazz, meta, config, im, new ReferenceEmitter([new FakeReferenceStrategy()]));
const res = ts.createPrinter().printNode(ts.EmitHint.Unspecified, tcb, sf);
return res.replace(/\s+/g, ' ');
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts
index ab64dded323ed..e8363d3945d4c 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts
@@ -13,6 +13,7 @@ import {LogicalFileSystem} from '../../path';
import {isNamedClassDeclaration} from '../../reflection';
import {getDeclaration, makeProgram} from '../../testing/in_memory_typescript';
import {getRootDirs} from '../../util/src/typescript';
+import {TypeCheckingConfig} from '../src/api';
import {TypeCheckContext} from '../src/context';
import {TypeCheckProgramHost} from '../src/host';
@@ -24,6 +25,12 @@ const LIB_D_TS = {
type NonNullable<T> = T extends null | undefined ? never : T;`
};
+const ALL_ENABLED_CONFIG: TypeCheckingConfig = {
+ applyTemplateContextGuards: true,
+ checkTemplateBodies: true,
+ checkTypeOfBindings: true,
+};
+
describe('ngtsc typechecking', () => {
describe('ctors', () => {
it('compiles a basic type constructor', () => {
@@ -47,7 +54,7 @@ TestClass.ngTypeCtor({value: 'test'});
new AbsoluteModuleStrategy(program, checker, options, host),
new LogicalProjectStrategy(checker, logicalFs),
]);
- const ctx = new TypeCheckContext(emitter);
+ const ctx = new TypeCheckContext(ALL_ENABLED_CONFIG, emitter);
const TestClass = getDeclaration(program, 'main.ts', 'TestClass', isNamedClassDeclaration);
ctx.addTypeCtor(program.getSourceFile('main.ts') !, TestClass, {
fnName: 'ngTypeCtor',
|
ant-design
|
https://github.com/ant-design/ant-design
|
39e37bf1b41102354e23ebeb072748429aef1f5e
|
偏右
|
2020-10-30 12:57:37
|
fix: Input[allowClear] className (#27462)
|
* fix: Input[allowClear] className missing
|
fix: Input[allowClear] className (#27462)
* fix: Input[allowClear] className missing
close #27444
* fix snapshot
|
diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap
index a6ec07b9f409..e2570853b0b1 100644
--- a/components/form/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/form/__tests__/__snapshots__/demo.test.js.snap
@@ -7623,7 +7623,7 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
class="ant-form-item-control-input-content"
>
<span
- class="ant-input-affix-wrapper"
+ class="ant-input-affix-wrapper ant-input-password"
>
<input
action="click"
diff --git a/components/input/ClearableLabeledInput.tsx b/components/input/ClearableLabeledInput.tsx
index c049a72a636e..0ac0afe1ef36 100644
--- a/components/input/ClearableLabeledInput.tsx
+++ b/components/input/ClearableLabeledInput.tsx
@@ -12,6 +12,10 @@ export function hasPrefixSuffix(props: InputProps | ClearableInputProps) {
return !!(props.prefix || props.suffix || props.allowClear);
}
+function hasAddon(props: InputProps | ClearableInputProps) {
+ return !!(props.addonBefore || props.addonAfter);
+}
+
/**
* This basic props required for input and textarea.
*/
@@ -121,8 +125,8 @@ class ClearableLabeledInput extends React.Component<ClearableInputProps> {
[`${prefixCls}-affix-wrapper-rtl`]: direction === 'rtl',
[`${prefixCls}-affix-wrapper-readonly`]: readOnly,
[`${prefixCls}-affix-wrapper-borderless`]: !bordered,
- // https://github.com/ant-design/ant-design/issues/27258
- [`${className}`]: !allowClear && className,
+ // className will go to addon wrapper
+ [`${className}`]: !hasAddon(this.props) && className,
});
return (
<span
@@ -145,7 +149,7 @@ class ClearableLabeledInput extends React.Component<ClearableInputProps> {
renderInputWithLabel(prefixCls: string, labeledElement: React.ReactElement) {
const { addonBefore, addonAfter, style, size, className, direction } = this.props;
// Not wrap when there is not addons
- if (!addonBefore && !addonAfter) {
+ if (!hasAddon(this.props)) {
return labeledElement;
}
@@ -156,8 +160,7 @@ class ClearableLabeledInput extends React.Component<ClearableInputProps> {
) : null;
const addonAfterNode = addonAfter ? <span className={addonClassName}>{addonAfter}</span> : null;
- const mergedWrapperClassName = classNames(`${prefixCls}-wrapper`, {
- [wrapperClassName]: addonBefore || addonAfter,
+ const mergedWrapperClassName = classNames(`${prefixCls}-wrapper`, wrapperClassName, {
[`${wrapperClassName}-rtl`]: direction === 'rtl',
});
@@ -197,8 +200,9 @@ class ClearableLabeledInput extends React.Component<ClearableInputProps> {
{
[`${prefixCls}-affix-wrapper-rtl`]: direction === 'rtl',
[`${prefixCls}-affix-wrapper-borderless`]: !bordered,
+ // className will go to addon wrapper
+ [`${className}`]: !hasAddon(this.props) && className,
},
- className,
);
return (
<span className={affixWrapperCls} style={style}>
diff --git a/components/input/__tests__/Search.test.js b/components/input/__tests__/Search.test.js
index 49f0546be61a..9c1f936e0b3c 100644
--- a/components/input/__tests__/Search.test.js
+++ b/components/input/__tests__/Search.test.js
@@ -22,10 +22,8 @@ describe('Input.Search', () => {
});
it('should support ReactNode suffix without error', () => {
- const fn = () => {
- mount(<Search suffix={<div>ok</div>} />);
- };
- expect(fn).not.toThrow();
+ const wrapper = mount(<Search suffix={<div>ok</div>} />);
+ expect(wrapper.render()).toMatchSnapshot();
});
it('should disable enter button when disabled prop is true', () => {
diff --git a/components/input/__tests__/__snapshots__/Search.test.js.snap b/components/input/__tests__/__snapshots__/Search.test.js.snap
index a2746d8e5d29..b5936dcce558 100644
--- a/components/input/__tests__/__snapshots__/Search.test.js.snap
+++ b/components/input/__tests__/__snapshots__/Search.test.js.snap
@@ -45,6 +45,62 @@ exports[`Input.Search rtl render component should be rendered correctly in RTL d
</span>
`;
+exports[`Input.Search should support ReactNode suffix without error 1`] = `
+<span
+ class="ant-input-group-wrapper ant-input-search"
+>
+ <span
+ class="ant-input-wrapper ant-input-group"
+ >
+ <span
+ class="ant-input-affix-wrapper"
+ >
+ <input
+ class="ant-input"
+ type="text"
+ value=""
+ />
+ <span
+ class="ant-input-suffix"
+ >
+ <div>
+ ok
+ </div>
+ </span>
+ </span>
+ <span
+ class="ant-input-group-addon"
+ >
+ <button
+ class="ant-btn ant-btn-icon-only ant-input-search-button"
+ type="button"
+ >
+ <span
+ aria-label="search"
+ class="anticon anticon-search"
+ role="img"
+ >
+ <svg
+ aria-hidden="true"
+ class=""
+ data-icon="search"
+ fill="currentColor"
+ focusable="false"
+ height="1em"
+ viewBox="64 64 896 896"
+ width="1em"
+ >
+ <path
+ d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"
+ />
+ </svg>
+ </span>
+ </button>
+ </span>
+ </span>
+</span>
+`;
+
exports[`Input.Search should support addonAfter 1`] = `
<span
class="ant-input-group-wrapper ant-input-search"
@@ -149,7 +205,7 @@ exports[`Input.Search should support addonAfter and suffix for loading 1`] = `
class="ant-input-wrapper ant-input-group"
>
<span
- class="ant-input-affix-wrapper ant-input-search"
+ class="ant-input-affix-wrapper"
>
<input
class="ant-input"
@@ -208,7 +264,7 @@ exports[`Input.Search should support addonAfter and suffix for loading 2`] = `
class="ant-input-wrapper ant-input-group"
>
<span
- class="ant-input-affix-wrapper ant-input-search ant-input-search-with-button"
+ class="ant-input-affix-wrapper"
>
<input
class="ant-input"
@@ -365,7 +421,7 @@ exports[`Input.Search should support invalid suffix 1`] = `
class="ant-input-wrapper ant-input-group"
>
<span
- class="ant-input-affix-wrapper ant-input-search"
+ class="ant-input-affix-wrapper"
>
<input
class="ant-input"
diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap
index 047141581bff..481fdc7203d8 100644
--- a/components/input/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/input/__tests__/__snapshots__/demo.test.js.snap
@@ -2737,7 +2737,7 @@ Array [
class="ant-input-wrapper ant-input-group"
>
<span
- class="ant-input-affix-wrapper ant-input-affix-wrapper-lg ant-input-search ant-input-search-large ant-input-search-with-button"
+ class="ant-input-affix-wrapper ant-input-affix-wrapper-lg"
>
<input
class="ant-input ant-input-lg"
diff --git a/components/input/__tests__/__snapshots__/index.test.js.snap b/components/input/__tests__/__snapshots__/index.test.js.snap
index 28a6d8740e3b..0dfbbe2c2cd2 100644
--- a/components/input/__tests__/__snapshots__/index.test.js.snap
+++ b/components/input/__tests__/__snapshots__/index.test.js.snap
@@ -354,57 +354,3 @@ exports[`Input should support size in form 1`] = `
</div>
</form>
`;
-
-exports[`Input.Search should support suffix 1`] = `
-<span
- class="ant-input-group-wrapper ant-input-search"
->
- <span
- class="ant-input-wrapper ant-input-group"
- >
- <span
- class="ant-input-affix-wrapper ant-input-search"
- >
- <input
- class="ant-input"
- type="text"
- value=""
- />
- <span
- class="ant-input-suffix"
- >
- suffix
- </span>
- </span>
- <span
- class="ant-input-group-addon"
- >
- <button
- class="ant-btn ant-btn-icon-only ant-input-search-button"
- type="button"
- >
- <span
- aria-label="search"
- class="anticon anticon-search"
- role="img"
- >
- <svg
- aria-hidden="true"
- class=""
- data-icon="search"
- fill="currentColor"
- focusable="false"
- height="1em"
- viewBox="64 64 896 896"
- width="1em"
- >
- <path
- d="M909.6 854.5L649.9 594.8C690.2 542.7 712 479 712 412c0-80.2-31.3-155.4-87.9-212.1-56.6-56.7-132-87.9-212.1-87.9s-155.5 31.3-212.1 87.9C143.2 256.5 112 331.8 112 412c0 80.1 31.3 155.5 87.9 212.1C256.5 680.8 331.8 712 412 712c67 0 130.6-21.8 182.7-62l259.7 259.6a8.2 8.2 0 0011.6 0l43.6-43.5a8.2 8.2 0 000-11.6zM570.4 570.4C528 612.7 471.8 636 412 636s-116-23.3-158.4-65.6C211.3 528 188 471.8 188 412s23.3-116.1 65.6-158.4C296 211.3 352.2 188 412 188s116.1 23.2 158.4 65.6S636 352.2 636 412s-23.3 116.1-65.6 158.4z"
- />
- </svg>
- </span>
- </button>
- </span>
- </span>
-</span>
-`;
diff --git a/components/input/__tests__/index.test.js b/components/input/__tests__/index.test.js
index fce7dbf55853..0268a9627b67 100644
--- a/components/input/__tests__/index.test.js
+++ b/components/input/__tests__/index.test.js
@@ -76,6 +76,20 @@ describe('Input', () => {
});
});
+describe('prefix and suffix', () => {
+ it('should support className when has suffix', () => {
+ const wrapper = mount(<Input suffix="suffix" className="my-class-name" />);
+ expect(wrapper.getDOMNode().className.includes('my-class-name')).toBe(true);
+ expect(wrapper.find('input').getDOMNode().className.includes('my-class-name')).toBe(false);
+ });
+
+ it('should support className when has prefix', () => {
+ const wrapper = mount(<Input prefix="prefix" className="my-class-name" />);
+ expect(wrapper.getDOMNode().className.includes('my-class-name')).toBe(true);
+ expect(wrapper.find('input').getDOMNode().className.includes('my-class-name')).toBe(false);
+ });
+});
+
describe('As Form Control', () => {
it('should be reset when wrapped in form.getFieldDecorator without initialValue', () => {
const Demo = () => {
@@ -110,13 +124,6 @@ describe('As Form Control', () => {
});
});
-describe('Input.Search', () => {
- it('should support suffix', () => {
- const wrapper = mount(<Input.Search suffix="suffix" />);
- expect(wrapper.render()).toMatchSnapshot();
- });
-});
-
describe('Input allowClear', () => {
it('should change type when click', () => {
const wrapper = mount(<Input allowClear />);
@@ -189,4 +196,11 @@ describe('Input allowClear', () => {
expect(wrapper.find('.ant-input-clear-icon-hidden').exists()).toBeTruthy();
});
});
+
+ // https://github.com/ant-design/ant-design/issues/27444
+ it('should support className', () => {
+ const wrapper = mount(<Input allowClear className="my-class-name" />);
+ expect(wrapper.getDOMNode().className.includes('my-class-name')).toBe(true);
+ expect(wrapper.find('input').getDOMNode().className.includes('my-class-name')).toBe(false);
+ });
});
|
tabby
|
https://github.com/TabbyML/tabby
|
3f1fefbfa1a3436d0a973810b8e96b2645a418c1
|
Meng Zhang
|
2023-12-26 13:08:53
|
feat(core): add TABBY_MODEL_CACHE_ROOT to allow individually set tabb… (#1121)
|
* feat(core): add TABBY_MODEL_CACHE_ROOT to allow individually set tabby model cache dir
* docs: update changelog
* [autofix.ci] apply automated fixes
---------
|
feat(core): add TABBY_MODEL_CACHE_ROOT to allow individually set tabb… (#1121)
* feat(core): add TABBY_MODEL_CACHE_ROOT to allow individually set tabby model cache dir
* docs: update changelog
* [autofix.ci] apply automated fixes
---------
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44792bca161c..c4999ea24006 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
* Add windows cpu binary distribution.
* Add linux rocm (AMD GPU) binary distribution.
* Fix cached permanent redirection on certain browsers(e.g chrome) when `--webserver` is not enabled.
+* Add environment variable `TABBY_MODEL_CACHE_ROOT` to override models cache directory individually.
# v0.7.0 (12/15/2023)
diff --git a/crates/tabby-common/src/path.rs b/crates/tabby-common/src/path.rs
index 2dc5305fe542..823d64f91ce4 100644
--- a/crates/tabby-common/src/path.rs
+++ b/crates/tabby-common/src/path.rs
@@ -9,6 +9,8 @@ lazy_static! {
Err(_) => home::home_dir().unwrap().join(".tabby"),
}))
};
+ static ref TABBY_MODEL_CACHE_ROOT: Option<PathBuf> =
+ env::var("TABBY_MODEL_CACHE_ROOT").ok().map(PathBuf::from);
}
#[cfg(feature = "testutils")]
@@ -48,7 +50,11 @@ pub fn dataset_dir() -> PathBuf {
}
pub fn models_dir() -> PathBuf {
- tabby_root().join("models")
+ if let Some(cache_root) = &*TABBY_MODEL_CACHE_ROOT {
+ cache_root.clone()
+ } else {
+ tabby_root().join("models")
+ }
}
pub fn events_dir() -> PathBuf {
|
angular
|
https://github.com/angular/angular
|
9e10af45c5da64ed1f40e8e346c85c03c4f38274
|
nikvarma
|
2024-01-25 01:53:51
|
docs: typo Chat to chart fix (#53892)
|
PR Close #53892
|
docs: typo Chat to chart fix (#53892)
PR Close #53892
|
diff --git a/adev/src/content/tools/devtools.md b/adev/src/content/tools/devtools.md
index 3a4b9c061107f7..77e7bad221c5bf 100644
--- a/adev/src/content/tools/devtools.md
+++ b/adev/src/content/tools/devtools.md
@@ -129,7 +129,7 @@ When you select a bar, DevTools displays useful information about it including:
### Understand component execution
-The bar chat displayed after clicking on a change detection cycle displays a detailed view about how much time your application spent running change detection in that particular component or directive.
+The bar chart displayed after clicking on a change detection cycle displays a detailed view about how much time your application spent running change detection in that particular component or directive.
This example shows the total time spent by the `NgForOf` directive and which method was called on it.
|
clair
|
https://github.com/quay/clair
|
d565775c190a4262ce049cb06a9c1842c42e00b8
|
crozzy
|
2023-02-23 20:18:52
|
chore: Add back GIT_HASH as needed for image name
|
We need the short git hash for the image name.
|
chore: Add back GIT_HASH as needed for image name
We need the short git hash for the image name.
Signed-off-by: crozzy <[email protected]>
|
diff --git a/contrib/openshift/build_and_deploy.sh b/contrib/openshift/build_and_deploy.sh
index f0fab89478..af4470b34c 100755
--- a/contrib/openshift/build_and_deploy.sh
+++ b/contrib/openshift/build_and_deploy.sh
@@ -3,6 +3,7 @@
set -exv
REPOSITORY="quay.io/app-sre"
IMAGE="${REPOSITORY}/clair"
+GIT_HASH=`git rev-parse --short=7 HEAD`
git archive HEAD|
docker build -t clair-service:latest -
|
pure
|
https://github.com/pure-css/pure
|
2474bef69847794ea8f028a0bd421c42e46ce77a
|
dependabot[bot]
|
2025-01-14 22:37:12
|
chore(deps-dev): bump eslint from 9.17.0 to 9.18.0 (#1378)
|
Bumps [eslint](https://github.com/eslint/eslint) from 9.17.0 to 9.18.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.17.0...v9.18.0)
---
|
chore(deps-dev): bump eslint from 9.17.0 to 9.18.0 (#1378)
Bumps [eslint](https://github.com/eslint/eslint) from 9.17.0 to 9.18.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v9.17.0...v9.18.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
diff --git a/package-lock.json b/package-lock.json
index a702b6b70..fd9f461a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -420,9 +420,9 @@
}
},
"node_modules/@eslint/core": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
- "integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
+ "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.15"
@@ -509,9 +509,9 @@
}
},
"node_modules/@eslint/js": {
- "version": "9.17.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
- "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
+ "version": "9.18.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz",
+ "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==",
"dev": true,
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -527,11 +527,12 @@
}
},
"node_modules/@eslint/plugin-kit": {
- "version": "0.2.4",
- "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz",
- "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==",
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
+ "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
"dev": true,
"dependencies": {
+ "@eslint/core": "^0.10.0",
"levn": "^0.4.1"
},
"engines": {
@@ -658,8 +659,7 @@
"version": "7.0.15",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
- "dev": true,
- "license": "MIT"
+ "dev": true
},
"node_modules/abbrev": {
"version": "1.1.1",
@@ -1928,18 +1928,18 @@
}
},
"node_modules/eslint": {
- "version": "9.17.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
- "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
+ "version": "9.18.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz",
+ "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.12.1",
"@eslint/config-array": "^0.19.0",
- "@eslint/core": "^0.9.0",
+ "@eslint/core": "^0.10.0",
"@eslint/eslintrc": "^3.2.0",
- "@eslint/js": "9.17.0",
- "@eslint/plugin-kit": "^0.2.3",
+ "@eslint/js": "9.18.0",
+ "@eslint/plugin-kit": "^0.2.5",
"@humanfs/node": "^0.16.6",
"@humanwhocodes/module-importer": "^1.0.1",
"@humanwhocodes/retry": "^0.4.1",
@@ -9244,9 +9244,9 @@
}
},
"@eslint/core": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
- "integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
+ "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.15"
@@ -9308,9 +9308,9 @@
}
},
"@eslint/js": {
- "version": "9.17.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
- "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
+ "version": "9.18.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz",
+ "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==",
"dev": true
},
"@eslint/object-schema": {
@@ -9320,11 +9320,12 @@
"dev": true
},
"@eslint/plugin-kit": {
- "version": "0.2.4",
- "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz",
- "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==",
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
+ "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
"dev": true,
"requires": {
+ "@eslint/core": "^0.10.0",
"levn": "^0.4.1"
}
},
@@ -10275,18 +10276,18 @@
"dev": true
},
"eslint": {
- "version": "9.17.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
- "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
+ "version": "9.18.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz",
+ "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==",
"dev": true,
"requires": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.12.1",
"@eslint/config-array": "^0.19.0",
- "@eslint/core": "^0.9.0",
+ "@eslint/core": "^0.10.0",
"@eslint/eslintrc": "^3.2.0",
- "@eslint/js": "9.17.0",
- "@eslint/plugin-kit": "^0.2.3",
+ "@eslint/js": "9.18.0",
+ "@eslint/plugin-kit": "^0.2.5",
"@humanfs/node": "^0.16.6",
"@humanwhocodes/module-importer": "^1.0.1",
"@humanwhocodes/retry": "^0.4.1",
|
ort
|
https://github.com/oss-review-toolkit/ort
|
b1dfed03ce65d8ab2accf093763b4aedb53fe2ed
|
Frank Viernau
|
2024-01-09 13:04:04
|
refactor(freemarker): Stop using `resolutionProvider`
|
Prepare for the removal of `ReporterInput.resolutionProvider`. The
change is non-functional because the reporter command ensures that
all relevant resolutions are contained in the `OrtResult`.
|
refactor(freemarker): Stop using `resolutionProvider`
Prepare for the removal of `ReporterInput.resolutionProvider`. The
change is non-functional because the reporter command ensures that
all relevant resolutions are contained in the `OrtResult`.
Signed-off-by: Frank Viernau <[email protected]>
|
diff --git a/model/src/main/kotlin/OrtResult.kt b/model/src/main/kotlin/OrtResult.kt
index 49a18232c3d70..bf72e4c08c5f3 100644
--- a/model/src/main/kotlin/OrtResult.kt
+++ b/model/src/main/kotlin/OrtResult.kt
@@ -387,6 +387,18 @@ data class OrtResult(
@JsonIgnore
fun getResolutions(): Resolutions = resolvedConfiguration.resolutions.orEmpty()
+ /**
+ * Return true if and only if [ruleViolation] is resolved in this [OrtResult].
+ */
+ fun isResolved(ruleViolation: RuleViolation): Boolean =
+ getResolutions().ruleViolations.any { it.matches(ruleViolation) }
+
+ /**
+ * Return true if and only if [vulnerability] is resolved in this [OrtResult].
+ */
+ fun isResolved(vulnerability: Vulnerability): Boolean =
+ getResolutions().vulnerabilities.any { it.matches(vulnerability) }
+
/**
* Return all [RuleViolation]s contained in this [OrtResult]. Optionally exclude resolved violations with
* [omitResolved] and remove violations below the [minSeverity].
diff --git a/plugins/reporters/freemarker/src/main/kotlin/FreemarkerTemplateProcessor.kt b/plugins/reporters/freemarker/src/main/kotlin/FreemarkerTemplateProcessor.kt
index 5402b57379acb..35e6205fc2546 100644
--- a/plugins/reporters/freemarker/src/main/kotlin/FreemarkerTemplateProcessor.kt
+++ b/plugins/reporters/freemarker/src/main/kotlin/FreemarkerTemplateProcessor.kt
@@ -275,14 +275,7 @@ class FreemarkerTemplateProcessor(
@JvmOverloads
@Suppress("UNUSED") // This function is used in the templates.
fun hasUnresolvedIssues(threshold: Severity = input.ortConfig.severeIssueThreshold) =
- input.ortResult.getIssues().any { (identifier, issues) ->
- issues.any { issue ->
- val isResolved = input.resolutionProvider.isResolved(issue)
- val isExcluded = input.ortResult.isExcluded(identifier)
-
- issue.severity >= threshold && !isResolved && !isExcluded
- }
- }
+ input.ortResult.getOpenIssues(minSeverity = threshold).isNotEmpty()
/**
* Return `true` if there are any unresolved and non-excluded [RuleViolation]s whose severity is equal to or
@@ -291,26 +284,23 @@ class FreemarkerTemplateProcessor(
@JvmOverloads
@Suppress("UNUSED") // This function is used in the templates.
fun hasUnresolvedRuleViolations(threshold: Severity = input.ortConfig.severeRuleViolationThreshold) =
- input.ortResult.evaluator?.violations?.any { violation ->
- val isResolved = input.resolutionProvider.isResolved(violation)
- val isExcluded = violation.pkg?.let { input.ortResult.isExcluded(it) } ?: false
-
- violation.severity >= threshold && !isResolved && !isExcluded
- } ?: false
+ input.ortResult.getRuleViolations(omitResolved = true, minSeverity = threshold).any { violation ->
+ violation.pkg?.let { input.ortResult.isExcluded(it) } ?: false
+ }
/**
* Return a list of [RuleViolation]s for which no [RuleViolationResolution] is provided.
*/
@Suppress("UNUSED") // This function is used in the templates.
fun filterForUnresolvedRuleViolations(ruleViolation: List<RuleViolation>): List<RuleViolation> =
- ruleViolation.filterNot { input.resolutionProvider.isResolved(it) }
+ ruleViolation.filterNot { input.ortResult.isResolved(it) }
/**
* Return a list of [Vulnerability]s for which no [VulnerabilityResolution] is provided.
*/
@Suppress("UNUSED") // This function is used in the templates.
fun filterForUnresolvedVulnerabilities(vulnerabilities: List<Vulnerability>): List<Vulnerability> =
- vulnerabilities.filterNot { input.resolutionProvider.isResolved(it) }
+ vulnerabilities.filterNot { input.ortResult.isResolved(it) }
/**
* Return a list of [SnippetFinding]s grouped by the source file being matched by those snippets.
|
node
|
https://github.com/nodejs/node
|
cda60c56723e97ae88eceeec6974ddc6ab619d31
|
Richard Lau
|
2021-03-22 15:56:12
|
test: remove references to unsupported AIX versions
|
The `filehandle.utimes()` and `fs.futimes()` APIs work on all versions
of AIX that are supported by this version of Node.js.
|
test: remove references to unsupported AIX versions
The `filehandle.utimes()` and `fs.futimes()` APIs work on all versions
of AIX that are supported by this version of Node.js.
PR-URL: https://github.com/nodejs/node/pull/37826
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Stewart X Addison <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Ash Cripps <[email protected]>
|
diff --git a/doc/api/fs.md b/doc/api/fs.md
index 899929a01db695..e11c057802e763 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -420,9 +420,6 @@ added: v10.0.0
Change the file system timestamps of the object referenced by the {FileHandle}
then resolves the promise with no arguments upon success.
-This function does not work on AIX versions before 7.1, it will reject the
-promise with an error using code `UV_ENOSYS`.
-
#### `filehandle.write(buffer[, offset[, length[, position]]])`
<!-- YAML
added: v10.0.0
@@ -2337,9 +2334,6 @@ changes:
Change the file system timestamps of the object referenced by the supplied file
descriptor. See [`fs.utimes()`][].
-This function does not work on AIX versions before 7.1, it will return the
-error `UV_ENOSYS`.
-
### `fs.lchmod(path, mode, callback)`
<!-- YAML
deprecated: v0.4.7
diff --git a/test/parallel/test-trace-events-fs-sync.js b/test/parallel/test-trace-events-fs-sync.js
index d8e9ca30a8ebd3..69a0ae2778245a 100644
--- a/test/parallel/test-trace-events-fs-sync.js
+++ b/test/parallel/test-trace-events-fs-sync.js
@@ -124,13 +124,6 @@ for (const tr in tests) {
'--trace-event-categories', 'node.fs.sync',
'-e', tests[tr] ],
{ cwd: tmpdir.path, encoding: 'utf8' });
- // Some AIX versions don't support futimes or utimes, so skip.
- if (common.isAIX && proc.status !== 0 && tr === 'fs.sync.futimes') {
- continue;
- }
- if (common.isAIX && proc.status !== 0 && tr === 'fs.sync.utimes') {
- continue;
- }
// Make sure the operation is successful.
// Don't use assert with a custom message here. Otherwise the
|
thanos
|
https://github.com/thanos-io/thanos
|
8fa5ff96597b646e4d78320c1a097f9095535782
|
Giedrius Statkevičius
|
2024-02-18 15:45:51
|
docs: fix link (#7129)
|
The link has moved to another since Cisco bought Banzai Cloud.
|
docs: fix link (#7129)
The link has moved to another since Cisco bought Banzai Cloud.
Signed-off-by: Giedrius Statkevičius <[email protected]>
Signed-off-by: Michael Hoffmann <[email protected]>
|
diff --git a/docs/getting-started.md b/docs/getting-started.md
index da6b414472..4ba84b8ad5 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -137,7 +137,7 @@ See up to date [jsonnet mixins](https://github.com/thanos-io/thanos/tree/main/mi
* [Adopting Thanos at LastPass](https://krisztianfekete.org/adopting-thanos-at-lastpass/)
* 2020:
- * [Banzai Cloud user story](https://banzaicloud.com/blog/multi-cluster-monitoring/)
+ * [Banzai Cloud user story](https://outshift.cisco.com/blog/multi-cluster-monitoring)
* [Monitoring the Beat microservices: A tale of evolution](https://build.thebeat.co/monitoring-the-beat-microservices-a-tale-of-evolution-4e246882606e)
* 2019:
|
aws-cdk
|
https://github.com/aws/aws-cdk
|
d013677cc181284b6f7444950784b758cb0c7100
|
Kaizen Conroy
|
2023-10-16 23:24:27
|
revert: "fix(s3): grantRead does not allow s3:HeadObject (#27416)" (#27556)
|
This reverts commit beac6753021138ee56abdbf02eef0318f7098dde.
Comments on #27416 demonstrate that the PR was created due to misunderstanding of an error message.
----
*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
|
revert: "fix(s3): grantRead does not allow s3:HeadObject (#27416)" (#27556)
This reverts commit beac6753021138ee56abdbf02eef0318f7098dde.
Comments on #27416 demonstrate that the PR was created due to misunderstanding of an error message.
----
*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
|
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.asset-build-spec.js.snapshot/CodeBuildAssetBuildSpecStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.asset-build-spec.js.snapshot/CodeBuildAssetBuildSpecStack.template.json
index ecc682e19a3e5..c4231385ef554 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.asset-build-spec.js.snapshot/CodeBuildAssetBuildSpecStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.asset-build-spec.js.snapshot/CodeBuildAssetBuildSpecStack.template.json
@@ -26,7 +26,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.caching.js.snapshot/aws-cdk-codebuild.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.caching.js.snapshot/aws-cdk-codebuild.template.json
index 542e17c5c0896..bb229d9f143c6 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.caching.js.snapshot/aws-cdk-codebuild.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.caching.js.snapshot/aws-cdk-codebuild.template.json
@@ -33,7 +33,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-bucket.js.snapshot/aws-cdk-codebuild.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-bucket.js.snapshot/aws-cdk-codebuild.template.json
index 1936d7f043131..2e7587aa97929 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-bucket.js.snapshot/aws-cdk-codebuild.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-bucket.js.snapshot/aws-cdk-codebuild.template.json
@@ -31,7 +31,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-buildspec-artifacts.js.snapshot/aws-cdk-codebuild-buildspec-artifact-name.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-buildspec-artifacts.js.snapshot/aws-cdk-codebuild-buildspec-artifact-name.template.json
index 8cf406cca010d..5267ba939c5d5 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-buildspec-artifacts.js.snapshot/aws-cdk-codebuild-buildspec-artifact-name.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-buildspec-artifacts.js.snapshot/aws-cdk-codebuild-buildspec-artifact-name.template.json
@@ -33,7 +33,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-secondary-sources-artifacts.js.snapshot/aws-cdk-codebuild-secondary-sources-artifacts.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-secondary-sources-artifacts.js.snapshot/aws-cdk-codebuild-secondary-sources-artifacts.template.json
index c25aab78a7ae4..05e907f202018 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-secondary-sources-artifacts.js.snapshot/aws-cdk-codebuild-secondary-sources-artifacts.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-secondary-sources-artifacts.js.snapshot/aws-cdk-codebuild-secondary-sources-artifacts.template.json
@@ -31,7 +31,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -64,7 +63,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.template.json
index eee7773e28624..4875a40c9139a 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.template.json
@@ -445,7 +445,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/cloudformation/integ.stacksets.js.snapshot/StackSetPipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/cloudformation/integ.stacksets.js.snapshot/StackSetPipelineStack.template.json
index 40eac48b94faa..fa3757f93ac36 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/cloudformation/integ.stacksets.js.snapshot/StackSetPipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/cloudformation/integ.stacksets.js.snapshot/StackSetPipelineStack.template.json
@@ -170,7 +170,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -393,7 +392,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -558,7 +556,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json
index c0d51abdd7a72..15cbb079c47d0 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json
@@ -158,7 +158,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -434,7 +433,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -560,7 +558,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -671,7 +668,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.js.snapshot/PipelineStack.template.json
index 68b1c9684baae..3f2e680f53298 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.js.snapshot/PipelineStack.template.json
@@ -152,7 +152,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -498,7 +497,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -616,7 +614,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -926,7 +923,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1035,7 +1031,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1352,7 +1347,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1564,7 +1558,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-pipeline.js.snapshot/aws-cdk-codepipeline-lambda.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-pipeline.js.snapshot/aws-cdk-codepipeline-lambda.template.json
index 18165949185e2..4ce100cedd9f4 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-pipeline.js.snapshot/aws-cdk-codepipeline-lambda.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-pipeline.js.snapshot/aws-cdk-codepipeline-lambda.template.json
@@ -152,7 +152,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -361,7 +360,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.js.snapshot/aws-cdk-codepipeline-alexa-deploy.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.js.snapshot/aws-cdk-codepipeline-alexa-deploy.template.json
index 788098628cb16..04020db26c6bd 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.js.snapshot/aws-cdk-codepipeline-alexa-deploy.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.js.snapshot/aws-cdk-codepipeline-alexa-deploy.template.json
@@ -162,7 +162,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -362,7 +361,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.js.snapshot/aws-cdk-codepipeline-cloudformation-cross-region.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.js.snapshot/aws-cdk-codepipeline-cloudformation-cross-region.template.json
index f104bc125995d..b2db804374e1e 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.js.snapshot/aws-cdk-codepipeline-cloudformation-cross-region.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.js.snapshot/aws-cdk-codepipeline-cloudformation-cross-region.template.json
@@ -38,7 +38,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -234,7 +233,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -353,7 +351,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -441,7 +438,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.js.snapshot/aws-cdk-codepipeline-cloudformation-cross-region-with-action-role.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.js.snapshot/aws-cdk-codepipeline-cloudformation-cross-region-with-action-role.template.json
index f883b801913e1..54333dbbb4f01 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.js.snapshot/aws-cdk-codepipeline-cloudformation-cross-region-with-action-role.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.js.snapshot/aws-cdk-codepipeline-cloudformation-cross-region-with-action-role.template.json
@@ -66,7 +66,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -164,7 +163,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -358,7 +356,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -456,7 +453,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json
index 215070aa4ee9c..f12bb1627bece 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn.js.snapshot/aws-cdk-codepipeline-cloudformation.template.json
@@ -152,7 +152,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -409,7 +408,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -537,7 +535,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -675,7 +672,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.js.snapshot/aws-cdk-codepipeline-codebuild-batch.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.js.snapshot/aws-cdk-codepipeline-codebuild-batch.template.json
index da473b93c7885..3a98cdabf9392 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.js.snapshot/aws-cdk-codepipeline-codebuild-batch.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.js.snapshot/aws-cdk-codepipeline-codebuild-batch.template.json
@@ -109,7 +109,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -426,7 +425,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.js.snapshot/aws-cdk-codepipeline-codebuild-multiple-inputs-outputs.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.js.snapshot/aws-cdk-codepipeline-codebuild-multiple-inputs-outputs.template.json
index 14ab6e2a8be7d..03592efd7cdfd 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.js.snapshot/aws-cdk-codepipeline-codebuild-multiple-inputs-outputs.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.js.snapshot/aws-cdk-codepipeline-codebuild-multiple-inputs-outputs.template.json
@@ -109,7 +109,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -171,7 +170,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -532,7 +530,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.js.snapshot/aws-cdk-codepipeline-codecommit-codebuild.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.js.snapshot/aws-cdk-codepipeline-codecommit-codebuild.template.json
index 86e155cbb057d..7ab7817439e35 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.js.snapshot/aws-cdk-codepipeline-codecommit-codebuild.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.js.snapshot/aws-cdk-codepipeline-codecommit-codebuild.template.json
@@ -91,7 +91,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -359,7 +358,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -616,7 +614,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit.js.snapshot/aws-cdk-codepipeline-codecommit.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit.js.snapshot/aws-cdk-codepipeline-codecommit.template.json
index eb5211cb3b5a8..6a88f7d4af098 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit.js.snapshot/aws-cdk-codepipeline-codecommit.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit.js.snapshot/aws-cdk-codepipeline-codecommit.template.json
@@ -223,7 +223,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -432,7 +431,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.js.snapshot/aws-cdk-codepipeline-codedeploy-ecs.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.js.snapshot/aws-cdk-codepipeline-codedeploy-ecs.template.json
index 919517508d92e..d48839f3050d7 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.js.snapshot/aws-cdk-codepipeline-codedeploy-ecs.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.js.snapshot/aws-cdk-codepipeline-codedeploy-ecs.template.json
@@ -38,7 +38,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -231,7 +230,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -440,7 +438,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy.js.snapshot/aws-cdk-codepipeline-codedeploy.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy.js.snapshot/aws-cdk-codepipeline-codedeploy.template.json
index db00e99d10a16..3bcb10a14b4da 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy.js.snapshot/aws-cdk-codepipeline-codedeploy.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy.js.snapshot/aws-cdk-codepipeline-codedeploy.template.json
@@ -112,7 +112,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -303,7 +302,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -507,7 +505,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecr-source.js.snapshot/aws-cdk-codepipeline-ecr-source.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecr-source.js.snapshot/aws-cdk-codepipeline-ecr-source.template.json
index d3589288e8ed4..43e63a1eaea6e 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecr-source.js.snapshot/aws-cdk-codepipeline-ecr-source.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecr-source.js.snapshot/aws-cdk-codepipeline-ecr-source.template.json
@@ -33,7 +33,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.js.snapshot/aws-cdk-codepipeline-ecs-deploy.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.js.snapshot/aws-cdk-codepipeline-ecs-deploy.template.json
index 60586509dba79..67d54e84dc3e0 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.js.snapshot/aws-cdk-codepipeline-ecs-deploy.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.js.snapshot/aws-cdk-codepipeline-ecs-deploy.template.json
@@ -444,7 +444,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -598,7 +597,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -835,7 +833,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1035,7 +1032,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.js.snapshot/aws-cdk-pipeline-ecs-separate-sources.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.js.snapshot/aws-cdk-pipeline-ecs-separate-sources.template.json
index 502779cf94763..bfd16eae92f25 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.js.snapshot/aws-cdk-pipeline-ecs-separate-sources.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-separate-source.lit.js.snapshot/aws-cdk-pipeline-ecs-separate-sources.template.json
@@ -145,7 +145,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -385,7 +384,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -632,7 +630,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -946,7 +943,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1048,7 +1044,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1342,7 +1337,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1438,7 +1432,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json
index eda0364eafc4a..a37d6bc6997d6 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json
@@ -227,7 +227,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -271,7 +270,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -478,7 +476,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -675,7 +672,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -813,7 +809,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-events.js.snapshot/aws-cdk-pipeline-event-target.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-events.js.snapshot/aws-cdk-pipeline-event-target.template.json
index 86c50d9c3a158..ca0a6faba2e5e 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-events.js.snapshot/aws-cdk-pipeline-event-target.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-events.js.snapshot/aws-cdk-pipeline-event-target.template.json
@@ -152,7 +152,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -376,7 +375,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -768,7 +766,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-jenkins.js.snapshot/aws-cdk-codepipeline-jenkins.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-jenkins.js.snapshot/aws-cdk-codepipeline-jenkins.template.json
index 78064d34b378f..f32415ad85d69 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-jenkins.js.snapshot/aws-cdk-codepipeline-jenkins.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-jenkins.js.snapshot/aws-cdk-codepipeline-jenkins.template.json
@@ -38,7 +38,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -251,7 +250,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-manual-approval.js.snapshot/aws-cdk-codepipeline-manual-approval.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-manual-approval.js.snapshot/aws-cdk-codepipeline-manual-approval.template.json
index ba7fe9e6911ab..cad0f8daf8000 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-manual-approval.js.snapshot/aws-cdk-codepipeline-manual-approval.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-manual-approval.js.snapshot/aws-cdk-codepipeline-manual-approval.template.json
@@ -33,7 +33,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -216,7 +215,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.js.snapshot/aws-cdk-codepipeline-s3-deploy.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.js.snapshot/aws-cdk-codepipeline-s3-deploy.template.json
index 5f3b15d03a8a8..793c34ba09d50 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.js.snapshot/aws-cdk-codepipeline-s3-deploy.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.js.snapshot/aws-cdk-codepipeline-s3-deploy.template.json
@@ -392,7 +392,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -659,7 +658,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -843,7 +841,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -972,7 +969,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.js.snapshot/aws-cdk-codepipeline-stepfunctions.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.js.snapshot/aws-cdk-codepipeline-stepfunctions.template.json
index 138fd0a82319b..567555af9ce77 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.js.snapshot/aws-cdk-codepipeline-stepfunctions.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.js.snapshot/aws-cdk-codepipeline-stepfunctions.template.json
@@ -186,7 +186,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -397,7 +396,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-replication.js.snapshot/integ-pipeline-consumer-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-replication.js.snapshot/integ-pipeline-consumer-stack.template.json
index 37a05d3db7569..01c46d2b4fe2e 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-replication.js.snapshot/integ-pipeline-consumer-stack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-replication.js.snapshot/integ-pipeline-consumer-stack.template.json
@@ -148,7 +148,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -383,7 +382,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -763,7 +761,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/s3/integ.source-bucket-events-cross-stack-same-env.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/s3/integ.source-bucket-events-cross-stack-same-env.js.snapshot/PipelineStack.template.json
index 50f7d17a513fc..5c9baff630942 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/s3/integ.source-bucket-events-cross-stack-same-env.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/s3/integ.source-bucket-events-cross-stack-same-env.js.snapshot/PipelineStack.template.json
@@ -117,7 +117,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -356,7 +355,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -570,7 +568,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/integ-init.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/integ-init.template.json
index bc2131c94c226..26b583d04e478 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/integ-init.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/integ-init.template.json
@@ -445,7 +445,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.environment-file.js.snapshot/aws-ecs-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.environment-file.js.snapshot/aws-ecs-integ.template.json
index bd500a75311e9..94d0972fad1da 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.environment-file.js.snapshot/aws-ecs-integ.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.environment-file.js.snapshot/aws-ecs-integ.template.json
@@ -1248,7 +1248,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1292,7 +1291,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.template.json
index af48a16650997..9a70d0f6035ba 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-imported.js.snapshot/aws-cdk-eks-import-cluster-test.template.json
@@ -545,7 +545,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-ipv6-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-ipv6-test.template.json
index 781271a8b1208..e2feaf3af783f 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-ipv6-test.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-ipv6-test.template.json
@@ -723,7 +723,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json
index e65a92eba98a3..48cbdeacf1e9f 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json
@@ -571,7 +571,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json
index 33918897a2b22..34f22196836b3 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-helm-asset.js.snapshot/aws-cdk-eks-helm-test.template.json
@@ -544,7 +544,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events-targets/test/codepipeline/integ.pipeline-event-target.js.snapshot/pipeline-events.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events-targets/test/codepipeline/integ.pipeline-event-target.js.snapshot/pipeline-events.template.json
index 3f2debc2c7f22..99b4ce0e9452a 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-events-targets/test/codepipeline/integ.pipeline-event-target.js.snapshot/pipeline-events.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events-targets/test/codepipeline/integ.pipeline-event-target.js.snapshot/pipeline-events.template.json
@@ -158,7 +158,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.js.snapshot/aws-cdk-firehose-event-target.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.js.snapshot/aws-cdk-firehose-event-target.template.json
index bf2be6f908673..592f4eef1579f 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.js.snapshot/aws-cdk-firehose-event-target.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-events-targets/test/kinesis-firehose/integ.kinesis-firehose-stream.js.snapshot/aws-cdk-firehose-event-target.template.json
@@ -33,7 +33,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.js.snapshot/aws-cdk-rds-s3-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.js.snapshot/aws-cdk-rds-s3-integ.template.json
index a7190500d87a2..4e07f44f347c8 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.js.snapshot/aws-cdk-rds-s3-integ.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.js.snapshot/aws-cdk-rds-s3-integ.template.json
@@ -518,7 +518,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -551,7 +550,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.template.json
index 25376719dcd64..2ac33a1ea212d 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-s3.mysql-8.js.snapshot/aws-cdk-rds-s3-mysql-8-integ.template.json
@@ -454,7 +454,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-s3-postgres.js.snapshot/aws-cdk-rds-instance-s3-postgres-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-s3-postgres.js.snapshot/aws-cdk-rds-instance-s3-postgres-integ.template.json
index 8e591599f81e4..0062655ad554e 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-s3-postgres.js.snapshot/aws-cdk-rds-instance-s3-postgres-integ.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-s3-postgres.js.snapshot/aws-cdk-rds-instance-s3-postgres-integ.template.json
@@ -421,7 +421,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -487,7 +486,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-s3.js.snapshot/aws-cdk-rds-instance-s3-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-s3.js.snapshot/aws-cdk-rds-instance-s3-integ.template.json
index 314e2681a8bab..044db26f317fb 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-s3.js.snapshot/aws-cdk-rds-instance-s3-integ.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.instance-s3.js.snapshot/aws-cdk-rds-instance-s3-integ.template.json
@@ -457,7 +457,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -490,7 +489,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.bundling.lit.js.snapshot/cdk-integ-assets-bundling.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.bundling.lit.js.snapshot/cdk-integ-assets-bundling.template.json
index c7cdebd7967cb..241b6f086f955 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.bundling.lit.js.snapshot/cdk-integ-assets-bundling.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.bundling.lit.js.snapshot/cdk-integ-assets-bundling.template.json
@@ -12,7 +12,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.directory.lit.js.snapshot/aws-cdk-asset-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.directory.lit.js.snapshot/aws-cdk-asset-test.template.json
index c7cdebd7967cb..241b6f086f955 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.directory.lit.js.snapshot/aws-cdk-asset-test.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.directory.lit.js.snapshot/aws-cdk-asset-test.template.json
@@ -12,7 +12,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file-bundling.lit.js.snapshot/cdk-integ-assets-bundling.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file-bundling.lit.js.snapshot/cdk-integ-assets-bundling.template.json
index c7cdebd7967cb..241b6f086f955 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file-bundling.lit.js.snapshot/cdk-integ-assets-bundling.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file-bundling.lit.js.snapshot/cdk-integ-assets-bundling.template.json
@@ -12,7 +12,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file.lit.js.snapshot/aws-cdk-asset-file-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file.lit.js.snapshot/aws-cdk-asset-file-test.template.json
index c7cdebd7967cb..241b6f086f955 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file.lit.js.snapshot/aws-cdk-asset-file-test.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.file.lit.js.snapshot/aws-cdk-asset-file-test.template.json
@@ -12,7 +12,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.permissions.lit.js.snapshot/aws-cdk-asset-refs.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.permissions.lit.js.snapshot/aws-cdk-asset-refs.template.json
index 369c90ccb4c1b..20afa25c70cd8 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.permissions.lit.js.snapshot/aws-cdk-asset-refs.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.permissions.lit.js.snapshot/aws-cdk-asset-refs.template.json
@@ -12,7 +12,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.refs.lit.js.snapshot/aws-cdk-asset-refs.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.refs.lit.js.snapshot/aws-cdk-asset-refs.template.json
index 75193d8d0d39b..855b59b64f45c 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.refs.lit.js.snapshot/aws-cdk-asset-refs.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.refs.lit.js.snapshot/aws-cdk-asset-refs.template.json
@@ -32,7 +32,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-cloudfront.js.snapshot/test-bucket-deployments-1.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-cloudfront.js.snapshot/test-bucket-deployments-1.template.json
index 7d4ca1b2e18b7..da66b0e50e4b2 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-cloudfront.js.snapshot/test-bucket-deployments-1.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-cloudfront.js.snapshot/test-bucket-deployments-1.template.json
@@ -278,7 +278,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -322,7 +321,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-data.js.snapshot/TestBucketDeploymentContent.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-data.js.snapshot/TestBucketDeploymentContent.template.json
index 33577b4db6e3b..b0e4fc31a8ca8 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-data.js.snapshot/TestBucketDeploymentContent.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-data.js.snapshot/TestBucketDeploymentContent.template.json
@@ -150,7 +150,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -194,7 +193,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-deployed-bucket.js.snapshot/test-bucket-deployment-deployed-bucket.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-deployed-bucket.js.snapshot/test-bucket-deployment-deployed-bucket.template.json
index 3d1bb4a8c9240..115732d465c8c 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-deployed-bucket.js.snapshot/test-bucket-deployment-deployed-bucket.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-deployed-bucket.js.snapshot/test-bucket-deployment-deployed-bucket.template.json
@@ -230,7 +230,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -274,7 +273,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-signcontent.js.snapshot/test-bucket-deployment-signobject.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-signcontent.js.snapshot/test-bucket-deployment-signobject.template.json
index f406e27b3f7b9..03ca1cce00a89 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-signcontent.js.snapshot/test-bucket-deployment-signobject.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-signcontent.js.snapshot/test-bucket-deployment-signobject.template.json
@@ -257,7 +257,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -301,7 +300,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-substitution-with-role.js.snapshot/cdk-s3-deploy-substitution-with-role.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-substitution-with-role.js.snapshot/cdk-s3-deploy-substitution-with-role.template.json
index a99d3e9e971dc..44198da1f0327 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-substitution-with-role.js.snapshot/cdk-s3-deploy-substitution-with-role.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-substitution-with-role.js.snapshot/cdk-s3-deploy-substitution-with-role.template.json
@@ -39,7 +39,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -83,7 +82,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-substitution.js.snapshot/test-s3-deploy-substitution.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-substitution.js.snapshot/test-s3-deploy-substitution.template.json
index ef5eed4a95adf..93b685cc2d1ee 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-substitution.js.snapshot/test-s3-deploy-substitution.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment-substitution.js.snapshot/test-s3-deploy-substitution.template.json
@@ -151,7 +151,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -195,7 +194,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment.js.snapshot/test-bucket-deployments-2.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment.js.snapshot/test-bucket-deployments-2.template.json
index 68f3285c915ec..d80d57e102eab 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment.js.snapshot/test-bucket-deployments-2.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3-deployment/test/integ.bucket-deployment.js.snapshot/test-bucket-deployments-2.template.json
@@ -239,7 +239,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -283,7 +282,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1184,7 +1182,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1228,7 +1225,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-sharing.js.snapshot/ConsumerStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-sharing.js.snapshot/ConsumerStack.template.json
index 293e7cdc9d5c5..906df6ecc3ff8 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-sharing.js.snapshot/ConsumerStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-sharing.js.snapshot/ConsumerStack.template.json
@@ -14,7 +14,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket.js.snapshot/aws-cdk-s3.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket.js.snapshot/aws-cdk-s3.template.json
index 78ab63dfdc92a..addecf1a07382 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket.js.snapshot/aws-cdk-s3.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket.js.snapshot/aws-cdk-s3.template.json
@@ -88,7 +88,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -140,7 +139,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.template.json
index d6086606484c5..354f8a3602b44 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.nested-stack-in-product-stack.js.snapshot/aws-cdk-nested-stack-in-product-stack.template.json
@@ -98,7 +98,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -135,7 +134,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.template.json
index 27ea4dca200e0..15eaefe8acb9d 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.encrypted.asset.js.snapshot/integ-servicecatalog-product-encrypted-asset.template.json
@@ -386,7 +386,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -423,7 +422,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json
index 6435efcacbc9f..fb9e0740f7335 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json
@@ -246,7 +246,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -283,7 +282,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.two-products.js.snapshot/integ-servicecatalog-two-products.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.two-products.js.snapshot/integ-servicecatalog-two-products.template.json
index 4fba990982455..a7a63627c886d 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.two-products.js.snapshot/integ-servicecatalog-two-products.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.two-products.js.snapshot/integ-servicecatalog-two-products.template.json
@@ -257,7 +257,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -294,7 +293,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.template.json
index 58c677a74c37c..cea9167958a72 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/emrcontainers/integ.job-submission-workflow.js.snapshot/aws-stepfunctions-tasks-emr-containers-all-services-test.template.json
@@ -1087,7 +1087,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.glue-task.js.snapshot/aws-stepfunctions-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.glue-task.js.snapshot/aws-stepfunctions-integ.template.json
index 714cfcf2fb6c0..883741e07b733 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.glue-task.js.snapshot/aws-stepfunctions-integ.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.glue-task.js.snapshot/aws-stepfunctions-integ.template.json
@@ -40,7 +40,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.start-job-run.js.snapshot/aws-stepfunctions-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.start-job-run.js.snapshot/aws-stepfunctions-integ.template.json
index 7066e276b5f68..e054ff5a5c807 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.start-job-run.js.snapshot/aws-stepfunctions-integ.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.start-job-run.js.snapshot/aws-stepfunctions-integ.template.json
@@ -40,7 +40,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.js.snapshot/aws-stepfunctions-integ-sagemaker.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.js.snapshot/aws-stepfunctions-integ-sagemaker.template.json
index aafd7db7895e0..b1f00c6fb8c47 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.js.snapshot/aws-stepfunctions-integ-sagemaker.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/sagemaker/integ.call-sagemaker.js.snapshot/aws-stepfunctions-integ-sagemaker.template.json
@@ -105,7 +105,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.js.snapshot/integ-stepfunctions-sagemaker.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.js.snapshot/integ-stepfunctions-sagemaker.template.json
index 129bfaa822cb5..c3525778207e9 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.js.snapshot/integ-stepfunctions-sagemaker.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/sagemaker/integ.create-training-job.js.snapshot/integ-stepfunctions-sagemaker.template.json
@@ -105,7 +105,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-codebuild-logging.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-codebuild-logging.js.snapshot/PipelineStack.template.json
index 5dd43677474af..66eefea24034b 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-codebuild-logging.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-codebuild-logging.js.snapshot/PipelineStack.template.json
@@ -68,7 +68,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -153,7 +152,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -2055,7 +2053,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -2413,7 +2410,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-cross-account-keys.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-cross-account-keys.js.snapshot/PipelineStack.template.json
index 1e76b9a29c247..bc3610a87c7cb 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-cross-account-keys.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-cross-account-keys.js.snapshot/PipelineStack.template.json
@@ -157,7 +157,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -242,7 +241,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -2104,7 +2102,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -2408,7 +2405,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-file-system-locations.js.snapshot/PipelinesFileSystemLocations.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-file-system-locations.js.snapshot/PipelinesFileSystemLocations.template.json
index 7429d4c73766c..f9db4786bc4a3 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-file-system-locations.js.snapshot/PipelinesFileSystemLocations.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-file-system-locations.js.snapshot/PipelinesFileSystemLocations.template.json
@@ -601,7 +601,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -686,7 +685,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1008,7 +1006,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1276,7 +1273,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1691,7 +1687,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-vpc.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-vpc.js.snapshot/PipelineStack.template.json
index 631b00ea21fbd..5144b7a84f1a8 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-vpc.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline-with-vpc.js.snapshot/PipelineStack.template.json
@@ -459,7 +459,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -544,7 +543,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1127,7 +1125,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1568,7 +1565,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1898,7 +1894,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline.js.snapshot/PipelineStack.template.json
index b07adfe1daa4c..476a2b6f3ea0c 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.newpipeline.js.snapshot/PipelineStack.template.json
@@ -68,7 +68,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -153,7 +152,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1990,7 +1988,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -2273,7 +2270,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-security.js.snapshot/PipelineSecurityStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-security.js.snapshot/PipelineSecurityStack.template.json
index c98a018d86e70..31b8ac763d327 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-security.js.snapshot/PipelineSecurityStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-security.js.snapshot/PipelineSecurityStack.template.json
@@ -298,7 +298,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -383,7 +382,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1557,7 +1555,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1825,7 +1822,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -2547,7 +2543,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -2892,7 +2887,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-artifact-bucket.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-artifact-bucket.js.snapshot/PipelineStack.template.json
index 3c961b2f619bb..1490697d192bd 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-artifact-bucket.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-artifact-bucket.js.snapshot/PipelineStack.template.json
@@ -38,7 +38,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -267,7 +266,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -458,7 +456,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -741,7 +738,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-assets-single-upload.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-assets-single-upload.js.snapshot/PipelineStack.template.json
index d092e6c4fbf82..4bfa5d8e80181 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-assets-single-upload.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-assets-single-upload.js.snapshot/PipelineStack.template.json
@@ -298,7 +298,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -383,7 +382,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -848,7 +846,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1116,7 +1113,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1458,7 +1454,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1696,7 +1691,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1900,7 +1894,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-assets.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-assets.js.snapshot/PipelineStack.template.json
index a27d07f9c57b0..97408341b8cdb 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-assets.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-assets.js.snapshot/PipelineStack.template.json
@@ -298,7 +298,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -383,7 +382,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -875,7 +873,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1143,7 +1140,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1485,7 +1481,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1723,7 +1718,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1927,7 +1921,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-stack-outputs-in-custom-step.js.snapshot/StackOutputPipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-stack-outputs-in-custom-step.js.snapshot/StackOutputPipelineStack.template.json
index 0fd2d313a8caf..a6f1c9de03e0f 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-stack-outputs-in-custom-step.js.snapshot/StackOutputPipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-stack-outputs-in-custom-step.js.snapshot/StackOutputPipelineStack.template.json
@@ -73,7 +73,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -158,7 +157,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -820,7 +818,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-variables.js.snapshot/VariablePipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-variables.js.snapshot/VariablePipelineStack.template.json
index e4a9253265f30..811c2f4d1eb6a 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-variables.js.snapshot/VariablePipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-variables.js.snapshot/VariablePipelineStack.template.json
@@ -239,7 +239,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -494,7 +493,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -685,7 +683,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -786,7 +783,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -913,7 +909,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1022,7 +1017,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1149,7 +1143,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-without-prepare.js.snapshot/PreparelessPipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-without-prepare.js.snapshot/PreparelessPipelineStack.template.json
index c71f77f851a42..90ccb6edb4c14 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-without-prepare.js.snapshot/PreparelessPipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-without-prepare.js.snapshot/PreparelessPipelineStack.template.json
@@ -210,7 +210,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -295,7 +294,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -586,7 +584,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -777,7 +774,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline.js.snapshot/PipelineStack.template.json b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline.js.snapshot/PipelineStack.template.json
index e3e2f396ad8ba..77fe88343914b 100644
--- a/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline.js.snapshot/PipelineStack.template.json
+++ b/packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline.js.snapshot/PipelineStack.template.json
@@ -298,7 +298,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -383,7 +382,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -810,7 +808,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1078,7 +1075,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1420,7 +1416,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1658,7 +1653,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.js.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json b/packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.js.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json
index 5e66c5e65976e..ca7bac420615b 100644
--- a/packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.js.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json
+++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.js.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json
@@ -54,7 +54,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.ts.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json b/packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.ts.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json
index 72c93cb35d17e..ca7bac420615b 100644
--- a/packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.ts.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json
+++ b/packages/@aws-cdk/app-staging-synthesizer-alpha/test/integ.synth-default-resources.ts.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json
@@ -54,7 +54,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -344,7 +343,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-appconfig-alpha/test/integ.configuration.js.snapshot/aws-appconfig-configuration.template.json b/packages/@aws-cdk/aws-appconfig-alpha/test/integ.configuration.js.snapshot/aws-appconfig-configuration.template.json
index d7abb505cc66f..6dbdcb9b930ac 100644
--- a/packages/@aws-cdk/aws-appconfig-alpha/test/integ.configuration.js.snapshot/aws-appconfig-configuration.template.json
+++ b/packages/@aws-cdk/aws-appconfig-alpha/test/integ.configuration.js.snapshot/aws-appconfig-configuration.template.json
@@ -590,7 +590,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -634,7 +633,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1239,7 +1237,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -1453,7 +1450,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1615,7 +1611,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-apprunner-alpha/test/service.test.ts b/packages/@aws-cdk/aws-apprunner-alpha/test/service.test.ts
index ed1e2801c0068..d73b9cf0d7a16 100644
--- a/packages/@aws-cdk/aws-apprunner-alpha/test/service.test.ts
+++ b/packages/@aws-cdk/aws-apprunner-alpha/test/service.test.ts
@@ -1301,7 +1301,6 @@ test('Service is grantable', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Resource: [
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/code.test.ts b/packages/@aws-cdk/aws-glue-alpha/test/code.test.ts
index 20283841aaf94..f67d6f71526b4 100644
--- a/packages/@aws-cdk/aws-glue-alpha/test/code.test.ts
+++ b/packages/@aws-cdk/aws-glue-alpha/test/code.test.ts
@@ -43,7 +43,6 @@ describe('Code', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
@@ -153,7 +152,6 @@ describe('Code', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.template.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.template.json
index 27710430569eb..dece180ae8219 100644
--- a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.template.json
+++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.template.json
@@ -40,7 +40,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -167,7 +166,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.job.js.snapshot/aws-glue-job.template.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.job.js.snapshot/aws-glue-job.template.json
index 038577fa9674b..e524ee21d34da 100644
--- a/packages/@aws-cdk/aws-glue-alpha/test/integ.job.js.snapshot/aws-glue-job.template.json
+++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.job.js.snapshot/aws-glue-job.template.json
@@ -42,7 +42,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -78,7 +77,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -273,7 +271,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -403,7 +400,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -439,7 +435,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -634,7 +629,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -764,7 +758,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -800,7 +793,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -995,7 +987,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1123,7 +1114,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1249,7 +1239,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1375,7 +1364,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -1504,7 +1492,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/aws-cdk-glue.template.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/aws-cdk-glue.template.json
index a6af791ac5366..75020f0d007ad 100644
--- a/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/aws-cdk-glue.template.json
+++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.table.js.snapshot/aws-cdk-glue.template.json
@@ -774,7 +774,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
@@ -967,7 +966,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/job.test.ts b/packages/@aws-cdk/aws-glue-alpha/test/job.test.ts
index 92ab59c104914..748d89b5668a2 100644
--- a/packages/@aws-cdk/aws-glue-alpha/test/job.test.ts
+++ b/packages/@aws-cdk/aws-glue-alpha/test/job.test.ts
@@ -68,7 +68,6 @@ describe('Job', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
@@ -485,7 +484,6 @@ describe('Job', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
@@ -575,7 +573,6 @@ describe('Job', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
@@ -675,7 +672,6 @@ describe('Job', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/s3-table.test.ts b/packages/@aws-cdk/aws-glue-alpha/test/s3-table.test.ts
index 3283dab446f4c..c5e498ad61c41 100644
--- a/packages/@aws-cdk/aws-glue-alpha/test/s3-table.test.ts
+++ b/packages/@aws-cdk/aws-glue-alpha/test/s3-table.test.ts
@@ -792,7 +792,6 @@ describe('grants', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
@@ -1002,7 +1001,6 @@ describe('grants', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/@aws-cdk/aws-glue-alpha/test/table-deprecated.test.ts b/packages/@aws-cdk/aws-glue-alpha/test/table-deprecated.test.ts
index 62d803f079b5a..9803d72a36240 100644
--- a/packages/@aws-cdk/aws-glue-alpha/test/table-deprecated.test.ts
+++ b/packages/@aws-cdk/aws-glue-alpha/test/table-deprecated.test.ts
@@ -1118,7 +1118,6 @@ describe('grants', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
@@ -1328,7 +1327,6 @@ describe('grants', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json b/packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json
index 5f46a30499f75..0b0c7bce3882d 100644
--- a/packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json
+++ b/packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json
@@ -105,7 +105,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/application.test.ts b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/application.test.ts
index 8381ca7f1a852..996a018649db7 100644
--- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/application.test.ts
+++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/application.test.ts
@@ -81,7 +81,7 @@ describe('Application', () => {
{ Action: 'cloudwatch:PutMetricData', Effect: 'Allow', Resource: '*' },
// Access to read from the code bucket
{
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Effect: 'Allow',
Resource: Match.anyValue(),
},
@@ -209,7 +209,7 @@ describe('Application', () => {
PolicyDocument: {
Version: '2012-10-17',
Statement: Match.arrayWith([
- Match.objectLike({ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'] }),
+ Match.objectLike({ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'] }),
]),
},
});
diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application-code-from-bucket.lit.js.snapshot/FlinkAppCodeFromBucketTest.template.json b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application-code-from-bucket.lit.js.snapshot/FlinkAppCodeFromBucketTest.template.json
index 91c82e63ebc2a..f7ddc667eef74 100644
--- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application-code-from-bucket.lit.js.snapshot/FlinkAppCodeFromBucketTest.template.json
+++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application-code-from-bucket.lit.js.snapshot/FlinkAppCodeFromBucketTest.template.json
@@ -31,7 +31,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application.lit.js.snapshot/FlinkAppTest.template.json b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application.lit.js.snapshot/FlinkAppTest.template.json
index c3638a20fca12..b9c3e751700b7 100644
--- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application.lit.js.snapshot/FlinkAppTest.template.json
+++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.application.lit.js.snapshot/FlinkAppTest.template.json
@@ -31,7 +31,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.vpc-application.js.snapshot/FlinkAppTest.template.json b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.vpc-application.js.snapshot/FlinkAppTest.template.json
index 26c53685899b1..b2ab7859cf42a 100644
--- a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.vpc-application.js.snapshot/FlinkAppTest.template.json
+++ b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/test/integ.vpc-application.js.snapshot/FlinkAppTest.template.json
@@ -432,7 +432,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json b/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json
index 9a9541300dbb6..224216bc4fb4c 100644
--- a/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json
+++ b/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json
@@ -33,7 +33,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json b/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json
index b777fc68955f2..cbf990668d7bf 100644
--- a/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json
+++ b/packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json
@@ -33,7 +33,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json
index d3fa5e0ac99f8..bcb74d8545e22 100644
--- a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json
+++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json
@@ -401,7 +401,6 @@
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/s3-bucket.test.ts b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/s3-bucket.test.ts
index 34344c59c702e..18404c284ce2b 100644
--- a/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/s3-bucket.test.ts
+++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/s3-bucket.test.ts
@@ -85,7 +85,6 @@ describe('S3 destination', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
@@ -122,7 +121,6 @@ describe('S3 destination', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint-config.js.snapshot/aws-cdk-sagemaker-endpointconfig.template.json b/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint-config.js.snapshot/aws-cdk-sagemaker-endpointconfig.template.json
index 78dae142573d1..f4258769bc2b2 100644
--- a/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint-config.js.snapshot/aws-cdk-sagemaker-endpointconfig.template.json
+++ b/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint-config.js.snapshot/aws-cdk-sagemaker-endpointconfig.template.json
@@ -483,7 +483,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint.alarms.js.snapshot/aws-cdk-sagemaker-endpoint-alarms.template.json b/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint.alarms.js.snapshot/aws-cdk-sagemaker-endpoint-alarms.template.json
index 220a434d34fbb..3aa1523256cb9 100644
--- a/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint.alarms.js.snapshot/aws-cdk-sagemaker-endpoint-alarms.template.json
+++ b/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint.alarms.js.snapshot/aws-cdk-sagemaker-endpoint-alarms.template.json
@@ -76,7 +76,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint.js.snapshot/aws-cdk-sagemaker-endpoint.template.json b/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint.js.snapshot/aws-cdk-sagemaker-endpoint.template.json
index 074de5842ea59..c8ee42be60b0f 100644
--- a/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint.js.snapshot/aws-cdk-sagemaker-endpoint.template.json
+++ b/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.endpoint.js.snapshot/aws-cdk-sagemaker-endpoint.template.json
@@ -76,7 +76,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.model.js.snapshot/aws-cdk-sagemaker-model.template.json b/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.model.js.snapshot/aws-cdk-sagemaker-model.template.json
index f5aac644145f0..30d465357b949 100644
--- a/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.model.js.snapshot/aws-cdk-sagemaker-model.template.json
+++ b/packages/@aws-cdk/aws-sagemaker-alpha/test/integ.model.js.snapshot/aws-cdk-sagemaker-model.template.json
@@ -483,7 +483,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
@@ -686,7 +685,6 @@
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
- "s3:HeadObject",
"s3:List*"
],
"Effect": "Allow",
diff --git a/packages/aws-cdk-lib/aws-codebuild/test/codebuild.test.ts b/packages/aws-cdk-lib/aws-codebuild/test/codebuild.test.ts
index 535d857b11400..3827705d56195 100644
--- a/packages/aws-cdk-lib/aws-codebuild/test/codebuild.test.ts
+++ b/packages/aws-cdk-lib/aws-codebuild/test/codebuild.test.ts
@@ -393,7 +393,6 @@ describe('default properties', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-pipeline-actions.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-pipeline-actions.test.ts
index 879ef29a9cc21..9d75c0279720a 100644
--- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-pipeline-actions.test.ts
+++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-pipeline-actions.test.ts
@@ -243,7 +243,6 @@ describe('CloudFormation Pipeline Actions', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
@@ -673,7 +672,6 @@ describe('CloudFormation Pipeline Actions', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
@@ -689,7 +687,6 @@ describe('CloudFormation Pipeline Actions', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-stackset-pipeline-actions.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-stackset-pipeline-actions.test.ts
index e5cc5441a37a4..cfa43a665baea 100644
--- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-stackset-pipeline-actions.test.ts
+++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/cloudformation/cloudformation-stackset-pipeline-actions.test.ts
@@ -166,7 +166,6 @@ describe('StackSetAction', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts
index a37055b23e1bb..2798fed1e27b5 100644
--- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts
+++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts
@@ -140,7 +140,6 @@ describe('', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
@@ -225,7 +224,6 @@ describe('', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/pipeline.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/pipeline.test.ts
index 66df8321769ff..fac873b4ba4fd 100644
--- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/pipeline.test.ts
+++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/pipeline.test.ts
@@ -927,7 +927,6 @@ describe('pipeline', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/test/s3/s3-deploy-action.test.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/test/s3/s3-deploy-action.test.ts
index d70e58dd0deb6..a2d362a9602e0 100644
--- a/packages/aws-cdk-lib/aws-codepipeline-actions/test/s3/s3-deploy-action.test.ts
+++ b/packages/aws-cdk-lib/aws-codepipeline-actions/test/s3/s3-deploy-action.test.ts
@@ -57,7 +57,6 @@ describe('S3 Deploy Action', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/aws-cdk-lib/aws-ec2/test/cfn-init.test.ts b/packages/aws-cdk-lib/aws-ec2/test/cfn-init.test.ts
index 62f0a35bd08e1..bf6823a598988 100644
--- a/packages/aws-cdk-lib/aws-ec2/test/cfn-init.test.ts
+++ b/packages/aws-cdk-lib/aws-ec2/test/cfn-init.test.ts
@@ -302,7 +302,7 @@ describe('userdata', () => {
});
const ASSET_STATEMENT = {
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Effect: 'Allow',
Resource: [
{
@@ -446,7 +446,7 @@ describe('assets n buckets', () => {
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Statement: Match.arrayWith([{
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Effect: 'Allow',
Resource: [
{ 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':s3:::my-bucket']] },
@@ -489,7 +489,7 @@ describe('assets n buckets', () => {
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Statement: Match.arrayWith([{
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Effect: 'Allow',
Resource: [
{ 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':s3:::my-bucket']] },
diff --git a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts
index b887624aa9891..a759faa15ffdb 100644
--- a/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts
+++ b/packages/aws-cdk-lib/aws-rds/test/cluster.test.ts
@@ -2414,7 +2414,6 @@ describe('cluster', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
@@ -2664,7 +2663,6 @@ describe('cluster', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/aws-cdk-lib/aws-rds/test/instance.test.ts b/packages/aws-cdk-lib/aws-rds/test/instance.test.ts
index d7a46d4012f82..3e791f2a0ab81 100644
--- a/packages/aws-cdk-lib/aws-rds/test/instance.test.ts
+++ b/packages/aws-cdk-lib/aws-rds/test/instance.test.ts
@@ -1519,7 +1519,6 @@ describe('instance', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
@@ -1532,7 +1531,6 @@ describe('instance', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/aws-cdk-lib/aws-s3-assets/test/asset.test.ts b/packages/aws-cdk-lib/aws-s3-assets/test/asset.test.ts
index 44e3e1aa686bc..4aa70b59bf24d 100644
--- a/packages/aws-cdk-lib/aws-s3-assets/test/asset.test.ts
+++ b/packages/aws-cdk-lib/aws-s3-assets/test/asset.test.ts
@@ -131,7 +131,7 @@ test('"readers" or "grantRead" can be used to grant read permissions on the asse
Version: '2012-10-17',
Statement: [
{
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Effect: 'Allow',
Resource: [
{ 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':s3:::', { Ref: 'AssetParameters6b84b87243a4a01c592d78e1fd3855c4bfef39328cd0a450cc97e81717fea2a2S3Bucket50B5A10B' }]] },
diff --git a/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts b/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts
index a5b0448df6322..f4cb9b8807678 100644
--- a/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts
+++ b/packages/aws-cdk-lib/aws-s3-deployment/test/bucket-deployment.test.ts
@@ -661,7 +661,6 @@ test('lambda execution role gets permissions to read from the source bucket and
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
@@ -692,7 +691,6 @@ test('lambda execution role gets permissions to read from the source bucket and
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/aws-cdk-lib/aws-s3/lib/perms.ts b/packages/aws-cdk-lib/aws-s3/lib/perms.ts
index e809cc39fec91..dcebbd92a0333 100644
--- a/packages/aws-cdk-lib/aws-s3/lib/perms.ts
+++ b/packages/aws-cdk-lib/aws-s3/lib/perms.ts
@@ -1,7 +1,6 @@
export const BUCKET_READ_ACTIONS = [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
];
diff --git a/packages/aws-cdk-lib/aws-s3/test/bucket.test.ts b/packages/aws-cdk-lib/aws-s3/test/bucket.test.ts
index 19bb2935335f4..88cc9d33dd97d 100644
--- a/packages/aws-cdk-lib/aws-s3/test/bucket.test.ts
+++ b/packages/aws-cdk-lib/aws-s3/test/bucket.test.ts
@@ -1400,7 +1400,6 @@ describe('bucket', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Resource': [{
@@ -1540,7 +1539,6 @@ describe('bucket', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
@@ -1613,7 +1611,6 @@ describe('bucket', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
@@ -1676,7 +1673,7 @@ describe('bucket', () => {
'Version': '2012-10-17',
'Statement': [
{
- 'Action': ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ 'Action': ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
'Condition': { 'StringEquals': { 'aws:PrincipalOrgID': 'o-1234' } },
'Effect': 'Allow',
'Principal': { AWS: '*' },
@@ -1720,7 +1717,6 @@ describe('bucket', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
@@ -2044,7 +2040,6 @@ describe('bucket', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
@@ -2104,7 +2099,6 @@ describe('bucket', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
@@ -2134,7 +2128,6 @@ describe('bucket', () => {
'Action': [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
'Effect': 'Allow',
diff --git a/packages/aws-cdk-lib/aws-servicecatalog/test/portfolio.test.ts b/packages/aws-cdk-lib/aws-servicecatalog/test/portfolio.test.ts
index 304920dff38e2..a7034e5e1689f 100644
--- a/packages/aws-cdk-lib/aws-servicecatalog/test/portfolio.test.ts
+++ b/packages/aws-cdk-lib/aws-servicecatalog/test/portfolio.test.ts
@@ -231,7 +231,7 @@ describe('Portfolio', () => {
PolicyDocument: {
Statement: [{
Effect: 'Allow',
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Principal: {
AWS: {
'Fn::Join': [
diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/emrcontainers/start-job-run.test.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/emrcontainers/start-job-run.test.ts
index 8606a2c67f505..67f37ba04e8a1 100644
--- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/emrcontainers/start-job-run.test.ts
+++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/test/emrcontainers/start-job-run.test.ts
@@ -245,7 +245,6 @@ describe('Invoke EMR Containers Start Job Run with ', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
@@ -391,7 +390,6 @@ describe('Invoke EMR Containers Start Job Run with ', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
's3:DeleteObject*',
's3:PutObject',
diff --git a/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine.test.ts b/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine.test.ts
index b6ff3aa16d916..df71c7d4fa392 100644
--- a/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine.test.ts
+++ b/packages/aws-cdk-lib/aws-stepfunctions/test/state-machine.test.ts
@@ -323,7 +323,6 @@ describe('State Machine', () => {
Action: [
's3:GetObject*',
's3:GetBucket*',
- 's3:HeadObject',
's3:List*',
],
Effect: 'Allow',
diff --git a/packages/aws-cdk-lib/pipelines/test/compliance/assets.test.ts b/packages/aws-cdk-lib/pipelines/test/compliance/assets.test.ts
index 8d064e28dae97..047963afb84ec 100644
--- a/packages/aws-cdk-lib/pipelines/test/compliance/assets.test.ts
+++ b/packages/aws-cdk-lib/pipelines/test/compliance/assets.test.ts
@@ -951,7 +951,7 @@ function expectedAssetRolePolicy(assumeRolePattern: string | string[], attachedR
Resource: unsingleton(assumeRolePattern.map(arn => { return { 'Fn::Sub': arn }; })),
},
{
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Effect: 'Allow',
Resource: [
{ 'Fn::GetAtt': ['CdkPipelineArtifactsBucket7B46C7BF', 'Arn'] },
diff --git a/packages/aws-cdk-lib/pipelines/test/compliance/environments.test.ts b/packages/aws-cdk-lib/pipelines/test/compliance/environments.test.ts
index dc468d20e2043..777ffb83a0d2c 100644
--- a/packages/aws-cdk-lib/pipelines/test/compliance/environments.test.ts
+++ b/packages/aws-cdk-lib/pipelines/test/compliance/environments.test.ts
@@ -77,7 +77,7 @@ behavior('action has right settings for same-env deployment', (suite) => {
Template.fromStack(pipelineStack).hasResourceProperties('AWS::S3::BucketPolicy', {
PolicyDocument: {
Statement: Match.arrayWith([Match.objectLike({
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Principal: {
AWS: roleArn('deploy-role'),
},
@@ -156,7 +156,7 @@ behavior('action has right settings for cross-account deployment', (suite) => {
Template.fromStack(pipelineStack).hasResourceProperties('AWS::S3::BucketPolicy', {
PolicyDocument: {
Statement: Match.arrayWith([Match.objectLike({
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Principal: {
AWS: {
'Fn::Join': ['', [
@@ -332,7 +332,7 @@ behavior('action has right settings for cross-account/cross-region deployment',
Template.fromStack(supportStack!).hasResourceProperties('AWS::S3::BucketPolicy', {
PolicyDocument: {
Statement: Match.arrayWith([Match.objectLike({
- Action: Match.arrayWith(['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*']),
+ Action: Match.arrayWith(['s3:GetObject*', 's3:GetBucket*', 's3:List*']),
Principal: {
AWS: {
'Fn::Join': ['', [
diff --git a/packages/aws-cdk-lib/pipelines/test/compliance/synths.test.ts b/packages/aws-cdk-lib/pipelines/test/compliance/synths.test.ts
index 9970814b9a2aa..30cbed9db1faf 100644
--- a/packages/aws-cdk-lib/pipelines/test/compliance/synths.test.ts
+++ b/packages/aws-cdk-lib/pipelines/test/compliance/synths.test.ts
@@ -786,7 +786,7 @@ behavior('Synth CodeBuild project role can be granted permissions', (suite) => {
Template.fromStack(pipelineStack).hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Statement: Match.arrayWith([Match.objectLike({
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Resource: ['arn:aws:s3:::this-particular-bucket', 'arn:aws:s3:::this-particular-bucket/*'],
})]),
},
diff --git a/packages/aws-cdk-lib/pipelines/test/compliance/validations.test.ts b/packages/aws-cdk-lib/pipelines/test/compliance/validations.test.ts
index 23681a8f1dfce..f1a560fdae911 100644
--- a/packages/aws-cdk-lib/pipelines/test/compliance/validations.test.ts
+++ b/packages/aws-cdk-lib/pipelines/test/compliance/validations.test.ts
@@ -504,7 +504,7 @@ behavior('can grant permissions to shell script action', (suite) => {
Template.fromStack(pipelineStack).hasResourceProperties('AWS::IAM::Policy', {
PolicyDocument: {
Statement: Match.arrayWith([Match.objectLike({
- Action: ['s3:GetObject*', 's3:GetBucket*', 's3:HeadObject', 's3:List*'],
+ Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'],
Resource: ['arn:aws:s3:::this-particular-bucket', 'arn:aws:s3:::this-particular-bucket/*'],
})]),
},
|
zitadel
|
https://github.com/zitadel/zitadel
|
637caba8a04b2cc2e880fc0c5099cc2e3d637e5a
|
Livio Spring
|
2023-08-25 19:32:25
|
chore(workflow): exclude console dist folder from cache (#6414)
|
* empty line for test
* chore: exclude console dist folder from cache
(cherry picked from commit f03a9d03b640c6ede89348922e136c210939288d)
|
chore(workflow): exclude console dist folder from cache (#6414)
* empty line for test
* chore: exclude console dist folder from cache
(cherry picked from commit f03a9d03b640c6ede89348922e136c210939288d)
|
diff --git a/.github/workflows/console.yml b/.github/workflows/console.yml
index 1c19982ac66..bc4c5f08981 100644
--- a/.github/workflows/console.yml
+++ b/.github/workflows/console.yml
@@ -32,7 +32,7 @@ jobs:
timeout-minutes: 1
id: cache
with:
- key: console-${{ hashFiles('console', 'proto') }}
+ key: console-${{ hashFiles('console', 'proto', '!console/dist') }}
restore-keys: |
console-
path: ${{ env.cache_path }}
|
kubo
|
https://github.com/ipfs/kubo
|
52c177ced94a1dca6f2a440ba9f25a184ff75ddb
|
Adin Schmahmann
|
2021-11-30 00:28:05
|
feat: go-libp2p 0.16, UnixFS autosharding and go-datastore with contexts (#8563)
|
* plumb through go-datastore context changes
* update go-libp2p to v0.16.0
* use LIBP2P_TCP_REUSEPORT instead of IPFS_REUSEPORT
* use relay config
* making deprecation notice match the go-ipfs-config key
* docs(config): circuit relay v2
* docs(config): fix links and headers
* feat(config): Internal.Libp2pForceReachability
This switches to config that supports setting and reading
Internal.Libp2pForceReachability OptionalString flag
* use configuration option for static relays
* chore: go-ipfs-config v0.18.0
|
feat: go-libp2p 0.16, UnixFS autosharding and go-datastore with contexts (#8563)
* plumb through go-datastore context changes
* update go-libp2p to v0.16.0
* use LIBP2P_TCP_REUSEPORT instead of IPFS_REUSEPORT
* use relay config
* making deprecation notice match the go-ipfs-config key
* docs(config): circuit relay v2
* docs(config): fix links and headers
* feat(config): Internal.Libp2pForceReachability
This switches to config that supports setting and reading
Internal.Libp2pForceReachability OptionalString flag
* use configuration option for static relays
* chore: go-ipfs-config v0.18.0
https://github.com/ipfs/go-ipfs-config/releases/tag/v0.18.0
* feat: circuit v1 migration prompt when Swarm.EnableRelayHop is set (#8559)
* exit when Swarm.EnableRelayHop is set
* docs: Experimental.ShardingEnabled migration
This ensures existing users of global sharding experiment get notified
that the flag no longer works + that autosharding happens automatically.
For people who NEED to keep the old behavior (eg. have no time to
migrate today) there is a note about restoring it with
`UnixFSShardingSizeThreshold`.
* chore: add dag-jose code to the cid command output
* add support for setting automatic unixfs sharding threshold from the config
* test: have tests use low cutoff for sharding to mimic old behavior
* test: change error message to match the current error
* test: Add automatic sharding/unsharding tests (#8547)
* test: refactored naming in the sharding sharness tests to make more sense
* ci: set interop test executor to convenience image for Go1.16 + Node
* ci: use interop master
Co-authored-by: Marcin Rataj <[email protected]>
Co-authored-by: Marten Seemann <[email protected]>
Co-authored-by: Marcin Rataj <[email protected]>
Co-authored-by: Gus Eggert <[email protected]>
Co-authored-by: Lucas Molas <[email protected]>
|
diff --git a/.circleci/main.yml b/.circleci/main.yml
index 410d13f808c..061bffac86e 100644
--- a/.circleci/main.yml
+++ b/.circleci/main.yml
@@ -56,7 +56,7 @@ executors:
environment:
<<: *default_environment
NO_SANDBOX: true
- IPFS_REUSEPORT: false
+ LIBP2P_TCP_REUSEPORT: false
LIBP2P_ALLOW_WEAK_RSA_KEYS: 1
E2E_IPFSD_TYPE: go
dockerizer:
@@ -216,7 +216,8 @@ jobs:
- bin/ipfs
- *store_gomod
interop:
- executor: node
+ docker:
+ - image: cimg/go:1.16-node
parallelism: 4
steps:
- *make_out_dirs
@@ -227,7 +228,7 @@ jobs:
command: |
npm init -y
npm install ipfs@^0.59.1
- npm install ipfs-interop@^7.0.3
+ npm install ipfs/interop#master
npm install [email protected]
working_directory: ~/ipfs/go-ipfs/interop
- run:
@@ -238,7 +239,7 @@ jobs:
npx ipfs-interop -- -t node -f $(sed -n -e "s|^require('\(.*\)')$|test/\1|p" node_modules/ipfs-interop/test/node.js | circleci tests split) -- --reporter mocha-circleci-reporter
working_directory: ~/ipfs/go-ipfs/interop
environment:
- IPFS_REUSEPORT: false
+ LIBP2P_TCP_REUSEPORT: false
LIBP2P_ALLOW_WEAK_RSA_KEYS: 1
IPFS_GO_EXEC: /tmp/circleci-workspace/bin/ipfs
- store_test_results:
diff --git a/Rules.mk b/Rules.mk
index 5af58d8667e..3d6f621cc87 100644
--- a/Rules.mk
+++ b/Rules.mk
@@ -22,7 +22,7 @@ include mk/golang.mk
ifeq ($(TEST_NO_FUSE),1)
GOTAGS += nofuse
endif
-export IPFS_REUSEPORT=false
+export LIBP2P_TCP_REUSEPORT=false
# -------------------- #
# sub-files #
diff --git a/blocks/blockstoreutil/remove.go b/blocks/blockstoreutil/remove.go
index ae645f6fd30..880f033656f 100644
--- a/blocks/blockstoreutil/remove.go
+++ b/blocks/blockstoreutil/remove.go
@@ -8,7 +8,7 @@ import (
cid "github.com/ipfs/go-cid"
bs "github.com/ipfs/go-ipfs-blockstore"
- "github.com/ipfs/go-ipfs-pinner"
+ pin "github.com/ipfs/go-ipfs-pinner"
)
// RemovedBlock is used to represent the result of removing a block.
@@ -40,15 +40,15 @@ func RmBlocks(ctx context.Context, blocks bs.GCBlockstore, pins pin.Pinner, cids
go func() {
defer close(out)
- unlocker := blocks.GCLock()
- defer unlocker.Unlock()
+ unlocker := blocks.GCLock(ctx)
+ defer unlocker.Unlock(ctx)
stillOkay := FilterPinned(ctx, pins, out, cids)
for _, c := range stillOkay {
// Kept for backwards compatibility. We may want to
// remove this sometime in the future.
- has, err := blocks.Has(c)
+ has, err := blocks.Has(ctx, c)
if err != nil {
out <- &RemovedBlock{Hash: c.String(), Error: err.Error()}
continue
@@ -58,7 +58,7 @@ func RmBlocks(ctx context.Context, blocks bs.GCBlockstore, pins pin.Pinner, cids
continue
}
- err = blocks.DeleteBlock(c)
+ err = blocks.DeleteBlock(ctx, c)
if err != nil {
out <- &RemovedBlock{Hash: c.String(), Error: err.Error()}
} else if !opts.Quiet {
diff --git a/core/commands/dag/import.go b/core/commands/dag/import.go
index 244260601bf..e206652ce36 100644
--- a/core/commands/dag/import.go
+++ b/core/commands/dag/import.go
@@ -42,8 +42,8 @@ func dagImport(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment
// This is especially important for use cases like dagger:
// ipfs dag import $( ... | ipfs-dagger --stdout=carfifos )
//
- unlocker := node.Blockstore.PinLock()
- defer unlocker.Unlock()
+ unlocker := node.Blockstore.PinLock(req.Context)
+ defer unlocker.Unlock(req.Context)
doPinRoots, _ := req.Options[pinRootsOptionName].(bool)
@@ -87,7 +87,7 @@ func dagImport(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment
ret := RootMeta{Cid: c}
- if block, err := node.Blockstore.Get(c); err != nil {
+ if block, err := node.Blockstore.Get(req.Context, c); err != nil {
ret.PinErrorMsg = err.Error()
} else if nd, err := ipld.Decode(block); err != nil {
ret.PinErrorMsg = err.Error()
diff --git a/core/commands/dht.go b/core/commands/dht.go
index c481c776a99..4379fb0414d 100644
--- a/core/commands/dht.go
+++ b/core/commands/dht.go
@@ -273,7 +273,7 @@ var provideRefDhtCmd = &cmds.Command{
return err
}
- has, err := nd.Blockstore.Has(c)
+ has, err := nd.Blockstore.Has(req.Context, c)
if err != nil {
return err
}
diff --git a/core/commands/filestore.go b/core/commands/filestore.go
index c36308bc140..03024eb5fa2 100644
--- a/core/commands/filestore.go
+++ b/core/commands/filestore.go
@@ -1,17 +1,18 @@
package commands
import (
+ "context"
"fmt"
"io"
"os"
filestore "github.com/ipfs/go-filestore"
+ cmds "github.com/ipfs/go-ipfs-cmds"
core "github.com/ipfs/go-ipfs/core"
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
e "github.com/ipfs/go-ipfs/core/commands/e"
"github.com/ipfs/go-cid"
- "github.com/ipfs/go-ipfs-cmds"
)
var FileStoreCmd = &cmds.Command{
@@ -56,17 +57,17 @@ The output is:
}
args := req.Arguments
if len(args) > 0 {
- return listByArgs(res, fs, args)
+ return listByArgs(req.Context, res, fs, args)
}
fileOrder, _ := req.Options[fileOrderOptionName].(bool)
- next, err := filestore.ListAll(fs, fileOrder)
+ next, err := filestore.ListAll(req.Context, fs, fileOrder)
if err != nil {
return err
}
for {
- r := next()
+ r := next(req.Context)
if r == nil {
break
}
@@ -133,17 +134,17 @@ For ERROR entries the error will also be printed to stderr.
}
args := req.Arguments
if len(args) > 0 {
- return listByArgs(res, fs, args)
+ return listByArgs(req.Context, res, fs, args)
}
fileOrder, _ := req.Options[fileOrderOptionName].(bool)
- next, err := filestore.VerifyAll(fs, fileOrder)
+ next, err := filestore.VerifyAll(req.Context, fs, fileOrder)
if err != nil {
return err
}
for {
- r := next()
+ r := next(req.Context)
if r == nil {
break
}
@@ -206,7 +207,7 @@ var dupsFileStore = &cmds.Command{
}
for cid := range ch {
- have, err := fs.MainBlockstore().Has(cid)
+ have, err := fs.MainBlockstore().Has(req.Context, cid)
if err != nil {
return res.Emit(&RefWrapper{Err: err.Error()})
}
@@ -235,7 +236,7 @@ func getFilestore(env cmds.Environment) (*core.IpfsNode, *filestore.Filestore, e
return n, fs, err
}
-func listByArgs(res cmds.ResponseEmitter, fs *filestore.Filestore, args []string) error {
+func listByArgs(ctx context.Context, res cmds.ResponseEmitter, fs *filestore.Filestore, args []string) error {
for _, arg := range args {
c, err := cid.Decode(arg)
if err != nil {
@@ -248,7 +249,7 @@ func listByArgs(res cmds.ResponseEmitter, fs *filestore.Filestore, args []string
}
continue
}
- r := filestore.Verify(fs, c)
+ r := filestore.Verify(ctx, fs, c)
if err := res.Emit(r); err != nil {
return err
}
diff --git a/core/commands/pin/remotepin.go b/core/commands/pin/remotepin.go
index 6548f29c350..3ca0d353278 100644
--- a/core/commands/pin/remotepin.go
+++ b/core/commands/pin/remotepin.go
@@ -174,7 +174,7 @@ NOTE: a comma-separated notation is supported in CLI for convenience:
return err
}
- isInBlockstore, err := node.Blockstore.Has(rp.Cid())
+ isInBlockstore, err := node.Blockstore.Has(req.Context, rp.Cid())
if err != nil {
return err
}
diff --git a/core/commands/repo.go b/core/commands/repo.go
index 307b4ffc58f..20cc41fcd91 100644
--- a/core/commands/repo.go
+++ b/core/commands/repo.go
@@ -239,7 +239,7 @@ func verifyWorkerRun(ctx context.Context, wg *sync.WaitGroup, keys <-chan cid.Ci
defer wg.Done()
for k := range keys {
- _, err := bs.Get(k)
+ _, err := bs.Get(ctx, k)
if err != nil {
select {
case results <- fmt.Sprintf("block %s was corrupt (%s)", k, err):
diff --git a/core/coreapi/block.go b/core/coreapi/block.go
index 18d9fb763d6..e1ad9badc05 100644
--- a/core/coreapi/block.go
+++ b/core/coreapi/block.go
@@ -46,10 +46,10 @@ func (api *BlockAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Bloc
}
if settings.Pin {
- defer api.blockstore.PinLock().Unlock()
+ defer api.blockstore.PinLock(ctx).Unlock(ctx)
}
- err = api.blocks.AddBlock(b)
+ err = api.blocks.AddBlock(ctx, b)
if err != nil {
return nil, err
}
diff --git a/core/coreapi/dag.go b/core/coreapi/dag.go
index 7994842b8e5..d056e8e6e0a 100644
--- a/core/coreapi/dag.go
+++ b/core/coreapi/dag.go
@@ -4,7 +4,7 @@ import (
"context"
cid "github.com/ipfs/go-cid"
- "github.com/ipfs/go-ipfs-pinner"
+ pin "github.com/ipfs/go-ipfs-pinner"
ipld "github.com/ipfs/go-ipld-format"
dag "github.com/ipfs/go-merkledag"
)
@@ -18,7 +18,7 @@ type dagAPI struct {
type pinningAdder CoreAPI
func (adder *pinningAdder) Add(ctx context.Context, nd ipld.Node) error {
- defer adder.blockstore.PinLock().Unlock()
+ defer adder.blockstore.PinLock(ctx).Unlock(ctx)
if err := adder.dag.Add(ctx, nd); err != nil {
return err
@@ -30,7 +30,7 @@ func (adder *pinningAdder) Add(ctx context.Context, nd ipld.Node) error {
}
func (adder *pinningAdder) AddMany(ctx context.Context, nds []ipld.Node) error {
- defer adder.blockstore.PinLock().Unlock()
+ defer adder.blockstore.PinLock(ctx).Unlock(ctx)
if err := adder.dag.AddMany(ctx, nds); err != nil {
return err
diff --git a/core/coreapi/dht.go b/core/coreapi/dht.go
index 892e7557629..3f10a0ffcf8 100644
--- a/core/coreapi/dht.go
+++ b/core/coreapi/dht.go
@@ -76,7 +76,7 @@ func (api *DhtAPI) Provide(ctx context.Context, path path.Path, opts ...caopts.D
c := rp.Cid()
- has, err := api.blockstore.Has(c)
+ has, err := api.blockstore.Has(ctx, c)
if err != nil {
return err
}
diff --git a/core/coreapi/object.go b/core/coreapi/object.go
index 4408cec7f64..62d31daede1 100644
--- a/core/coreapi/object.go
+++ b/core/coreapi/object.go
@@ -12,7 +12,7 @@ import (
"io/ioutil"
cid "github.com/ipfs/go-cid"
- "github.com/ipfs/go-ipfs-pinner"
+ pin "github.com/ipfs/go-ipfs-pinner"
ipld "github.com/ipfs/go-ipld-format"
dag "github.com/ipfs/go-merkledag"
"github.com/ipfs/go-merkledag/dagutils"
@@ -110,7 +110,7 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
}
if options.Pin {
- defer api.blockstore.PinLock().Unlock()
+ defer api.blockstore.PinLock(ctx).Unlock(ctx)
}
err = api.dag.Add(ctx, dagnode)
diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go
index b5db63d35a1..52ea6a6a453 100644
--- a/core/coreapi/pin.go
+++ b/core/coreapi/pin.go
@@ -27,7 +27,7 @@ func (api *PinAPI) Add(ctx context.Context, p path.Path, opts ...caopts.PinAddOp
return err
}
- defer api.blockstore.PinLock().Unlock()
+ defer api.blockstore.PinLock(ctx).Unlock(ctx)
err = api.pinning.Pin(ctx, dagNode, settings.Recursive)
if err != nil {
@@ -89,7 +89,7 @@ func (api *PinAPI) Rm(ctx context.Context, p path.Path, opts ...caopts.PinRmOpti
// Note: after unpin the pin sets are flushed to the blockstore, so we need
// to take a lock to prevent a concurrent garbage collection
- defer api.blockstore.PinLock().Unlock()
+ defer api.blockstore.PinLock(ctx).Unlock(ctx)
if err = api.pinning.Unpin(ctx, rp.Cid(), settings.Recursive); err != nil {
return err
@@ -114,7 +114,7 @@ func (api *PinAPI) Update(ctx context.Context, from path.Path, to path.Path, opt
return err
}
- defer api.blockstore.PinLock().Unlock()
+ defer api.blockstore.PinLock(ctx).Unlock(ctx)
err = api.pinning.Update(ctx, fp.Cid(), tp.Cid(), settings.Unpin)
if err != nil {
diff --git a/core/coreapi/test/path_test.go b/core/coreapi/test/path_test.go
index cc7ba2efaef..bf26b39ce59 100644
--- a/core/coreapi/test/path_test.go
+++ b/core/coreapi/test/path_test.go
@@ -14,7 +14,6 @@ import (
"github.com/ipld/go-ipld-prime"
)
-
func TestPathUnixFSHAMTPartial(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -27,16 +26,16 @@ func TestPathUnixFSHAMTPartial(t *testing.T) {
a := apis[0]
// Setting this after instantiating the swarm so that it's not clobbered by loading the go-ipfs config
- prevVal := uio.UseHAMTSharding
- uio.UseHAMTSharding = true
+ prevVal := uio.HAMTShardingSize
+ uio.HAMTShardingSize = 1
defer func() {
- uio.UseHAMTSharding = prevVal
+ uio.HAMTShardingSize = prevVal
}()
// Create and add a sharded directory
dir := make(map[string]files.Node)
// Make sure we have at least two levels of sharding
- for i := 0; i < uio.DefaultShardWidth + 1; i++ {
+ for i := 0; i < uio.DefaultShardWidth+1; i++ {
dir[strconv.Itoa(i)] = files.NewBytesFile([]byte(strconv.Itoa(i)))
}
@@ -67,7 +66,7 @@ func TestPathUnixFSHAMTPartial(t *testing.T) {
for k := range dir {
// The node will go out to the (non-existent) network looking for the missing block. Make sure we're erroring
// because we exceeded the timeout on our query
- timeoutCtx, timeoutCancel := context.WithTimeout(ctx, time.Second * 1)
+ timeoutCtx, timeoutCancel := context.WithTimeout(ctx, time.Second*1)
_, err := a.ResolveNode(timeoutCtx, path.Join(r, k))
if err != nil {
if timeoutCtx.Err() == nil {
diff --git a/core/coreapi/unixfs.go b/core/coreapi/unixfs.go
index 6146f807a71..55410dcb098 100644
--- a/core/coreapi/unixfs.go
+++ b/core/coreapi/unixfs.go
@@ -111,10 +111,10 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
DAGService: dserv,
syncFn: func() error {
ds := api.repo.Datastore()
- if err := ds.Sync(bstore.BlockPrefix); err != nil {
+ if err := ds.Sync(ctx, bstore.BlockPrefix); err != nil {
return err
}
- return ds.Sync(filestore.FilestorePrefix)
+ return ds.Sync(ctx, filestore.FilestorePrefix)
},
}
}
@@ -164,7 +164,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
fileAdder.SetMfsRoot(mr)
}
- nd, err := fileAdder.AddAllAndPin(files)
+ nd, err := fileAdder.AddAllAndPin(ctx, files)
if err != nil {
return nil, err
}
diff --git a/core/corehttp/metrics_test.go b/core/corehttp/metrics_test.go
index 200414d4ef1..dc3b68bc945 100644
--- a/core/corehttp/metrics_test.go
+++ b/core/corehttp/metrics_test.go
@@ -21,7 +21,7 @@ func TestPeersTotal(t *testing.T) {
hosts := make([]*bhost.BasicHost, 4)
for i := 0; i < 4; i++ {
var err error
- hosts[i], err = bhost.NewHost(ctx, swarmt.GenSwarm(t, ctx), nil)
+ hosts[i], err = bhost.NewHost(swarmt.GenSwarm(t), nil)
if err != nil {
t.Fatal(err)
}
diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go
index 1fe888eb82c..5db45bf477d 100644
--- a/core/corerepo/gc.go
+++ b/core/corerepo/gc.go
@@ -205,7 +205,7 @@ func ConditionalGC(ctx context.Context, node *core.IpfsNode, offset uint64) erro
}
func (gc *GC) maybeGC(ctx context.Context, offset uint64) error {
- storage, err := gc.Repo.GetStorageUsage()
+ storage, err := gc.Repo.GetStorageUsage(ctx)
if err != nil {
return err
}
diff --git a/core/corerepo/stat.go b/core/corerepo/stat.go
index 370cd88e4eb..52a42ca8c2b 100644
--- a/core/corerepo/stat.go
+++ b/core/corerepo/stat.go
@@ -71,7 +71,7 @@ func RepoSize(ctx context.Context, n *core.IpfsNode) (SizeStat, error) {
return SizeStat{}, err
}
- usage, err := r.GetStorageUsage()
+ usage, err := r.GetStorageUsage(ctx)
if err != nil {
return SizeStat{}, err
}
diff --git a/core/coreunix/add.go b/core/coreunix/add.go
index 68be08056ff..387a977784d 100644
--- a/core/coreunix/add.go
+++ b/core/coreunix/add.go
@@ -11,9 +11,9 @@ import (
"github.com/ipfs/go-cid"
bstore "github.com/ipfs/go-ipfs-blockstore"
chunker "github.com/ipfs/go-ipfs-chunker"
- "github.com/ipfs/go-ipfs-files"
- "github.com/ipfs/go-ipfs-pinner"
- "github.com/ipfs/go-ipfs-posinfo"
+ files "github.com/ipfs/go-ipfs-files"
+ pin "github.com/ipfs/go-ipfs-pinner"
+ posinfo "github.com/ipfs/go-ipfs-posinfo"
ipld "github.com/ipfs/go-ipld-format"
logging "github.com/ipfs/go-log"
dag "github.com/ipfs/go-merkledag"
@@ -254,17 +254,17 @@ func (adder *Adder) addNode(node ipld.Node, path string) error {
}
// AddAllAndPin adds the given request's files and pin them.
-func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
+func (adder *Adder) AddAllAndPin(ctx context.Context, file files.Node) (ipld.Node, error) {
if adder.Pin {
- adder.unlocker = adder.gcLocker.PinLock()
+ adder.unlocker = adder.gcLocker.PinLock(ctx)
}
defer func() {
if adder.unlocker != nil {
- adder.unlocker.Unlock()
+ adder.unlocker.Unlock(ctx)
}
}()
- if err := adder.addFileNode("", file, true); err != nil {
+ if err := adder.addFileNode(ctx, "", file, true); err != nil {
return nil, err
}
@@ -333,10 +333,10 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
return nd, adder.PinRoot(nd)
}
-func (adder *Adder) addFileNode(path string, file files.Node, toplevel bool) error {
+func (adder *Adder) addFileNode(ctx context.Context, path string, file files.Node, toplevel bool) error {
defer file.Close()
- err := adder.maybePauseForGC()
+ err := adder.maybePauseForGC(ctx)
if err != nil {
return err
}
@@ -357,7 +357,7 @@ func (adder *Adder) addFileNode(path string, file files.Node, toplevel bool) err
switch f := file.(type) {
case files.Directory:
- return adder.addDir(path, f, toplevel)
+ return adder.addDir(ctx, path, f, toplevel)
case *files.Symlink:
return adder.addSymlink(path, f)
case files.File:
@@ -405,7 +405,7 @@ func (adder *Adder) addFile(path string, file files.File) error {
return adder.addNode(dagnode, path)
}
-func (adder *Adder) addDir(path string, dir files.Directory, toplevel bool) error {
+func (adder *Adder) addDir(ctx context.Context, path string, dir files.Directory, toplevel bool) error {
log.Infof("adding directory: %s", path)
if !(toplevel && path == "") {
@@ -426,7 +426,7 @@ func (adder *Adder) addDir(path string, dir files.Directory, toplevel bool) erro
it := dir.Entries()
for it.Next() {
fpath := gopath.Join(path, it.Name())
- err := adder.addFileNode(fpath, it.Node(), false)
+ err := adder.addFileNode(ctx, fpath, it.Node(), false)
if err != nil {
return err
}
@@ -435,8 +435,8 @@ func (adder *Adder) addDir(path string, dir files.Directory, toplevel bool) erro
return it.Err()
}
-func (adder *Adder) maybePauseForGC() error {
- if adder.unlocker != nil && adder.gcLocker.GCRequested() {
+func (adder *Adder) maybePauseForGC(ctx context.Context) error {
+ if adder.unlocker != nil && adder.gcLocker.GCRequested(ctx) {
rn, err := adder.curRootNode()
if err != nil {
return err
@@ -447,8 +447,8 @@ func (adder *Adder) maybePauseForGC() error {
return err
}
- adder.unlocker.Unlock()
- adder.unlocker = adder.gcLocker.PinLock()
+ adder.unlocker.Unlock(ctx)
+ adder.unlocker = adder.gcLocker.PinLock(ctx)
}
return nil
}
diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go
index 6277e858c2e..7dd2b0cec65 100644
--- a/core/coreunix/add_test.go
+++ b/core/coreunix/add_test.go
@@ -68,7 +68,7 @@ func TestAddMultipleGCLive(t *testing.T) {
go func() {
defer close(out)
- _, _ = adder.AddAllAndPin(slf)
+ _, _ = adder.AddAllAndPin(context.Background(), slf)
// Ignore errors for clarity - the real bug would be gc'ing files while adding them, not this resultant error
}()
@@ -179,7 +179,7 @@ func TestAddGCLive(t *testing.T) {
go func() {
defer close(addDone)
defer close(out)
- _, err := adder.AddAllAndPin(slf)
+ _, err := adder.AddAllAndPin(context.Background(), slf)
if err != nil {
t.Error(err)
@@ -288,7 +288,7 @@ func testAddWPosInfo(t *testing.T, rawLeaves bool) {
go func() {
defer close(adder.Out)
- _, err = adder.AddAllAndPin(file)
+ _, err = adder.AddAllAndPin(context.Background(), file)
if err != nil {
t.Error(err)
}
@@ -327,16 +327,16 @@ type testBlockstore struct {
countAtOffsetNonZero int
}
-func (bs *testBlockstore) Put(block blocks.Block) error {
+func (bs *testBlockstore) Put(ctx context.Context, block blocks.Block) error {
bs.CheckForPosInfo(block)
- return bs.GCBlockstore.Put(block)
+ return bs.GCBlockstore.Put(ctx, block)
}
-func (bs *testBlockstore) PutMany(blocks []blocks.Block) error {
+func (bs *testBlockstore) PutMany(ctx context.Context, blocks []blocks.Block) error {
for _, blk := range blocks {
bs.CheckForPosInfo(blk)
}
- return bs.GCBlockstore.PutMany(blocks)
+ return bs.GCBlockstore.PutMany(ctx, blocks)
}
func (bs *testBlockstore) CheckForPosInfo(block blocks.Block) {
diff --git a/core/mock/mock.go b/core/mock/mock.go
index ed123dff7c0..d0a5cd7f65c 100644
--- a/core/mock/mock.go
+++ b/core/mock/mock.go
@@ -16,8 +16,8 @@ import (
config "github.com/ipfs/go-ipfs-config"
"github.com/libp2p/go-libp2p"
- host "github.com/libp2p/go-libp2p-core/host"
- peer "github.com/libp2p/go-libp2p-core/peer"
+ "github.com/libp2p/go-libp2p-core/host"
+ "github.com/libp2p/go-libp2p-core/peer"
pstore "github.com/libp2p/go-libp2p-core/peerstore"
testutil "github.com/libp2p/go-libp2p-testing/net"
@@ -36,7 +36,7 @@ func NewMockNode() (*core.IpfsNode, error) {
}
func MockHostOption(mn mocknet.Mocknet) libp2p2.HostOption {
- return func(ctx context.Context, id peer.ID, ps pstore.Peerstore, _ ...libp2p.Option) (host.Host, error) {
+ return func(id peer.ID, ps pstore.Peerstore, _ ...libp2p.Option) (host.Host, error) {
return mn.AddPeerWithPeerstore(id, ps)
}
}
diff --git a/core/node/core.go b/core/node/core.go
index cdb790bd22f..c8305bb610a 100644
--- a/core/node/core.go
+++ b/core/node/core.go
@@ -46,11 +46,11 @@ func BlockService(lc fx.Lifecycle, bs blockstore.Blockstore, rem exchange.Interf
func Pinning(bstore blockstore.Blockstore, ds format.DAGService, repo repo.Repo) (pin.Pinner, error) {
rootDS := repo.Datastore()
- syncFn := func() error {
- if err := rootDS.Sync(blockstore.BlockPrefix); err != nil {
+ syncFn := func(ctx context.Context) error {
+ if err := rootDS.Sync(ctx, blockstore.BlockPrefix); err != nil {
return err
}
- return rootDS.Sync(filestore.FilestorePrefix)
+ return rootDS.Sync(ctx, filestore.FilestorePrefix)
}
syncDs := &syncDagService{ds, syncFn}
@@ -72,11 +72,11 @@ var (
// syncDagService is used by the Pinner to ensure data gets persisted to the underlying datastore
type syncDagService struct {
format.DAGService
- syncFn func() error
+ syncFn func(context.Context) error
}
-func (s *syncDagService) Sync() error {
- return s.syncFn()
+func (s *syncDagService) Sync(ctx context.Context) error {
+ return s.syncFn(ctx)
}
func (s *syncDagService) Session(ctx context.Context) format.NodeGetter {
@@ -113,22 +113,22 @@ func Files(mctx helpers.MetricsCtx, lc fx.Lifecycle, repo repo.Repo, dag format.
dsk := datastore.NewKey("/local/filesroot")
pf := func(ctx context.Context, c cid.Cid) error {
rootDS := repo.Datastore()
- if err := rootDS.Sync(blockstore.BlockPrefix); err != nil {
+ if err := rootDS.Sync(ctx, blockstore.BlockPrefix); err != nil {
return err
}
- if err := rootDS.Sync(filestore.FilestorePrefix); err != nil {
+ if err := rootDS.Sync(ctx, filestore.FilestorePrefix); err != nil {
return err
}
- if err := rootDS.Put(dsk, c.Bytes()); err != nil {
+ if err := rootDS.Put(ctx, dsk, c.Bytes()); err != nil {
return err
}
- return rootDS.Sync(dsk)
+ return rootDS.Sync(ctx, dsk)
}
var nd *merkledag.ProtoNode
- val, err := repo.Datastore().Get(dsk)
ctx := helpers.LifecycleCtx(mctx, lc)
+ val, err := repo.Datastore().Get(ctx, dsk)
switch {
case err == datastore.ErrNotFound || val == nil:
diff --git a/core/node/groups.go b/core/node/groups.go
index 930a2151bef..914e7c59b92 100644
--- a/core/node/groups.go
+++ b/core/node/groups.go
@@ -9,8 +9,8 @@ import (
blockstore "github.com/ipfs/go-ipfs-blockstore"
config "github.com/ipfs/go-ipfs-config"
util "github.com/ipfs/go-ipfs-util"
- log "github.com/ipfs/go-log"
- peer "github.com/libp2p/go-libp2p-core/peer"
+ "github.com/ipfs/go-log"
+ "github.com/libp2p/go-libp2p-core/peer"
pubsub "github.com/libp2p/go-libp2p-pubsub"
"github.com/ipfs/go-ipfs/core/node/libp2p"
@@ -19,6 +19,8 @@ import (
offline "github.com/ipfs/go-ipfs-exchange-offline"
offroute "github.com/ipfs/go-ipfs-routing/offline"
uio "github.com/ipfs/go-unixfs/io"
+
+ "github.com/dustin/go-humanize"
"go.uber.org/fx"
)
@@ -109,19 +111,34 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
autonat = fx.Provide(libp2p.AutoNATService(cfg.AutoNAT.Throttle))
}
- // If `cfg.Swarm.DisableRelay` is set and `Network.Relay` isn't, use the former.
- enableRelay := cfg.Swarm.Transports.Network.Relay.WithDefault(!cfg.Swarm.DisableRelay) //nolint
+ // If `cfg.Swarm.DisableRelay` is set and `Network.RelayTransport` isn't, use the former.
+ enableRelayTransport := cfg.Swarm.Transports.Network.Relay.WithDefault(!cfg.Swarm.DisableRelay) //nolint
// Warn about a deprecated option.
//nolint
if cfg.Swarm.DisableRelay {
- logger.Error("The `Swarm.DisableRelay' config field is deprecated.")
- if enableRelay {
- logger.Error("`Swarm.DisableRelay' has been overridden by `Swarm.Transports.Network.Relay'")
+ logger.Error("The 'Swarm.DisableRelay' config field is deprecated.")
+ if enableRelayTransport {
+ logger.Error("'Swarm.DisableRelay' has been overridden by 'Swarm.Transports.Network.Relay'")
+ } else {
+ logger.Error("Use the 'Swarm.Transports.Network.Relay' config field instead")
+ }
+ }
+ //nolint
+ if cfg.Swarm.EnableAutoRelay {
+ logger.Error("The 'Swarm.EnableAutoRelay' config field is deprecated.")
+ if cfg.Swarm.RelayClient.Enabled == config.Default {
+ logger.Error("Use the 'Swarm.AutoRelay.Enabled' config field instead")
} else {
- logger.Error("Use the `Swarm.Transports.Network.Relay' config field instead")
+ logger.Error("'Swarm.EnableAutoRelay' has been overridden by 'Swarm.AutoRelay.Enabled'")
}
}
+ //nolint
+ if cfg.Swarm.EnableRelayHop {
+ logger.Fatal("The `Swarm.EnableRelayHop` config field is ignored.\n" +
+ "Use `Swarm.RelayService` to configure the circuit v2 relay.\n" +
+ "If you want to continue running a circuit v1 relay, please use the standalone relay daemon: https://github.com/libp2p/go-libp2p-relay-daemon (with RelayV1.Enabled: true)")
+ }
// Gather all the options
opts := fx.Options(
@@ -130,10 +147,13 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
fx.Provide(libp2p.AddrFilters(cfg.Swarm.AddrFilters)),
fx.Provide(libp2p.AddrsFactory(cfg.Addresses.Announce, cfg.Addresses.NoAnnounce)),
fx.Provide(libp2p.SmuxTransport(cfg.Swarm.Transports)),
- fx.Provide(libp2p.Relay(enableRelay, cfg.Swarm.EnableRelayHop)),
+ fx.Provide(libp2p.RelayTransport(enableRelayTransport)),
+ fx.Provide(libp2p.RelayService(cfg.Swarm.RelayService.Enabled.WithDefault(true), cfg.Swarm.RelayService)),
fx.Provide(libp2p.Transports(cfg.Swarm.Transports)),
fx.Invoke(libp2p.StartListening(cfg.Addresses.Swarm)),
fx.Invoke(libp2p.SetupDiscovery(cfg.Discovery.MDNS.Enabled, cfg.Discovery.MDNS.Interval)),
+ fx.Provide(libp2p.ForceReachability(cfg.Internal.Libp2pForceReachability)),
+ fx.Provide(libp2p.StaticRelays(cfg.Swarm.RelayClient.StaticRelays)),
fx.Provide(libp2p.Security(!bcfg.DisableEncryptedConnections, cfg.Swarm.Transports)),
@@ -143,7 +163,7 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
maybeProvide(libp2p.BandwidthCounter, !cfg.Swarm.DisableBandwidthMetrics),
maybeProvide(libp2p.NatPortMap, !cfg.Swarm.DisableNatPortMap),
- maybeProvide(libp2p.AutoRelay, cfg.Swarm.EnableAutoRelay),
+ maybeProvide(libp2p.AutoRelay(len(cfg.Swarm.RelayClient.StaticRelays) == 0), cfg.Swarm.RelayClient.Enabled.WithDefault(false)),
autonat,
connmgr,
ps,
@@ -316,8 +336,20 @@ func IPFS(ctx context.Context, bcfg *BuildCfg) fx.Option {
return bcfgOpts // error
}
- // TEMP: setting global sharding switch here
- uio.UseHAMTSharding = cfg.Experimental.ShardingEnabled
+ // Auto-sharding settings
+ shardSizeString := cfg.Internal.UnixFSShardingSizeThreshold.WithDefault("256kiB")
+ shardSizeInt, err := humanize.ParseBytes(shardSizeString)
+ if err != nil {
+ return fx.Error(err)
+ }
+ uio.HAMTShardingSize = int(shardSizeInt)
+
+ // Migrate users of deprecated Experimental.ShardingEnabled flag
+ if cfg.Experimental.ShardingEnabled {
+ logger.Fatal("The `Experimental.ShardingEnabled` field is no longer used, please remove it from the config.\n" +
+ "go-ipfs now automatically shards when directory block is bigger than `" + shardSizeString + "`.\n" +
+ "If you need to restore the old behavior (sharding everything) set `Internal.UnixFSShardingSizeThreshold` to `1B`.\n")
+ }
return fx.Options(
bcfgOpts,
diff --git a/core/node/libp2p/discovery.go b/core/node/libp2p/discovery.go
index f29f523cee1..64860ce5c66 100644
--- a/core/node/libp2p/discovery.go
+++ b/core/node/libp2p/discovery.go
@@ -40,8 +40,10 @@ func DiscoveryHandler(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host)
func SetupDiscovery(useMdns bool, mdnsInterval int) func(helpers.MetricsCtx, fx.Lifecycle, host.Host, *discoveryHandler) error {
return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, handler *discoveryHandler) error {
if useMdns {
- service := mdns.NewMdnsService(host, mdns.ServiceName)
- service.RegisterNotifee(handler)
+ service := mdns.NewMdnsService(host, mdns.ServiceName, handler)
+ if err := service.Start(); err != nil {
+ return err
+ }
if mdnsInterval == 0 {
mdnsInterval = 5
diff --git a/core/node/libp2p/host.go b/core/node/libp2p/host.go
index 04682682b48..9298f7ffbf9 100644
--- a/core/node/libp2p/host.go
+++ b/core/node/libp2p/host.go
@@ -4,10 +4,10 @@ import (
"context"
"github.com/libp2p/go-libp2p"
- host "github.com/libp2p/go-libp2p-core/host"
- peer "github.com/libp2p/go-libp2p-core/peer"
- peerstore "github.com/libp2p/go-libp2p-core/peerstore"
- routing "github.com/libp2p/go-libp2p-core/routing"
+ "github.com/libp2p/go-libp2p-core/host"
+ "github.com/libp2p/go-libp2p-core/peer"
+ "github.com/libp2p/go-libp2p-core/peerstore"
+ "github.com/libp2p/go-libp2p-core/routing"
record "github.com/libp2p/go-libp2p-record"
routedhost "github.com/libp2p/go-libp2p/p2p/host/routed"
@@ -64,7 +64,7 @@ func Host(mctx helpers.MetricsCtx, lc fx.Lifecycle, params P2PHostIn) (out P2PHo
return r, err
}))
- out.Host, err = params.HostOption(ctx, params.ID, params.Peerstore, opts...)
+ out.Host, err = params.HostOption(params.ID, params.Peerstore, opts...)
if err != nil {
return P2PHostOut{}, err
}
diff --git a/core/node/libp2p/hostopt.go b/core/node/libp2p/hostopt.go
index 26d6cad7066..23d28c8c001 100644
--- a/core/node/libp2p/hostopt.go
+++ b/core/node/libp2p/hostopt.go
@@ -1,25 +1,24 @@
package libp2p
import (
- "context"
"fmt"
"github.com/libp2p/go-libp2p"
- host "github.com/libp2p/go-libp2p-core/host"
- peer "github.com/libp2p/go-libp2p-core/peer"
- peerstore "github.com/libp2p/go-libp2p-core/peerstore"
+ "github.com/libp2p/go-libp2p-core/host"
+ "github.com/libp2p/go-libp2p-core/peer"
+ "github.com/libp2p/go-libp2p-core/peerstore"
)
-type HostOption func(ctx context.Context, id peer.ID, ps peerstore.Peerstore, options ...libp2p.Option) (host.Host, error)
+type HostOption func(id peer.ID, ps peerstore.Peerstore, options ...libp2p.Option) (host.Host, error)
var DefaultHostOption HostOption = constructPeerHost
// isolates the complex initialization steps
-func constructPeerHost(ctx context.Context, id peer.ID, ps peerstore.Peerstore, options ...libp2p.Option) (host.Host, error) {
+func constructPeerHost(id peer.ID, ps peerstore.Peerstore, options ...libp2p.Option) (host.Host, error) {
pkey := ps.PrivKey(id)
if pkey == nil {
return nil, fmt.Errorf("missing private key for node ID: %s", id.Pretty())
}
options = append([]libp2p.Option{libp2p.Identity(pkey), libp2p.Peerstore(ps)}, options...)
- return libp2p.New(ctx, options...)
+ return libp2p.New(options...)
}
diff --git a/core/node/libp2p/libp2p.go b/core/node/libp2p/libp2p.go
index 57539259baa..3659b3c6179 100644
--- a/core/node/libp2p/libp2p.go
+++ b/core/node/libp2p/libp2p.go
@@ -1,6 +1,7 @@
package libp2p
import (
+ "fmt"
"sort"
"time"
@@ -9,7 +10,7 @@ import (
logging "github.com/ipfs/go-log"
"github.com/libp2p/go-libp2p"
- "github.com/libp2p/go-libp2p-connmgr"
+ connmgr "github.com/libp2p/go-libp2p-connmgr"
"github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/libp2p/go-libp2p-core/peerstore"
@@ -78,3 +79,21 @@ func prioritizeOptions(opts []priorityOption) libp2p.Option {
}
return libp2p.ChainOptions(p2pOpts...)
}
+
+func ForceReachability(val *config.OptionalString) func() (opts Libp2pOpts, err error) {
+ return func() (opts Libp2pOpts, err error) {
+ if val.IsDefault() {
+ return
+ }
+ v := val.WithDefault("unrecognized")
+ switch v {
+ case "public":
+ opts.Opts = append(opts.Opts, libp2p.ForceReachabilityPublic())
+ case "private":
+ opts.Opts = append(opts.Opts, libp2p.ForceReachabilityPrivate())
+ default:
+ return opts, fmt.Errorf("unrecognized reachability option: %s", v)
+ }
+ return
+ }
+}
diff --git a/core/node/libp2p/nat.go b/core/node/libp2p/nat.go
index 9fe74d91cb3..ce0ca345f70 100644
--- a/core/node/libp2p/nat.go
+++ b/core/node/libp2p/nat.go
@@ -3,7 +3,7 @@ package libp2p
import (
"time"
- "github.com/ipfs/go-ipfs-config"
+ config "github.com/ipfs/go-ipfs-config"
"github.com/libp2p/go-libp2p"
)
@@ -13,14 +13,12 @@ func AutoNATService(throttle *config.AutoNATThrottleConfig) func() Libp2pOpts {
return func() (opts Libp2pOpts) {
opts.Opts = append(opts.Opts, libp2p.EnableNATService())
if throttle != nil {
- global := throttle.GlobalLimit
- peer := throttle.PeerLimit
- interval := time.Duration(throttle.Interval)
- if interval == 0 {
- interval = time.Minute
- }
opts.Opts = append(opts.Opts,
- libp2p.AutoNATServiceRateLimit(global, peer, interval),
+ libp2p.AutoNATServiceRateLimit(
+ throttle.GlobalLimit,
+ throttle.PeerLimit,
+ throttle.Interval.WithDefault(time.Minute),
+ ),
)
}
return opts
diff --git a/core/node/libp2p/peerstore.go b/core/node/libp2p/peerstore.go
index 03ad64a6c8a..0cc6b21f54c 100644
--- a/core/node/libp2p/peerstore.go
+++ b/core/node/libp2p/peerstore.go
@@ -8,13 +8,16 @@ import (
"go.uber.org/fx"
)
-func Peerstore(lc fx.Lifecycle) peerstore.Peerstore {
- pstore := pstoremem.NewPeerstore()
+func Peerstore(lc fx.Lifecycle) (peerstore.Peerstore, error) {
+ pstore, err := pstoremem.NewPeerstore()
+ if err != nil {
+ return nil, err
+ }
lc.Append(fx.Hook{
OnStop: func(ctx context.Context) error {
return pstore.Close()
},
})
- return pstore
+ return pstore, nil
}
diff --git a/core/node/libp2p/relay.go b/core/node/libp2p/relay.go
index e625b4d001c..d456179294b 100644
--- a/core/node/libp2p/relay.go
+++ b/core/node/libp2p/relay.go
@@ -1,18 +1,17 @@
package libp2p
import (
+ config "github.com/ipfs/go-ipfs-config"
+ "github.com/libp2p/go-libp2p-core/peer"
+
"github.com/libp2p/go-libp2p"
- relay "github.com/libp2p/go-libp2p-circuit"
+ "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay"
)
-func Relay(enableRelay, enableHop bool) func() (opts Libp2pOpts, err error) {
+func RelayTransport(enableRelay bool) func() (opts Libp2pOpts, err error) {
return func() (opts Libp2pOpts, err error) {
if enableRelay {
- relayOpts := []relay.RelayOpt{}
- if enableHop {
- relayOpts = append(relayOpts, relay.OptHop)
- }
- opts.Opts = append(opts.Opts, libp2p.EnableRelay(relayOpts...))
+ opts.Opts = append(opts.Opts, libp2p.EnableRelay())
} else {
opts.Opts = append(opts.Opts, libp2p.DisableRelay())
}
@@ -20,4 +19,54 @@ func Relay(enableRelay, enableHop bool) func() (opts Libp2pOpts, err error) {
}
}
-var AutoRelay = simpleOpt(libp2p.ChainOptions(libp2p.EnableAutoRelay(), libp2p.DefaultStaticRelays()))
+func RelayService(enable bool, relayOpts config.RelayService) func() (opts Libp2pOpts, err error) {
+ return func() (opts Libp2pOpts, err error) {
+ if enable {
+ def := relay.DefaultResources()
+ // Real defaults live in go-libp2p.
+ // Here we apply any overrides from user config.
+ opts.Opts = append(opts.Opts, libp2p.EnableRelayService(relay.WithResources(relay.Resources{
+ Limit: &relay.RelayLimit{
+ Data: relayOpts.ConnectionDataLimit.WithDefault(def.Limit.Data),
+ Duration: relayOpts.ConnectionDurationLimit.WithDefault(def.Limit.Duration),
+ },
+ MaxCircuits: int(relayOpts.MaxCircuits.WithDefault(int64(def.MaxCircuits))),
+ BufferSize: int(relayOpts.BufferSize.WithDefault(int64(def.BufferSize))),
+ ReservationTTL: relayOpts.ReservationTTL.WithDefault(def.ReservationTTL),
+ MaxReservations: int(relayOpts.MaxReservations.WithDefault(int64(def.MaxReservations))),
+ MaxReservationsPerIP: int(relayOpts.MaxReservations.WithDefault(int64(def.MaxReservationsPerIP))),
+ MaxReservationsPerPeer: int(relayOpts.MaxReservations.WithDefault(int64(def.MaxReservationsPerPeer))),
+ MaxReservationsPerASN: int(relayOpts.MaxReservations.WithDefault(int64(def.MaxReservationsPerASN))),
+ })))
+ }
+ return
+ }
+}
+
+func StaticRelays(relays []string) func() (opts Libp2pOpts, err error) {
+ return func() (opts Libp2pOpts, err error) {
+ staticRelays := make([]peer.AddrInfo, 0, len(relays))
+ for _, s := range relays {
+ var addr *peer.AddrInfo
+ addr, err = peer.AddrInfoFromString(s)
+ if err != nil {
+ return
+ }
+ staticRelays = append(staticRelays, *addr)
+ }
+ if len(staticRelays) > 0 {
+ opts.Opts = append(opts.Opts, libp2p.StaticRelays(staticRelays))
+ }
+ return
+ }
+}
+
+func AutoRelay(addDefaultRelays bool) func() (opts Libp2pOpts, err error) {
+ return func() (opts Libp2pOpts, err error) {
+ opts.Opts = append(opts.Opts, libp2p.EnableAutoRelay())
+ if addDefaultRelays {
+ opts.Opts = append(opts.Opts, libp2p.DefaultStaticRelays())
+ }
+ return
+ }
+}
diff --git a/docs/config.md b/docs/config.md
index ca33f448da1..3a9fb90127c 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -99,11 +99,22 @@ config file at runtime.
- [`Swarm.AddrFilters`](#swarmaddrfilters)
- [`Swarm.DisableBandwidthMetrics`](#swarmdisablebandwidthmetrics)
- [`Swarm.DisableNatPortMap`](#swarmdisablenatportmap)
- - [`Swarm.DisableRelay`](#swarmdisablerelay)
- - [`Swarm.EnableRelayHop`](#swarmenablerelayhop)
- [`Swarm.EnableAutoRelay`](#swarmenableautorelay)
- - [Mode 1: `EnableRelayHop` is `false`](#mode-1-enablerelayhop-is-false)
- - [Mode 2: `EnableRelayHop` is `true`](#mode-2-enablerelayhop-is-true)
+ - [`Swarm.RelayClient`](#swarmrelayclient)
+ - [`Swarm.RelayClient.Enabled`](#swarmrelayclientenabled)
+ - [`Swarm.RelayClient.StaticRelays`](#swarmrelayclientstaticrelays)
+ - [`Swarm.RelayService`](#swarmrelayservice)
+ - [`Swarm.RelayService.Enabled`](#swarmrelayserviceenabled)
+ - [`Swarm.RelayService.ConnectionDurationLimit`](#swarmrelayserviceconnectiondurationlimit)
+ - [`Swarm.RelayService.ConnectionDataLimit`](#swarmrelayserviceconnectiondatalimit)
+ - [`Swarm.RelayService.ReservationTTL`](#swarmrelayservicereservationttl)
+ - [`Swarm.RelayService.MaxReservations`](#swarmrelayservicemaxreservations)
+ - [`Swarm.RelayService.MaxCircuits`](#swarmrelayservicemaxcircuits)
+ - [`Swarm.RelayService.BufferSize`](#swarmrelayservicebuffersize)
+ - [`Swarm.RelayService.MaxReservationsPerPeer`](#swarmrelayservicemaxreservationsperpeer)
+ - [`Swarm.RelayService.MaxReservationsPerIP`](#swarmrelayservicemaxreservationsperip)
+ - [`Swarm.RelayService.MaxReservationsPerASN`](#swarmrelayservicemaxreservationsperasn)
+ - [`Swarm.DisableRelay`](#swarmdisablerelay)
- [`Swarm.EnableAutoNATService`](#swarmenableautonatservice)
- [`Swarm.ConnMgr`](#swarmconnmgr)
- [`Swarm.ConnMgr.Type`](#swarmconnmgrtype)
@@ -1268,63 +1279,183 @@ Default: `false`
Type: `bool`
-### `Swarm.DisableRelay`
+### `Swarm.EnableAutoRelay`
-Deprecated: Set `Swarm.Transports.Network.Relay` to `false`.
+Deprecated: Set `Swarm.RelayClient.Enabled` to `true`.
-Disables the p2p-circuit relay transport. This will prevent this node from
-connecting to nodes behind relays, or accepting connections from nodes behind
-relays.
+Enables "automatic relay user" mode for this node.
+
+Your node will automatically _use_ public relays from the network if it detects
+that it cannot be reached from the public internet (e.g., it's behind a
+firewall) and get a `/p2p-circuit` address from a public relay.
+
+This is likely the feature you're looking for, but see also:
+- [`Swarm.RelayService.Enabled`](#swarmrelayserviceenabled) if your node should act as a limited relay for other peers
+- Docs: [Libp2p Circuit Relay](https://docs.libp2p.io/concepts/circuit-relay/)
Default: `false`
Type: `bool`
-### `Swarm.EnableRelayHop`
+### `Swarm.RelayClient`
+
+Configuration options for the relay client to use relay services.
-Configures this node to act as a relay "hop". A relay "hop" relays traffic for other peers.
+Default: `{}`
+
+Type: `object`
+
+#### `Swarm.RelayClient.Enabled`
-WARNING: Do not enable this option unless you know what you're doing. Other
-peers will randomly decide to use your node as a relay and consume _all_
-available bandwidth. There is _no_ rate-limiting.
+Enables "automatic relay user" mode for this node.
+
+Your node will automatically _use_ public relays from the network if it detects
+that it cannot be reached from the public internet (e.g., it's behind a
+firewall) and get a `/p2p-circuit` address from a public relay.
Default: `false`
Type: `bool`
-### `Swarm.EnableAutoRelay`
+#### `Swarm.RelayClient.StaticRelays`
-Enables "automatic relay" mode for this node. This option does two _very_
-different things based on the `Swarm.EnableRelayHop`. See
-[#7228](https://github.com/ipfs/go-ipfs/issues/7228) for context.
+Your node will use these statically configured relay servers instead of
+discovering public relays from the network.
-Default: `false`
+Default: `[]`
-Type: `bool`
+Type: `array[string]`
-#### Mode 1: `EnableRelayHop` is `false`
+### `Swarm.RelayService`
-If `Swarm.EnableAutoRelay` is enabled and `Swarm.EnableRelayHop` is disabled,
-your node will automatically _use_ public relays from the network if it detects
-that it cannot be reached from the public internet (e.g., it's behind a
-firewall). This is likely the feature you're looking for.
+Configuration options for the relay service that can be provided to _other_ peers
+on the network ([Circuit Relay v2](https://github.com/libp2p/specs/blob/master/relay/circuit-v2.md)).
+
+Default: `{}`
+
+Type: `object`
+
+#### `Swarm.RelayService.Enabled`
+
+Enables providing `/p2p-circuit` v2 relay service to other peers on the network.
+
+NOTE: This is the service/server part of the relay system.
+Disabling this will prevent this node from running as a relay server.
+Use [`Swarm.EnableAutoRelay`](#swarmenableautorelay) for turning your node into a relay user.
+
+Default: Enabled
+
+Type: `flag`
+
+#### `Swarm.RelayService.Limit`
+
+Limits applied to every relayed connection.
+
+Default: `{}`
+
+Type: `object[string -> string]`
+
+##### `Swarm.RelayService.ConnectionDurationLimit`
+
+Time limit before a relayed connection is reset.
+
+Default: `"2m"`
+
+Type: `duration`
+
+##### `Swarm.RelayService.ConnectionDataLimit`
+
+Limit of data relayed (in each direction) before a relayed connection is reset.
+
+Default: `131072` (128 kb)
+
+Type: `optionalInteger`
-If you enable `EnableAutoRelay`, you should almost certainly disable
-`EnableRelayHop`.
-#### Mode 2: `EnableRelayHop` is `true`
+#### `Swarm.RelayService.ReservationTTL`
-If `EnableAutoRelay` is enabled and `EnableRelayHop` is enabled, your node will
-_act_ as a public relay for the network. Furthermore, in addition to simply
-relaying traffic, your node will advertise itself as a public relay. Unless you
-have the bandwidth of a small ISP, do not enable both of these options at the
-same time.
+Duration of a new or refreshed reservation.
+
+Default: `"1h"`
+
+Type: `duration`
+
+
+#### `Swarm.RelayService.MaxReservations`
+
+Maximum number of active relay slots.
+
+Default: `128`
+
+Type: `optionalInteger`
+
+
+#### `Swarm.RelayService.MaxReservations`
+
+Maximum number of open relay connections for each peer.
+
+Default: `16`
+
+Type: `optionalInteger`
+
+
+#### `Swarm.RelayService.BufferSize`
+
+Size of the relayed connection buffers.
+
+Default: `2048`
+
+Type: `optionalInteger`
+
+
+#### `Swarm.RelayService.MaxReservationsPerPeer`
+
+Maximum number of reservations originating from the same peer.
+
+Default: `4`
+
+Type: `optionalInteger`
+
+
+#### `Swarm.RelayService.MaxReservationsPerIP`
+
+Maximum number of reservations originating from the same IP.
+
+Default: `8`
+
+Type: `optionalInteger`
+
+#### `Swarm.RelayService.MaxReservationsPerASN`
+
+Maximum number of reservations originating from the same ASN.
+
+Default: `32`
+
+Type: `optionalInteger`
+
+### `Swarm.EnableRelayHop`
+
+**REMOVED**
+
+Replaced with [`Swarm.RelayService.Enabled`](#swarmrelayserviceenabled).
+
+### `Swarm.DisableRelay`
+
+Deprecated: Set `Swarm.Transports.Network.Relay` to `false`.
+
+Disables the p2p-circuit relay transport. This will prevent this node from
+connecting to nodes behind relays, or accepting connections from nodes behind
+relays.
+
+Default: `false`
+
+Type: `bool`
### `Swarm.EnableAutoNATService`
**REMOVED**
-Please use [`AutoNAT.ServiceMode`][].
+Please use [`AutoNAT.ServiceMode`][#autonatservicemode].
### `Swarm.ConnMgr`
@@ -1470,16 +1601,25 @@ Listen Addresses:
#### `Swarm.Transports.Network.Relay`
[Libp2p Relay](https://github.com/libp2p/specs/tree/master/relay) proxy
-transport that forms connections by hopping between multiple libp2p nodes. This
-transport is primarily useful for bypassing firewalls and NATs.
+transport that forms connections by hopping between multiple libp2p nodes.
+Allows IPFS node to connect to other peers using their `/p2p-circuit`
+multiaddrs. This transport is primarily useful for bypassing firewalls and
+NATs.
+
+See also:
+- Docs: [Libp2p Circuit Relay](https://docs.libp2p.io/concepts/circuit-relay/)
+- [`Swarm.EnableAutoRelay`](#swarmenableautorelay) for getting a public
+ `/p2p-circuit` address when behind a firewall.
+- [`Swarm.RelayService.Enabled`](#swarmrelayserviceenabled) for becoming a
+ limited relay for other peers
Default: Enabled
Type: `flag`
-Listen Addresses: This transport is special. Any node that enables this
-transport can receive inbound connections on this transport, without specifying
-a listen address.
+Listen Addresses:
+* This transport is special. Any node that enables this transport can receive
+ inbound connections on this transport, without specifying a listen address.
### `Swarm.Transports.Security`
diff --git a/docs/examples/go-ipfs-as-a-library/go.mod b/docs/examples/go-ipfs-as-a-library/go.mod
index 24b996a7adb..00b294b63a6 100644
--- a/docs/examples/go-ipfs-as-a-library/go.mod
+++ b/docs/examples/go-ipfs-as-a-library/go.mod
@@ -7,6 +7,6 @@ require (
github.com/ipfs/go-ipfs-config v0.16.0
github.com/ipfs/go-ipfs-files v0.0.8
github.com/ipfs/interface-go-ipfs-core v0.5.1
- github.com/libp2p/go-libp2p-core v0.9.0
+ github.com/libp2p/go-libp2p-core v0.11.0
github.com/multiformats/go-multiaddr v0.4.0
)
diff --git a/docs/examples/go-ipfs-as-a-library/go.sum b/docs/examples/go-ipfs-as-a-library/go.sum
index b2cc10b62dc..bb26555cc37 100644
--- a/docs/examples/go-ipfs-as-a-library/go.sum
+++ b/docs/examples/go-ipfs-as-a-library/go.sum
@@ -113,8 +113,6 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ=
-github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -467,7 +465,6 @@ github.com/ipfs/go-ipfs-exchange-interface v0.0.1/go.mod h1:c8MwfHjtQjPoDyiy9cFq
github.com/ipfs/go-ipfs-exchange-offline v0.0.1 h1:P56jYKZF7lDDOLx5SotVh5KFxoY6C81I1NSHW1FxGew=
github.com/ipfs/go-ipfs-exchange-offline v0.0.1/go.mod h1:WhHSFCVYX36H/anEKQboAzpUws3x7UeEGkzQc3iNkM0=
github.com/ipfs/go-ipfs-files v0.0.3/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4=
-github.com/ipfs/go-ipfs-files v0.0.8 h1:8o0oFJkJ8UkO/ABl8T6ac6tKF3+NIpj67aAB6ZpusRg=
github.com/ipfs/go-ipfs-files v0.0.8/go.mod h1:wiN/jSG8FKyk7N0WyctKSvq3ljIa2NNTiZB55kpTdOs=
github.com/ipfs/go-ipfs-keystore v0.0.2 h1:Fa9xg9IFD1VbiZtrNLzsD0GuELVHUFXCWF64kCPfEXU=
github.com/ipfs/go-ipfs-keystore v0.0.2/go.mod h1:H49tRmibOEs7gLMgbOsjC4dqh1u5e0R/SWuc2ScfgSo=
@@ -641,8 +638,9 @@ github.com/libp2p/go-conn-security v0.0.1/go.mod h1:bGmu51N0KU9IEjX7kl2PQjgZa40J
github.com/libp2p/go-conn-security-multistream v0.0.2/go.mod h1:nc9vud7inQ+d6SO0I/6dSWrdMnHnzZNHeyUQqrAJulE=
github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU=
-github.com/libp2p/go-conn-security-multistream v0.2.1 h1:ft6/POSK7F+vl/2qzegnHDaXFU0iWB4yVTYrioC6Zy0=
github.com/libp2p/go-conn-security-multistream v0.2.1/go.mod h1:cR1d8gA0Hr59Fj6NhaTpFhJZrjSYuNmhpT2r25zYR70=
+github.com/libp2p/go-conn-security-multistream v0.3.0 h1:9UCIKlBL1hC9u7nkMXpD1nkc/T53PKMAn3/k9ivBAVc=
+github.com/libp2p/go-conn-security-multistream v0.3.0/go.mod h1:EEP47t4fw/bTelVmEzIDqSe69hO/ip52xBEhZMLWAHM=
github.com/libp2p/go-doh-resolver v0.3.1 h1:1wbVGkB4Tdj4WEvjAuYknOPyt4vSSDn9thnj13pKPaY=
github.com/libp2p/go-doh-resolver v0.3.1/go.mod h1:y5go1ZppAq9N2eppbX0xON01CyPBeUg2yS6BTssssog=
github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
@@ -664,10 +662,11 @@ github.com/libp2p/go-libp2p v0.13.0/go.mod h1:pM0beYdACRfHO1WcJlp65WXyG2A6NqYM+t
github.com/libp2p/go-libp2p v0.14.0/go.mod h1:dsQrWLAoIn+GkHPN/U+yypizkHiB9tnv79Os+kSgQ4Q=
github.com/libp2p/go-libp2p v0.14.3/go.mod h1:d12V4PdKbpL0T1/gsUNN8DfgMuRPDX8bS2QxCZlwRH0=
github.com/libp2p/go-libp2p v0.14.4/go.mod h1:EIRU0Of4J5S8rkockZM7eJp2S0UrCyi55m2kJVru3rM=
-github.com/libp2p/go-libp2p v0.15.0 h1:jbMbdmtizfpvl1+oQuGJzfGhttAtuxUCavF3enwFncg=
-github.com/libp2p/go-libp2p v0.15.0/go.mod h1:8Ljmwon0cZZYKrOCjFeLwQEK8bqR42dOheUZ1kSKhP0=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052 h1:BM7aaOF7RpmNn9+9g6uTjGJ0cTzWr5j9i9IKeun2M8U=
+github.com/libp2p/go-libp2p v0.15.0-rc.1.0.20211021081216-db8f9c6fddb5 h1:nE20CmFlCbwN56/3bADccjHEvbM9E9hFe7Y+0ebdpig=
+github.com/libp2p/go-libp2p v0.15.0-rc.1.0.20211021081216-db8f9c6fddb5/go.mod h1:P+WgjkSS2d8eBj+NvkyKo0nb8fJAC04G+cCex0ZMcvI=
github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
+github.com/libp2p/go-libp2p-asn-util v0.1.0 h1:rABPCO77SjdbJ/eJ/ynIo8vWICy1VEnL5JAxJbQLo1E=
+github.com/libp2p/go-libp2p-asn-util v0.1.0/go.mod h1:wu+AnM9Ii2KgO5jMmS1rz9dvzTdj8BXqsPR9HR0XB7I=
github.com/libp2p/go-libp2p-autonat v0.0.6/go.mod h1:uZneLdOkZHro35xIhpbtTzLlgYturpu4J5+0cZK3MqE=
github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod h1:1tLf2yXxiE/oKGtDwPYWTSYG3PtvYlJmg7NeVtPRqH8=
github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE=
@@ -675,8 +674,9 @@ github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQ
github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI=
github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/nBwNHoeyyT4IWV6A=
github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
-github.com/libp2p/go-libp2p-autonat v0.4.2 h1:YMp7StMi2dof+baaxkbxaizXjY1RPvU71CXfxExzcUU=
github.com/libp2p/go-libp2p-autonat v0.4.2/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
+github.com/libp2p/go-libp2p-autonat v0.5.0 h1:/+3+4NcQV47DQ/duvRyFDP8oxv6CQTvSKYD5iWoPcYs=
+github.com/libp2p/go-libp2p-autonat v0.5.0/go.mod h1:085tmmuXn0nXgFwuF7a2tt4UxgTjuapbuml27v4htKY=
github.com/libp2p/go-libp2p-blankhost v0.0.1/go.mod h1:Ibpbw/7cPPYwFb7PACIWdvxxv0t0XCCI10t7czjAjTc=
github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU=
@@ -716,8 +716,10 @@ github.com/libp2p/go-libp2p-core v0.8.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJB
github.com/libp2p/go-libp2p-core v0.8.2/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
github.com/libp2p/go-libp2p-core v0.8.6/go.mod h1:dgHr0l0hIKfWpGpqAMbpo19pen9wJfdCGv51mTmdpmM=
-github.com/libp2p/go-libp2p-core v0.9.0 h1:t97Mv0LIBZlP2FXVRNKKVzHJCIjbIWGxYptGId4+htU=
github.com/libp2p/go-libp2p-core v0.9.0/go.mod h1:ESsbz31oC3C1AvMJoGx26RTuCkNhmkSRCqZ0kQtJ2/8=
+github.com/libp2p/go-libp2p-core v0.10.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
+github.com/libp2p/go-libp2p-core v0.11.0 h1:75jAgdA+IChNa+/mZXogfmrGkgwxkVvxmIC7pV+F6sI=
+github.com/libp2p/go-libp2p-core v0.11.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod h1:yJkNyDmO341d5wwXxDUGO0LykUVT72ImHNUqh5D/dBE=
github.com/libp2p/go-libp2p-crypto v0.0.2/go.mod h1:eETI5OUfBnvARGOHrJz2eWNyTUxEGZnBxMcbUjfIj4I=
github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
@@ -757,8 +759,9 @@ github.com/libp2p/go-libp2p-mplex v0.4.1 h1:/pyhkP1nLwjG3OM+VuaNJkQT/Pqq73WzB3aD
github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod h1:cmy+3GfqfM1PceHTLL7zQzAAYaryDu6iPSC+CIb094g=
github.com/libp2p/go-libp2p-nat v0.0.4/go.mod h1:N9Js/zVtAXqaeT99cXgTV9e75KpnWCvVOiGzlcHmBbY=
github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
-github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw=
+github.com/libp2p/go-libp2p-nat v0.1.0 h1:vigUi2MEN+fwghe5ijpScxtbbDz+L/6y8XwlzYOJgSY=
+github.com/libp2p/go-libp2p-nat v0.1.0/go.mod h1:DQzAG+QbDYjN1/C3B6vXucLtz3u9rEonLVPtZVzQqks=
github.com/libp2p/go-libp2p-net v0.0.1/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
github.com/libp2p/go-libp2p-net v0.0.2/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFxecf9Gt03cKxm2f/Q=
@@ -766,8 +769,8 @@ github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLK
github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
github.com/libp2p/go-libp2p-noise v0.2.0/go.mod h1:IEbYhBBzGyvdLBoxxULL/SGbJARhUeqlO8lVSREYu2Q=
-github.com/libp2p/go-libp2p-noise v0.2.2 h1:MRt5XGfYziDXIUy2udtMWfPmzZqUDYoC1FZoKnqPzwk=
-github.com/libp2p/go-libp2p-noise v0.2.2/go.mod h1:IEbYhBBzGyvdLBoxxULL/SGbJARhUeqlO8lVSREYu2Q=
+github.com/libp2p/go-libp2p-noise v0.3.0 h1:NCVH7evhVt9njbTQshzT7N1S3Q6fjj9M11FCgfH5+cA=
+github.com/libp2p/go-libp2p-noise v0.3.0/go.mod h1:JNjHbociDJKHD64KTkzGnzqJ0FEV5gHJa6AB00kbCNQ=
github.com/libp2p/go-libp2p-peer v0.0.1/go.mod h1:nXQvOBbwVqoP+T5Y5nCjeH4sP9IX/J0AMzcDUVruVoo=
github.com/libp2p/go-libp2p-peer v0.1.1/go.mod h1:jkF12jGB4Gk/IOo+yomm+7oLWxF278F7UnrYUQ1Q8es=
github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
@@ -781,8 +784,9 @@ github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRj
github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
github.com/libp2p/go-libp2p-peerstore v0.2.6/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
-github.com/libp2p/go-libp2p-peerstore v0.2.8 h1:nJghUlUkFVvyk7ccsM67oFA6kqUkwyCM1G4WPVMCWYA=
github.com/libp2p/go-libp2p-peerstore v0.2.8/go.mod h1:gGiPlXdz7mIHd2vfAsHzBNAMqSDkt2UBFwgcITgw1lA=
+github.com/libp2p/go-libp2p-peerstore v0.3.0 h1:wp/G0+37+GLr7tu+wE+4GWNrA3uxKg6IPRigIMSS5oQ=
+github.com/libp2p/go-libp2p-peerstore v0.3.0/go.mod h1:fNX9WlOENMvdx/YD7YO/5Hkrn8+lQIk5A39BHa1HIrM=
github.com/libp2p/go-libp2p-pnet v0.2.0 h1:J6htxttBipJujEjz1y0a5+eYoiPcFHhSYHH6na5f0/k=
github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod h1:Qqvq6JH/oMZGwqs3N1Fqhv8NVhrdYcO0BW4wssv21LA=
github.com/libp2p/go-libp2p-protocol v0.0.1/go.mod h1:Af9n4PiruirSDjHycM1QuiMi/1VZNHYcK8cLgFJLZ4s=
@@ -794,8 +798,9 @@ github.com/libp2p/go-libp2p-pubsub-router v0.4.0 h1:KjzTLIOBCt0+/4wH6epTxD/Qu4Up
github.com/libp2p/go-libp2p-pubsub-router v0.4.0/go.mod h1:hs0j0ugcBjMOMgJ6diOlZM2rZEId/w5Gg86E+ac4SmQ=
github.com/libp2p/go-libp2p-quic-transport v0.10.0/go.mod h1:RfJbZ8IqXIhxBRm5hqUEJqjiiY8xmEuq3HUDS993MkA=
github.com/libp2p/go-libp2p-quic-transport v0.11.2/go.mod h1:wlanzKtIh6pHrq+0U3p3DY9PJfGqxMgPaGKaK5LifwQ=
-github.com/libp2p/go-libp2p-quic-transport v0.12.0 h1:7IjDH4XNkmJbOMD+mxRloTe4LzMTq+vqvm2nYNL1N7M=
-github.com/libp2p/go-libp2p-quic-transport v0.12.0/go.mod h1:EKHqxZbWE/FhDJZ6ebyZ/4v3X9zyuuuKIN0XR9vANT0=
+github.com/libp2p/go-libp2p-quic-transport v0.13.0/go.mod h1:39/ZWJ1TW/jx1iFkKzzUg00W6tDJh73FC0xYudjr7Hc=
+github.com/libp2p/go-libp2p-quic-transport v0.14.0 h1:sBjT/8zKv8otFZh3Uhdxl91BhwXwuHAOB5lJgbT2zyk=
+github.com/libp2p/go-libp2p-quic-transport v0.14.0/go.mod h1:/W4njiXIRowKk62w6j4y4dVpBZvEk9WtGOtOYh2M6J8=
github.com/libp2p/go-libp2p-record v0.0.1/go.mod h1:grzqg263Rug/sRex85QrDOLntdFAymLDLm7lxMgU79Q=
github.com/libp2p/go-libp2p-record v0.1.0/go.mod h1:ujNc8iuE5dlKWVy6wuL6dd58t0n7xI4hAIl8pE6wu5Q=
github.com/libp2p/go-libp2p-record v0.1.1/go.mod h1:VRgKajOyMVgP/F0L5g3kH7SVskp17vFi2xheb5uMJtg=
@@ -819,8 +824,9 @@ github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJeg
github.com/libp2p/go-libp2p-swarm v0.3.1/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
github.com/libp2p/go-libp2p-swarm v0.4.0/go.mod h1:XVFcO52VoLoo0eitSxNQWYq4D6sydGOweTOAjJNraCw=
github.com/libp2p/go-libp2p-swarm v0.5.0/go.mod h1:sU9i6BoHE0Ve5SKz3y9WfKrh8dUat6JknzUehFx8xW4=
-github.com/libp2p/go-libp2p-swarm v0.5.3 h1:hsYaD/y6+kZff1o1Mc56NcuwSg80lIphTS/zDk3mO4M=
github.com/libp2p/go-libp2p-swarm v0.5.3/go.mod h1:NBn7eNW2lu568L7Ns9wdFrOhgRlkRnIDg0FLKbuu3i8=
+github.com/libp2p/go-libp2p-swarm v0.7.0 h1:ZohJ/XtPP0O73Y1BeCvRRfBcoBfZkqRiKmBwKQfnYGg=
+github.com/libp2p/go-libp2p-swarm v0.7.0/go.mod h1:Ii3RNGBC+CMIO3BzK/hmzzriJUOkCVT7viOd+alyEPY=
github.com/libp2p/go-libp2p-testing v0.0.1/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
@@ -830,11 +836,12 @@ github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eq
github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
github.com/libp2p/go-libp2p-testing v0.3.0/go.mod h1:efZkql4UZ7OVsEfaxNHZPzIehtsBXMrXnCfJIgDti5g=
github.com/libp2p/go-libp2p-testing v0.4.0/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
-github.com/libp2p/go-libp2p-testing v0.4.2 h1:IOiA5mMigi+eEjf4J+B7fepDhsjtsoWA9QbsCqbNp5U=
github.com/libp2p/go-libp2p-testing v0.4.2/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
+github.com/libp2p/go-libp2p-testing v0.5.0 h1:bTjC29TTQ/ODq0ld3+0KLq3irdA5cAH3OMbRi0/QsvE=
+github.com/libp2p/go-libp2p-testing v0.5.0/go.mod h1:QBk8fqIL1XNcno/l3/hhaIEn4aLRijpYOR+zVjjlh+A=
github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
-github.com/libp2p/go-libp2p-tls v0.2.0 h1:N8i5wPiHudA+02sfW85R2nUbybPm7agjAywZc6pd3xA=
-github.com/libp2p/go-libp2p-tls v0.2.0/go.mod h1:twrp2Ci4lE2GYspA1AnlYm+boYjqVruxDKJJj7s6xrc=
+github.com/libp2p/go-libp2p-tls v0.3.0 h1:8BgvUJiOTcj0Gp6XvEicF0rL5aUtRg/UzEdeZDmDlC8=
+github.com/libp2p/go-libp2p-tls v0.3.0/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5oFlg+wo2FxJDY=
github.com/libp2p/go-libp2p-transport v0.0.1/go.mod h1:UzbUs9X+PHOSw7S3ZmeOxfnwaQY5vGDzZmKPod3N3tk=
github.com/libp2p/go-libp2p-transport v0.0.5/go.mod h1:StoY3sx6IqsP6XKoabsPnHCwqKXWUMWU7Rfcsubee/A=
github.com/libp2p/go-libp2p-transport-upgrader v0.0.4/go.mod h1:RGq+tupk+oj7PzL2kn/m1w6YXxcIAYJYeI90h6BGgUc=
@@ -844,8 +851,9 @@ github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D
github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod h1:J4ko0ObtZSmgn5BX5AmegP+dK3CSnU2lMCKsSq/EY0s=
github.com/libp2p/go-libp2p-transport-upgrader v0.4.2/go.mod h1:NR8ne1VwfreD5VIWIU62Agt/J18ekORFU/j1i2y8zvk=
github.com/libp2p/go-libp2p-transport-upgrader v0.4.3/go.mod h1:bpkldbOWXMrXhpZbSV1mQxTrefOg2Fi+k1ClDSA4ppw=
-github.com/libp2p/go-libp2p-transport-upgrader v0.4.6 h1:SHt3g0FslnqIkEWF25YOB8UCOCTpGAVvHRWQYJ+veiI=
github.com/libp2p/go-libp2p-transport-upgrader v0.4.6/go.mod h1:JE0WQuQdy+uLZ5zOaI3Nw9dWGYJIA7mywEtP2lMvnyk=
+github.com/libp2p/go-libp2p-transport-upgrader v0.5.0 h1:7SDl3O2+AYOgfE40Mis83ClpfGNkNA6m4FwhbOHs+iI=
+github.com/libp2p/go-libp2p-transport-upgrader v0.5.0/go.mod h1:Rc+XODlB3yce7dvFV4q/RmyJGsFcCZRkeZMu/Zdg0mo=
github.com/libp2p/go-libp2p-xor v0.0.0-20210714161855-5c005aca55db h1:EDoDKW8ZAHd6SIDeo+thU51PyQppqLYkBxx0ObvFj/w=
github.com/libp2p/go-libp2p-xor v0.0.0-20210714161855-5c005aca55db/go.mod h1:LSTM5yRnjGZbWNTA/hRwq2gGFrvRIbQJscoIL/u6InY=
github.com/libp2p/go-libp2p-yamux v0.1.2/go.mod h1:xUoV/RmYkg6BW/qGxA9XJyg+HzXFYkeXbnhjmnYzKp8=
@@ -878,12 +886,14 @@ github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ
github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
github.com/libp2p/go-msgio v0.0.3/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.6 h1:lQ7Uc0kS1wb1EfRxO2Eir/RJoHkHn7t6o+EiwsYIKJA=
github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
+github.com/libp2p/go-msgio v0.1.0 h1:8Q7g/528ivAlfXTFWvWhVjTE8XG8sDTkRUKPYh9+5Q8=
+github.com/libp2p/go-msgio v0.1.0/go.mod h1:eNlv2vy9V2X/kNldcZ+SShFE++o2Yjxwx6RAYsmgJnE=
github.com/libp2p/go-nat v0.0.3/go.mod h1:88nUEt0k0JD45Bk93NIwDqjlhiOwOoV36GchpcVc1yI=
github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
-github.com/libp2p/go-nat v0.0.5 h1:qxnwkco8RLKqVh1NmjQ+tJ8p8khNLFxuElYG/TwqW4Q=
github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
+github.com/libp2p/go-nat v0.1.0 h1:MfVsH6DLcpa04Xr+p8hmVRG4juse0s3J8HyNWYHffXg=
+github.com/libp2p/go-nat v0.1.0/go.mod h1:X7teVkwRHNInVNWQiO/tAiAVRwSr5zoRz4YSTC3uRBM=
github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
github.com/libp2p/go-netroute v0.1.3/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
github.com/libp2p/go-netroute v0.1.5/go.mod h1:V1SR3AaECRkEQCoFFzYwVYWvYIEtlxx89+O3qcpCl4A=
@@ -896,13 +906,15 @@ github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO
github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
-github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU=
github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ=
+github.com/libp2p/go-reuseport v0.1.0 h1:0ooKOx2iwyIkf339WCZ2HN3ujTDbkK0PjC7JVoP1AiM=
+github.com/libp2p/go-reuseport v0.1.0/go.mod h1:bQVn9hmfcTaoo0c9v5pBhOarsU1eNOBZdaAd2hzXRKU=
github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM=
github.com/libp2p/go-reuseport-transport v0.0.4/go.mod h1:trPa7r/7TJK/d+0hdBLOCGvpQQVOU74OXbNCIMkufGw=
-github.com/libp2p/go-reuseport-transport v0.0.5 h1:lJzi+vSYbyJj2faPKLxNGWEIBcaV/uJmyvsUxXy2mLw=
github.com/libp2p/go-reuseport-transport v0.0.5/go.mod h1:TC62hhPc8qs5c/RoXDZG6YmjK+/YWUPC0yYmeUecbjc=
+github.com/libp2p/go-reuseport-transport v0.1.0 h1:C3PHeHjmnz8m6f0uydObj02tMEoi7CyD1zuN7xQT8gc=
+github.com/libp2p/go-reuseport-transport v0.1.0/go.mod h1:vev0C0uMkzriDY59yFHD9v+ujJvYmDQVLowvAjEOmfw=
github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
github.com/libp2p/go-sockaddr v0.1.1 h1:yD80l2ZOdGksnOyHrhxDdTDFrf7Oy+v3FMVArIRgZxQ=
@@ -922,8 +934,8 @@ github.com/libp2p/go-tcp-transport v0.2.1/go.mod h1:zskiJ70MEfWz2MKxvFB/Pv+tPIB1
github.com/libp2p/go-tcp-transport v0.2.3/go.mod h1:9dvr03yqrPyYGIEN6Dy5UvdJZjyPFvl1S/igQ5QD1SU=
github.com/libp2p/go-tcp-transport v0.2.4/go.mod h1:9dvr03yqrPyYGIEN6Dy5UvdJZjyPFvl1S/igQ5QD1SU=
github.com/libp2p/go-tcp-transport v0.2.7/go.mod h1:lue9p1b3VmZj1MhhEGB/etmvF/nBQ0X9CW2DutBT3MM=
-github.com/libp2p/go-tcp-transport v0.2.8 h1:aLjX+Nkz+kIz3uA56WtlGKRSAnKDvnqKmv1qF4EyyE4=
-github.com/libp2p/go-tcp-transport v0.2.8/go.mod h1:64rSfVidkYPLqbzpcN2IwHY4pmgirp67h++hZ/rcndQ=
+github.com/libp2p/go-tcp-transport v0.4.0 h1:VDyg4j6en3OuXf90gfDQh5Sy9KowO9udnd0OU8PP6zg=
+github.com/libp2p/go-tcp-transport v0.4.0/go.mod h1:0y52Rwrn4076xdJYu/51/qJIdxz+EWDAOG2S45sV3VI=
github.com/libp2p/go-testutil v0.0.1/go.mod h1:iAcJc/DKJQanJ5ws2V+u5ywdL2n12X1WbbEG+Jjy69I=
github.com/libp2p/go-testutil v0.1.0/go.mod h1:81b2n5HypcVyrCg/MJx4Wgfp/VHojytjVe/gLzZ2Ehc=
github.com/libp2p/go-ws-transport v0.0.5/go.mod h1:Qbl4BxPfXXhhd/o0wcrgoaItHqA9tnZjoFZnxykuaXU=
@@ -948,14 +960,15 @@ github.com/libp2p/go-yamux/v2 v2.0.0/go.mod h1:NVWira5+sVUIU6tu1JWvaRn1dRnG+cawO
github.com/libp2p/go-yamux/v2 v2.1.1/go.mod h1:3So6P6TV6r75R9jiBpiIKgU/66lOarCZjqROGxzPpPQ=
github.com/libp2p/go-yamux/v2 v2.2.0 h1:RwtpYZ2/wVviZ5+3pjC8qdQ4TKnrak0/E01N1UWoAFU=
github.com/libp2p/go-yamux/v2 v2.2.0/go.mod h1:3So6P6TV6r75R9jiBpiIKgU/66lOarCZjqROGxzPpPQ=
-github.com/libp2p/zeroconf/v2 v2.0.0 h1:qYAHAqUVh4hMSfu+iDTZNqH07wLGAvb1+DW4Tx/qUoQ=
-github.com/libp2p/zeroconf/v2 v2.0.0/go.mod h1:J85R/d9joD8u8F9aHM8pBXygtG9W02enEwS+wWeL6yo=
+github.com/libp2p/zeroconf/v2 v2.1.1 h1:XAuSczA96MYkVwH+LqqqCUZb2yH3krobMJ1YE+0hG2s=
+github.com/libp2p/zeroconf/v2 v2.1.1/go.mod h1:fuJqLnUwZTshS3U/bMRJ3+ow/v9oid1n0DmyYyNO1Xs=
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
github.com/lucas-clemente/quic-go v0.21.2/go.mod h1:vF5M1XqhBAHgbjKcJOXY3JZz3GP0T3FQhz/uyOUS38Q=
-github.com/lucas-clemente/quic-go v0.23.0 h1:5vFnKtZ6nHDFsc/F3uuiF4T3y/AXaQdxjUqiVw26GZE=
github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
+github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g=
+github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
diff --git a/docs/examples/go-ipfs-as-a-library/main.go b/docs/examples/go-ipfs-as-a-library/main.go
index b7c1537ddd7..5b032e56a29 100644
--- a/docs/examples/go-ipfs-as-a-library/main.go
+++ b/docs/examples/go-ipfs-as-a-library/main.go
@@ -66,8 +66,6 @@ func createTempRepo() (string, error) {
cfg.Experimental.FilestoreEnabled = true
// https://github.com/ipfs/go-ipfs/blob/master/docs/experimental-features.md#ipfs-urlstore
cfg.Experimental.UrlstoreEnabled = true
- // https://github.com/ipfs/go-ipfs/blob/master/docs/experimental-features.md#directory-sharding--hamt
- cfg.Experimental.ShardingEnabled = true
// https://github.com/ipfs/go-ipfs/blob/master/docs/experimental-features.md#ipfs-p2p
cfg.Experimental.Libp2pStreamMounting = true
// https://github.com/ipfs/go-ipfs/blob/master/docs/experimental-features.md#p2p-http-proxy
diff --git a/docs/experimental-features.md b/docs/experimental-features.md
index 9b0bffa1e0f..fc5c908c9cc 100644
--- a/docs/experimental-features.md
+++ b/docs/experimental-features.md
@@ -402,27 +402,22 @@ See [Plugin docs](./plugins.md)
## Directory Sharding / HAMT
### In Version
-0.4.8
-### State
-Experimental
-
-Allows creating directories with an unlimited number of entries.
+- 0.4.8:
+ - Introduced `Experimental.ShardingEnabled` which enabled sharding globally.
+ - All-or-nothing, unnecessary sharding of small directories.
-**Caveats:**
-1. right now it is a GLOBAL FLAG which will impact the final CID of all directories produced by `ipfs.add` (even the small ones)
-2. currently size of unixfs directories is limited by the maximum block size
+- 0.11.0 :
+ - Removed support for `Experimental.ShardingEnabled`
+ - Replaced with automatic sharding based on the block size
-### Basic Usage:
+### State
-```
-ipfs config --json Experimental.ShardingEnabled true
-```
+Replaced by autosharding.
-### Road to being a real feature
+The `Experimental.ShardingEnabled` config field is no longer used, please remove it from your configs.
-- [ ] Make sure that objects that don't have to be sharded aren't
-- [ ] Generalize sharding and define a new layer between IPLD and IPFS
+go-ipfs now automatically shards when directory block is bigger than 256KB, ensuring every block is small enough to be exchanged with other peers
## IPNS pubsub
@@ -468,7 +463,11 @@ run your daemon with the `--enable-namesys-pubsub` flag; enables pubsub.
### In Version
-0.4.19
+- 0.4.19 :
+ - Introduced Circuit Relay v1
+- 0.11.0 :
+ - Deprecated v1
+ - Introduced [Circuit Relay v2](https://github.com/libp2p/specs/blob/master/relay/circuit-v2.md)
### State
@@ -481,15 +480,14 @@ Automatically discovers relays and advertises relay addresses when the node is b
Modify your ipfs config:
```
-ipfs config --json Swarm.EnableRelayHop false
-ipfs config --json Swarm.EnableAutoRelay true
+ipfs config --json Swarm.RelayClient.Enabled true
```
-NOTE: Ensuring `Swarm.EnableRelayHop` is _false_ is extremely important here. If you set it to true, you will _act_ as a public relay for the rest of the network instead of _using_ the public relays.
-
### Road to being a real feature
- [ ] needs testing
+- [ ] needs to be automatically enabled when AutoNAT detects node is behind an impenetrable NAT.
+
## Strategic Providing
@@ -600,4 +598,4 @@ ipfs config --json Experimental.AcceleratedDHTClient true
- [ ] Needs more people to use and report on how well it works
- [ ] Should be usable for queries (even if slower/less efficient) shortly after startup
-- [ ] Should be usable with non-WAN DHTs
\ No newline at end of file
+- [ ] Should be usable with non-WAN DHTs
diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go
index 85d5e1a6ba3..1fbb473106d 100644
--- a/fuse/readonly/readonly_unix.go
+++ b/fuse/readonly/readonly_unix.go
@@ -1,3 +1,4 @@
+//go:build (linux || darwin || freebsd) && !nofuse
// +build linux darwin freebsd
// +build !nofuse
@@ -81,7 +82,7 @@ func (s *Root) Lookup(ctx context.Context, name string) (fs.Node, error) {
}
// convert ipld-prime node to universal node
- blk, err := s.Ipfs.Blockstore.Get(cidLnk.Cid)
+ blk, err := s.Ipfs.Blockstore.Get(ctx, cidLnk.Cid)
if err != nil {
log.Debugf("fuse failed to retrieve block: %v: %s", cidLnk, err)
return nil, fuse.ENOENT
diff --git a/gc/gc.go b/gc/gc.go
index 4b0e6c5d790..b65756f01d7 100644
--- a/gc/gc.go
+++ b/gc/gc.go
@@ -40,7 +40,7 @@ type Result struct {
func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn pin.Pinner, bestEffortRoots []cid.Cid) <-chan Result {
ctx, cancel := context.WithCancel(ctx)
- unlocker := bs.GCLock()
+ unlocker := bs.GCLock(ctx)
bsrv := bserv.New(bs, offline.Exchange(bs))
ds := dag.NewDAGService(bsrv)
@@ -50,7 +50,7 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
go func() {
defer cancel()
defer close(output)
- defer unlocker.Unlock()
+ defer unlocker.Unlock(ctx)
gcs, err := ColoredSet(ctx, pn, ds, bestEffortRoots, output)
if err != nil {
@@ -80,7 +80,7 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
break loop
}
if !gcs.Has(k) {
- err := bs.DeleteBlock(k)
+ err := bs.DeleteBlock(ctx, k)
removed++
if err != nil {
errors = true
@@ -115,7 +115,7 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
return
}
- err = gds.CollectGarbage()
+ err = gds.CollectGarbage(ctx)
if err != nil {
select {
case output <- Result{Error: err}:
diff --git a/go.mod b/go.mod
index 739d85be399..c96e45e40aa 100644
--- a/go.mod
+++ b/go.mod
@@ -12,33 +12,33 @@ require (
github.com/gabriel-vasile/mimetype v1.1.2
github.com/go-bindata/go-bindata/v3 v3.1.3
github.com/hashicorp/go-multierror v1.1.1
- github.com/ipfs/go-bitswap v0.4.0
+ github.com/ipfs/go-bitswap v0.5.1
github.com/ipfs/go-block-format v0.0.3
- github.com/ipfs/go-blockservice v0.1.7
- github.com/ipfs/go-cid v0.0.7
+ github.com/ipfs/go-blockservice v0.2.1
+ github.com/ipfs/go-cid v0.1.0
github.com/ipfs/go-cidutil v0.0.2
- github.com/ipfs/go-datastore v0.4.6
+ github.com/ipfs/go-datastore v0.5.1
github.com/ipfs/go-detect-race v0.0.1
- github.com/ipfs/go-ds-badger v0.2.7
- github.com/ipfs/go-ds-flatfs v0.4.5
- github.com/ipfs/go-ds-leveldb v0.4.2
- github.com/ipfs/go-ds-measure v0.1.0
- github.com/ipfs/go-fetcher v1.5.0
- github.com/ipfs/go-filestore v0.0.3
+ github.com/ipfs/go-ds-badger v0.3.0
+ github.com/ipfs/go-ds-flatfs v0.5.0
+ github.com/ipfs/go-ds-leveldb v0.5.0
+ github.com/ipfs/go-ds-measure v0.2.0
+ github.com/ipfs/go-fetcher v1.6.1
+ github.com/ipfs/go-filestore v0.1.0
github.com/ipfs/go-fs-lock v0.0.7
- github.com/ipfs/go-graphsync v0.8.0
- github.com/ipfs/go-ipfs-blockstore v0.1.6
+ github.com/ipfs/go-graphsync v0.10.6-0.20211119194020-99752d2dc1cc
+ github.com/ipfs/go-ipfs-blockstore v0.2.1
github.com/ipfs/go-ipfs-chunker v0.0.5
github.com/ipfs/go-ipfs-cmds v0.6.0
- github.com/ipfs/go-ipfs-config v0.16.0
- github.com/ipfs/go-ipfs-exchange-interface v0.0.1
- github.com/ipfs/go-ipfs-exchange-offline v0.0.1
+ github.com/ipfs/go-ipfs-config v0.18.0
+ github.com/ipfs/go-ipfs-exchange-interface v0.1.0
+ github.com/ipfs/go-ipfs-exchange-offline v0.1.1
github.com/ipfs/go-ipfs-files v0.0.9
github.com/ipfs/go-ipfs-keystore v0.0.2
- github.com/ipfs/go-ipfs-pinner v0.1.2
+ github.com/ipfs/go-ipfs-pinner v0.2.1
github.com/ipfs/go-ipfs-posinfo v0.0.1
- github.com/ipfs/go-ipfs-provider v0.6.1
- github.com/ipfs/go-ipfs-routing v0.1.0
+ github.com/ipfs/go-ipfs-provider v0.7.1
+ github.com/ipfs/go-ipfs-routing v0.2.1
github.com/ipfs/go-ipfs-util v0.0.2
github.com/ipfs/go-ipld-cbor v0.0.5
github.com/ipfs/go-ipld-format v0.2.0
@@ -46,17 +46,17 @@ require (
github.com/ipfs/go-ipld-legacy v0.1.0
github.com/ipfs/go-ipns v0.1.2
github.com/ipfs/go-log v1.0.5
- github.com/ipfs/go-merkledag v0.4.0
+ github.com/ipfs/go-merkledag v0.5.1
github.com/ipfs/go-metrics-interface v0.0.1
github.com/ipfs/go-metrics-prometheus v0.0.2
- github.com/ipfs/go-mfs v0.1.2
- github.com/ipfs/go-namesys v0.3.1
- github.com/ipfs/go-path v0.1.2
+ github.com/ipfs/go-mfs v0.2.1
+ github.com/ipfs/go-namesys v0.4.0
+ github.com/ipfs/go-path v0.2.1
github.com/ipfs/go-pinning-service-http-client v0.1.0
- github.com/ipfs/go-unixfs v0.2.5
+ github.com/ipfs/go-unixfs v0.3.1
github.com/ipfs/go-unixfsnode v1.1.3
github.com/ipfs/go-verifcid v0.0.1
- github.com/ipfs/interface-go-ipfs-core v0.5.1
+ github.com/ipfs/interface-go-ipfs-core v0.5.2
github.com/ipfs/tar-utils v0.0.1
github.com/ipld/go-car v0.3.2
github.com/ipld/go-codec-dagpb v1.3.0
@@ -65,29 +65,28 @@ require (
github.com/jbenet/go-temp-err-catcher v0.1.0
github.com/jbenet/goprocess v0.1.4
github.com/libp2p/go-doh-resolver v0.3.1
- github.com/libp2p/go-libp2p v0.15.0
- github.com/libp2p/go-libp2p-circuit v0.4.0
+ github.com/libp2p/go-libp2p v0.16.0
github.com/libp2p/go-libp2p-connmgr v0.2.4
- github.com/libp2p/go-libp2p-core v0.9.0
- github.com/libp2p/go-libp2p-discovery v0.5.1
+ github.com/libp2p/go-libp2p-core v0.11.0
+ github.com/libp2p/go-libp2p-discovery v0.6.0
github.com/libp2p/go-libp2p-http v0.2.1
- github.com/libp2p/go-libp2p-kad-dht v0.13.1
+ github.com/libp2p/go-libp2p-kad-dht v0.15.0
github.com/libp2p/go-libp2p-kbucket v0.4.7
github.com/libp2p/go-libp2p-loggables v0.1.0
github.com/libp2p/go-libp2p-mplex v0.4.1
- github.com/libp2p/go-libp2p-noise v0.2.2
- github.com/libp2p/go-libp2p-peerstore v0.2.8
- github.com/libp2p/go-libp2p-pubsub v0.5.4
- github.com/libp2p/go-libp2p-pubsub-router v0.4.0
- github.com/libp2p/go-libp2p-quic-transport v0.12.0
+ github.com/libp2p/go-libp2p-noise v0.3.0
+ github.com/libp2p/go-libp2p-peerstore v0.4.0
+ github.com/libp2p/go-libp2p-pubsub v0.6.0
+ github.com/libp2p/go-libp2p-pubsub-router v0.5.0
+ github.com/libp2p/go-libp2p-quic-transport v0.15.0
github.com/libp2p/go-libp2p-record v0.1.3
github.com/libp2p/go-libp2p-routing-helpers v0.2.3
- github.com/libp2p/go-libp2p-swarm v0.5.3
- github.com/libp2p/go-libp2p-testing v0.4.2
- github.com/libp2p/go-libp2p-tls v0.2.0
- github.com/libp2p/go-libp2p-yamux v0.5.4
+ github.com/libp2p/go-libp2p-swarm v0.8.0
+ github.com/libp2p/go-libp2p-testing v0.5.0
+ github.com/libp2p/go-libp2p-tls v0.3.1
+ github.com/libp2p/go-libp2p-yamux v0.6.0
github.com/libp2p/go-socket-activation v0.1.0
- github.com/libp2p/go-tcp-transport v0.2.8
+ github.com/libp2p/go-tcp-transport v0.4.0
github.com/libp2p/go-ws-transport v0.5.0
github.com/miekg/dns v1.1.43
github.com/mitchellh/go-homedir v1.1.0
@@ -95,7 +94,7 @@ require (
github.com/multiformats/go-multiaddr-dns v0.3.1
github.com/multiformats/go-multibase v0.0.3
github.com/multiformats/go-multicodec v0.3.0
- github.com/multiformats/go-multihash v0.0.15
+ github.com/multiformats/go-multihash v0.1.0
github.com/opentracing/opentracing-go v1.2.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.11.0
@@ -107,10 +106,9 @@ require (
go.opencensus.io v0.23.0
go.uber.org/fx v1.13.1
go.uber.org/zap v1.19.0
- golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e
- golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
+ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
- golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912
+ golang.org/x/sys v0.0.0-20211025112917-711f33c9992c
)
go 1.16
diff --git a/go.sum b/go.sum
index 643d4206182..f2e60135d7a 100644
--- a/go.sum
+++ b/go.sum
@@ -65,6 +65,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a h1:E/8AP5dFtMhl5KPJz66Kt9G0n+7Sn41Fy1wv9/jHOrc=
+github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5 h1:iW0a5ljuFxkLGPNem5Ui+KBjFJzKg4Fv2fnxe4dvzpM=
github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5/go.mod h1:Y2QMoi1vgtOIfc+6DhrMOGkLoGzqSV2rKp4Sm+opsyA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
@@ -115,8 +117,6 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ=
-github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -300,7 +300,6 @@ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+u
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
-github.com/google/gopacket v1.1.18/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -324,9 +323,8 @@ github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE0
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4=
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f h1:KMlcu9X58lhTA/KrfX8Bi1LQSO4pzoVjTiL3h4Jk+Zk=
-github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -385,47 +383,48 @@ github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod
github.com/ipfs/bbloom v0.0.1/go.mod h1:oqo8CVWsJFMOZqTglBG4wydCE4IQA/G2/SEofB0rjUI=
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
+github.com/ipfs/go-bitfield v1.0.0 h1:y/XHm2GEmD9wKngheWNNCNL0pzrWXZwCdQGv1ikXknQ=
+github.com/ipfs/go-bitfield v1.0.0/go.mod h1:N/UiujQy+K+ceU1EF5EkVd1TNqevLrCQMIcAEPrdtus=
github.com/ipfs/go-bitswap v0.0.9/go.mod h1:kAPf5qgn2W2DrgAcscZ3HrM9qh4pH+X8Fkk3UPrwvis=
github.com/ipfs/go-bitswap v0.1.0/go.mod h1:FFJEf18E9izuCqUtHxbWEvq+reg7o4CW5wSAE1wsxj0=
github.com/ipfs/go-bitswap v0.1.2/go.mod h1:qxSWS4NXGs7jQ6zQvoPY3+NmOfHHG47mhkiLzBpJQIs=
-github.com/ipfs/go-bitswap v0.1.3/go.mod h1:YEQlFy0kkxops5Vy+OxWdRSEZIoS7I7KDIwoa5Chkps=
github.com/ipfs/go-bitswap v0.1.8/go.mod h1:TOWoxllhccevbWFUR2N7B1MTSVVge1s6XSMiCSA4MzM=
github.com/ipfs/go-bitswap v0.3.4/go.mod h1:4T7fvNv/LmOys+21tnLzGKncMeeXUYUd1nUiJ2teMvI=
-github.com/ipfs/go-bitswap v0.4.0 h1:bLiqrpef1na4wdqGLqHKv954s1zz6KFghfmQWCPjBik=
-github.com/ipfs/go-bitswap v0.4.0/go.mod h1:J2sAsp9UKxLgHDektSy3y3Q9OfQjM9sjhKBR1dlwrMg=
+github.com/ipfs/go-bitswap v0.5.1 h1:721YAEDBnLIrvcIMkCHCdqp34hA8jwL9yKMkyJpSpco=
+github.com/ipfs/go-bitswap v0.5.1/go.mod h1:P+ckC87ri1xFLvk74NlXdP0Kj9RmWAh4+H78sC6Qopo=
github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
github.com/ipfs/go-block-format v0.0.3 h1:r8t66QstRp/pd/or4dpnbVfXT5Gt7lOqRvC+/dDTpMc=
github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
github.com/ipfs/go-blockservice v0.0.7/go.mod h1:EOfb9k/Y878ZTRY/CH0x5+ATtaipfbRhbvNSdgc/7So=
github.com/ipfs/go-blockservice v0.1.0/go.mod h1:hzmMScl1kXHg3M2BjTymbVPjv627N7sYcvYaKbop39M=
-github.com/ipfs/go-blockservice v0.1.1/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I=
-github.com/ipfs/go-blockservice v0.1.3/go.mod h1:OTZhFpkgY48kNzbgyvcexW9cHrpjBYIjSR0KoDOFOLU=
github.com/ipfs/go-blockservice v0.1.4/go.mod h1:OTZhFpkgY48kNzbgyvcexW9cHrpjBYIjSR0KoDOFOLU=
-github.com/ipfs/go-blockservice v0.1.7 h1:yVe9te0M7ow8i+PPkx03YFSpxqzXx594d6h+34D6qMg=
github.com/ipfs/go-blockservice v0.1.7/go.mod h1:GmS+BAt4hrwBKkzE11AFDQUrnvqjwFatGS2MY7wOjEM=
+github.com/ipfs/go-blockservice v0.2.1 h1:NJ4j/cwEfIg60rzAWcCIxRtOwbf6ZPK49MewNxObCPQ=
+github.com/ipfs/go-blockservice v0.2.1/go.mod h1:k6SiwmgyYgs4M/qt+ww6amPeUH9EISLRBnvUurKJhi8=
github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M=
github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
-github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
+github.com/ipfs/go-cid v0.1.0 h1:YN33LQulcRHjfom/i25yoOZR4Telp1Hr/2RU3d0PnC0=
+github.com/ipfs/go-cid v0.1.0/go.mod h1:rH5/Xv83Rfy8Rw6xG+id3DYAMUVmem1MowoKwdXmN2o=
github.com/ipfs/go-cidutil v0.0.2 h1:CNOboQf1t7Qp0nuNh8QMmhJs0+Q//bRL1axtCnIB1Yo=
github.com/ipfs/go-cidutil v0.0.2/go.mod h1:ewllrvrxG6AMYStla3GD7Cqn+XYSLqjK0vc+086tB6s=
github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
github.com/ipfs/go-datastore v0.0.5/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
github.com/ipfs/go-datastore v0.1.0/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
github.com/ipfs/go-datastore v0.1.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
-github.com/ipfs/go-datastore v0.3.0/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
github.com/ipfs/go-datastore v0.3.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
github.com/ipfs/go-datastore v0.4.0/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
github.com/ipfs/go-datastore v0.4.5/go.mod h1:eXTcaaiN6uOlVCLS9GjJUJtlvJfM3xk23w3fyfrmmJs=
-github.com/ipfs/go-datastore v0.4.6 h1:zU2cmweykxJ+ziXnA2cPtsLe8rdR/vrthOipLPuf6kc=
-github.com/ipfs/go-datastore v0.4.6/go.mod h1:XSipLSc64rFKSFRFGo1ecQl+WhYce3K7frtpHkyPFUc=
+github.com/ipfs/go-datastore v0.5.0/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk=
+github.com/ipfs/go-datastore v0.5.1 h1:WkRhLuISI+XPD0uk3OskB0fYFSyqK8Ob5ZYew9Qa1nQ=
+github.com/ipfs/go-datastore v0.5.1/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk=
github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
github.com/ipfs/go-ds-badger v0.0.2/go.mod h1:Y3QpeSFWQf6MopLTiZD+VT6IC1yZqaGmjvRcKeSGij8=
@@ -433,31 +432,34 @@ github.com/ipfs/go-ds-badger v0.0.5/go.mod h1:g5AuuCGmr7efyzQhLL8MzwqcauPojGPUaH
github.com/ipfs/go-ds-badger v0.0.7/go.mod h1:qt0/fWzZDoPW6jpQeqUjR5kBfhDNB65jd9YlmAvpQBk=
github.com/ipfs/go-ds-badger v0.2.1/go.mod h1:Tx7l3aTph3FMFrRS838dcSJh+jjA7cX9DrGVwx/NOwE=
github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-badger v0.2.6/go.mod h1:02rnztVKA4aZwDuaRPTf8mpqcKmXP7mLl6JPxd14JHA=
-github.com/ipfs/go-ds-badger v0.2.7 h1:ju5REfIm+v+wgVnQ19xGLYPHYHbYLR6qJfmMbCDSK1I=
github.com/ipfs/go-ds-badger v0.2.7/go.mod h1:02rnztVKA4aZwDuaRPTf8mpqcKmXP7mLl6JPxd14JHA=
-github.com/ipfs/go-ds-flatfs v0.4.5 h1:4QceuKEbH+HVZ2ZommstJMi3o3II+dWS3IhLaD7IGHs=
-github.com/ipfs/go-ds-flatfs v0.4.5/go.mod h1:e4TesLyZoA8k1gV/yCuBTnt2PJtypn4XUlB5n8KQMZY=
+github.com/ipfs/go-ds-badger v0.3.0 h1:xREL3V0EH9S219kFFueOYJJTcjgNSZ2HY1iSvN7U1Ro=
+github.com/ipfs/go-ds-badger v0.3.0/go.mod h1:1ke6mXNqeV8K3y5Ak2bAA0osoTfmxUdupVCGm4QUIek=
+github.com/ipfs/go-ds-flatfs v0.5.0 h1:ntq2P05cC51VOSZ0VO/HRaCoLefVXNKGRu9gYr9Ajko=
+github.com/ipfs/go-ds-flatfs v0.5.0/go.mod h1:RWTV7oZD/yZYBKdbVIFXTX2fdY2Tbvl94NsWqmoyAX4=
github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc=
github.com/ipfs/go-ds-leveldb v0.1.0/go.mod h1:hqAW8y4bwX5LWcCtku2rFNX3vjDZCy5LZCg+cSZvYb8=
github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
-github.com/ipfs/go-ds-leveldb v0.4.2 h1:QmQoAJ9WkPMUfBLnu1sBVy0xWWlJPg0m4kRAiJL9iaw=
github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
-github.com/ipfs/go-ds-measure v0.1.0 h1:vE4TyY4aeLeVgnnPBC5QzKIjKrqzha0NCujTfgvVbVQ=
-github.com/ipfs/go-ds-measure v0.1.0/go.mod h1:1nDiFrhLlwArTME1Ees2XaBOl49OoCgd2A3f8EchMSY=
-github.com/ipfs/go-fetcher v1.5.0 h1:oreKTKBzja3S09rSmoZlA3KGVlRiUbJ1pQjtB4K6y3w=
+github.com/ipfs/go-ds-leveldb v0.5.0 h1:s++MEBbD3ZKc9/8/njrn4flZLnCuY9I79v94gBUNumo=
+github.com/ipfs/go-ds-leveldb v0.5.0/go.mod h1:d3XG9RUDzQ6V4SHi8+Xgj9j1XuEk1z82lquxrVbml/Q=
+github.com/ipfs/go-ds-measure v0.2.0 h1:sG4goQe0KDTccHMyT45CY1XyUbxe5VwTKpg2LjApYyQ=
+github.com/ipfs/go-ds-measure v0.2.0/go.mod h1:SEUD/rE2PwRa4IQEC5FuNAmjJCyYObZr9UvVh8V3JxE=
github.com/ipfs/go-fetcher v1.5.0/go.mod h1:5pDZ0393oRF/fHiLmtFZtpMNBQfHOYNPtryWedVuSWE=
-github.com/ipfs/go-filestore v0.0.3 h1:MhZ1jT5K3NewZwim6rS/akcJLm1xM+r6nz6foeB9EwE=
-github.com/ipfs/go-filestore v0.0.3/go.mod h1:dvXRykFzyyXN2CdNlRGzDAkXMDPyI+D7JE066SiKLSE=
+github.com/ipfs/go-fetcher v1.6.1 h1:UFuRVYX5AIllTiRhi5uK/iZkfhSpBCGX7L70nSZEmK8=
+github.com/ipfs/go-fetcher v1.6.1/go.mod h1:27d/xMV8bodjVs9pugh/RCjjK2OZ68UgAMspMdingNo=
+github.com/ipfs/go-filestore v0.1.0 h1:qxvDVTzGrbQElddMmkwsJwJn+fDwWb3pHQHtKc1H0a8=
+github.com/ipfs/go-filestore v0.1.0/go.mod h1:0KTrzoJnJ3sJDEDM09Vq8nz8H475rRyeq4i0n/bpF00=
github.com/ipfs/go-fs-lock v0.0.7 h1:6BR3dajORFrFTkb5EpCUFIAypsoxpGpDSVUdFwzgL9U=
github.com/ipfs/go-fs-lock v0.0.7/go.mod h1:Js8ka+FNYmgQRLrRXzU3CB/+Csr1BwrRilEcvYrHhhc=
-github.com/ipfs/go-graphsync v0.8.0 h1:Zhh6QdTqdipYHD71ncLO8eA6c8EGUTOoJ4Rqybw3K+o=
-github.com/ipfs/go-graphsync v0.8.0/go.mod h1:CLxN859dUTcXCav1DvNvmAUWPZfmNLjlGLJYy+c3dlM=
+github.com/ipfs/go-graphsync v0.10.6-0.20211119194020-99752d2dc1cc h1:kPybQo49W3WoMJYvpyBhOCNxZ6XfLXtoY6xADtSz/+g=
+github.com/ipfs/go-graphsync v0.10.6-0.20211119194020-99752d2dc1cc/go.mod h1:D2h16WyfJhnACG1T+VfpAgcMIWhDeq789GZ6SxvsqmQ=
github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08=
github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod h1:5aD0AvHPi7mZc6Ci1WCAhiBQu2IsfTduLl+422H6Rqw=
github.com/ipfs/go-ipfs-blockstore v0.1.4/go.mod h1:Jxm3XMVjh6R17WvxFEiyKBLUGr86HgIYJW/D/MwqeYQ=
-github.com/ipfs/go-ipfs-blockstore v0.1.6 h1:+RNM/gkTF6lzLPtt/xqjEUXJuG0lFwAiv+MV8MoAhvA=
github.com/ipfs/go-ipfs-blockstore v0.1.6/go.mod h1:Jxm3XMVjh6R17WvxFEiyKBLUGr86HgIYJW/D/MwqeYQ=
+github.com/ipfs/go-ipfs-blockstore v0.2.1 h1:624eIDnkZWNdWbp/N8aDBOUtSY0YW75aJu+vbxnNlkA=
+github.com/ipfs/go-ipfs-blockstore v0.2.1/go.mod h1:jGesd8EtCM3/zPgx+qr0/feTXGUeRai6adgwC+Q+JvE=
github.com/ipfs/go-ipfs-blocksutil v0.0.1 h1:Eh/H4pc1hsvhzsQoMEP3Bke/aW5P5rVM1IWFJMcGIPQ=
github.com/ipfs/go-ipfs-blocksutil v0.0.1/go.mod h1:Yq4M86uIOmxmGPUHv/uI7uKqZNtLb449gwKqXjIsnRk=
github.com/ipfs/go-ipfs-chunker v0.0.1/go.mod h1:tWewYK0we3+rMbOh7pPFGDyypCtvGcBFymgY4rSDLAw=
@@ -465,36 +467,39 @@ github.com/ipfs/go-ipfs-chunker v0.0.5 h1:ojCf7HV/m+uS2vhUGWcogIIxiO5ubl5O57Q7Na
github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod h1:jhgdF8vxRHycr00k13FM8Y0E+6BoalYeobXmUyTreP8=
github.com/ipfs/go-ipfs-cmds v0.6.0 h1:yAxdowQZzoFKjcLI08sXVNnqVj3jnABbf9smrPQmBsw=
github.com/ipfs/go-ipfs-cmds v0.6.0/go.mod h1:ZgYiWVnCk43ChwoH8hAmI1IRbuVtq3GSTHwtRB/Kqhk=
-github.com/ipfs/go-ipfs-config v0.16.0 h1:CBtIYyp/iWIczCv83bmfge8EA2KqxOOfqmETs3tUnnU=
-github.com/ipfs/go-ipfs-config v0.16.0/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A=
+github.com/ipfs/go-ipfs-config v0.18.0 h1:Ta1aNGNEq6RIvzbw7dqzCVZJKb7j+Dd35JFnAOCpT8g=
+github.com/ipfs/go-ipfs-config v0.18.0/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A=
github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
github.com/ipfs/go-ipfs-ds-help v0.0.1/go.mod h1:gtP9xRaZXqIQRh1HRpp595KbBEdgqWFxefeVKOV8sxo=
github.com/ipfs/go-ipfs-ds-help v0.1.1 h1:IW/bXGeaAZV2VH0Kuok+Ohva/zHkHmeLFBxC1k7mNPc=
github.com/ipfs/go-ipfs-ds-help v0.1.1/go.mod h1:SbBafGJuGsPI/QL3j9Fc5YPLeAu+SzOkI0gFwAg+mOs=
-github.com/ipfs/go-ipfs-exchange-interface v0.0.1 h1:LJXIo9W7CAmugqI+uofioIpRb6rY30GUu7G6LUfpMvM=
github.com/ipfs/go-ipfs-exchange-interface v0.0.1/go.mod h1:c8MwfHjtQjPoDyiy9cFquVtVHkO9b9Ob3FG91qJnWCM=
-github.com/ipfs/go-ipfs-exchange-offline v0.0.1 h1:P56jYKZF7lDDOLx5SotVh5KFxoY6C81I1NSHW1FxGew=
+github.com/ipfs/go-ipfs-exchange-interface v0.1.0 h1:TiMekCrOGQuWYtZO3mf4YJXDIdNgnKWZ9IE3fGlnWfo=
+github.com/ipfs/go-ipfs-exchange-interface v0.1.0/go.mod h1:ych7WPlyHqFvCi/uQI48zLZuAWVP5iTQPXEfVaw5WEI=
github.com/ipfs/go-ipfs-exchange-offline v0.0.1/go.mod h1:WhHSFCVYX36H/anEKQboAzpUws3x7UeEGkzQc3iNkM0=
+github.com/ipfs/go-ipfs-exchange-offline v0.1.1 h1:mEiXWdbMN6C7vtDG21Fphx8TGCbZPpQnz/496w/PL4g=
+github.com/ipfs/go-ipfs-exchange-offline v0.1.1/go.mod h1:vTiBRIbzSwDD0OWm+i3xeT0mO7jG2cbJYatp3HPk5XY=
github.com/ipfs/go-ipfs-files v0.0.3/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4=
github.com/ipfs/go-ipfs-files v0.0.8/go.mod h1:wiN/jSG8FKyk7N0WyctKSvq3ljIa2NNTiZB55kpTdOs=
github.com/ipfs/go-ipfs-files v0.0.9 h1:OFyOfmuVDu9c5YtjSDORmwXzE6fmZikzZpzsnNkgFEg=
github.com/ipfs/go-ipfs-files v0.0.9/go.mod h1:aFv2uQ/qxWpL/6lidWvnSQmaVqCrf0TBGoUr+C1Fo84=
github.com/ipfs/go-ipfs-keystore v0.0.2 h1:Fa9xg9IFD1VbiZtrNLzsD0GuELVHUFXCWF64kCPfEXU=
github.com/ipfs/go-ipfs-keystore v0.0.2/go.mod h1:H49tRmibOEs7gLMgbOsjC4dqh1u5e0R/SWuc2ScfgSo=
-github.com/ipfs/go-ipfs-pinner v0.1.2 h1:Ve9OBhL6eg5+tVqEnIhPZOCXDtMjB+OhOohVZxPUxms=
-github.com/ipfs/go-ipfs-pinner v0.1.2/go.mod h1:/u9kMe+TyQybN21O5OBicdyx3x93lVI77PCtiTnArUk=
+github.com/ipfs/go-ipfs-pinner v0.2.1 h1:kw9hiqh2p8TatILYZ3WAfQQABby7SQARdrdA+5Z5QfY=
+github.com/ipfs/go-ipfs-pinner v0.2.1/go.mod h1:l1AtLL5bovb7opnG77sh4Y10waINz3Y1ni6CvTzx7oo=
github.com/ipfs/go-ipfs-posinfo v0.0.1 h1:Esoxj+1JgSjX0+ylc0hUmJCOv6V2vFoZiETLR6OtpRs=
github.com/ipfs/go-ipfs-posinfo v0.0.1/go.mod h1:SwyeVP+jCwiDu0C313l/8jg6ZxM0qqtlt2a0vILTc1A=
github.com/ipfs/go-ipfs-pq v0.0.1/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
github.com/ipfs/go-ipfs-pq v0.0.2 h1:e1vOOW6MuOwG2lqxcLA+wEn93i/9laCY8sXAw76jFOY=
github.com/ipfs/go-ipfs-pq v0.0.2/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
-github.com/ipfs/go-ipfs-provider v0.6.1 h1:4VenAH1J5XH+/mgM2Y7p+QN3wlk7CInMDG8rsT2CGW4=
-github.com/ipfs/go-ipfs-provider v0.6.1/go.mod h1:I4Cig3InhftbRJohph76Qy/P2uKEZILNGiKvDJmmC28=
+github.com/ipfs/go-ipfs-provider v0.7.1 h1:eKToBUAb6ZY8iiA6AYVxzW4G1ep67XUaaEBUIYpxhfw=
+github.com/ipfs/go-ipfs-provider v0.7.1/go.mod h1:QwdDYRYnC5sYGLlOwVDY/0ZB6T3zcMtu+5+GdGeUuw8=
github.com/ipfs/go-ipfs-routing v0.0.1/go.mod h1:k76lf20iKFxQTjcJokbPM9iBXVXVZhcOwc360N4nuKs=
-github.com/ipfs/go-ipfs-routing v0.1.0 h1:gAJTT1cEeeLj6/DlLX6t+NxD9fQe2ymTO6qWRDI/HQQ=
github.com/ipfs/go-ipfs-routing v0.1.0/go.mod h1:hYoUkJLyAUKhF58tysKpids8RNDPO42BVMgK5dNsoqY=
+github.com/ipfs/go-ipfs-routing v0.2.1 h1:E+whHWhJkdN9YeoHZNj5itzc+OR292AJ2uE9FFiW0BY=
+github.com/ipfs/go-ipfs-routing v0.2.1/go.mod h1:xiNNiwgjmLqPS1cimvAw6EyB9rkVDbiocA4yY+wRNLM=
github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
@@ -511,8 +516,6 @@ github.com/ipfs/go-ipld-git v0.1.1 h1:TWGnZjS0htmEmlMFEkA3ogrNCqWjIxwr16x1OsdhG+
github.com/ipfs/go-ipld-git v0.1.1/go.mod h1:+VyMqF5lMcJh4rwEppV0e6g4nCCHXThLYYDpKUkJubI=
github.com/ipfs/go-ipld-legacy v0.1.0 h1:wxkkc4k8cnvIGIjPO0waJCe7SHEyFgl+yQdafdjGrpA=
github.com/ipfs/go-ipld-legacy v0.1.0/go.mod h1:86f5P/srAmh9GcIcWQR9lfFLZPrIyyXQeVlOWeeWEuI=
-github.com/ipfs/go-ipns v0.0.2/go.mod h1:WChil4e0/m9cIINWLxZe1Jtf77oz5L05rO2ei/uKJ5U=
-github.com/ipfs/go-ipns v0.1.0/go.mod h1:3IbsuPkR6eAGcnx+E7j6HpOSbSQJPZ6zlRj+NK3jPxQ=
github.com/ipfs/go-ipns v0.1.2 h1:O/s/0ht+4Jl9+VoxoUo0zaHjnZUS+aBQIKTuzdZ/ucI=
github.com/ipfs/go-ipns v0.1.2/go.mod h1:ioQ0j02o6jdIVW+bmi18f4k2gRf0AV3kZ9KeHYHICnQ=
github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
@@ -529,46 +532,43 @@ github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Ax
github.com/ipfs/go-log/v2 v2.3.0 h1:31Re/cPqFHpsRHgyVwjWADPoF0otB1WrjTy8ZFYwEZU=
github.com/ipfs/go-log/v2 v2.3.0/go.mod h1:QqGoj30OTpnKaG/LKTGTxoP2mmQtjVMEnK72gynbe/g=
github.com/ipfs/go-merkledag v0.0.6/go.mod h1:QYPdnlvkOg7GnQRofu9XZimC5ZW5Wi3bKys/4GQQfto=
-github.com/ipfs/go-merkledag v0.1.0/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
github.com/ipfs/go-merkledag v0.2.3/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
-github.com/ipfs/go-merkledag v0.3.0/go.mod h1:4pymaZLhSLNVuiCITYrpViD6vmfZ/Ws4n/L9tfNv3S4=
-github.com/ipfs/go-merkledag v0.3.1/go.mod h1:fvkZNNZixVW6cKSZ/JfLlON5OlgTXNdRLz0p6QG/I2M=
github.com/ipfs/go-merkledag v0.3.2/go.mod h1:fvkZNNZixVW6cKSZ/JfLlON5OlgTXNdRLz0p6QG/I2M=
-github.com/ipfs/go-merkledag v0.4.0 h1:ixNu/5MJSaT/Qs073T0/HsWKwnOoBgqSq1g+GaJIen0=
github.com/ipfs/go-merkledag v0.4.0/go.mod h1:XshXBkhyeS63YNGisLL1uDSfuTyrQIxVUOg3ojR5MOE=
+github.com/ipfs/go-merkledag v0.5.1 h1:tr17GPP5XtPhvPPiWtu20tSGZiZDuTaJRXBLcr79Umk=
+github.com/ipfs/go-merkledag v0.5.1/go.mod h1:cLMZXx8J08idkp5+id62iVftUQV+HlYJ3PIhDfZsjA4=
github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fGD6n0jO4kdg=
github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY=
github.com/ipfs/go-metrics-prometheus v0.0.2 h1:9i2iljLg12S78OhC6UAiXi176xvQGiZaGVF1CUVdE+s=
github.com/ipfs/go-metrics-prometheus v0.0.2/go.mod h1:ELLU99AQQNi+zX6GCGm2lAgnzdSH3u5UVlCdqSXnEks=
-github.com/ipfs/go-mfs v0.1.2 h1:DlelNSmH+yz/Riy0RjPKlooPg0KML4lXGdLw7uZkfAg=
-github.com/ipfs/go-mfs v0.1.2/go.mod h1:T1QBiZPEpkPLzDqEJLNnbK55BVKVlNi2a+gVm4diFo0=
-github.com/ipfs/go-namesys v0.3.1 h1:DqmeXlVODejOyECAqoqhSB5JGRv8aRFhtG0oPDmxsMc=
-github.com/ipfs/go-namesys v0.3.1/go.mod h1:/BL4xk8LP5Lq82AmaRKyxZv/eYRlumNiU9SZUe1Hlps=
+github.com/ipfs/go-mfs v0.2.1 h1:5jz8+ukAg/z6jTkollzxGzhkl3yxm022Za9f2nL5ab8=
+github.com/ipfs/go-mfs v0.2.1/go.mod h1:Woj80iuw4ajDnIP6+seRaoHpPsc9hmL0pk/nDNDWP88=
+github.com/ipfs/go-namesys v0.4.0 h1:Gxg4kEWxVcHuUJl60KMNs1k8AiVB3luXbz8ZJkSGacs=
+github.com/ipfs/go-namesys v0.4.0/go.mod h1:jpJwzodyP8DZdWN6DShRjVZw6gaqMr4nQLBSxU5cR6E=
github.com/ipfs/go-path v0.0.7/go.mod h1:6KTKmeRnBXgqrTvzFrPV3CamxcgvXX/4z79tfAd2Sno=
github.com/ipfs/go-path v0.0.9/go.mod h1:VpDkSBKQ9EFQOUgi54Tq/O/tGi8n1RfYNks13M3DEs8=
github.com/ipfs/go-path v0.1.1/go.mod h1:vC8q4AKOtrjJz2NnllIrmr2ZbGlF5fW2OKKyhV9ggb0=
-github.com/ipfs/go-path v0.1.2 h1:yQxN9JNhO4KbaaYtVgVpIH0BQDzn5Zpl5A6to93O7Ck=
-github.com/ipfs/go-path v0.1.2/go.mod h1:3DdbxZb0PtT0g3UlMqyzms1UBKPc0pQ2NHx5/XScYdY=
+github.com/ipfs/go-path v0.2.1 h1:R0JYCu0JBnfa6A3C42nzsNPxtKU5/fnUPhWSuzcJHws=
+github.com/ipfs/go-path v0.2.1/go.mod h1:NOScsVgxfC/eIw4nz6OiGwK42PjaSJ4Y/ZFPn1Xe07I=
github.com/ipfs/go-peertaskqueue v0.0.4/go.mod h1:03H8fhyeMfKNFWqzYEVyMbcPUeYrqP1MX6Kd+aN+rMQ=
github.com/ipfs/go-peertaskqueue v0.1.0/go.mod h1:Jmk3IyCcfl1W3jTW3YpghSwSEC6IJ3Vzz/jUmWw8Z0U=
github.com/ipfs/go-peertaskqueue v0.1.1/go.mod h1:Jmk3IyCcfl1W3jTW3YpghSwSEC6IJ3Vzz/jUmWw8Z0U=
github.com/ipfs/go-peertaskqueue v0.2.0/go.mod h1:5/eNrBEbtSKWCG+kQK8K8fGNixoYUnr+P7jivavs9lY=
-github.com/ipfs/go-peertaskqueue v0.4.0 h1:x1hFgA4JOUJ3ntPfqLRu6v4k6kKL0p07r3RSg9JNyHI=
-github.com/ipfs/go-peertaskqueue v0.4.0/go.mod h1:KL9F49hXJMoXCad8e5anivjN+kWdr+CyGcyh4K6doLc=
+github.com/ipfs/go-peertaskqueue v0.7.0 h1:VyO6G4sbzX80K58N60cCaHsSsypbUNs1GjO5seGNsQ0=
+github.com/ipfs/go-peertaskqueue v0.7.0/go.mod h1:M/akTIE/z1jGNXMU7kFB4TeSEFvj68ow0Rrb04donIU=
github.com/ipfs/go-pinning-service-http-client v0.1.0 h1:Au0P4NglL5JfzhNSZHlZ1qra+IcJyO3RWMd9EYCwqSY=
github.com/ipfs/go-pinning-service-http-client v0.1.0/go.mod h1:tcCKmlkWWH9JUUkKs8CrOZBanacNc1dmKLfjlyXAMu4=
-github.com/ipfs/go-unixfs v0.1.0/go.mod h1:lysk5ELhOso8+Fed9U1QTGey2ocsfaZ18h0NCO2Fj9s=
github.com/ipfs/go-unixfs v0.2.4/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=
-github.com/ipfs/go-unixfs v0.2.5 h1:irj/WzIcgTBay48mSMUYDbKlIzIocXWcuUUsi5qOMOE=
-github.com/ipfs/go-unixfs v0.2.5/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=
+github.com/ipfs/go-unixfs v0.3.1 h1:LrfED0OGfG98ZEegO4/xiprx2O+yS+krCMQSp7zLVv8=
+github.com/ipfs/go-unixfs v0.3.1/go.mod h1:h4qfQYzghiIc8ZNFKiLMFWOTzrWIAtzYQ59W/pCFf1o=
github.com/ipfs/go-unixfsnode v1.1.2/go.mod h1:5dcE2x03pyjHk4JjamXmunTMzz+VUtqvPwZjIEkfV6s=
github.com/ipfs/go-unixfsnode v1.1.3 h1:IyqJBGIEvcHvll1wDDVIHOEVXnE+IH6tjzTWpZ6kGiI=
github.com/ipfs/go-unixfsnode v1.1.3/go.mod h1:ZZxUM5wXBC+G0Co9FjrYTOm+UlhZTjxLfRYdWY9veZ4=
github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E=
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
github.com/ipfs/interface-go-ipfs-core v0.4.0/go.mod h1:UJBcU6iNennuI05amq3FQ7g0JHUkibHFAfhfUIy927o=
-github.com/ipfs/interface-go-ipfs-core v0.5.1 h1:1KMM7RkjUD8W5fSoRsa9xR6ZMzeL8fLHOUM1UEW9Y4M=
-github.com/ipfs/interface-go-ipfs-core v0.5.1/go.mod h1:lNBJrdXHtWS46evMPBdWtDQMDsrKcGbxCOGoKLkztOE=
+github.com/ipfs/interface-go-ipfs-core v0.5.2 h1:m1/5U+WpOK2ZE7Qzs5iIu80QM1ZA3aWYi2Ilwpi+tdg=
+github.com/ipfs/interface-go-ipfs-core v0.5.2/go.mod h1:lNBJrdXHtWS46evMPBdWtDQMDsrKcGbxCOGoKLkztOE=
github.com/ipfs/tar-utils v0.0.1 h1:8Na0KBD6GddGyXwU4rXNtVTE24iuZws8mENJQPLG7W4=
github.com/ipfs/tar-utils v0.0.1/go.mod h1:ACflm9wXvV9w0eMJt6yYXxS2zuIV+yXGNwbuq1bhLeE=
github.com/ipld/go-car v0.3.2 h1:V9wt/80FNfbMRWSD98W5br6fyjUAyVgI2lDOTZX16Lg=
@@ -658,8 +658,9 @@ github.com/libp2p/go-conn-security v0.0.1/go.mod h1:bGmu51N0KU9IEjX7kl2PQjgZa40J
github.com/libp2p/go-conn-security-multistream v0.0.2/go.mod h1:nc9vud7inQ+d6SO0I/6dSWrdMnHnzZNHeyUQqrAJulE=
github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU=
-github.com/libp2p/go-conn-security-multistream v0.2.1 h1:ft6/POSK7F+vl/2qzegnHDaXFU0iWB4yVTYrioC6Zy0=
github.com/libp2p/go-conn-security-multistream v0.2.1/go.mod h1:cR1d8gA0Hr59Fj6NhaTpFhJZrjSYuNmhpT2r25zYR70=
+github.com/libp2p/go-conn-security-multistream v0.3.0 h1:9UCIKlBL1hC9u7nkMXpD1nkc/T53PKMAn3/k9ivBAVc=
+github.com/libp2p/go-conn-security-multistream v0.3.0/go.mod h1:EEP47t4fw/bTelVmEzIDqSe69hO/ip52xBEhZMLWAHM=
github.com/libp2p/go-doh-resolver v0.3.1 h1:1wbVGkB4Tdj4WEvjAuYknOPyt4vSSDn9thnj13pKPaY=
github.com/libp2p/go-doh-resolver v0.3.1/go.mod h1:y5go1ZppAq9N2eppbX0xON01CyPBeUg2yS6BTssssog=
github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
@@ -681,10 +682,12 @@ github.com/libp2p/go-libp2p v0.13.0/go.mod h1:pM0beYdACRfHO1WcJlp65WXyG2A6NqYM+t
github.com/libp2p/go-libp2p v0.14.0/go.mod h1:dsQrWLAoIn+GkHPN/U+yypizkHiB9tnv79Os+kSgQ4Q=
github.com/libp2p/go-libp2p v0.14.3/go.mod h1:d12V4PdKbpL0T1/gsUNN8DfgMuRPDX8bS2QxCZlwRH0=
github.com/libp2p/go-libp2p v0.14.4/go.mod h1:EIRU0Of4J5S8rkockZM7eJp2S0UrCyi55m2kJVru3rM=
-github.com/libp2p/go-libp2p v0.15.0 h1:jbMbdmtizfpvl1+oQuGJzfGhttAtuxUCavF3enwFncg=
-github.com/libp2p/go-libp2p v0.15.0/go.mod h1:8Ljmwon0cZZYKrOCjFeLwQEK8bqR42dOheUZ1kSKhP0=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052 h1:BM7aaOF7RpmNn9+9g6uTjGJ0cTzWr5j9i9IKeun2M8U=
+github.com/libp2p/go-libp2p v0.16.0-dev.0.20211116110622-8df360043e98/go.mod h1:FD8rjfPcFVABY1DZDt9zKVRhNDiPdEfCrFnAJzjt6A4=
+github.com/libp2p/go-libp2p v0.16.0 h1:aTxzQPllnW+nyC9mY8xaS20BbcrSYMt1HCkjZRHvdGY=
+github.com/libp2p/go-libp2p v0.16.0/go.mod h1:ump42BsirwAWxKzsCiFnTtN1Yc+DuPu76fyMX364/O4=
github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
+github.com/libp2p/go-libp2p-asn-util v0.1.0 h1:rABPCO77SjdbJ/eJ/ynIo8vWICy1VEnL5JAxJbQLo1E=
+github.com/libp2p/go-libp2p-asn-util v0.1.0/go.mod h1:wu+AnM9Ii2KgO5jMmS1rz9dvzTdj8BXqsPR9HR0XB7I=
github.com/libp2p/go-libp2p-autonat v0.0.6/go.mod h1:uZneLdOkZHro35xIhpbtTzLlgYturpu4J5+0cZK3MqE=
github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod h1:1tLf2yXxiE/oKGtDwPYWTSYG3PtvYlJmg7NeVtPRqH8=
github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE=
@@ -692,8 +695,9 @@ github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQ
github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI=
github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/nBwNHoeyyT4IWV6A=
github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
-github.com/libp2p/go-libp2p-autonat v0.4.2 h1:YMp7StMi2dof+baaxkbxaizXjY1RPvU71CXfxExzcUU=
github.com/libp2p/go-libp2p-autonat v0.4.2/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
+github.com/libp2p/go-libp2p-autonat v0.6.0 h1:+vbQ1pMzMGjE/RJopiQKK2FRjdCKHPNPrkPm8u+luQU=
+github.com/libp2p/go-libp2p-autonat v0.6.0/go.mod h1:bFC6kY8jwzNNWoqc8iGE57vsfwyJ/lP4O4DOV1e0B2o=
github.com/libp2p/go-libp2p-blankhost v0.0.1/go.mod h1:Ibpbw/7cPPYwFb7PACIWdvxxv0t0XCCI10t7czjAjTc=
github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU=
@@ -733,8 +737,10 @@ github.com/libp2p/go-libp2p-core v0.8.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJB
github.com/libp2p/go-libp2p-core v0.8.2/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
github.com/libp2p/go-libp2p-core v0.8.6/go.mod h1:dgHr0l0hIKfWpGpqAMbpo19pen9wJfdCGv51mTmdpmM=
-github.com/libp2p/go-libp2p-core v0.9.0 h1:t97Mv0LIBZlP2FXVRNKKVzHJCIjbIWGxYptGId4+htU=
github.com/libp2p/go-libp2p-core v0.9.0/go.mod h1:ESsbz31oC3C1AvMJoGx26RTuCkNhmkSRCqZ0kQtJ2/8=
+github.com/libp2p/go-libp2p-core v0.10.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
+github.com/libp2p/go-libp2p-core v0.11.0 h1:75jAgdA+IChNa+/mZXogfmrGkgwxkVvxmIC7pV+F6sI=
+github.com/libp2p/go-libp2p-core v0.11.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod h1:yJkNyDmO341d5wwXxDUGO0LykUVT72ImHNUqh5D/dBE=
github.com/libp2p/go-libp2p-crypto v0.0.2/go.mod h1:eETI5OUfBnvARGOHrJz2eWNyTUxEGZnBxMcbUjfIj4I=
github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
@@ -743,8 +749,8 @@ github.com/libp2p/go-libp2p-discovery v0.1.0/go.mod h1:4F/x+aldVHjHDHuX85x1zWoFT
github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg=
github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw=
github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod h1:+srtPIU9gDaBNu//UHvcdliKBIcr4SfDcm0/PfPJLug=
-github.com/libp2p/go-libp2p-discovery v0.5.1 h1:CJylx+h2+4+s68GvrM4pGNyfNhOYviWBPtVv5PA7sfo=
-github.com/libp2p/go-libp2p-discovery v0.5.1/go.mod h1:+srtPIU9gDaBNu//UHvcdliKBIcr4SfDcm0/PfPJLug=
+github.com/libp2p/go-libp2p-discovery v0.6.0 h1:1XdPmhMJr8Tmj/yUfkJMIi8mgwWrLUsCB3bMxdT+DSo=
+github.com/libp2p/go-libp2p-discovery v0.6.0/go.mod h1:/u1voHt0tKIe5oIA1RHBKQLVCWPna2dXmPNHc2zR9S8=
github.com/libp2p/go-libp2p-gostream v0.3.0 h1:rnas//vRdHYCr7bjraZJISPwZV8OGMjeX5k5fN5Ax44=
github.com/libp2p/go-libp2p-gostream v0.3.0/go.mod h1:pLBQu8db7vBMNINGsAwLL/ZCE8wng5V1FThoaE5rNjc=
github.com/libp2p/go-libp2p-host v0.0.1/go.mod h1:qWd+H1yuU0m5CwzAkvbSjqKairayEHdR5MMl7Cwa7Go=
@@ -755,9 +761,8 @@ github.com/libp2p/go-libp2p-interface-connmgr v0.0.1/go.mod h1:GarlRLH0LdeWcLnYM
github.com/libp2p/go-libp2p-interface-connmgr v0.0.4/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
github.com/libp2p/go-libp2p-interface-connmgr v0.0.5/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
github.com/libp2p/go-libp2p-interface-pnet v0.0.1/go.mod h1:el9jHpQAXK5dnTpKA4yfCNBZXvrzdOU75zz+C6ryp3k=
-github.com/libp2p/go-libp2p-kad-dht v0.11.1/go.mod h1:5ojtR2acDPqh/jXf5orWy8YGb8bHQDS+qeDcoscL/PI=
-github.com/libp2p/go-libp2p-kad-dht v0.13.1 h1:wQgzOpoc+dcPVDb3h0HNWUjon5JiYEqsA4iNBUtIA7A=
-github.com/libp2p/go-libp2p-kad-dht v0.13.1/go.mod h1:iVdxmsKHVPQSCGPP4V/A+tDFCLsxrREZUBX8ohOcKDw=
+github.com/libp2p/go-libp2p-kad-dht v0.15.0 h1:Ke+Oj78gX5UDXnA6HBdrgvi+fStJxgYTDa51U0TsCLo=
+github.com/libp2p/go-libp2p-kad-dht v0.15.0/go.mod h1:rZtPxYu1TnHHz6n1RggdGrxUX/tA1C2/Wiw3ZMUDrU0=
github.com/libp2p/go-libp2p-kbucket v0.3.1/go.mod h1:oyjT5O7tS9CQurok++ERgc46YLwEpuGoFq9ubvoUOio=
github.com/libp2p/go-libp2p-kbucket v0.4.7 h1:spZAcgxifvFZHBD8tErvppbnNiKA5uokDu3CV7axu70=
github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod h1:XyVo99AfQH0foSf176k4jY1xUJ2+jUJIZCSDm7r2YKk=
@@ -776,8 +781,9 @@ github.com/libp2p/go-libp2p-mplex v0.4.1 h1:/pyhkP1nLwjG3OM+VuaNJkQT/Pqq73WzB3aD
github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod h1:cmy+3GfqfM1PceHTLL7zQzAAYaryDu6iPSC+CIb094g=
github.com/libp2p/go-libp2p-nat v0.0.4/go.mod h1:N9Js/zVtAXqaeT99cXgTV9e75KpnWCvVOiGzlcHmBbY=
github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
-github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw=
+github.com/libp2p/go-libp2p-nat v0.1.0 h1:vigUi2MEN+fwghe5ijpScxtbbDz+L/6y8XwlzYOJgSY=
+github.com/libp2p/go-libp2p-nat v0.1.0/go.mod h1:DQzAG+QbDYjN1/C3B6vXucLtz3u9rEonLVPtZVzQqks=
github.com/libp2p/go-libp2p-net v0.0.1/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
github.com/libp2p/go-libp2p-net v0.0.2/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFxecf9Gt03cKxm2f/Q=
@@ -785,8 +791,8 @@ github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLK
github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
github.com/libp2p/go-libp2p-noise v0.2.0/go.mod h1:IEbYhBBzGyvdLBoxxULL/SGbJARhUeqlO8lVSREYu2Q=
-github.com/libp2p/go-libp2p-noise v0.2.2 h1:MRt5XGfYziDXIUy2udtMWfPmzZqUDYoC1FZoKnqPzwk=
-github.com/libp2p/go-libp2p-noise v0.2.2/go.mod h1:IEbYhBBzGyvdLBoxxULL/SGbJARhUeqlO8lVSREYu2Q=
+github.com/libp2p/go-libp2p-noise v0.3.0 h1:NCVH7evhVt9njbTQshzT7N1S3Q6fjj9M11FCgfH5+cA=
+github.com/libp2p/go-libp2p-noise v0.3.0/go.mod h1:JNjHbociDJKHD64KTkzGnzqJ0FEV5gHJa6AB00kbCNQ=
github.com/libp2p/go-libp2p-peer v0.0.1/go.mod h1:nXQvOBbwVqoP+T5Y5nCjeH4sP9IX/J0AMzcDUVruVoo=
github.com/libp2p/go-libp2p-peer v0.1.1/go.mod h1:jkF12jGB4Gk/IOo+yomm+7oLWxF278F7UnrYUQ1Q8es=
github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
@@ -800,24 +806,25 @@ github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRj
github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
github.com/libp2p/go-libp2p-peerstore v0.2.6/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
-github.com/libp2p/go-libp2p-peerstore v0.2.8 h1:nJghUlUkFVvyk7ccsM67oFA6kqUkwyCM1G4WPVMCWYA=
github.com/libp2p/go-libp2p-peerstore v0.2.8/go.mod h1:gGiPlXdz7mIHd2vfAsHzBNAMqSDkt2UBFwgcITgw1lA=
+github.com/libp2p/go-libp2p-peerstore v0.4.0 h1:DOhRJLnM9Dc9lIXi3rPDZBf789LXy1BrzwIs7Tj0cKA=
+github.com/libp2p/go-libp2p-peerstore v0.4.0/go.mod h1:rDJUFyzEWPpXpEwywkcTYYzDHlwza8riYMaUzaN6hX0=
github.com/libp2p/go-libp2p-pnet v0.2.0 h1:J6htxttBipJujEjz1y0a5+eYoiPcFHhSYHH6na5f0/k=
github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod h1:Qqvq6JH/oMZGwqs3N1Fqhv8NVhrdYcO0BW4wssv21LA=
github.com/libp2p/go-libp2p-protocol v0.0.1/go.mod h1:Af9n4PiruirSDjHycM1QuiMi/1VZNHYcK8cLgFJLZ4s=
github.com/libp2p/go-libp2p-protocol v0.1.0/go.mod h1:KQPHpAabB57XQxGrXCNvbL6UEXfQqUgC/1adR2Xtflk=
-github.com/libp2p/go-libp2p-pubsub v0.4.0/go.mod h1:izkeMLvz6Ht8yAISXjx60XUQZMq9ZMe5h2ih4dLIBIQ=
-github.com/libp2p/go-libp2p-pubsub v0.5.4 h1:rHl9/Xok4zX3zgi0pg0XnUj9Xj2OeXO8oTu85q2+YA8=
-github.com/libp2p/go-libp2p-pubsub v0.5.4/go.mod h1:gVOzwebXVdSMDQBTfH8ACO5EJ4SQrvsHqCmYsCZpD0E=
-github.com/libp2p/go-libp2p-pubsub-router v0.4.0 h1:KjzTLIOBCt0+/4wH6epTxD/Qu4Up/IyeKHlj9MhWRJI=
-github.com/libp2p/go-libp2p-pubsub-router v0.4.0/go.mod h1:hs0j0ugcBjMOMgJ6diOlZM2rZEId/w5Gg86E+ac4SmQ=
+github.com/libp2p/go-libp2p-pubsub v0.6.0 h1:98+RXuEWW17U6cAijK1yaTf6mw/B+n5yPA421z+dlo0=
+github.com/libp2p/go-libp2p-pubsub v0.6.0/go.mod h1:nJv87QM2cU0w45KPR1rZicq+FmFIOD16zmT+ep1nOmg=
+github.com/libp2p/go-libp2p-pubsub-router v0.5.0 h1:WuYdY42DVIJ+N0qMdq2du/E9poJH+xzsXL7Uptwj9tw=
+github.com/libp2p/go-libp2p-pubsub-router v0.5.0/go.mod h1:TRJKskSem3C0aSb3CmRgPwq6IleVFzds6hS09fmZbGM=
github.com/libp2p/go-libp2p-quic-transport v0.10.0/go.mod h1:RfJbZ8IqXIhxBRm5hqUEJqjiiY8xmEuq3HUDS993MkA=
github.com/libp2p/go-libp2p-quic-transport v0.11.2/go.mod h1:wlanzKtIh6pHrq+0U3p3DY9PJfGqxMgPaGKaK5LifwQ=
-github.com/libp2p/go-libp2p-quic-transport v0.12.0 h1:7IjDH4XNkmJbOMD+mxRloTe4LzMTq+vqvm2nYNL1N7M=
-github.com/libp2p/go-libp2p-quic-transport v0.12.0/go.mod h1:EKHqxZbWE/FhDJZ6ebyZ/4v3X9zyuuuKIN0XR9vANT0=
+github.com/libp2p/go-libp2p-quic-transport v0.13.0/go.mod h1:39/ZWJ1TW/jx1iFkKzzUg00W6tDJh73FC0xYudjr7Hc=
+github.com/libp2p/go-libp2p-quic-transport v0.14.0/go.mod h1:/W4njiXIRowKk62w6j4y4dVpBZvEk9WtGOtOYh2M6J8=
+github.com/libp2p/go-libp2p-quic-transport v0.15.0 h1:DR0mP6kcieowikBprWkcNtbquRKOPWb5dLZ4ahDZujk=
+github.com/libp2p/go-libp2p-quic-transport v0.15.0/go.mod h1:wv4uGwjcqe8Mhjj7N/Ic0aKjA+/10UnMlSzLO0yRpYQ=
github.com/libp2p/go-libp2p-record v0.0.1/go.mod h1:grzqg263Rug/sRex85QrDOLntdFAymLDLm7lxMgU79Q=
github.com/libp2p/go-libp2p-record v0.1.0/go.mod h1:ujNc8iuE5dlKWVy6wuL6dd58t0n7xI4hAIl8pE6wu5Q=
-github.com/libp2p/go-libp2p-record v0.1.1/go.mod h1:VRgKajOyMVgP/F0L5g3kH7SVskp17vFi2xheb5uMJtg=
github.com/libp2p/go-libp2p-record v0.1.2/go.mod h1:pal0eNcT5nqZaTV7UGhqeGqxFgGdsU/9W//C8dqjQDk=
github.com/libp2p/go-libp2p-record v0.1.3 h1:R27hoScIhQf/A8XJZ8lYpnqh9LatJ5YbHs28kCIfql0=
github.com/libp2p/go-libp2p-record v0.1.3/go.mod h1:yNUff/adKIfPnYQXgp6FQmNu3gLJ6EMg7+/vv2+9pY4=
@@ -838,8 +845,9 @@ github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJeg
github.com/libp2p/go-libp2p-swarm v0.3.1/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
github.com/libp2p/go-libp2p-swarm v0.4.0/go.mod h1:XVFcO52VoLoo0eitSxNQWYq4D6sydGOweTOAjJNraCw=
github.com/libp2p/go-libp2p-swarm v0.5.0/go.mod h1:sU9i6BoHE0Ve5SKz3y9WfKrh8dUat6JknzUehFx8xW4=
-github.com/libp2p/go-libp2p-swarm v0.5.3 h1:hsYaD/y6+kZff1o1Mc56NcuwSg80lIphTS/zDk3mO4M=
github.com/libp2p/go-libp2p-swarm v0.5.3/go.mod h1:NBn7eNW2lu568L7Ns9wdFrOhgRlkRnIDg0FLKbuu3i8=
+github.com/libp2p/go-libp2p-swarm v0.8.0 h1:nRHNRhi86L7jhka02N4MoV+PSFFPoJFkHNQwCTFxNhw=
+github.com/libp2p/go-libp2p-swarm v0.8.0/go.mod h1:sOMp6dPuqco0r0GHTzfVheVBh6UEL0L1lXUZ5ot2Fvc=
github.com/libp2p/go-libp2p-testing v0.0.1/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
@@ -849,11 +857,13 @@ github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eq
github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
github.com/libp2p/go-libp2p-testing v0.3.0/go.mod h1:efZkql4UZ7OVsEfaxNHZPzIehtsBXMrXnCfJIgDti5g=
github.com/libp2p/go-libp2p-testing v0.4.0/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
-github.com/libp2p/go-libp2p-testing v0.4.2 h1:IOiA5mMigi+eEjf4J+B7fepDhsjtsoWA9QbsCqbNp5U=
github.com/libp2p/go-libp2p-testing v0.4.2/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
+github.com/libp2p/go-libp2p-testing v0.5.0 h1:bTjC29TTQ/ODq0ld3+0KLq3irdA5cAH3OMbRi0/QsvE=
+github.com/libp2p/go-libp2p-testing v0.5.0/go.mod h1:QBk8fqIL1XNcno/l3/hhaIEn4aLRijpYOR+zVjjlh+A=
github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
-github.com/libp2p/go-libp2p-tls v0.2.0 h1:N8i5wPiHudA+02sfW85R2nUbybPm7agjAywZc6pd3xA=
-github.com/libp2p/go-libp2p-tls v0.2.0/go.mod h1:twrp2Ci4lE2GYspA1AnlYm+boYjqVruxDKJJj7s6xrc=
+github.com/libp2p/go-libp2p-tls v0.3.0/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5oFlg+wo2FxJDY=
+github.com/libp2p/go-libp2p-tls v0.3.1 h1:lsE2zYte+rZCEOHF72J1Fg3XK3dGQyKvI6i5ehJfEp0=
+github.com/libp2p/go-libp2p-tls v0.3.1/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5oFlg+wo2FxJDY=
github.com/libp2p/go-libp2p-transport v0.0.1/go.mod h1:UzbUs9X+PHOSw7S3ZmeOxfnwaQY5vGDzZmKPod3N3tk=
github.com/libp2p/go-libp2p-transport v0.0.5/go.mod h1:StoY3sx6IqsP6XKoabsPnHCwqKXWUMWU7Rfcsubee/A=
github.com/libp2p/go-libp2p-transport-upgrader v0.0.4/go.mod h1:RGq+tupk+oj7PzL2kn/m1w6YXxcIAYJYeI90h6BGgUc=
@@ -863,8 +873,9 @@ github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D
github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod h1:J4ko0ObtZSmgn5BX5AmegP+dK3CSnU2lMCKsSq/EY0s=
github.com/libp2p/go-libp2p-transport-upgrader v0.4.2/go.mod h1:NR8ne1VwfreD5VIWIU62Agt/J18ekORFU/j1i2y8zvk=
github.com/libp2p/go-libp2p-transport-upgrader v0.4.3/go.mod h1:bpkldbOWXMrXhpZbSV1mQxTrefOg2Fi+k1ClDSA4ppw=
-github.com/libp2p/go-libp2p-transport-upgrader v0.4.6 h1:SHt3g0FslnqIkEWF25YOB8UCOCTpGAVvHRWQYJ+veiI=
github.com/libp2p/go-libp2p-transport-upgrader v0.4.6/go.mod h1:JE0WQuQdy+uLZ5zOaI3Nw9dWGYJIA7mywEtP2lMvnyk=
+github.com/libp2p/go-libp2p-transport-upgrader v0.5.0 h1:7SDl3O2+AYOgfE40Mis83ClpfGNkNA6m4FwhbOHs+iI=
+github.com/libp2p/go-libp2p-transport-upgrader v0.5.0/go.mod h1:Rc+XODlB3yce7dvFV4q/RmyJGsFcCZRkeZMu/Zdg0mo=
github.com/libp2p/go-libp2p-xor v0.0.0-20210714161855-5c005aca55db h1:EDoDKW8ZAHd6SIDeo+thU51PyQppqLYkBxx0ObvFj/w=
github.com/libp2p/go-libp2p-xor v0.0.0-20210714161855-5c005aca55db/go.mod h1:LSTM5yRnjGZbWNTA/hRwq2gGFrvRIbQJscoIL/u6InY=
github.com/libp2p/go-libp2p-yamux v0.1.2/go.mod h1:xUoV/RmYkg6BW/qGxA9XJyg+HzXFYkeXbnhjmnYzKp8=
@@ -879,8 +890,9 @@ github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod h1:+DWDjtFMzoAwYLVkNZftoucn7PelN
github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLwTGf0L4DFq9g6po=
github.com/libp2p/go-libp2p-yamux v0.5.1/go.mod h1:dowuvDu8CRWmr0iqySMiSxK+W0iL5cMVO9S94Y6gkv4=
github.com/libp2p/go-libp2p-yamux v0.5.3/go.mod h1:Vy3TMonBAfTMXHWopsMc8iX/XGRYrRlpUaMzaeuHV/s=
-github.com/libp2p/go-libp2p-yamux v0.5.4 h1:/UOPtT/6DHPtr3TtKXBHa6g0Le0szYuI33Xc/Xpd7fQ=
github.com/libp2p/go-libp2p-yamux v0.5.4/go.mod h1:tfrXbyaTqqSU654GTvK3ocnSZL3BuHoeTSqhcel1wsE=
+github.com/libp2p/go-libp2p-yamux v0.6.0 h1:TKayW983n92JhCGdCo7ej7eEb+DQ0VYfKNOxlN/1kNQ=
+github.com/libp2p/go-libp2p-yamux v0.6.0/go.mod h1:MRhd6mAYnFRnSISp4M8i0ClV/j+mWHo2mYLifWGw33k=
github.com/libp2p/go-maddr-filter v0.0.1/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
@@ -897,12 +909,14 @@ github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ
github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
github.com/libp2p/go-msgio v0.0.3/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.6 h1:lQ7Uc0kS1wb1EfRxO2Eir/RJoHkHn7t6o+EiwsYIKJA=
github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
+github.com/libp2p/go-msgio v0.1.0 h1:8Q7g/528ivAlfXTFWvWhVjTE8XG8sDTkRUKPYh9+5Q8=
+github.com/libp2p/go-msgio v0.1.0/go.mod h1:eNlv2vy9V2X/kNldcZ+SShFE++o2Yjxwx6RAYsmgJnE=
github.com/libp2p/go-nat v0.0.3/go.mod h1:88nUEt0k0JD45Bk93NIwDqjlhiOwOoV36GchpcVc1yI=
github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
-github.com/libp2p/go-nat v0.0.5 h1:qxnwkco8RLKqVh1NmjQ+tJ8p8khNLFxuElYG/TwqW4Q=
github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
+github.com/libp2p/go-nat v0.1.0 h1:MfVsH6DLcpa04Xr+p8hmVRG4juse0s3J8HyNWYHffXg=
+github.com/libp2p/go-nat v0.1.0/go.mod h1:X7teVkwRHNInVNWQiO/tAiAVRwSr5zoRz4YSTC3uRBM=
github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
github.com/libp2p/go-netroute v0.1.3/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
github.com/libp2p/go-netroute v0.1.5/go.mod h1:V1SR3AaECRkEQCoFFzYwVYWvYIEtlxx89+O3qcpCl4A=
@@ -915,13 +929,15 @@ github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO
github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
-github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU=
github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ=
+github.com/libp2p/go-reuseport v0.1.0 h1:0ooKOx2iwyIkf339WCZ2HN3ujTDbkK0PjC7JVoP1AiM=
+github.com/libp2p/go-reuseport v0.1.0/go.mod h1:bQVn9hmfcTaoo0c9v5pBhOarsU1eNOBZdaAd2hzXRKU=
github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM=
github.com/libp2p/go-reuseport-transport v0.0.4/go.mod h1:trPa7r/7TJK/d+0hdBLOCGvpQQVOU74OXbNCIMkufGw=
-github.com/libp2p/go-reuseport-transport v0.0.5 h1:lJzi+vSYbyJj2faPKLxNGWEIBcaV/uJmyvsUxXy2mLw=
github.com/libp2p/go-reuseport-transport v0.0.5/go.mod h1:TC62hhPc8qs5c/RoXDZG6YmjK+/YWUPC0yYmeUecbjc=
+github.com/libp2p/go-reuseport-transport v0.1.0 h1:C3PHeHjmnz8m6f0uydObj02tMEoi7CyD1zuN7xQT8gc=
+github.com/libp2p/go-reuseport-transport v0.1.0/go.mod h1:vev0C0uMkzriDY59yFHD9v+ujJvYmDQVLowvAjEOmfw=
github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
github.com/libp2p/go-sockaddr v0.1.1 h1:yD80l2ZOdGksnOyHrhxDdTDFrf7Oy+v3FMVArIRgZxQ=
@@ -942,8 +958,8 @@ github.com/libp2p/go-tcp-transport v0.2.1/go.mod h1:zskiJ70MEfWz2MKxvFB/Pv+tPIB1
github.com/libp2p/go-tcp-transport v0.2.3/go.mod h1:9dvr03yqrPyYGIEN6Dy5UvdJZjyPFvl1S/igQ5QD1SU=
github.com/libp2p/go-tcp-transport v0.2.4/go.mod h1:9dvr03yqrPyYGIEN6Dy5UvdJZjyPFvl1S/igQ5QD1SU=
github.com/libp2p/go-tcp-transport v0.2.7/go.mod h1:lue9p1b3VmZj1MhhEGB/etmvF/nBQ0X9CW2DutBT3MM=
-github.com/libp2p/go-tcp-transport v0.2.8 h1:aLjX+Nkz+kIz3uA56WtlGKRSAnKDvnqKmv1qF4EyyE4=
-github.com/libp2p/go-tcp-transport v0.2.8/go.mod h1:64rSfVidkYPLqbzpcN2IwHY4pmgirp67h++hZ/rcndQ=
+github.com/libp2p/go-tcp-transport v0.4.0 h1:VDyg4j6en3OuXf90gfDQh5Sy9KowO9udnd0OU8PP6zg=
+github.com/libp2p/go-tcp-transport v0.4.0/go.mod h1:0y52Rwrn4076xdJYu/51/qJIdxz+EWDAOG2S45sV3VI=
github.com/libp2p/go-testutil v0.0.1/go.mod h1:iAcJc/DKJQanJ5ws2V+u5ywdL2n12X1WbbEG+Jjy69I=
github.com/libp2p/go-testutil v0.1.0/go.mod h1:81b2n5HypcVyrCg/MJx4Wgfp/VHojytjVe/gLzZ2Ehc=
github.com/libp2p/go-ws-transport v0.0.5/go.mod h1:Qbl4BxPfXXhhd/o0wcrgoaItHqA9tnZjoFZnxykuaXU=
@@ -966,16 +982,18 @@ github.com/libp2p/go-yamux v1.4.1 h1:P1Fe9vF4th5JOxxgQvfbOHkrGqIZniTLf+ddhZp8YTI
github.com/libp2p/go-yamux v1.4.1/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
github.com/libp2p/go-yamux/v2 v2.0.0/go.mod h1:NVWira5+sVUIU6tu1JWvaRn1dRnG+cawOJiflsAM+7U=
github.com/libp2p/go-yamux/v2 v2.1.1/go.mod h1:3So6P6TV6r75R9jiBpiIKgU/66lOarCZjqROGxzPpPQ=
-github.com/libp2p/go-yamux/v2 v2.2.0 h1:RwtpYZ2/wVviZ5+3pjC8qdQ4TKnrak0/E01N1UWoAFU=
github.com/libp2p/go-yamux/v2 v2.2.0/go.mod h1:3So6P6TV6r75R9jiBpiIKgU/66lOarCZjqROGxzPpPQ=
-github.com/libp2p/zeroconf/v2 v2.0.0 h1:qYAHAqUVh4hMSfu+iDTZNqH07wLGAvb1+DW4Tx/qUoQ=
-github.com/libp2p/zeroconf/v2 v2.0.0/go.mod h1:J85R/d9joD8u8F9aHM8pBXygtG9W02enEwS+wWeL6yo=
+github.com/libp2p/go-yamux/v2 v2.3.0 h1:luRV68GS1vqqr6EFUjtu1kr51d+IbW0gSowu8emYWAI=
+github.com/libp2p/go-yamux/v2 v2.3.0/go.mod h1:iTU+lOIn/2h0AgKcL49clNTwfEw+WSfDYrXe05EyKIs=
+github.com/libp2p/zeroconf/v2 v2.1.1 h1:XAuSczA96MYkVwH+LqqqCUZb2yH3krobMJ1YE+0hG2s=
+github.com/libp2p/zeroconf/v2 v2.1.1/go.mod h1:fuJqLnUwZTshS3U/bMRJ3+ow/v9oid1n0DmyYyNO1Xs=
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
github.com/lucas-clemente/quic-go v0.21.2/go.mod h1:vF5M1XqhBAHgbjKcJOXY3JZz3GP0T3FQhz/uyOUS38Q=
-github.com/lucas-clemente/quic-go v0.23.0 h1:5vFnKtZ6nHDFsc/F3uuiF4T3y/AXaQdxjUqiVw26GZE=
github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
+github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g=
+github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -1101,8 +1119,10 @@ github.com/multiformats/go-multihash v0.0.9/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa
github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multihash v0.0.15 h1:hWOPdrNqDjwHDx82vsYGSDZNyktOJJ2dzZJzFkOV1jM=
github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg=
+github.com/multiformats/go-multihash v0.0.16/go.mod h1:zhfEIgVnB/rPMfxgFw15ZmGoNaKyNUIE4IWHG/kC+Ag=
+github.com/multiformats/go-multihash v0.1.0 h1:CgAgwqk3//SVEw3T+6DqI4mWMyRuDwZtOWcJT0q9+EA=
+github.com/multiformats/go-multihash v0.1.0/go.mod h1:RJlXsxt6vHGaia+S8We0ErjhojtKzPP2AH4+kYM7k84=
github.com/multiformats/go-multistream v0.0.1/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
github.com/multiformats/go-multistream v0.0.4/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
@@ -1269,9 +1289,8 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8=
github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
-github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
-github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
@@ -1447,8 +1466,9 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e h1:VvfwVmMH40bpMeizC9/K7ipM5Qjucuu16RWfneFPyhQ=
golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1471,9 +1491,8 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
@@ -1482,7 +1501,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1642,8 +1660,9 @@ golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 h1:uCLL3g5wH2xjxVREVuAbP9JM5PPKjRbXKRa6IBjkzmU=
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211025112917-711f33c9992c h1:i4MLwL3EbCgobekQtkVW94UBSPLMadfEGtKq+CAFsEU=
+golang.org/x/sys v0.0.0-20211025112917-711f33c9992c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1715,7 +1734,6 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.1-0.20210225150353-54dc8c5edb56/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU=
golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1867,6 +1885,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+lukechampine.com/blake3 v1.1.6 h1:H3cROdztr7RCfoaTpGZFQsrqvweFLrqS73j7L7cmR5c=
+lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/peering/peering_test.go b/peering/peering_test.go
index cf91e637c75..27c9b717514 100644
--- a/peering/peering_test.go
+++ b/peering/peering_test.go
@@ -16,7 +16,6 @@ import (
func newNode(ctx context.Context, t *testing.T) host.Host {
h, err := libp2p.New(
- ctx,
libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"),
// We'd like to set the connection manager low water to 0, but
// that would disable the connection manager.
diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go
index dcb09e979a7..a5152a831c9 100644
--- a/repo/fsrepo/fsrepo.go
+++ b/repo/fsrepo/fsrepo.go
@@ -1,6 +1,7 @@
package fsrepo
import (
+ "context"
"errors"
"fmt"
"io"
@@ -660,8 +661,8 @@ func (r *FSRepo) Datastore() repo.Datastore {
}
// GetStorageUsage computes the storage space taken by the repo in bytes
-func (r *FSRepo) GetStorageUsage() (uint64, error) {
- return ds.DiskUsage(r.Datastore())
+func (r *FSRepo) GetStorageUsage(ctx context.Context) (uint64, error) {
+ return ds.DiskUsage(ctx, r.Datastore())
}
func (r *FSRepo) SwarmKey() ([]byte, error) {
diff --git a/repo/fsrepo/fsrepo_test.go b/repo/fsrepo/fsrepo_test.go
index 63bd11fd185..cd2d66618a5 100644
--- a/repo/fsrepo/fsrepo_test.go
+++ b/repo/fsrepo/fsrepo_test.go
@@ -2,6 +2,7 @@ package fsrepo
import (
"bytes"
+ "context"
"io/ioutil"
"os"
"path/filepath"
@@ -74,10 +75,10 @@ func TestDatastoreGetNotAllowedAfterClose(t *testing.T) {
k := "key"
data := []byte(k)
- assert.Nil(r.Datastore().Put(datastore.NewKey(k), data), t, "Put should be successful")
+ assert.Nil(r.Datastore().Put(context.Background(), datastore.NewKey(k), data), t, "Put should be successful")
assert.Nil(r.Close(), t)
- _, err = r.Datastore().Get(datastore.NewKey(k))
+ _, err = r.Datastore().Get(context.Background(), datastore.NewKey(k))
assert.Err(err, t, "after closer, Get should be fail")
}
@@ -91,12 +92,12 @@ func TestDatastorePersistsFromRepoToRepo(t *testing.T) {
k := "key"
expected := []byte(k)
- assert.Nil(r1.Datastore().Put(datastore.NewKey(k), expected), t, "using first repo, Put should be successful")
+ assert.Nil(r1.Datastore().Put(context.Background(), datastore.NewKey(k), expected), t, "using first repo, Put should be successful")
assert.Nil(r1.Close(), t)
r2, err := Open(path)
assert.Nil(err, t)
- actual, err := r2.Datastore().Get(datastore.NewKey(k))
+ actual, err := r2.Datastore().Get(context.Background(), datastore.NewKey(k))
assert.Nil(err, t, "using second repo, Get should be successful")
assert.Nil(r2.Close(), t)
assert.True(bytes.Equal(expected, actual), t, "data should match")
diff --git a/repo/mock.go b/repo/mock.go
index 298a49a298d..0576498716a 100644
--- a/repo/mock.go
+++ b/repo/mock.go
@@ -1,6 +1,7 @@
package repo
import (
+ "context"
"errors"
filestore "github.com/ipfs/go-filestore"
@@ -43,7 +44,7 @@ func (m *Mock) GetConfigKey(key string) (interface{}, error) {
func (m *Mock) Datastore() Datastore { return m.D }
-func (m *Mock) GetStorageUsage() (uint64, error) { return 0, nil }
+func (m *Mock) GetStorageUsage(_ context.Context) (uint64, error) { return 0, nil }
func (m *Mock) Close() error { return m.D.Close() }
diff --git a/repo/repo.go b/repo/repo.go
index 614bfa5beda..744bfdf5d57 100644
--- a/repo/repo.go
+++ b/repo/repo.go
@@ -1,6 +1,7 @@
package repo
import (
+ "context"
"errors"
"io"
@@ -39,7 +40,7 @@ type Repo interface {
Datastore() Datastore
// GetStorageUsage returns the number of bytes stored.
- GetStorageUsage() (uint64, error)
+ GetStorageUsage(context.Context) (uint64, error)
// Keystore returns a reference to the key management interface.
Keystore() keystore.Keystore
diff --git a/test/integration/bitswap_wo_routing_test.go b/test/integration/bitswap_wo_routing_test.go
index d854f3a6b28..ec0c2f11a83 100644
--- a/test/integration/bitswap_wo_routing_test.go
+++ b/test/integration/bitswap_wo_routing_test.go
@@ -5,10 +5,10 @@ import (
"context"
"testing"
- "github.com/ipfs/go-block-format"
+ blocks "github.com/ipfs/go-block-format"
"github.com/ipfs/go-cid"
"github.com/ipfs/go-ipfs/core"
- "github.com/ipfs/go-ipfs/core/mock"
+ coremock "github.com/ipfs/go-ipfs/core/mock"
"github.com/ipfs/go-ipfs/core/node/libp2p"
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
)
@@ -61,7 +61,7 @@ func TestBitswapWithoutRouting(t *testing.T) {
block1 := blocks.NewBlock([]byte("block1"))
// put 1 before
- if err := nodes[0].Blockstore.Put(block0); err != nil {
+ if err := nodes[0].Blockstore.Put(ctx, block0); err != nil {
t.Fatal(err)
}
@@ -84,7 +84,7 @@ func TestBitswapWithoutRouting(t *testing.T) {
}
// put 1 after
- if err := nodes[1].Blockstore.Put(block1); err != nil {
+ if err := nodes[1].Blockstore.Put(ctx, block1); err != nil {
t.Fatal(err)
}
diff --git a/test/sharness/t0032-mount-sharded.sh b/test/sharness/t0032-mount-sharded.sh
index db9a12ca2f6..10ba421a225 100755
--- a/test/sharness/t0032-mount-sharded.sh
+++ b/test/sharness/t0032-mount-sharded.sh
@@ -15,8 +15,8 @@ fi
test_init_ipfs
-test_expect_success 'enable sharding' '
- ipfs config --json Experimental.ShardingEnabled true
+test_expect_success 'force sharding' '
+ ipfs config --json Internal.UnixFSShardingSizeThreshold "\"1B\""
'
test_launch_ipfs_daemon
diff --git a/test/sharness/t0182-circuit-relay.sh b/test/sharness/t0182-circuit-relay.sh
index 3dd12ed68fa..2b855844db0 100755
--- a/test/sharness/t0182-circuit-relay.sh
+++ b/test/sharness/t0182-circuit-relay.sh
@@ -15,8 +15,24 @@ test_expect_success 'start up nodes for configuration' '
iptb start -wait -- --routing=none
'
-test_expect_success 'configure EnableRelayHop in relay node' '
- ipfsi 1 config --json Swarm.EnableRelayHop true
+test_expect_success 'peer ids' '
+ PEERID_0=$(iptb attr get 0 id) &&
+ PEERID_1=$(iptb attr get 1 id) &&
+ PEERID_2=$(iptb attr get 2 id)
+'
+
+relayaddrs=$(ipfsi 1 swarm addrs local | jq --raw-input . | jq --slurp .)
+staticrelay=$(ipfsi 1 swarm addrs local | sed -e "s|$|/p2p/$PEERID_1|g" | jq --raw-input . | jq --slurp .)
+
+test_expect_success 'configure the relay node as a static relay for node A' '
+ ipfsi 0 config Internal.Libp2pForceReachability private &&
+ ipfsi 0 config --json Swarm.RelayClient.Enabled true &&
+ ipfsi 0 config --json Swarm.RelayClient.StaticRelays "$staticrelay"
+'
+
+test_expect_success 'configure the relay node' '
+ ipfsi 1 config --json Addresses.Swarm "$relayaddrs" &&
+ ipfsi 1 config Internal.Libp2pForceReachability public
'
test_expect_success 'restart nodes' '
@@ -37,18 +53,12 @@ test_expect_success 'wait until relay is ready to do work' '
sleep 1
'
-test_expect_success 'peer ids' '
- PEERID_0=$(iptb attr get 0 id) &&
- PEERID_1=$(iptb attr get 1 id) &&
- PEERID_2=$(iptb attr get 2 id)
-'
-
test_expect_success 'connect A <-Relay-> B' '
- ipfsi 0 swarm connect /p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_2 > peers_out
+ ipfsi 2 swarm connect /p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_0 > peers_out
'
test_expect_success 'output looks good' '
- echo "connect $PEERID_2 success" > peers_exp &&
+ echo "connect $PEERID_0 success" > peers_exp &&
test_cmp peers_exp peers_out
'
@@ -62,23 +72,6 @@ test_expect_success 'peers for B look good' '
test_should_contain "/p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_0$" peers_out
'
-test_expect_success 'add an object in A' '
- echo "hello relay" | ipfsi 0 add > peers_out
-'
-
-test_expect_success 'object ID' '
- OBJID=$(cut -f3 -d " " peers_out)
-'
-
-test_expect_success 'cat the object in B' '
- ipfsi 2 cat $OBJID > peers_out
-'
-
-test_expect_success 'output looks good' '
- echo "hello relay" > peers_exp &&
- test_cmp peers_exp peers_out
-'
-
test_expect_success 'stop iptb' '
iptb stop
'
diff --git a/test/sharness/t0250-files-api.sh b/test/sharness/t0250-files-api.sh
index 019710d01a7..c91dd123b33 100755
--- a/test/sharness/t0250-files-api.sh
+++ b/test/sharness/t0250-files-api.sh
@@ -845,7 +845,7 @@ tests_for_files_api "with-daemon"
test_kill_ipfs_daemon
test_expect_success "enable sharding in config" '
- ipfs config --json Experimental.ShardingEnabled true
+ ipfs config --json Internal.UnixFSShardingSizeThreshold "\"1B\""
'
test_launch_ipfs_daemon_without_network
@@ -858,4 +858,70 @@ test_sharding "(cidv1 root)" "--cid-version=1"
test_kill_ipfs_daemon
+# Test automatic sharding and unsharding
+
+# We shard based on size with a threshold of 256 KiB (see config file docs)
+# above which directories are sharded.
+#
+# The directory size is estimated as the size of each link. Links are roughly
+# the entry name + the CID byte length (e.g. 34 bytes for a CIDv0). So for
+# entries of length 10 we need 256 KiB / (34 + 10) ~ 6000 entries in the
+# directory to trigger sharding.
+test_expect_success "set up automatic sharding/unsharding data" '
+ mkdir big_dir
+ for i in `seq 5960` # Just above the number of entries that trigger sharding for 256KiB
+ do
+ echo $i > big_dir/`printf "file%06d" $i` # fixed length of 10 chars
+ done
+'
+
+# TODO: This does not need to report an error https://github.com/ipfs/go-ipfs/issues/8088
+test_expect_failure "reset automatic sharding" '
+ ipfs config --json Internal.UnixFSShardingSizeThreshold null
+'
+
+test_launch_ipfs_daemon_without_network
+
+LARGE_SHARDED="QmWfjnRWRvdvYezQWnfbvrvY7JjrpevsE9cato1x76UqGr"
+LARGE_MINUS_5_UNSHARDED="QmbVxi5zDdzytrjdufUejM92JsWj8wGVmukk6tiPce3p1m"
+
+test_add_large_sharded_dir() {
+ exphash="$1"
+ test_expect_success "ipfs add on directory succeeds" '
+ ipfs add -r -Q big_dir > shardbigdir_out &&
+ echo "$exphash" > shardbigdir_exp &&
+ test_cmp shardbigdir_exp shardbigdir_out
+ '
+
+ test_expect_success "can access a path under the dir" '
+ ipfs cat "$exphash/file000030" > file30_out &&
+ test_cmp big_dir/file000030 file30_out
+ '
+}
+
+test_add_large_sharded_dir "$LARGE_SHARDED"
+
+test_expect_success "remove a few entries from big_dir/ to trigger unsharding" '
+ ipfs files cp /ipfs/"$LARGE_SHARDED" /big_dir &&
+ for i in `seq 5`
+ do
+ ipfs files rm /big_dir/`printf "file%06d" $i`
+ done &&
+ ipfs files stat --hash /big_dir > unshard_dir_hash &&
+ echo "$LARGE_MINUS_5_UNSHARDED" > unshard_exp &&
+ test_cmp unshard_exp unshard_dir_hash
+'
+
+test_expect_success "add a few entries to big_dir/ to retrigger sharding" '
+ for i in `seq 5`
+ do
+ ipfs files cp /ipfs/"$LARGE_SHARDED"/`printf "file%06d" $i` /big_dir/`printf "file%06d" $i`
+ done &&
+ ipfs files stat --hash /big_dir > shard_dir_hash &&
+ echo "$LARGE_SHARDED" > shard_exp &&
+ test_cmp shard_exp shard_dir_hash
+'
+
+test_kill_ipfs_daemon
+
test_done
diff --git a/test/sharness/t0260-sharding.sh b/test/sharness/t0260-sharding.sh
index 4270d688d06..85e4a7ca708 100755
--- a/test/sharness/t0260-sharding.sh
+++ b/test/sharness/t0260-sharding.sh
@@ -16,14 +16,14 @@ test_expect_success "set up test data" '
done
'
-test_add_large_dir() {
+test_add_dir() {
exphash="$1"
- test_expect_success "ipfs add on very large directory succeeds" '
+ test_expect_success "ipfs add on directory succeeds" '
ipfs add -r -Q testdata > sharddir_out &&
echo "$exphash" > sharddir_exp &&
test_cmp sharddir_exp sharddir_out
'
- test_expect_success "ipfs get on very large directory succeeds" '
+ test_expect_success "ipfs get on directory succeeds" '
ipfs get -o testdata-out "$exphash" &&
test_cmp testdata testdata-out
'
@@ -32,24 +32,29 @@ test_add_large_dir() {
test_init_ipfs
UNSHARDED="QmavrTrQG4VhoJmantURAYuw3bowq3E2WcvP36NRQDAC1N"
-test_add_large_dir "$UNSHARDED"
+
+test_expect_success "force sharding off" '
+ipfs config --json Internal.UnixFSShardingSizeThreshold "\"1G\""
+'
+
+test_add_dir "$UNSHARDED"
test_launch_ipfs_daemon
-test_add_large_dir "$UNSHARDED"
+test_add_dir "$UNSHARDED"
test_kill_ipfs_daemon
-test_expect_success "enable sharding" '
- ipfs config --json Experimental.ShardingEnabled true
+test_expect_success "force sharding on" '
+ ipfs config --json Internal.UnixFSShardingSizeThreshold "\"1B\""
'
SHARDED="QmSCJD1KYLhVVHqBK3YyXuoEqHt7vggyJhzoFYbT8v1XYL"
-test_add_large_dir "$SHARDED"
+test_add_dir "$SHARDED"
test_launch_ipfs_daemon
-test_add_large_dir "$SHARDED"
+test_add_dir "$SHARDED"
test_kill_ipfs_daemon
@@ -93,9 +98,9 @@ test_expect_success "'ipfs resolve' can resolve sharded dirs" '
test_kill_ipfs_daemon
-test_add_large_dir_v1() {
+test_add_dir_v1() {
exphash="$1"
- test_expect_success "ipfs add (CIDv1) on very large directory succeeds" '
+ test_expect_success "ipfs add (CIDv1) on directory succeeds" '
ipfs add -r -Q --cid-version=1 testdata > sharddir_out &&
echo "$exphash" > sharddir_exp &&
test_cmp sharddir_exp sharddir_out
@@ -109,11 +114,11 @@ test_add_large_dir_v1() {
# this hash implies the directory is CIDv1 and leaf entries are CIDv1 and raw
SHARDEDV1="bafybeibiemewfzzdyhq2l74wrd6qj2oz42usjlktgnlqv4yfawgouaqn4u"
-test_add_large_dir_v1 "$SHARDEDV1"
+test_add_dir_v1 "$SHARDEDV1"
test_launch_ipfs_daemon
-test_add_large_dir_v1 "$SHARDEDV1"
+test_add_dir_v1 "$SHARDEDV1"
test_kill_ipfs_daemon
@@ -129,7 +134,7 @@ test_list_incomplete_dir() {
test_expect_success "can list part of the directory" '
ipfs ls "$largeSHA3dir" 2> ls_err_out
- echo "Error: merkledag: not found" > exp_err_out &&
+ echo "Error: failed to fetch all nodes" > exp_err_out &&
cat ls_err_out &&
test_cmp exp_err_out ls_err_out
'
diff --git a/test/sharness/t0290-cid.sh b/test/sharness/t0290-cid.sh
index f1fab8df650..680e5308d91 100755
--- a/test/sharness/t0290-cid.sh
+++ b/test/sharness/t0290-cid.sh
@@ -107,6 +107,7 @@ cat <<EOF > codecs_expect
112 protobuf
113 cbor
120 git-raw
+ 133 dag-jose
144 eth-block
145 eth-block-list
146 eth-tx-trie
diff --git a/testplans/bitswap/go.sum b/testplans/bitswap/go.sum
index fb588faf808..4ef964c93af 100644
--- a/testplans/bitswap/go.sum
+++ b/testplans/bitswap/go.sum
@@ -1,25 +1,8 @@
-bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-contrib.go.opencensus.io/exporter/prometheus v0.3.0/go.mod h1:rpCPVQKhiyH8oomWgm34ZmgIdZa8OVYO5WAIygPbBBE=
dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
@@ -29,13 +12,11 @@ github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOv
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/Stebalien/go-bitfield v0.0.1/go.mod h1:GNjFpasyUVkHMsfEOk8EFLJ9syQ6SI+XWrX9Wf2XH0s=
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
@@ -44,7 +25,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5/go.mod h1:Y2QMoi1vgtOIfc+6DhrMOGkLoGzqSV2rKp4Sm+opsyA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -58,18 +38,14 @@ github.com/avast/retry-go v2.6.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevB
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
-github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
-github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
-github.com/btcsuite/btcd v0.0.0-20190605094302-a0d1e3e36d50/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
github.com/btcsuite/btcd v0.21.0-beta h1:At9hIZdJW0s9E/fAz28nrz6AmcNlSVucCH796ZteX1M=
@@ -95,10 +71,6 @@ github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuPxX30=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -107,17 +79,13 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.2.1-0.20180108230905-e214231b295a/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
-github.com/coreos/go-systemd/v22 v22.3.1/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3/go.mod h1:p1d6YEZWvFzEh4KLyvBcVSnrfNDDvK2zfK/4x2v/4pE=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/cskr/pubsub v1.0.2 h1:vlOzMhl6PFn60gRlTQQsIfVwaPB/B/8MziK8FhEPt/0=
github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TIRis=
@@ -145,15 +113,12 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302/go.mod h1:qBlWZqWeVx9BjvqBsnC/8RUlAYpIFmPvgROcw0n1scE=
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5/go.mod h1:JpoxHjuQauoxiFMl1ie8Xc/7TfLuMZ5eOCONd1sUBHg=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ=
github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=
@@ -166,14 +131,10 @@ github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gabriel-vasile/mimetype v1.1.2/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I=
github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
@@ -186,8 +147,6 @@ github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -200,13 +159,11 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
@@ -243,13 +200,10 @@ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+u
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
-github.com/google/gopacket v1.1.18/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -258,17 +212,13 @@ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f h1:KMlcu9X58lhTA/KrfX8Bi1LQSO4pzoVjTiL3h4Jk+Zk=
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -279,8 +229,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpg
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
-github.com/hannahhoward/cbor-gen-for v0.0.0-20200817222906-ea96cece81f1/go.mod h1:jvfsLIxk0fY/2BKSQ1xf2406AKA5dwMmKKv0ADcOfN8=
-github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e/go.mod h1:I8h3MITA53gN9OnWGCgaMa0JWVRdXthWw4M3CPM54OY=
github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
@@ -313,31 +261,17 @@ github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmK
github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo=
github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 h1:k3/6a1Shi7GGCp9QpyYuXsMM6ncTOjCzOE9Fd6CDA+Q=
github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/ipfs/bbloom v0.0.1/go.mod h1:oqo8CVWsJFMOZqTglBG4wydCE4IQA/G2/SEofB0rjUI=
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/go-bitswap v0.0.9/go.mod h1:kAPf5qgn2W2DrgAcscZ3HrM9qh4pH+X8Fkk3UPrwvis=
-github.com/ipfs/go-bitswap v0.1.0/go.mod h1:FFJEf18E9izuCqUtHxbWEvq+reg7o4CW5wSAE1wsxj0=
-github.com/ipfs/go-bitswap v0.1.2/go.mod h1:qxSWS4NXGs7jQ6zQvoPY3+NmOfHHG47mhkiLzBpJQIs=
-github.com/ipfs/go-bitswap v0.1.3/go.mod h1:YEQlFy0kkxops5Vy+OxWdRSEZIoS7I7KDIwoa5Chkps=
-github.com/ipfs/go-bitswap v0.1.8/go.mod h1:TOWoxllhccevbWFUR2N7B1MTSVVge1s6XSMiCSA4MzM=
github.com/ipfs/go-bitswap v0.3.4 h1:AhJhRrG8xkxh6x87b4wWs+4U4y3DVB3doI8yFNqgQME=
github.com/ipfs/go-bitswap v0.3.4/go.mod h1:4T7fvNv/LmOys+21tnLzGKncMeeXUYUd1nUiJ2teMvI=
-github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
github.com/ipfs/go-block-format v0.0.3 h1:r8t66QstRp/pd/or4dpnbVfXT5Gt7lOqRvC+/dDTpMc=
github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
-github.com/ipfs/go-blockservice v0.0.7/go.mod h1:EOfb9k/Y878ZTRY/CH0x5+ATtaipfbRhbvNSdgc/7So=
-github.com/ipfs/go-blockservice v0.1.0/go.mod h1:hzmMScl1kXHg3M2BjTymbVPjv627N7sYcvYaKbop39M=
-github.com/ipfs/go-blockservice v0.1.1/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I=
-github.com/ipfs/go-blockservice v0.1.2/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I=
-github.com/ipfs/go-blockservice v0.1.3/go.mod h1:OTZhFpkgY48kNzbgyvcexW9cHrpjBYIjSR0KoDOFOLU=
-github.com/ipfs/go-blockservice v0.1.4/go.mod h1:OTZhFpkgY48kNzbgyvcexW9cHrpjBYIjSR0KoDOFOLU=
github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
@@ -346,13 +280,9 @@ github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67Fexh
github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
-github.com/ipfs/go-cidutil v0.0.2/go.mod h1:ewllrvrxG6AMYStla3GD7Cqn+XYSLqjK0vc+086tB6s=
github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
-github.com/ipfs/go-datastore v0.0.5/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
github.com/ipfs/go-datastore v0.1.0/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
github.com/ipfs/go-datastore v0.1.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
-github.com/ipfs/go-datastore v0.3.0/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
-github.com/ipfs/go-datastore v0.3.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
github.com/ipfs/go-datastore v0.4.0/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
@@ -365,30 +295,16 @@ github.com/ipfs/go-ds-badger v0.0.5/go.mod h1:g5AuuCGmr7efyzQhLL8MzwqcauPojGPUaH
github.com/ipfs/go-ds-badger v0.0.7/go.mod h1:qt0/fWzZDoPW6jpQeqUjR5kBfhDNB65jd9YlmAvpQBk=
github.com/ipfs/go-ds-badger v0.2.1/go.mod h1:Tx7l3aTph3FMFrRS838dcSJh+jjA7cX9DrGVwx/NOwE=
github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-badger v0.2.6/go.mod h1:02rnztVKA4aZwDuaRPTf8mpqcKmXP7mLl6JPxd14JHA=
github.com/ipfs/go-ds-badger v0.2.7/go.mod h1:02rnztVKA4aZwDuaRPTf8mpqcKmXP7mLl6JPxd14JHA=
-github.com/ipfs/go-ds-flatfs v0.4.5/go.mod h1:e4TesLyZoA8k1gV/yCuBTnt2PJtypn4XUlB5n8KQMZY=
github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc=
github.com/ipfs/go-ds-leveldb v0.1.0/go.mod h1:hqAW8y4bwX5LWcCtku2rFNX3vjDZCy5LZCg+cSZvYb8=
github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
-github.com/ipfs/go-ds-measure v0.1.0/go.mod h1:1nDiFrhLlwArTME1Ees2XaBOl49OoCgd2A3f8EchMSY=
-github.com/ipfs/go-filestore v0.0.3/go.mod h1:dvXRykFzyyXN2CdNlRGzDAkXMDPyI+D7JE066SiKLSE=
-github.com/ipfs/go-fs-lock v0.0.6/go.mod h1:OTR+Rj9sHiRubJh3dRhD15Juhd/+w6VPOY28L7zESmM=
-github.com/ipfs/go-graphsync v0.8.0/go.mod h1:CLxN859dUTcXCav1DvNvmAUWPZfmNLjlGLJYy+c3dlM=
-github.com/ipfs/go-ipfs v0.9.1 h1:fqilyDPFCEMr3AUFWG/UOgwleTrzt4Ou2UuY7+/Dvcg=
-github.com/ipfs/go-ipfs v0.9.1/go.mod h1:JhyFP5C+cCyrrPPx2XdNIEVc7GsG6xjIIyWektE0rVs=
-github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08=
-github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod h1:5aD0AvHPi7mZc6Ci1WCAhiBQu2IsfTduLl+422H6Rqw=
github.com/ipfs/go-ipfs-blockstore v0.1.4/go.mod h1:Jxm3XMVjh6R17WvxFEiyKBLUGr86HgIYJW/D/MwqeYQ=
github.com/ipfs/go-ipfs-blockstore v0.1.6 h1:+RNM/gkTF6lzLPtt/xqjEUXJuG0lFwAiv+MV8MoAhvA=
github.com/ipfs/go-ipfs-blockstore v0.1.6/go.mod h1:Jxm3XMVjh6R17WvxFEiyKBLUGr86HgIYJW/D/MwqeYQ=
github.com/ipfs/go-ipfs-blocksutil v0.0.1 h1:Eh/H4pc1hsvhzsQoMEP3Bke/aW5P5rVM1IWFJMcGIPQ=
github.com/ipfs/go-ipfs-blocksutil v0.0.1/go.mod h1:Yq4M86uIOmxmGPUHv/uI7uKqZNtLb449gwKqXjIsnRk=
-github.com/ipfs/go-ipfs-chunker v0.0.1/go.mod h1:tWewYK0we3+rMbOh7pPFGDyypCtvGcBFymgY4rSDLAw=
-github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod h1:jhgdF8vxRHycr00k13FM8Y0E+6BoalYeobXmUyTreP8=
-github.com/ipfs/go-ipfs-cmds v0.6.0/go.mod h1:ZgYiWVnCk43ChwoH8hAmI1IRbuVtq3GSTHwtRB/Kqhk=
-github.com/ipfs/go-ipfs-config v0.14.0/go.mod h1:Ei/FLgHGTdPyqCPK0oPCwGTe8VSnsjJjx7HZqUb6Ry0=
github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
@@ -397,45 +313,24 @@ github.com/ipfs/go-ipfs-ds-help v0.1.1 h1:IW/bXGeaAZV2VH0Kuok+Ohva/zHkHmeLFBxC1k
github.com/ipfs/go-ipfs-ds-help v0.1.1/go.mod h1:SbBafGJuGsPI/QL3j9Fc5YPLeAu+SzOkI0gFwAg+mOs=
github.com/ipfs/go-ipfs-exchange-interface v0.0.1 h1:LJXIo9W7CAmugqI+uofioIpRb6rY30GUu7G6LUfpMvM=
github.com/ipfs/go-ipfs-exchange-interface v0.0.1/go.mod h1:c8MwfHjtQjPoDyiy9cFquVtVHkO9b9Ob3FG91qJnWCM=
-github.com/ipfs/go-ipfs-exchange-offline v0.0.1/go.mod h1:WhHSFCVYX36H/anEKQboAzpUws3x7UeEGkzQc3iNkM0=
-github.com/ipfs/go-ipfs-files v0.0.3/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4=
-github.com/ipfs/go-ipfs-files v0.0.8/go.mod h1:wiN/jSG8FKyk7N0WyctKSvq3ljIa2NNTiZB55kpTdOs=
-github.com/ipfs/go-ipfs-keystore v0.0.2/go.mod h1:H49tRmibOEs7gLMgbOsjC4dqh1u5e0R/SWuc2ScfgSo=
-github.com/ipfs/go-ipfs-pinner v0.1.1/go.mod h1:EzyyaWCWeZJ/he9cDBH6QrEkSuRqTRWMmCoyNkylTTg=
-github.com/ipfs/go-ipfs-posinfo v0.0.1/go.mod h1:SwyeVP+jCwiDu0C313l/8jg6ZxM0qqtlt2a0vILTc1A=
-github.com/ipfs/go-ipfs-pq v0.0.1/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
github.com/ipfs/go-ipfs-pq v0.0.2 h1:e1vOOW6MuOwG2lqxcLA+wEn93i/9laCY8sXAw76jFOY=
github.com/ipfs/go-ipfs-pq v0.0.2/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
-github.com/ipfs/go-ipfs-provider v0.5.1/go.mod h1:fem6HKSru7n35Ljap6kowWdJrUzvcWJW01uhAkqNnzo=
-github.com/ipfs/go-ipfs-regression v0.0.0-20210928154621-dd4770807754 h1:e4uAx9BSz/SrWSfwdgbit3cEVFHNwnEqAsxuJVYA0Yw=
-github.com/ipfs/go-ipfs-regression v0.0.0-20210928154621-dd4770807754/go.mod h1:I9yKzBjbirC5D0ND0DBkiQ5PPSQ2R2YjhcqHPj8L28A=
github.com/ipfs/go-ipfs-regression v0.0.1 h1:LX3lrYYgiCE9QmL/qlc4Mh0cewdOHRl5pArbeQRllsU=
github.com/ipfs/go-ipfs-regression v0.0.1/go.mod h1:I9yKzBjbirC5D0ND0DBkiQ5PPSQ2R2YjhcqHPj8L28A=
-github.com/ipfs/go-ipfs-routing v0.0.1/go.mod h1:k76lf20iKFxQTjcJokbPM9iBXVXVZhcOwc360N4nuKs=
github.com/ipfs/go-ipfs-routing v0.1.0 h1:gAJTT1cEeeLj6/DlLX6t+NxD9fQe2ymTO6qWRDI/HQQ=
github.com/ipfs/go-ipfs-routing v0.1.0/go.mod h1:hYoUkJLyAUKhF58tysKpids8RNDPO42BVMgK5dNsoqY=
github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
-github.com/ipfs/go-ipld-cbor v0.0.2/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
-github.com/ipfs/go-ipld-cbor v0.0.3/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
-github.com/ipfs/go-ipld-cbor v0.0.4/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9Oh8B2Ftq4=
-github.com/ipfs/go-ipld-cbor v0.0.5/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9Oh8B2Ftq4=
-github.com/ipfs/go-ipld-format v0.0.1/go.mod h1:kyJtbkDALmFHv3QR6et67i35QzO3S0dCDnkOJhcZkms=
-github.com/ipfs/go-ipld-format v0.0.2/go.mod h1:4B6+FM2u9OJ9zCV+kSbgFAZlOrv1Hqbf0INGQgiKf9k=
-github.com/ipfs/go-ipld-format v0.2.0/go.mod h1:3l3C1uKoadTPbeNfrDi+xMInYKlx2Cvg1BuydPSdzQs=
-github.com/ipfs/go-ipld-git v0.0.4/go.mod h1:RuvMXa9qtJpDbqngyICCU/d+cmLFXxLsbIclmD0Lcr0=
github.com/ipfs/go-ipns v0.0.2/go.mod h1:WChil4e0/m9cIINWLxZe1Jtf77oz5L05rO2ei/uKJ5U=
github.com/ipfs/go-ipns v0.1.0 h1:jk03sneWwh+/bSHrFjRfE38xHDnTzqCsx2wsJ8ipukM=
github.com/ipfs/go-ipns v0.1.0/go.mod h1:3IbsuPkR6eAGcnx+E7j6HpOSbSQJPZ6zlRj+NK3jPxQ=
github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
-github.com/ipfs/go-log v1.0.1/go.mod h1:HuWlQttfN6FWNHRhlY5yMk/lW7evQC0HHGOxEwMRR8I=
github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs=
github.com/ipfs/go-log v1.0.5 h1:2dOuUCB1Z7uoczMWgAyDck5JLb72zHzrMnGnCNNbvY8=
github.com/ipfs/go-log v1.0.5/go.mod h1:j0b8ZoR+7+R99LD9jZ6+AJsrzkPbSXbZfGakb5JPtIo=
-github.com/ipfs/go-log/v2 v2.0.1/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
github.com/ipfs/go-log/v2 v2.0.2/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
@@ -443,33 +338,10 @@ github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHn
github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g=
github.com/ipfs/go-log/v2 v2.3.0 h1:31Re/cPqFHpsRHgyVwjWADPoF0otB1WrjTy8ZFYwEZU=
github.com/ipfs/go-log/v2 v2.3.0/go.mod h1:QqGoj30OTpnKaG/LKTGTxoP2mmQtjVMEnK72gynbe/g=
-github.com/ipfs/go-merkledag v0.0.6/go.mod h1:QYPdnlvkOg7GnQRofu9XZimC5ZW5Wi3bKys/4GQQfto=
-github.com/ipfs/go-merkledag v0.1.0/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
-github.com/ipfs/go-merkledag v0.2.3/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
-github.com/ipfs/go-merkledag v0.3.0/go.mod h1:4pymaZLhSLNVuiCITYrpViD6vmfZ/Ws4n/L9tfNv3S4=
-github.com/ipfs/go-merkledag v0.3.1/go.mod h1:fvkZNNZixVW6cKSZ/JfLlON5OlgTXNdRLz0p6QG/I2M=
-github.com/ipfs/go-merkledag v0.3.2/go.mod h1:fvkZNNZixVW6cKSZ/JfLlON5OlgTXNdRLz0p6QG/I2M=
github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fGD6n0jO4kdg=
github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY=
-github.com/ipfs/go-metrics-prometheus v0.0.2/go.mod h1:ELLU99AQQNi+zX6GCGm2lAgnzdSH3u5UVlCdqSXnEks=
-github.com/ipfs/go-mfs v0.1.2/go.mod h1:T1QBiZPEpkPLzDqEJLNnbK55BVKVlNi2a+gVm4diFo0=
-github.com/ipfs/go-namesys v0.3.0/go.mod h1:/BL4xk8LP5Lq82AmaRKyxZv/eYRlumNiU9SZUe1Hlps=
-github.com/ipfs/go-path v0.0.7/go.mod h1:6KTKmeRnBXgqrTvzFrPV3CamxcgvXX/4z79tfAd2Sno=
-github.com/ipfs/go-path v0.0.9/go.mod h1:VpDkSBKQ9EFQOUgi54Tq/O/tGi8n1RfYNks13M3DEs8=
-github.com/ipfs/go-peertaskqueue v0.0.4/go.mod h1:03H8fhyeMfKNFWqzYEVyMbcPUeYrqP1MX6Kd+aN+rMQ=
-github.com/ipfs/go-peertaskqueue v0.1.0/go.mod h1:Jmk3IyCcfl1W3jTW3YpghSwSEC6IJ3Vzz/jUmWw8Z0U=
-github.com/ipfs/go-peertaskqueue v0.1.1/go.mod h1:Jmk3IyCcfl1W3jTW3YpghSwSEC6IJ3Vzz/jUmWw8Z0U=
github.com/ipfs/go-peertaskqueue v0.2.0 h1:2cSr7exUGKYyDeUyQ7P/nHPs9P7Ht/B+ROrpN1EJOjc=
github.com/ipfs/go-peertaskqueue v0.2.0/go.mod h1:5/eNrBEbtSKWCG+kQK8K8fGNixoYUnr+P7jivavs9lY=
-github.com/ipfs/go-pinning-service-http-client v0.1.0/go.mod h1:tcCKmlkWWH9JUUkKs8CrOZBanacNc1dmKLfjlyXAMu4=
-github.com/ipfs/go-unixfs v0.1.0/go.mod h1:lysk5ELhOso8+Fed9U1QTGey2ocsfaZ18h0NCO2Fj9s=
-github.com/ipfs/go-unixfs v0.2.4/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=
-github.com/ipfs/go-unixfs v0.2.5/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=
-github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
-github.com/ipfs/interface-go-ipfs-core v0.4.0/go.mod h1:UJBcU6iNennuI05amq3FQ7g0JHUkibHFAfhfUIy927o=
-github.com/ipfs/tar-utils v0.0.1/go.mod h1:ACflm9wXvV9w0eMJt6yYXxS2zuIV+yXGNwbuq1bhLeE=
-github.com/ipld/go-car v0.3.1/go.mod h1:dPkEWeAK8KaVvH5TahaCs6Mncpd4lDMpkbs0/SPzuVs=
-github.com/ipld/go-codec-dagpb v1.2.0/go.mod h1:6nBN7X7h8EOsEejZGqC7tej5drsdBAXbMHyBT+Fne5s=
github.com/ipld/go-ipld-prime v0.9.0/go.mod h1:KvBLMr4PX1gWptgkzRjVZCrLmSGcZCb/jioOQwCqZN8=
github.com/ipld/go-ipld-prime v0.9.1-0.20210324083106-dc342a9917db h1:kFwGn8rXa/Z31ev1OFNQsYeNKNCdifnTPl/NvPy5L38=
github.com/ipld/go-ipld-prime v0.9.1-0.20210324083106-dc342a9917db/go.mod h1:KvBLMr4PX1gWptgkzRjVZCrLmSGcZCb/jioOQwCqZN8=
@@ -480,7 +352,6 @@ github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+
github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs=
github.com/jbenet/go-cienv v0.1.0 h1:Vc/s0QbQtoxX8MwwSLWWh+xNNZvM3Lw7NsTcHrvvhMc=
github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c/go.mod h1:sdx1xVM9UuLw1tXnhJWN3piypTUO3vCIHYmG15KE/dU=
github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod h1:8GXXJV31xl8whumTzdZsTt3RnUIiPqzkyf7mxToRCMs=
github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
@@ -498,11 +369,8 @@ github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlT
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -519,7 +387,6 @@ github.com/klauspost/cpuid/v2 v2.0.4 h1:g0I61F2K2DjRHz1cnxlkNSBIaePVoJIjjnHui8QH
github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/koron/go-ssdp v0.0.0-20180514024734-4a0ed625a78b/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk=
github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d h1:68u9r4wEvL3gYg2jvAOgROwZ3H+Y3hIDk4tbbmIjcYQ=
github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -539,13 +406,10 @@ github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOS
github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c=
github.com/libp2p/go-cidranger v1.1.0/go.mod h1:KWZTfSr+r9qEo9OkI9/SIEeAtw+NNoU0dXIXt15Okic=
-github.com/libp2p/go-conn-security v0.0.1/go.mod h1:bGmu51N0KU9IEjX7kl2PQjgZa40JQWnayTvNMgD/vyk=
-github.com/libp2p/go-conn-security-multistream v0.0.2/go.mod h1:nc9vud7inQ+d6SO0I/6dSWrdMnHnzZNHeyUQqrAJulE=
github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU=
github.com/libp2p/go-conn-security-multistream v0.2.1 h1:ft6/POSK7F+vl/2qzegnHDaXFU0iWB4yVTYrioC6Zy0=
github.com/libp2p/go-conn-security-multistream v0.2.1/go.mod h1:cR1d8gA0Hr59Fj6NhaTpFhJZrjSYuNmhpT2r25zYR70=
-github.com/libp2p/go-doh-resolver v0.3.1/go.mod h1:y5go1ZppAq9N2eppbX0xON01CyPBeUg2yS6BTssssog=
github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
github.com/libp2p/go-eventbus v0.2.1 h1:VanAdErQnpTioN2TowqNcOijf6YwhuODe4pPKSDpxGc=
github.com/libp2p/go-eventbus v0.2.1/go.mod h1:jc2S4SoEVPP48H9Wpzm5aiGwUCBMfGhVhhBjyhhCJs8=
@@ -553,22 +417,15 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
github.com/libp2p/go-flow-metrics v0.0.2/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
github.com/libp2p/go-flow-metrics v0.0.3 h1:8tAs/hSdNvUiLgtlSy3mxwxWP4I9y/jlkPFT7epKdeM=
github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-libp2p v0.0.30/go.mod h1:XWT8FGHlhptAv1+3V/+J5mEpzyui/5bvFsNuWYs611A=
-github.com/libp2p/go-libp2p v0.1.0/go.mod h1:6D/2OBauqLUoqcADOJpn9WbKqvaM07tDw68qHM0BxUM=
-github.com/libp2p/go-libp2p v0.1.1/go.mod h1:I00BRo1UuUSdpuc8Q2mN7yDF/oTUTRAX6JWpTiK9Rp8=
github.com/libp2p/go-libp2p v0.6.1/go.mod h1:CTFnWXogryAHjXAKEbOf1OWY+VeAP3lDMZkfEI5sT54=
github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xSU1ivxn0k=
github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw=
github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o=
-github.com/libp2p/go-libp2p v0.12.0/go.mod h1:FpHZrfC1q7nA8jitvdjKBDF31hguaC676g/nT9PgQM0=
github.com/libp2p/go-libp2p v0.13.0/go.mod h1:pM0beYdACRfHO1WcJlp65WXyG2A6NqYM+t2DTVAJxMo=
-github.com/libp2p/go-libp2p v0.14.3/go.mod h1:d12V4PdKbpL0T1/gsUNN8DfgMuRPDX8bS2QxCZlwRH0=
github.com/libp2p/go-libp2p v0.14.4 h1:QCJE+jGyqxWdrSPuS4jByXCzosgaIg4SJTLCRplJ53w=
github.com/libp2p/go-libp2p v0.14.4/go.mod h1:EIRU0Of4J5S8rkockZM7eJp2S0UrCyi55m2kJVru3rM=
github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052 h1:BM7aaOF7RpmNn9+9g6uTjGJ0cTzWr5j9i9IKeun2M8U=
github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
-github.com/libp2p/go-libp2p-autonat v0.0.6/go.mod h1:uZneLdOkZHro35xIhpbtTzLlgYturpu4J5+0cZK3MqE=
-github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod h1:1tLf2yXxiE/oKGtDwPYWTSYG3PtvYlJmg7NeVtPRqH8=
github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE=
github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQdNbfzE1C718tcViI=
github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI=
@@ -576,21 +433,16 @@ github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/
github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
github.com/libp2p/go-libp2p-autonat v0.4.2 h1:YMp7StMi2dof+baaxkbxaizXjY1RPvU71CXfxExzcUU=
github.com/libp2p/go-libp2p-autonat v0.4.2/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
-github.com/libp2p/go-libp2p-blankhost v0.0.1/go.mod h1:Ibpbw/7cPPYwFb7PACIWdvxxv0t0XCCI10t7czjAjTc=
github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU=
github.com/libp2p/go-libp2p-blankhost v0.2.0 h1:3EsGAi0CBGcZ33GwRuXEYJLLPoVWyXJ1bcJzAJjINkk=
github.com/libp2p/go-libp2p-blankhost v0.2.0/go.mod h1:eduNKXGTioTuQAUcZ5epXi9vMl+t4d8ugUBRQ4SqaNQ=
-github.com/libp2p/go-libp2p-circuit v0.0.9/go.mod h1:uU+IBvEQzCu953/ps7bYzC/D/R0Ho2A9LfKVVCatlqU=
-github.com/libp2p/go-libp2p-circuit v0.1.0/go.mod h1:Ahq4cY3V9VJcHcn1SBXjr78AbFkZeIRmfunbA7pmFh8=
github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod h1:CY67BrEjKNDhdTk8UgBX1Y/H5c3xkAcs3gnksxY7osU=
github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod h1:BXPwYDN5A8z4OEY9sOfr2DUQMLQvKt/6oku45YUmjIo=
github.com/libp2p/go-libp2p-circuit v0.4.0 h1:eqQ3sEYkGTtybWgr6JLqJY6QLtPWRErvFjFDfAOO1wc=
github.com/libp2p/go-libp2p-circuit v0.4.0/go.mod h1:t/ktoFIUzM6uLQ+o1G6NuBl2ANhBKN9Bc8jRIk31MoA=
-github.com/libp2p/go-libp2p-connmgr v0.2.4/go.mod h1:YV0b/RIm8NGPnnNWM7hG9Q38OeQiQfKhHCCs1++ufn0=
github.com/libp2p/go-libp2p-core v0.0.1/go.mod h1:g/VxnTZ/1ygHxH3dKok7Vno1VfpvGcGip57wjTU4fco=
github.com/libp2p/go-libp2p-core v0.0.2/go.mod h1:9dAcntw/n46XycV4RnlBq3BpgrmyUi9LuoTNdPrbUco=
-github.com/libp2p/go-libp2p-core v0.0.3/go.mod h1:j+YQMNz9WNSkNezXOsahp9kwZBKBvxLpKD316QWSJXE=
github.com/libp2p/go-libp2p-core v0.0.4/go.mod h1:jyuCQP356gzfCFtRKyvAbNkyeuxb7OlyhWZ3nls5d2I=
github.com/libp2p/go-libp2p-core v0.2.0/go.mod h1:X0eyB0Gy93v0DZtSYbEM7RnMChm9Uv3j7yRXjO77xSI=
github.com/libp2p/go-libp2p-core v0.2.2/go.mod h1:8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0=
@@ -615,60 +467,35 @@ github.com/libp2p/go-libp2p-core v0.8.2/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJB
github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
github.com/libp2p/go-libp2p-core v0.8.6 h1:3S8g006qG6Tjpj1JdRK2S+TWc2DJQKX/RG9fdLeiLSU=
github.com/libp2p/go-libp2p-core v0.8.6/go.mod h1:dgHr0l0hIKfWpGpqAMbpo19pen9wJfdCGv51mTmdpmM=
-github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod h1:yJkNyDmO341d5wwXxDUGO0LykUVT72ImHNUqh5D/dBE=
-github.com/libp2p/go-libp2p-crypto v0.0.2/go.mod h1:eETI5OUfBnvARGOHrJz2eWNyTUxEGZnBxMcbUjfIj4I=
github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
-github.com/libp2p/go-libp2p-discovery v0.0.5/go.mod h1:YtF20GUxjgoKZ4zmXj8j3Nb2TUSBHFlOCetzYdbZL5I=
-github.com/libp2p/go-libp2p-discovery v0.1.0/go.mod h1:4F/x+aldVHjHDHuX85x1zWoFTGElt8HnoDzwkFZm29g=
github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg=
github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw=
github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod h1:+srtPIU9gDaBNu//UHvcdliKBIcr4SfDcm0/PfPJLug=
github.com/libp2p/go-libp2p-discovery v0.5.1 h1:CJylx+h2+4+s68GvrM4pGNyfNhOYviWBPtVv5PA7sfo=
github.com/libp2p/go-libp2p-discovery v0.5.1/go.mod h1:+srtPIU9gDaBNu//UHvcdliKBIcr4SfDcm0/PfPJLug=
-github.com/libp2p/go-libp2p-gostream v0.3.0/go.mod h1:pLBQu8db7vBMNINGsAwLL/ZCE8wng5V1FThoaE5rNjc=
-github.com/libp2p/go-libp2p-host v0.0.1/go.mod h1:qWd+H1yuU0m5CwzAkvbSjqKairayEHdR5MMl7Cwa7Go=
-github.com/libp2p/go-libp2p-host v0.0.3/go.mod h1:Y/qPyA6C8j2coYyos1dfRm0I8+nvd4TGrDGt4tA7JR8=
-github.com/libp2p/go-libp2p-http v0.2.0/go.mod h1:GlNKFqDZHe25LVy2CvnZKx75/jLtMaD3VxZV6N39X7E=
-github.com/libp2p/go-libp2p-interface-connmgr v0.0.1/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
-github.com/libp2p/go-libp2p-interface-connmgr v0.0.4/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
-github.com/libp2p/go-libp2p-interface-connmgr v0.0.5/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
-github.com/libp2p/go-libp2p-interface-pnet v0.0.1/go.mod h1:el9jHpQAXK5dnTpKA4yfCNBZXvrzdOU75zz+C6ryp3k=
-github.com/libp2p/go-libp2p-kad-dht v0.11.1/go.mod h1:5ojtR2acDPqh/jXf5orWy8YGb8bHQDS+qeDcoscL/PI=
github.com/libp2p/go-libp2p-kad-dht v0.12.2 h1:INBYK7pEPzka5TrAWB2II+PYLeEaRlu6RWIoukfEBFQ=
github.com/libp2p/go-libp2p-kad-dht v0.12.2/go.mod h1:mznpWRg0Nbkr9PB2Dm9XWN24V2BChE3FT1dHmwaDVws=
github.com/libp2p/go-libp2p-kbucket v0.3.1/go.mod h1:oyjT5O7tS9CQurok++ERgc46YLwEpuGoFq9ubvoUOio=
github.com/libp2p/go-libp2p-kbucket v0.4.7 h1:spZAcgxifvFZHBD8tErvppbnNiKA5uokDu3CV7axu70=
github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod h1:XyVo99AfQH0foSf176k4jY1xUJ2+jUJIZCSDm7r2YKk=
-github.com/libp2p/go-libp2p-loggables v0.0.1/go.mod h1:lDipDlBNYbpyqyPX/KcoO+eq0sJYEVR2JgOexcivchg=
github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
-github.com/libp2p/go-libp2p-metrics v0.0.1/go.mod h1:jQJ95SXXA/K1VZi13h52WZMa9ja78zjyy5rspMsC/08=
-github.com/libp2p/go-libp2p-mplex v0.1.1/go.mod h1:KUQWpGkCzfV7UIpi8SKsAVxyBgz1c9R5EvxgnwLsb/I=
github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=
github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE=
github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod h1:74S9eum0tVQdAfFiKxAyKzNdSuLqw5oadDq7+L/FELo=
github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod h1:CK3p2+9qH9x+7ER/gWWDYJ3QW5ZxWDkm+dVvjfuG3ek=
-github.com/libp2p/go-libp2p-mplex v0.3.0/go.mod h1:l9QWxRbbb5/hQMECEb908GbS9Sm2UAR2KFZKUJEynEs=
github.com/libp2p/go-libp2p-mplex v0.4.0/go.mod h1:yCyWJE2sc6TBTnFpjvLuEJgTSw/u+MamvzILKdX7asw=
github.com/libp2p/go-libp2p-mplex v0.4.1 h1:/pyhkP1nLwjG3OM+VuaNJkQT/Pqq73WzB3aDN3Fx1sc=
github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod h1:cmy+3GfqfM1PceHTLL7zQzAAYaryDu6iPSC+CIb094g=
-github.com/libp2p/go-libp2p-nat v0.0.4/go.mod h1:N9Js/zVtAXqaeT99cXgTV9e75KpnWCvVOiGzlcHmBbY=
github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw=
-github.com/libp2p/go-libp2p-net v0.0.1/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
-github.com/libp2p/go-libp2p-net v0.0.2/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
-github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFxecf9Gt03cKxm2f/Q=
github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=
github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
github.com/libp2p/go-libp2p-noise v0.2.0 h1:wmk5nhB9a2w2RxMOyvsoKjizgJOEaJdfAakr0jN8gds=
github.com/libp2p/go-libp2p-noise v0.2.0/go.mod h1:IEbYhBBzGyvdLBoxxULL/SGbJARhUeqlO8lVSREYu2Q=
-github.com/libp2p/go-libp2p-peer v0.0.1/go.mod h1:nXQvOBbwVqoP+T5Y5nCjeH4sP9IX/J0AMzcDUVruVoo=
-github.com/libp2p/go-libp2p-peer v0.1.1/go.mod h1:jkF12jGB4Gk/IOo+yomm+7oLWxF278F7UnrYUQ1Q8es=
github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
-github.com/libp2p/go-libp2p-peerstore v0.0.1/go.mod h1:RabLyPVJLuNQ+GFyoEkfi8H4Ti6k/HtZJ7YKgtSq+20=
-github.com/libp2p/go-libp2p-peerstore v0.0.6/go.mod h1:RabLyPVJLuNQ+GFyoEkfi8H4Ti6k/HtZJ7YKgtSq+20=
github.com/libp2p/go-libp2p-peerstore v0.1.0/go.mod h1:2CeHkQsr8svp4fZ+Oi9ykN1HBb6u0MOvdJ7YIsmcwtY=
github.com/libp2p/go-libp2p-peerstore v0.1.3/go.mod h1:BJ9sHlm59/80oSkpWgr1MyY1ciXAXV397W6h1GH/uKI=
github.com/libp2p/go-libp2p-peerstore v0.1.4/go.mod h1:+4BDbDiiKf4PzpANZDAT+knVdLxvqh7hXOujessqdzs=
@@ -681,38 +508,26 @@ github.com/libp2p/go-libp2p-peerstore v0.2.8 h1:nJghUlUkFVvyk7ccsM67oFA6kqUkwyCM
github.com/libp2p/go-libp2p-peerstore v0.2.8/go.mod h1:gGiPlXdz7mIHd2vfAsHzBNAMqSDkt2UBFwgcITgw1lA=
github.com/libp2p/go-libp2p-pnet v0.2.0 h1:J6htxttBipJujEjz1y0a5+eYoiPcFHhSYHH6na5f0/k=
github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod h1:Qqvq6JH/oMZGwqs3N1Fqhv8NVhrdYcO0BW4wssv21LA=
-github.com/libp2p/go-libp2p-protocol v0.0.1/go.mod h1:Af9n4PiruirSDjHycM1QuiMi/1VZNHYcK8cLgFJLZ4s=
-github.com/libp2p/go-libp2p-protocol v0.1.0/go.mod h1:KQPHpAabB57XQxGrXCNvbL6UEXfQqUgC/1adR2Xtflk=
-github.com/libp2p/go-libp2p-pubsub v0.4.0/go.mod h1:izkeMLvz6Ht8yAISXjx60XUQZMq9ZMe5h2ih4dLIBIQ=
-github.com/libp2p/go-libp2p-pubsub v0.4.2/go.mod h1:izkeMLvz6Ht8yAISXjx60XUQZMq9ZMe5h2ih4dLIBIQ=
-github.com/libp2p/go-libp2p-pubsub-router v0.4.0/go.mod h1:hs0j0ugcBjMOMgJ6diOlZM2rZEId/w5Gg86E+ac4SmQ=
github.com/libp2p/go-libp2p-quic-transport v0.10.0/go.mod h1:RfJbZ8IqXIhxBRm5hqUEJqjiiY8xmEuq3HUDS993MkA=
github.com/libp2p/go-libp2p-quic-transport v0.11.2 h1:p1YQDZRHH4Cv2LPtHubqlQ9ggz4CKng/REZuXZbZMhM=
github.com/libp2p/go-libp2p-quic-transport v0.11.2/go.mod h1:wlanzKtIh6pHrq+0U3p3DY9PJfGqxMgPaGKaK5LifwQ=
-github.com/libp2p/go-libp2p-record v0.0.1/go.mod h1:grzqg263Rug/sRex85QrDOLntdFAymLDLm7lxMgU79Q=
github.com/libp2p/go-libp2p-record v0.1.0/go.mod h1:ujNc8iuE5dlKWVy6wuL6dd58t0n7xI4hAIl8pE6wu5Q=
-github.com/libp2p/go-libp2p-record v0.1.1/go.mod h1:VRgKajOyMVgP/F0L5g3kH7SVskp17vFi2xheb5uMJtg=
github.com/libp2p/go-libp2p-record v0.1.2/go.mod h1:pal0eNcT5nqZaTV7UGhqeGqxFgGdsU/9W//C8dqjQDk=
github.com/libp2p/go-libp2p-record v0.1.3 h1:R27hoScIhQf/A8XJZ8lYpnqh9LatJ5YbHs28kCIfql0=
github.com/libp2p/go-libp2p-record v0.1.3/go.mod h1:yNUff/adKIfPnYQXgp6FQmNu3gLJ6EMg7+/vv2+9pY4=
-github.com/libp2p/go-libp2p-routing v0.0.1/go.mod h1:N51q3yTr4Zdr7V8Jt2JIktVU+3xBBylx1MZeVA6t1Ys=
github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod h1:795bh+9YeoFl99rMASoiVgHdi5bjack0N1+AFAdbvBw=
-github.com/libp2p/go-libp2p-secio v0.0.3/go.mod h1:hS7HQ00MgLhRO/Wyu1bTX6ctJKhVpm+j2/S2A5UqYb0=
github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8=
github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g=
github.com/libp2p/go-libp2p-secio v0.2.1/go.mod h1:cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8=
github.com/libp2p/go-libp2p-secio v0.2.2/go.mod h1:wP3bS+m5AUnFA+OFO7Er03uO1mncHG0uVwGrwvjYlNY=
-github.com/libp2p/go-libp2p-swarm v0.0.6/go.mod h1:s5GZvzg9xXe8sbeESuFpjt8CJPTCa8mhEusweJqyFy8=
github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4=
github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod h1:fvmtQ0T1nErXym1/aa1uJEyN7JzaTNyBcHImCxRpPKU=
github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod h1:P2VO/EpxRyDxtChXz/VPVXyTnszHvokHKRhfkEgFKNM=
github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod h1:JQKMGSth4SMqonruY0a8yjlPVIkb0mdNSwckW7OYziM=
github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
-github.com/libp2p/go-libp2p-swarm v0.3.1/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
github.com/libp2p/go-libp2p-swarm v0.4.0/go.mod h1:XVFcO52VoLoo0eitSxNQWYq4D6sydGOweTOAjJNraCw=
github.com/libp2p/go-libp2p-swarm v0.5.0 h1:HIK0z3Eqoo8ugmN8YqWAhD2RORgR+3iNXYG4U2PFd1E=
github.com/libp2p/go-libp2p-swarm v0.5.0/go.mod h1:sU9i6BoHE0Ve5SKz3y9WfKrh8dUat6JknzUehFx8xW4=
-github.com/libp2p/go-libp2p-testing v0.0.1/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing v0.0.4/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
@@ -724,9 +539,6 @@ github.com/libp2p/go-libp2p-testing v0.4.0 h1:PrwHRi0IGqOwVQWR3xzgigSlhlLfxgfXgk
github.com/libp2p/go-libp2p-testing v0.4.0/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
github.com/libp2p/go-libp2p-tls v0.1.3 h1:twKMhMu44jQO+HgQK9X8NHO5HkeJu2QbhLzLJpa8oNM=
github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
-github.com/libp2p/go-libp2p-transport v0.0.1/go.mod h1:UzbUs9X+PHOSw7S3ZmeOxfnwaQY5vGDzZmKPod3N3tk=
-github.com/libp2p/go-libp2p-transport v0.0.5/go.mod h1:StoY3sx6IqsP6XKoabsPnHCwqKXWUMWU7Rfcsubee/A=
-github.com/libp2p/go-libp2p-transport-upgrader v0.0.4/go.mod h1:RGq+tupk+oj7PzL2kn/m1w6YXxcIAYJYeI90h6BGgUc=
github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod h1:IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod h1:mQcrHj4asu6ArfSoMuyojOdjx73Q47cYD7s5+gZOlns=
github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D1dwydnTmKRPXiAR/fyvi1dXuL4o=
@@ -734,10 +546,7 @@ github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod h1:J4ko0ObtZSmgn5BX
github.com/libp2p/go-libp2p-transport-upgrader v0.4.2 h1:4JsnbfJzgZeRS9AWN7B9dPqn/LY/HoQTlO9gtdJTIYM=
github.com/libp2p/go-libp2p-transport-upgrader v0.4.2/go.mod h1:NR8ne1VwfreD5VIWIU62Agt/J18ekORFU/j1i2y8zvk=
github.com/libp2p/go-libp2p-xor v0.0.0-20200501025846-71e284145d58/go.mod h1:AYjOiqJIdcmI4SXE2ouKQuFrUbE5myv8txWaB2pl4TI=
-github.com/libp2p/go-libp2p-yamux v0.1.2/go.mod h1:xUoV/RmYkg6BW/qGxA9XJyg+HzXFYkeXbnhjmnYzKp8=
-github.com/libp2p/go-libp2p-yamux v0.1.3/go.mod h1:VGSQVrqkh6y4nm0189qqxMtvyBft44MOYYPpYKXiVt4=
github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod h1:Db2gU+XfLpm6E4rG5uGCFX6uXA8MEXOxFcRoXUODaK8=
-github.com/libp2p/go-libp2p-yamux v0.2.1/go.mod h1:1FBXiHDk1VyRM1C0aez2bCfHQ4vMZKkAQzZbkSQt5fI=
github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod h1:lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw=
github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod h1:Zpgj6arbyQrmZ3wxSZxfBmbdnWtbZ48OpsfmQVTErwA=
github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod h1:X28ENrBMU/nm4I3Nx4sZ4dgjZ6VhLEn0XhIoZ5viCwU=
@@ -747,13 +556,11 @@ github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLw
github.com/libp2p/go-libp2p-yamux v0.5.1/go.mod h1:dowuvDu8CRWmr0iqySMiSxK+W0iL5cMVO9S94Y6gkv4=
github.com/libp2p/go-libp2p-yamux v0.5.4 h1:/UOPtT/6DHPtr3TtKXBHa6g0Le0szYuI33Xc/Xpd7fQ=
github.com/libp2p/go-libp2p-yamux v0.5.4/go.mod h1:tfrXbyaTqqSU654GTvK3ocnSZL3BuHoeTSqhcel1wsE=
-github.com/libp2p/go-maddr-filter v0.0.1/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
github.com/libp2p/go-maddr-filter v0.1.0 h1:4ACqZKw8AqiuJfwFGq1CYDFugfXTOos+qQ3DETkhtCE=
github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
-github.com/libp2p/go-mplex v0.0.4/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU=
github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
@@ -761,11 +568,9 @@ github.com/libp2p/go-mplex v0.2.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ
github.com/libp2p/go-mplex v0.3.0 h1:U1T+vmCYJaEoDJPV1aq31N56hS+lJgb397GsylNSgrU=
github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.3/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
github.com/libp2p/go-msgio v0.0.6 h1:lQ7Uc0kS1wb1EfRxO2Eir/RJoHkHn7t6o+EiwsYIKJA=
github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-nat v0.0.3/go.mod h1:88nUEt0k0JD45Bk93NIwDqjlhiOwOoV36GchpcVc1yI=
github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
github.com/libp2p/go-nat v0.0.5 h1:qxnwkco8RLKqVh1NmjQ+tJ8p8khNLFxuElYG/TwqW4Q=
github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
@@ -791,33 +596,21 @@ github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2L
github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
github.com/libp2p/go-sockaddr v0.1.1 h1:yD80l2ZOdGksnOyHrhxDdTDFrf7Oy+v3FMVArIRgZxQ=
github.com/libp2p/go-sockaddr v0.1.1/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
-github.com/libp2p/go-socket-activation v0.0.2/go.mod h1:KP44C+yZ7gA8sTxavgaD0b8vXVFJwam2CEW0s7+f094=
github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l5MEaHbKaliuT14=
-github.com/libp2p/go-stream-muxer v0.1.0/go.mod h1:8JAVsjeRBCWwPoZeH0W1imLOcriqXJyFvB0mR4A04sQ=
-github.com/libp2p/go-stream-muxer-multistream v0.1.1/go.mod h1:zmGdfkQ1AzOECIAcccoL8L//laqawOsO03zX8Sa+eGw=
github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
github.com/libp2p/go-stream-muxer-multistream v0.3.0 h1:TqnSHPJEIqDEO7h1wZZ0p3DXdvDSiLHQidKKUGZtiOY=
github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod h1:yDh8abSIzmZtqtOt64gFJUXEryejzNb0lisTt+fAMJA=
-github.com/libp2p/go-tcp-transport v0.0.4/go.mod h1:+E8HvC8ezEVOxIo3V5vCK9l1y/19K427vCzQ+xHKH/o=
github.com/libp2p/go-tcp-transport v0.1.0/go.mod h1:oJ8I5VXryj493DEJ7OsBieu8fcg2nHGctwtInJVpipc=
github.com/libp2p/go-tcp-transport v0.1.1/go.mod h1:3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY=
github.com/libp2p/go-tcp-transport v0.2.0/go.mod h1:vX2U0CnWimU4h0SGSEsg++AzvBcroCGYw28kh94oLe0=
github.com/libp2p/go-tcp-transport v0.2.1/go.mod h1:zskiJ70MEfWz2MKxvFB/Pv+tPIB1PpPUrHIWQ8aFw7M=
-github.com/libp2p/go-tcp-transport v0.2.3/go.mod h1:9dvr03yqrPyYGIEN6Dy5UvdJZjyPFvl1S/igQ5QD1SU=
github.com/libp2p/go-tcp-transport v0.2.4 h1:IL5ZAQrkLftufe24mWrmGtTV6drGi6BiXWMTLEM9PBE=
github.com/libp2p/go-tcp-transport v0.2.4/go.mod h1:9dvr03yqrPyYGIEN6Dy5UvdJZjyPFvl1S/igQ5QD1SU=
-github.com/libp2p/go-testutil v0.0.1/go.mod h1:iAcJc/DKJQanJ5ws2V+u5ywdL2n12X1WbbEG+Jjy69I=
-github.com/libp2p/go-testutil v0.1.0/go.mod h1:81b2n5HypcVyrCg/MJx4Wgfp/VHojytjVe/gLzZ2Ehc=
-github.com/libp2p/go-ws-transport v0.0.5/go.mod h1:Qbl4BxPfXXhhd/o0wcrgoaItHqA9tnZjoFZnxykuaXU=
-github.com/libp2p/go-ws-transport v0.1.0/go.mod h1:rjw1MG1LU9YDC6gzmwObkPd/Sqwhw7yT74kj3raBFuo=
github.com/libp2p/go-ws-transport v0.2.0/go.mod h1:9BHJz/4Q5A9ludYWKoGCFC5gUElzlHoKzu0yY9p/klM=
github.com/libp2p/go-ws-transport v0.3.0/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
-github.com/libp2p/go-ws-transport v0.3.1/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
github.com/libp2p/go-ws-transport v0.4.0 h1:9tvtQ9xbws6cA5LvqdE6Ne3vcmGB4f1z9SByggk4s0k=
github.com/libp2p/go-ws-transport v0.4.0/go.mod h1:EcIEKqf/7GDjth6ksuS/6p7R49V4CBY6/E7R/iyhYUA=
-github.com/libp2p/go-yamux v1.2.1/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
github.com/libp2p/go-yamux v1.2.2/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.2.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
github.com/libp2p/go-yamux v1.3.0/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
github.com/libp2p/go-yamux v1.3.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
github.com/libp2p/go-yamux v1.3.5/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
@@ -852,17 +645,12 @@ github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
-github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
@@ -925,7 +713,6 @@ github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9x
github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod h1:TJ5pr5bBO7Y1B18djPuRsVkduhQH2YqYSbxWJzYGdK0=
-github.com/multiformats/go-multiaddr-dns v0.3.0/go.mod h1:mNzQ4eTGDg0ll1N9jKPOUogZPoJ30W8a7zk66FQPpdQ=
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
github.com/multiformats/go-multiaddr-fmt v0.0.1/go.mod h1:aBYjqL4T/7j4Qx+R73XSv/8JsgnRFlf0w2KGLCmXl3Q=
@@ -954,8 +741,6 @@ github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUj
github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
github.com/multiformats/go-multihash v0.0.15 h1:hWOPdrNqDjwHDx82vsYGSDZNyktOJJ2dzZJzFkOV1jM=
github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg=
-github.com/multiformats/go-multistream v0.0.1/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
-github.com/multiformats/go-multistream v0.0.4/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38=
github.com/multiformats/go-multistream v0.2.0/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k=
@@ -1029,19 +814,15 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
-github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e h1:ZOcivgkkFRnjfoTcGsDq3UQYiBmekwLA+qg0OjyB/ls=
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
-github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU=
github.com/prometheus/client_golang v1.10.0 h1:/o0BDeWzLWXNZ+4q5gXltUvaMpJqckTa+jTNoB+z4cg=
@@ -1054,36 +835,29 @@ github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y=
github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/statsd_exporter v0.20.0/go.mod h1:YL3FWCG8JBBtaUSxAg4Gz2ZYu22bS84XM89ZQXXTWmQ=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ=
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
@@ -1115,11 +889,8 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
-github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
-github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
@@ -1157,37 +928,23 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
github.com/testground/sdk-go v0.2.7 h1:SDLDukPZIaZOeG2gQjCNsh5EB3QL3mOhOM4p0BMpqlc=
github.com/testground/sdk-go v0.2.7/go.mod h1:Q4dnWsUBH+dZ1u7aEGDBHWGUaLfhitjUq3UJQqxeTmk=
-github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli/v2 v2.0.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
github.com/wangjia184/sortedset v0.0.0-20160527075905-f5d03557ba30/go.mod h1:YkocrP2K2tcw938x9gCOmT5G5eCD6jsTz0SZuyAqwIE=
-github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
-github.com/warpfork/go-wish v0.0.0-20190328234359-8b3e70f8e830/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a h1:G++j5e0OC488te356JvdhaM8YS6nMsjLAYF7JxCv07w=
github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
-github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc/go.mod h1:r45hJU7yEoA81k6MWNhpMj/kms0n14dkzkxYHoB96UM=
-github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI=
-github.com/whyrusleeping/cbor-gen v0.0.0-20200710004633-5379fc63235d/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
-github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
-github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8=
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
github.com/whyrusleeping/go-logging v0.0.1/go.mod h1:lDPYj54zutzG1XYfHAhcc7oNXEburHQBn+Iqd4yS4vE=
-github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f/go.mod h1:cZNvX9cFybI01GriPRMXDtczuvUhgbcYr9iCGaNlRv8=
-github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1/go.mod h1:tKH72zYNt/exx6/5IQO6L9LoQ0rEjd5SbbWaDTs9Zso=
github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA=
-github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4=
github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4=
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1:E9S12nwJwEOXe2d6gT6qxdvqMnNq+VnSsKPgm2ZZNds=
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI=
-github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee/go.mod h1:m2aV4LZI4Aez7dP5PMyVKEHhUyEJ/RjmPEDOpDvudHg=
github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
@@ -1200,7 +957,6 @@ go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -1213,15 +969,11 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/dig v1.10.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw=
-go.uber.org/fx v1.13.1/go.mod h1:bREWhavnedxpJeTq9pQT53BbvwhUv7TcpsOqcH4a+3w=
-go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
-go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@@ -1233,7 +985,6 @@ go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
-go4.org v0.0.0-20200411211856-f5505b9728dd/go.mod h1:CIiUVy99QCPfoE13bO4EZaz5GZMZXMSBGhxRdsvzbkg=
golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1242,14 +993,11 @@ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -1266,36 +1014,19 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf h1:B2n+Zi5QeYRDAEodEu72OS36gmTWjgpXr2+cWcBW90o=
golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI=
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1316,19 +1047,11 @@ golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
@@ -1346,9 +1069,6 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1375,20 +1095,12 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190524122548-abf6ff778158/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190524152521-dbbf3f1254d4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1398,19 +1110,13 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1440,7 +1146,6 @@ golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1451,38 +1156,21 @@ golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.1-0.20210225150353-54dc8c5edb56/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU=
golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1494,39 +1182,19 @@ google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+
google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
@@ -1535,14 +1203,12 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o=
@@ -1555,7 +1221,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
@@ -1591,11 +1256,9 @@ grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJd
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/thirdparty/cidv0v1/blockstore.go b/thirdparty/cidv0v1/blockstore.go
index 2f098dff9fe..f28feae7560 100644
--- a/thirdparty/cidv0v1/blockstore.go
+++ b/thirdparty/cidv0v1/blockstore.go
@@ -1,6 +1,8 @@
package cidv0v1
import (
+ "context"
+
blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
bs "github.com/ipfs/go-ipfs-blockstore"
@@ -15,8 +17,8 @@ func NewBlockstore(b bs.Blockstore) bs.Blockstore {
return &blockstore{b}
}
-func (b *blockstore) Has(c cid.Cid) (bool, error) {
- have, err := b.Blockstore.Has(c)
+func (b *blockstore) Has(ctx context.Context, c cid.Cid) (bool, error) {
+ have, err := b.Blockstore.Has(ctx, c)
if have || err != nil {
return have, err
}
@@ -24,11 +26,11 @@ func (b *blockstore) Has(c cid.Cid) (bool, error) {
if !c1.Defined() {
return false, nil
}
- return b.Blockstore.Has(c1)
+ return b.Blockstore.Has(ctx, c1)
}
-func (b *blockstore) Get(c cid.Cid) (blocks.Block, error) {
- block, err := b.Blockstore.Get(c)
+func (b *blockstore) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
+ block, err := b.Blockstore.Get(ctx, c)
if err == nil {
return block, nil
}
@@ -39,7 +41,7 @@ func (b *blockstore) Get(c cid.Cid) (blocks.Block, error) {
if !c1.Defined() {
return nil, bs.ErrNotFound
}
- block, err = b.Blockstore.Get(c1)
+ block, err = b.Blockstore.Get(ctx, c1)
if err != nil {
return nil, err
}
@@ -50,15 +52,15 @@ func (b *blockstore) Get(c cid.Cid) (blocks.Block, error) {
}
// insert the block with the original CID to avoid problems
// with pinning
- err = b.Blockstore.Put(block)
+ err = b.Blockstore.Put(ctx, block)
if err != nil {
return nil, err
}
return block, nil
}
-func (b *blockstore) GetSize(c cid.Cid) (int, error) {
- size, err := b.Blockstore.GetSize(c)
+func (b *blockstore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
+ size, err := b.Blockstore.GetSize(ctx, c)
if err == nil {
return size, nil
}
@@ -69,7 +71,7 @@ func (b *blockstore) GetSize(c cid.Cid) (int, error) {
if !c1.Defined() {
return -1, bs.ErrNotFound
}
- return b.Blockstore.GetSize(c1)
+ return b.Blockstore.GetSize(ctx, c1)
}
func tryOtherCidVersion(c cid.Cid) cid.Cid {
diff --git a/thirdparty/verifbs/verifbs.go b/thirdparty/verifbs/verifbs.go
index 53b6d13ca77..7be5348a82c 100644
--- a/thirdparty/verifbs/verifbs.go
+++ b/thirdparty/verifbs/verifbs.go
@@ -1,6 +1,8 @@
package verifbs
import (
+ "context"
+
blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
bstore "github.com/ipfs/go-ipfs-blockstore"
@@ -11,52 +13,52 @@ type VerifBSGC struct {
bstore.GCBlockstore
}
-func (bs *VerifBSGC) Put(b blocks.Block) error {
+func (bs *VerifBSGC) Put(ctx context.Context, b blocks.Block) error {
if err := verifcid.ValidateCid(b.Cid()); err != nil {
return err
}
- return bs.GCBlockstore.Put(b)
+ return bs.GCBlockstore.Put(ctx, b)
}
-func (bs *VerifBSGC) PutMany(blks []blocks.Block) error {
+func (bs *VerifBSGC) PutMany(ctx context.Context, blks []blocks.Block) error {
for _, b := range blks {
if err := verifcid.ValidateCid(b.Cid()); err != nil {
return err
}
}
- return bs.GCBlockstore.PutMany(blks)
+ return bs.GCBlockstore.PutMany(ctx, blks)
}
-func (bs *VerifBSGC) Get(c cid.Cid) (blocks.Block, error) {
+func (bs *VerifBSGC) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
if err := verifcid.ValidateCid(c); err != nil {
return nil, err
}
- return bs.GCBlockstore.Get(c)
+ return bs.GCBlockstore.Get(ctx, c)
}
type VerifBS struct {
bstore.Blockstore
}
-func (bs *VerifBS) Put(b blocks.Block) error {
+func (bs *VerifBS) Put(ctx context.Context, b blocks.Block) error {
if err := verifcid.ValidateCid(b.Cid()); err != nil {
return err
}
- return bs.Blockstore.Put(b)
+ return bs.Blockstore.Put(ctx, b)
}
-func (bs *VerifBS) PutMany(blks []blocks.Block) error {
+func (bs *VerifBS) PutMany(ctx context.Context, blks []blocks.Block) error {
for _, b := range blks {
if err := verifcid.ValidateCid(b.Cid()); err != nil {
return err
}
}
- return bs.Blockstore.PutMany(blks)
+ return bs.Blockstore.PutMany(ctx, blks)
}
-func (bs *VerifBS) Get(c cid.Cid) (blocks.Block, error) {
+func (bs *VerifBS) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
if err := verifcid.ValidateCid(c); err != nil {
return nil, err
}
- return bs.Blockstore.Get(c)
+ return bs.Blockstore.Get(ctx, c)
}
|
sentry
|
https://github.com/getsentry/sentry
|
1b323eadff356c60ca3574e2b22beea3a9fef3b6
|
Billy Vong
|
2018-12-04 05:49:25
|
feat(events-stream): Change loading/error UI (APP-744) (#10869)
|
* move Events Header + search into container so that it appears while loading
* change how events loads/errors (always displays chart + table, show error message above chart
* add toast when loading chart data fails
|
feat(events-stream): Change loading/error UI (APP-744) (#10869)
* move Events Header + search into container so that it appears while loading
* change how events loads/errors (always displays chart + table, show error message above chart
* add toast when loading chart data fails
|
diff --git a/src/sentry/static/sentry/app/views/organizationEvents/events.jsx b/src/sentry/static/sentry/app/views/organizationEvents/events.jsx
index ee86043c0efdc7..dcf25d98d40534 100644
--- a/src/sentry/static/sentry/app/views/organizationEvents/events.jsx
+++ b/src/sentry/static/sentry/app/views/organizationEvents/events.jsx
@@ -3,19 +3,17 @@ import {isEqual} from 'lodash';
import React from 'react';
import styled from 'react-emotion';
-import utils from 'app/utils';
import {Panel} from 'app/components/panels';
import {t} from 'app/locale';
import AsyncView from 'app/views/asyncView';
import Pagination from 'app/components/pagination';
import SentryTypes from 'app/sentryTypes';
+import utils from 'app/utils';
import withOrganization from 'app/utils/withOrganization';
-import BetaTag from 'app/components/betaTag';
import {getParams} from './utils/getParams';
import EventsChart from './eventsChart';
import EventsTable from './eventsTable';
-import SearchBar from './searchBar';
const parseRowFromLinks = (links, numRows) => {
links = utils.parseLinkHeader(links);
@@ -80,69 +78,51 @@ class OrganizationEvents extends AsyncView {
return `Events - ${this.props.organization.slug}`;
}
- handleSearch = query => {
- let {router, location} = this.props;
- router.push({
- pathname: location.pathname,
- query: {
- ...(location.query || {}),
- query,
- },
- });
- };
-
renderRowCounts() {
const {events, eventsPageLinks} = this.state;
return parseRowFromLinks(eventsPageLinks, events.length);
}
+ renderError() {
+ return this.renderBody();
+ }
+
+ renderLoading() {
+ return this.renderBody();
+ }
+
renderBody() {
- const {organization, location} = this.props;
- const {reloading, events, eventsPageLinks} = this.state;
+ const {organization} = this.props;
+ const {error, loading, reloading, events, eventsPageLinks} = this.state;
return (
<React.Fragment>
- <Flex align="center" justify="space-between" mb={2}>
- <HeaderTitle>
- {t('Events')} <BetaTag />
- </HeaderTitle>
- <StyledSearchBar
- query={(location.query && location.query.query) || ''}
- onSearch={this.handleSearch}
- organization={organization}
- />
- </Flex>
-
+ {error && super.renderError(new Error('Unable to load all required endpoints'))}
<Panel>
- <EventsChart organization={organization} />
+ <EventsChart loading={loading || reloading} organization={organization} />
</Panel>
- <EventsTable reloading={reloading} events={events} organization={organization} />
-
- <Flex align="center" justify="space-between">
- <RowDisplay>
- {events.length ? t(`Results ${this.renderRowCounts()}`) : t('No Results')}
- </RowDisplay>
- <Pagination pageLinks={eventsPageLinks} className="" />
- </Flex>
+ <EventsTable
+ loading={!reloading && loading}
+ reloading={reloading}
+ events={events}
+ organization={organization}
+ />
+
+ {!loading &&
+ !error && (
+ <Flex align="center" justify="space-between">
+ <RowDisplay>
+ {events.length ? t(`Results ${this.renderRowCounts()}`) : t('No Results')}
+ </RowDisplay>
+ <Pagination pageLinks={eventsPageLinks} className="" />
+ </Flex>
+ )}
</React.Fragment>
);
}
}
-const HeaderTitle = styled('h4')`
- flex: 1;
- font-size: ${p => p.theme.headerFontSize};
- line-height: ${p => p.theme.headerFontSize};
- font-weight: normal;
- color: ${p => p.theme.gray4};
- margin: 0;
-`;
-
-const StyledSearchBar = styled(SearchBar)`
- flex: 1;
-`;
-
const RowDisplay = styled('div')`
color: ${p => p.theme.gray6};
`;
diff --git a/src/sentry/static/sentry/app/views/organizationEvents/eventsChart.jsx b/src/sentry/static/sentry/app/views/organizationEvents/eventsChart.jsx
index b2f0d265a935fb..28d4e7e1818475 100644
--- a/src/sentry/static/sentry/app/views/organizationEvents/eventsChart.jsx
+++ b/src/sentry/static/sentry/app/views/organizationEvents/eventsChart.jsx
@@ -5,11 +5,12 @@ import moment from 'moment';
import {t} from 'app/locale';
import LineChart from 'app/components/charts/lineChart';
+import EventsContext from 'app/views/organizationEvents/utils/eventsContext';
+import EventsRequest from 'app/views/organizationEvents/utils/eventsRequest';
import SentryTypes from 'app/sentryTypes';
import withApi from 'app/utils/withApi';
-import {EventsRequestWithParams} from './utils/eventsRequest';
-import EventsContext from './utils/eventsContext';
+const DEFAULT_GET_CATEGORY = () => t('Events');
class EventsChart extends React.PureComponent {
static propTypes = {
@@ -19,10 +20,6 @@ class EventsChart extends React.PureComponent {
utc: PropTypes.bool,
};
- constructor(props) {
- super(props);
- }
-
handleDataZoom = (evt, chart) => {
const model = chart.getModel();
const {xAxis, series} = model.option;
@@ -89,12 +86,12 @@ class EventsChart extends React.PureComponent {
return (
<div>
- <EventsRequestWithParams
+ <EventsRequest
{...this.props}
interval={interval}
showLoading
query={(location.query && location.query.query) || ''}
- getCategory={() => t('Events')}
+ getCategory={DEFAULT_GET_CATEGORY}
includePrevious={!!period}
>
{({timeseriesData, previousTimeseriesData}) => {
@@ -116,7 +113,7 @@ class EventsChart extends React.PureComponent {
/>
);
}}
- </EventsRequestWithParams>
+ </EventsRequest>
</div>
);
}
@@ -124,7 +121,7 @@ class EventsChart extends React.PureComponent {
const EventsChartContainer = withRouter(
withApi(
- class EventsChartContainer extends React.Component {
+ class EventsChartWithParams extends React.Component {
render() {
return (
<EventsContext.Consumer>
diff --git a/src/sentry/static/sentry/app/views/organizationEvents/eventsTable.jsx b/src/sentry/static/sentry/app/views/organizationEvents/eventsTable.jsx
index 1e8738a0aa5467..93a4429bc51687 100644
--- a/src/sentry/static/sentry/app/views/organizationEvents/eventsTable.jsx
+++ b/src/sentry/static/sentry/app/views/organizationEvents/eventsTable.jsx
@@ -18,6 +18,7 @@ import EventsContext from './utils/eventsContext';
class EventsTable extends React.Component {
static propTypes = {
+ loading: PropTypes.bool,
reloading: PropTypes.bool,
events: PropTypes.array,
organization: SentryTypes.Organization,
@@ -32,7 +33,10 @@ class EventsTable extends React.Component {
}
shouldComponentUpdate(nextProps) {
- if (this.props.reloading !== nextProps.reloading) {
+ if (
+ this.props.reloading !== nextProps.reloading ||
+ this.props.loading !== nextProps.loading
+ ) {
return true;
}
@@ -63,7 +67,7 @@ class EventsTable extends React.Component {
}
render() {
- const {events, organization, reloading, utc} = this.props;
+ const {events, organization, loading, reloading, utc} = this.props;
const hasEvents = events && !!events.length;
return (
@@ -76,7 +80,8 @@ class EventsTable extends React.Component {
<div>{t('Time')}</div>
</TableLayout>
</PanelHeader>
- {!hasEvents && <EmptyStateWarning>No events</EmptyStateWarning>}
+ {loading && <LoadingIndicator />}
+ {!loading && !hasEvents && <EmptyStateWarning>No events</EmptyStateWarning>}
{hasEvents && (
<StyledPanelBody>
{reloading && <StyledLoadingIndicator overlay />}
diff --git a/src/sentry/static/sentry/app/views/organizationEvents/index.jsx b/src/sentry/static/sentry/app/views/organizationEvents/index.jsx
index da74866cb9f800..f364b428c16d76 100644
--- a/src/sentry/static/sentry/app/views/organizationEvents/index.jsx
+++ b/src/sentry/static/sentry/app/views/organizationEvents/index.jsx
@@ -8,12 +8,15 @@ import styled from 'react-emotion';
import {DEFAULT_STATS_PERIOD, DEFAULT_USE_UTC} from 'app/constants';
import {defined} from 'app/utils';
import {getLocalDateObject, getUtcDateString} from 'app/utils/dates';
+import {t} from 'app/locale';
+import BetaTag from 'app/components/betaTag';
import Feature from 'app/components/acl/feature';
import Header from 'app/components/organizations/header';
import HeaderSeparator from 'app/components/organizations/headerSeparator';
import HeaderItemPosition from 'app/components/organizations/headerItemPosition';
import MultipleEnvironmentSelector from 'app/components/organizations/multipleEnvironmentSelector';
import MultipleProjectSelector from 'app/components/organizations/multipleProjectSelector';
+import SearchBar from 'app/components/searchBar';
import SentryTypes from 'app/sentryTypes';
import TimeRangeSelector from 'app/components/organizations/timeRangeSelector';
import space from 'app/styles/space';
@@ -188,6 +191,17 @@ class OrganizationEventsContainer extends React.Component {
handleUpdateProjects = () => this.handleUpdate('project');
+ handleSearch = query => {
+ let {router, location} = this.props;
+ router.push({
+ pathname: location.pathname,
+ query: {
+ ...(location.query || {}),
+ query,
+ },
+ });
+ };
+
render() {
const {organization, children} = this.props;
const {period, start, end, utc} = this.state;
@@ -234,7 +248,20 @@ class OrganizationEventsContainer extends React.Component {
/>
</HeaderItemPosition>
</Header>
- <Body>{children}</Body>
+ <Body>
+ <Flex align="center" justify="space-between" mb={2}>
+ <HeaderTitle>
+ {t('Events')} <BetaTag />
+ </HeaderTitle>
+ <StyledSearchBar
+ query={(location.query && location.query.query) || ''}
+ placeholder={t('Search for events, users, tags, and everything else.')}
+ onSearch={this.handleSearch}
+ />
+ </Flex>
+
+ {children}
+ </Body>
</OrganizationEventsContent>
</EventsContext.Provider>
</Feature>
@@ -259,3 +286,16 @@ const Body = styled('div')`
flex: 1;
padding: ${space(2)} ${space(4)} ${space(3)};
`;
+
+const HeaderTitle = styled('h4')`
+ flex: 1;
+ font-size: ${p => p.theme.headerFontSize};
+ line-height: ${p => p.theme.headerFontSize};
+ font-weight: normal;
+ color: ${p => p.theme.gray4};
+ margin: 0;
+`;
+
+const StyledSearchBar = styled(SearchBar)`
+ flex: 1;
+`;
diff --git a/src/sentry/static/sentry/app/views/organizationEvents/utils/eventsRequest.jsx b/src/sentry/static/sentry/app/views/organizationEvents/utils/eventsRequest.jsx
index 633db464804be5..41f01be406ad2e 100644
--- a/src/sentry/static/sentry/app/views/organizationEvents/utils/eventsRequest.jsx
+++ b/src/sentry/static/sentry/app/views/organizationEvents/utils/eventsRequest.jsx
@@ -2,15 +2,17 @@ import {isEqual, omitBy} from 'lodash';
import PropTypes from 'prop-types';
import React from 'react';
+import {addErrorMessage} from 'app/actionCreators/indicator';
import {doEventsRequest} from 'app/actionCreators/events';
+import {t} from 'app/locale';
import LoadingPanel from 'app/views/organizationHealth/loadingPanel';
import SentryTypes from 'app/sentryTypes';
-import withApi from 'app/utils/withApi';
-import withLatestContext from 'app/utils/withLatestContext';
-import EventsContext from './eventsContext';
+const propNamesToIgnore = ['api', 'children', 'organizations', 'project', 'loading'];
+const omitIgnoredProps = props =>
+ omitBy(props, (value, key) => propNamesToIgnore.includes(key));
-class EventsRequestWithParams extends React.Component {
+class EventsRequest extends React.Component {
static propTypes = {
/**
* API client instance
@@ -80,6 +82,9 @@ class EventsRequestWithParams extends React.Component {
*/
timeAggregationSeriesName: PropTypes.string,
+ // Initial loading state
+ loading: PropTypes.bool,
+
showLoading: PropTypes.bool,
};
@@ -99,7 +104,7 @@ class EventsRequestWithParams extends React.Component {
constructor(props) {
super(props);
this.state = {
- reloading: false,
+ reloading: false || props.loading,
timeseriesData: null,
};
}
@@ -109,11 +114,6 @@ class EventsRequestWithParams extends React.Component {
}
componentDidUpdate(prevProps) {
- const propNamesToIgnore = ['api', 'children', 'organizations', 'project'];
-
- const omitIgnoredProps = props =>
- omitBy(props, (value, key) => propNamesToIgnore.includes(key));
-
if (isEqual(omitIgnoredProps(prevProps), omitIgnoredProps(this.props))) {
return;
}
@@ -127,12 +127,18 @@ class EventsRequestWithParams extends React.Component {
fetchData = async () => {
const {api, ...props} = this.props;
+ let timeseriesData;
this.setState(state => ({
reloading: state.timeseriesData !== null,
}));
- const timeseriesData = await doEventsRequest(api, props);
+ try {
+ timeseriesData = await doEventsRequest(api, props);
+ } catch (err) {
+ addErrorMessage(t('Error loading chart data'));
+ timeseriesData = null;
+ }
if (this.unmounting) return;
@@ -260,7 +266,7 @@ class EventsRequestWithParams extends React.Component {
const {timeseriesData, reloading} = this.state;
// Is "loading" if data is null
- const loading = reloading || timeseriesData === null;
+ const loading = this.props.loading || reloading || timeseriesData === null;
if (showLoading && loading) {
return <LoadingPanel />;
@@ -295,27 +301,4 @@ class EventsRequestWithParams extends React.Component {
}
}
-const EventsRequest = withLatestContext(
- withApi(
- class EventsRequest extends React.Component {
- render() {
- return (
- <EventsContext.Consumer>
- {({projects, environments, period, filters}) => (
- <EventsRequestWithParams
- projects={projects}
- environments={environments}
- period={period}
- filters={filters}
- {...this.props}
- />
- )}
- </EventsContext.Consumer>
- );
- }
- }
- )
-);
-
export default EventsRequest;
-export {EventsRequestWithParams};
diff --git a/tests/js/spec/views/organizationEvents/events.spec.jsx b/tests/js/spec/views/organizationEvents/events.spec.jsx
index 2e01783a5b6abd..465d8cff22cf7a 100644
--- a/tests/js/spec/views/organizationEvents/events.spec.jsx
+++ b/tests/js/spec/views/organizationEvents/events.spec.jsx
@@ -38,6 +38,29 @@ describe('OrganizationEventsErrors', function() {
});
});
+ it('renders with errors', async function() {
+ MockApiClient.addMockResponse({
+ url: `/organizations/${org.slug}/events/`,
+ statusCode: 500,
+ body: {details: 'Error'},
+ });
+ MockApiClient.addMockResponse({
+ url: `/organizations/${org.slug}/events-stats/`,
+ statusCode: 500,
+ body: {details: 'Error'},
+ });
+ let wrapper = mount(
+ <OrganizationEvents organization={org} location={{query: {}}} />,
+ TestStubs.routerContext()
+ );
+ await tick();
+ wrapper.update();
+
+ expect(wrapper.find('EventsChart')).toHaveLength(1);
+ expect(wrapper.find('EventsTable')).toHaveLength(1);
+ expect(wrapper.find('RouteError')).toHaveLength(1);
+ });
+
it('renders events table', async function() {
let wrapper = mount(
<OrganizationEvents organization={org} location={{query: {}}} />,
diff --git a/tests/js/spec/views/organizationEvents/utils/eventsRequest.spec.jsx b/tests/js/spec/views/organizationEvents/utils/eventsRequest.spec.jsx
index e80f4215e84858..543081c8e8d514 100644
--- a/tests/js/spec/views/organizationEvents/utils/eventsRequest.spec.jsx
+++ b/tests/js/spec/views/organizationEvents/utils/eventsRequest.spec.jsx
@@ -2,7 +2,7 @@ import {mount} from 'enzyme';
import React from 'react';
import {doEventsRequest} from 'app/actionCreators/events';
-import {EventsRequestWithParams} from 'app/views/organizationEvents/utils/eventsRequest';
+import EventsRequest from 'app/views/organizationEvents/utils/eventsRequest';
const COUNT_OBJ = {
count: 123,
@@ -38,9 +38,7 @@ describe('EventsRequest', function() {
data: [[new Date(), [COUNT_OBJ]]],
})
);
- wrapper = mount(
- <EventsRequestWithParams {...DEFAULTS}>{mock}</EventsRequestWithParams>
- );
+ wrapper = mount(<EventsRequest {...DEFAULTS}>{mock}</EventsRequest>);
});
it('makes requests', async function() {
@@ -130,9 +128,9 @@ describe('EventsRequest', function() {
})
);
wrapper = mount(
- <EventsRequestWithParams {...DEFAULTS} includePrevious={true}>
+ <EventsRequest {...DEFAULTS} includePrevious={true}>
{mock}
- </EventsRequestWithParams>
+ </EventsRequest>
);
await tick();
@@ -205,9 +203,9 @@ describe('EventsRequest', function() {
);
wrapper = mount(
- <EventsRequestWithParams {...DEFAULTS} includeTimeseries={true}>
+ <EventsRequest {...DEFAULTS} includeTimeseries={true}>
{mock}
- </EventsRequestWithParams>
+ </EventsRequest>
);
await tick();
@@ -244,13 +242,13 @@ describe('EventsRequest', function() {
);
wrapper = mount(
- <EventsRequestWithParams
+ <EventsRequest
{...DEFAULTS}
includeTimeseries={true}
getCategory={() => 'static-category'}
>
{mock}
- </EventsRequestWithParams>
+ </EventsRequest>
);
await tick();
|
hanko
|
https://github.com/teamhanko/hanko
|
5aa9e0c01058af44cf14ec6a6d65bb037b408f54
|
dependabot[bot]
|
2023-03-03 16:10:51
|
chore(deps-dev): bump @typescript-eslint/eslint-plugin
|
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.51.0 to 5.54.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.54.0/packages/eslint-plugin)
---
|
chore(deps-dev): bump @typescript-eslint/eslint-plugin
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.51.0 to 5.54.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.54.0/packages/eslint-plugin)
---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
|
diff --git a/frontend/frontend-sdk/package-lock.json b/frontend/frontend-sdk/package-lock.json
index bcac7f398..d8f936a0a 100644
--- a/frontend/frontend-sdk/package-lock.json
+++ b/frontend/frontend-sdk/package-lock.json
@@ -14,7 +14,7 @@
"devDependencies": {
"@github/webauthn-json": "^2.1.1",
"@types/jest": "^29.4.0",
- "@typescript-eslint/eslint-plugin": "^5.51.0",
+ "@typescript-eslint/eslint-plugin": "^5.54.0",
"better-docs": "^2.7.2",
"eslint": "^8.33.0",
"eslint-config-google": "^0.14.0",
@@ -3068,14 +3068,14 @@
"dev": true
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz",
- "integrity": "sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz",
+ "integrity": "sha512-+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "5.51.0",
- "@typescript-eslint/type-utils": "5.51.0",
- "@typescript-eslint/utils": "5.51.0",
+ "@typescript-eslint/scope-manager": "5.54.0",
+ "@typescript-eslint/type-utils": "5.54.0",
+ "@typescript-eslint/utils": "5.54.0",
"debug": "^4.3.4",
"grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
@@ -3102,13 +3102,13 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz",
- "integrity": "sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz",
+ "integrity": "sha512-VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/visitor-keys": "5.51.0"
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/visitor-keys": "5.54.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3119,9 +3119,9 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.51.0.tgz",
- "integrity": "sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz",
+ "integrity": "sha512-nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3132,13 +3132,13 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz",
- "integrity": "sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz",
+ "integrity": "sha512-X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/visitor-keys": "5.51.0",
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/visitor-keys": "5.54.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -3159,16 +3159,16 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.51.0.tgz",
- "integrity": "sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz",
+ "integrity": "sha512-cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.51.0",
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/typescript-estree": "5.51.0",
+ "@typescript-eslint/scope-manager": "5.54.0",
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/typescript-estree": "5.54.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0",
"semver": "^7.3.7"
@@ -3185,12 +3185,12 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz",
- "integrity": "sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz",
+ "integrity": "sha512-xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.51.0",
+ "@typescript-eslint/types": "5.54.0",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
@@ -3266,13 +3266,13 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz",
- "integrity": "sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz",
+ "integrity": "sha512-WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ==",
"dev": true,
"dependencies": {
- "@typescript-eslint/typescript-estree": "5.51.0",
- "@typescript-eslint/utils": "5.51.0",
+ "@typescript-eslint/typescript-estree": "5.54.0",
+ "@typescript-eslint/utils": "5.54.0",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -3293,13 +3293,13 @@
}
},
"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz",
- "integrity": "sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz",
+ "integrity": "sha512-VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/visitor-keys": "5.51.0"
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/visitor-keys": "5.54.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3310,9 +3310,9 @@
}
},
"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.51.0.tgz",
- "integrity": "sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz",
+ "integrity": "sha512-nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3323,13 +3323,13 @@
}
},
"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz",
- "integrity": "sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz",
+ "integrity": "sha512-X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/visitor-keys": "5.51.0",
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/visitor-keys": "5.54.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -3350,16 +3350,16 @@
}
},
"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.51.0.tgz",
- "integrity": "sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz",
+ "integrity": "sha512-cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.51.0",
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/typescript-estree": "5.51.0",
+ "@typescript-eslint/scope-manager": "5.54.0",
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/typescript-estree": "5.54.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0",
"semver": "^7.3.7"
@@ -3376,12 +3376,12 @@
}
},
"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz",
- "integrity": "sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz",
+ "integrity": "sha512-xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.51.0",
+ "@typescript-eslint/types": "5.54.0",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
@@ -14377,14 +14377,14 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz",
- "integrity": "sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz",
+ "integrity": "sha512-+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.51.0",
- "@typescript-eslint/type-utils": "5.51.0",
- "@typescript-eslint/utils": "5.51.0",
+ "@typescript-eslint/scope-manager": "5.54.0",
+ "@typescript-eslint/type-utils": "5.54.0",
+ "@typescript-eslint/utils": "5.54.0",
"debug": "^4.3.4",
"grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
@@ -14395,29 +14395,29 @@
},
"dependencies": {
"@typescript-eslint/scope-manager": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz",
- "integrity": "sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz",
+ "integrity": "sha512-VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/visitor-keys": "5.51.0"
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/visitor-keys": "5.54.0"
}
},
"@typescript-eslint/types": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.51.0.tgz",
- "integrity": "sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz",
+ "integrity": "sha512-nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz",
- "integrity": "sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz",
+ "integrity": "sha512-X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/visitor-keys": "5.51.0",
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/visitor-keys": "5.54.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -14426,28 +14426,28 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.51.0.tgz",
- "integrity": "sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz",
+ "integrity": "sha512-cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.51.0",
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/typescript-estree": "5.51.0",
+ "@typescript-eslint/scope-manager": "5.54.0",
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/typescript-estree": "5.54.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0",
"semver": "^7.3.7"
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz",
- "integrity": "sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz",
+ "integrity": "sha512-xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.51.0",
+ "@typescript-eslint/types": "5.54.0",
"eslint-visitor-keys": "^3.3.0"
}
}
@@ -14486,41 +14486,41 @@
}
},
"@typescript-eslint/type-utils": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz",
- "integrity": "sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz",
+ "integrity": "sha512-WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ==",
"dev": true,
"requires": {
- "@typescript-eslint/typescript-estree": "5.51.0",
- "@typescript-eslint/utils": "5.51.0",
+ "@typescript-eslint/typescript-estree": "5.54.0",
+ "@typescript-eslint/utils": "5.54.0",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
"dependencies": {
"@typescript-eslint/scope-manager": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz",
- "integrity": "sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz",
+ "integrity": "sha512-VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/visitor-keys": "5.51.0"
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/visitor-keys": "5.54.0"
}
},
"@typescript-eslint/types": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.51.0.tgz",
- "integrity": "sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz",
+ "integrity": "sha512-nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz",
- "integrity": "sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz",
+ "integrity": "sha512-X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/visitor-keys": "5.51.0",
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/visitor-keys": "5.54.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -14529,28 +14529,28 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.51.0.tgz",
- "integrity": "sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz",
+ "integrity": "sha512-cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.51.0",
- "@typescript-eslint/types": "5.51.0",
- "@typescript-eslint/typescript-estree": "5.51.0",
+ "@typescript-eslint/scope-manager": "5.54.0",
+ "@typescript-eslint/types": "5.54.0",
+ "@typescript-eslint/typescript-estree": "5.54.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0",
"semver": "^7.3.7"
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.51.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz",
- "integrity": "sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==",
+ "version": "5.54.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz",
+ "integrity": "sha512-xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.51.0",
+ "@typescript-eslint/types": "5.54.0",
"eslint-visitor-keys": "^3.3.0"
}
}
diff --git a/frontend/frontend-sdk/package.json b/frontend/frontend-sdk/package.json
index eb50aca9e..ae51e5ee6 100644
--- a/frontend/frontend-sdk/package.json
+++ b/frontend/frontend-sdk/package.json
@@ -44,7 +44,7 @@
"devDependencies": {
"@github/webauthn-json": "^2.1.1",
"@types/jest": "^29.4.0",
- "@typescript-eslint/eslint-plugin": "^5.51.0",
+ "@typescript-eslint/eslint-plugin": "^5.54.0",
"better-docs": "^2.7.2",
"eslint": "^8.33.0",
"eslint-config-google": "^0.14.0",
|
generator-jhipster
|
https://github.com/jhipster/generator-jhipster
|
ddbe2478820c11c2a02e14524537157aabc2d8cd
|
dependabot[bot]
|
2024-01-02 04:58:48
|
build(deps-dev): bump @types/node from 18.19.3 to 18.19.4
|
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.3 to 18.19.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
---
|
build(deps-dev): bump @types/node from 18.19.3 to 18.19.4
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.3 to 18.19.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
---
updated-dependencies:
- dependency-name: "@types/node"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
|
diff --git a/package-lock.json b/package-lock.json
index 175d11b7e675..9033531d5e73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,7 +78,7 @@
"@types/glob": "npm:[email protected]",
"@types/minimatch": "npm:[email protected]",
"@types/mocha": "10.0.6",
- "@types/node": "18.19.3",
+ "@types/node": "18.19.4",
"@types/sinon-chai": "3.2.12",
"chai": "4.3.10",
"chokidar": "3.5.3",
@@ -3247,9 +3247,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "18.19.3",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz",
- "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==",
+ "version": "18.19.4",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.4.tgz",
+ "integrity": "sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A==",
"dependencies": {
"undici-types": "~5.26.4"
}
diff --git a/package.json b/package.json
index d4cd72bab2e7..02e1026e199b 100644
--- a/package.json
+++ b/package.json
@@ -169,7 +169,7 @@
"@types/glob": "npm:[email protected]",
"@types/minimatch": "npm:[email protected]",
"@types/mocha": "10.0.6",
- "@types/node": "18.19.3",
+ "@types/node": "18.19.4",
"@types/sinon-chai": "3.2.12",
"chai": "4.3.10",
"chokidar": "3.5.3",
|
findroid
|
https://github.com/jarnedemeulemeester/findroid
|
d86b162d4b2408f39faafff9efdae6a3d964340a
|
mustafadakhel
|
2023-07-29 19:17:36
|
feat: add double tap ripple animation (#401)
|
* Add double tap seeking animation
* Remove unnecessary formatting changes
* Order imports correctly
* Remove needless blank line
* feat: add ripple for playback (play / pause)
* refactor: clean up
---------
|
feat: add double tap ripple animation (#401)
* Add double tap seeking animation
* Remove unnecessary formatting changes
* Order imports correctly
* Remove needless blank line
* feat: add ripple for playback (play / pause)
* refactor: clean up
---------
Co-authored-by: Jarne Demeulemeester <[email protected]>
|
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
index 30bd3f6f7a..05981bc7d6 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/utils/PlayerGestureHelper.kt
@@ -10,9 +10,13 @@ import android.view.GestureDetector
import android.view.MotionEvent
import android.view.ScaleGestureDetector
import android.view.View
+import android.view.ViewPropertyAnimator
import android.view.WindowInsets
import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL
import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_OFF
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import android.widget.ImageView
import androidx.media3.ui.AspectRatioFrameLayout
import androidx.media3.ui.PlayerView
import dev.jdtech.jellyfin.AppPreferences
@@ -72,8 +76,6 @@ class PlayerGestureHelper(
val viewWidth = playerView.measuredWidth
val areaWidth = viewWidth / 5 // Divide the view into 5 parts: 2:1:2
- val currentPos = playerView.player?.currentPosition ?: 0
-
// Define the areas and their boundaries
val leftmostAreaStart = 0
val middleAreaStart = areaWidth * 2
@@ -82,15 +84,15 @@ class PlayerGestureHelper(
when (e.x.toInt()) {
in leftmostAreaStart until middleAreaStart -> {
// Tapped on the leftmost area (seek backward)
- playerView.player?.seekTo((currentPos - appPreferences.playerSeekBackIncrement).coerceAtLeast(0))
+ rewind()
}
in middleAreaStart until rightmostAreaStart -> {
// Tapped on the middle area (toggle pause/unpause)
- playerView.player?.playWhenReady = !playerView.player?.playWhenReady!!
+ togglePlayback()
}
in rightmostAreaStart until viewWidth -> {
// Tapped on the rightmost area (seek forward)
- playerView.player?.seekTo(currentPos + appPreferences.playerSeekForwardIncrement)
+ fastForward()
}
}
return true
@@ -98,6 +100,68 @@ class PlayerGestureHelper(
},
)
+ private fun fastForward() {
+ val currentPosition = playerView.player?.currentPosition ?: 0
+ val fastForwardPosition = currentPosition + appPreferences.playerSeekForwardIncrement
+ seekTo(fastForwardPosition)
+ animateRipple(activity.binding.imageFfwdAnimationRipple)
+ }
+
+ private fun rewind() {
+ val currentPosition = playerView.player?.currentPosition ?: 0
+ val rewindPosition = currentPosition - appPreferences.playerSeekBackIncrement
+ seekTo(rewindPosition.coerceAtLeast(0))
+ animateRipple(activity.binding.imageRewindAnimationRipple)
+ }
+
+ private fun togglePlayback() {
+ playerView.player?.playWhenReady = !playerView.player?.playWhenReady!!
+ animateRipple(activity.binding.imagePlaybackAnimationRipple)
+ }
+
+ private fun seekTo(position: Long) {
+ playerView.player?.seekTo(position)
+ }
+
+ private fun animateRipple(image: ImageView) {
+ image
+ .animateSeekingRippleStart()
+ .withEndAction {
+ resetRippleImage(image)
+ }
+ .start()
+ }
+
+ private fun ImageView.animateSeekingRippleStart(): ViewPropertyAnimator {
+ val rippleImageHeight = this.height
+ val playerViewHeight = playerView.height.toFloat()
+ val playerViewWidth = playerView.width.toFloat()
+ val scaleDifference = playerViewHeight / rippleImageHeight
+ val playerViewAspectRatio = playerViewWidth / playerViewHeight
+ val scaleValue = scaleDifference * playerViewAspectRatio
+ return animate()
+ .alpha(1f)
+ .scaleX(scaleValue)
+ .scaleY(scaleValue)
+ .setDuration(180)
+ .setInterpolator(DecelerateInterpolator())
+ }
+
+ private fun resetRippleImage(image: ImageView) {
+ image
+ .animateSeekingRippleEnd()
+ .withEndAction {
+ image.scaleX = 1f
+ image.scaleY = 1f
+ }
+ .start()
+ }
+
+ private fun ImageView.animateSeekingRippleEnd() = animate()
+ .alpha(0f)
+ .setDuration(150)
+ .setInterpolator(AccelerateInterpolator())
+
private val seekGestureDetector = GestureDetector(
playerView.context,
object : GestureDetector.SimpleOnGestureListener() {
diff --git a/app/phone/src/main/res/layout/activity_player.xml b/app/phone/src/main/res/layout/activity_player.xml
index ec44e30fbd..ee2e89772e 100644
--- a/app/phone/src/main/res/layout/activity_player.xml
+++ b/app/phone/src/main/res/layout/activity_player.xml
@@ -113,4 +113,30 @@
tools:ignore="ContentDescription" />
</LinearLayout>
+ <ImageView
+ android:id="@+id/image_ffwd_animation_ripple"
+ android:layout_width="50dp"
+ android:layout_height="50dp"
+ android:layout_gravity="center_vertical|end"
+ android:alpha="0"
+ android:src="@drawable/transparent_circle"
+ tools:ignore="ContentDescription" />
+
+ <ImageView
+ android:id="@+id/image_rewind_animation_ripple"
+ android:layout_width="50dp"
+ android:layout_height="50dp"
+ android:layout_gravity="center_vertical|start"
+ android:alpha="0"
+ android:src="@drawable/transparent_circle"
+ tools:ignore="ContentDescription" />
+
+ <ImageView
+ android:id="@+id/image_playback_animation_ripple"
+ android:layout_width="50dp"
+ android:layout_height="50dp"
+ android:layout_gravity="center"
+ android:alpha="0"
+ android:src="@drawable/transparent_circle"
+ tools:ignore="ContentDescription" />
</FrameLayout>
diff --git a/core/src/main/res/drawable/transparent_circle.xml b/core/src/main/res/drawable/transparent_circle.xml
new file mode 100644
index 0000000000..a8e538b933
--- /dev/null
+++ b/core/src/main/res/drawable/transparent_circle.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="oval">
+ <size
+ android:width="24dp"
+ android:height="24dp" />
+ <solid android:color="#22ffffff" />
+</shape>
\ No newline at end of file
|
node
|
https://github.com/nodejs/node
|
1e8625c622d4f3463fa0138e9912615b162ec296
|
Robert Nagy
|
2020-03-01 23:08:49
|
test: fix flaky test-gc-net-timeout
|
If the timeout is called in the time between 'end' and 'close'
that would cause a EPIPE error. Essentially making the test flaky.
|
test: fix flaky test-gc-net-timeout
If the timeout is called in the time between 'end' and 'close'
that would cause a EPIPE error. Essentially making the test flaky.
PR-URL: https://github.com/nodejs/node/pull/31918
Reviewed-By: Anna Henningsen <[email protected]>
|
diff --git a/test/parallel/test-gc-net-timeout.js b/test/parallel/test-gc-net-timeout.js
index 51d9b8ca09bbbc..9ba6d2bc1744f9 100644
--- a/test/parallel/test-gc-net-timeout.js
+++ b/test/parallel/test-gc-net-timeout.js
@@ -12,6 +12,9 @@ function serverHandler(sock) {
sock.on('close', function() {
clearTimeout(timer);
});
+ sock.on('end', function() {
+ clearTimeout(timer);
+ });
sock.on('error', function(err) {
assert.strictEqual(err.code, 'ECONNRESET');
});
|
super-linter
|
https://github.com/super-linter/super-linter
|
945b682d09b2a4a3ccf1ec276f4738b90d7ab248
|
Marco Ferrari
|
2025-03-22 17:11:59
|
chore: cache multi-stage build (#6678)
|
Cache all the stages of the multi-stage build
|
chore: cache multi-stage build (#6678)
Cache all the stages of the multi-stage build
|
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 69c2d52db5c..ab4e8902704 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -9,8 +9,69 @@ on:
permissions: {}
jobs:
+ build-stages:
+ name: Build and cache container image stages
+ runs-on: ubuntu-latest
+ concurrency:
+ group: ${{ github.workflow }}-main-build-stages-${{ matrix.stages.stage-name }}
+ cancel-in-progress: true
+ permissions:
+ contents: read
+ issues: write
+ packages: write
+ strategy:
+ fail-fast: false
+ matrix:
+ stages:
+ - stage-name: clang-format
+ - stage-name: python-builder
+ - stage-name: npm-builder
+ - stage-name: tflint-plugins
+ - stage-name: lintr-installer
+ - stage-name: powershell-installer
+ - stage-name: php-linters
+ timeout-minutes: 120
+ env:
+ CONTAINER_IMAGE_ID: "ghcr.io/super-linter/super-linter:latest"
+ steps:
+ - name: Checkout Code
+ uses: actions/checkout@v4
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
+
+ - name: Build clang-format stage
+ uses: docker/build-push-action@v6
+ with:
+ context: .
+ file: ./Dockerfile
+ cache-from: type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-${{ matrix.stages.stage-name }}
+ cache-to: type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-${{ matrix.stages.stage-name }},mode=max
+ load: false
+ push: false
+ secrets: |
+ GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+ target: ${{ matrix.stages.stage-name }}
+ - name: Create Issue on Failure
+ uses: actions/github-script@v7
+ if: failure()
+ with:
+ github-token: ${{secrets.GITHUB_TOKEN}}
+ script: |
+ const create = await github.rest.issues.create({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ title: "Failed to build stage ${{ matrix.stages.stage-name }}",
+ body: "Automation has failed us!\nMore information can be found at:\n - ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+ assignees: [
+ "zkoppert", "Hanse00", "ferrarimarco"
+ ]
+ })
+
test:
name: Build and Test
+ needs:
+ - build-stages
runs-on: ubuntu-latest
concurrency:
group: ${{ github.workflow }}-main-${{ matrix.images.target }}
@@ -95,7 +156,15 @@ jobs:
BUILD_DATE=${{ env.BUILD_DATE }}
BUILD_REVISION=${{ env.BUILD_REVISION }}
BUILD_VERSION=${{ env.BUILD_VERSION }}
- cache-from: type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache
+ cache-from: |
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-clang-format
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-python-builder
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-npm-builder
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-tflint-plugins
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-lintr-installer
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-powershell-installer
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-php-linters
load: true
push: false
secrets: |
@@ -125,7 +194,15 @@ jobs:
BUILD_DATE=${{ env.BUILD_DATE }}
BUILD_REVISION=${{ env.BUILD_REVISION }}
BUILD_VERSION=${{ env.BUILD_VERSION }}
- cache-from: type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache
+ cache-from: |
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-clang-format
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-python-builder
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-npm-builder
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-tflint-plugins
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-lintr-installer
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-powershell-installer
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-php-linters
cache-to: type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache,mode=max
load: false
push: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 41bbb3f174f..24560ba9ada 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,6 +75,47 @@ jobs:
echo "CONTAINER_IMAGE_BUILD_VERSION=${BUILD_VERSION}"
} >> "${GITHUB_OUTPUT}"
+ build-stages:
+ name: Build and cache container image stages
+ runs-on: ubuntu-latest
+ concurrency:
+ group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ github.event_name }}-build-stages-${{ matrix.stages.stage-name }}
+ cancel-in-progress: true
+ permissions:
+ contents: read
+ strategy:
+ fail-fast: false
+ matrix:
+ stages:
+ - stage-name: clang-format
+ - stage-name: python-builder
+ - stage-name: npm-builder
+ - stage-name: tflint-plugins
+ - stage-name: lintr-installer
+ - stage-name: powershell-installer
+ - stage-name: php-linters
+ timeout-minutes: 120
+ env:
+ CONTAINER_IMAGE_ID: "ghcr.io/super-linter/super-linter:latest"
+ steps:
+ - name: Checkout Code
+ uses: actions/checkout@v4
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
+
+ - name: Build ${{ matrix.stages.stage-name }} stage
+ uses: docker/build-push-action@v6
+ with:
+ context: .
+ file: ./Dockerfile
+ cache-from: type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-${{ matrix.stages.stage-name }}
+ load: false
+ push: false
+ secrets: |
+ GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+ target: ${{ matrix.stages.stage-name }}
+
build-container-image:
name: Build and Test
runs-on: ubuntu-latest
@@ -127,7 +168,15 @@ jobs:
BUILD_DATE=${{ needs.set-build-metadata.outputs.CONTAINER_IMAGE_BUILD_DATE }}
BUILD_REVISION=${{ needs.set-build-metadata.outputs.CONTAINER_IMAGE_BUILD_REVISION }}
BUILD_VERSION=${{ needs.set-build-metadata.outputs.CONTAINER_IMAGE_BUILD_VERSION }}
- cache-from: type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache
+ cache-from: |
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-clang-format
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-python-builder
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-npm-builder
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-tflint-plugins
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-lintr-installer
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-powershell-installer
+ type=registry,ref=${{ env.CONTAINER_IMAGE_ID }}-buildcache-php-linters
outputs: type=docker,dest=/tmp/${{ env.CONTAINER_IMAGE_OUTPUT_IMAGE_NAME }}.tar
push: false
secrets: |
|
aws-cdk
|
https://github.com/aws/aws-cdk
|
f4af33018e374ea97346e8ec70776feb46f6ab7b
|
Andrew Hammond
|
2024-04-18 04:48:42
|
feat(elasticloadbalancingv2): add removeSuffix param for ExternalApplicationListener.addAction() (#29746)
|
### Issue # (if applicable)
|
feat(elasticloadbalancingv2): add removeSuffix param for ExternalApplicationListener.addAction() (#29746)
### Issue # (if applicable)
Closes #29496
### Reason for this change
See https://github.com/aws/aws-cdk/pull/29513 (props based solution instead of feature-flag)
### Description of changes
Adds a `removeSuffix` property to addAction method to address problems due to logicalId inconsistency.
### Description of how you validated changes
UTs. Per IT document, integration tests are not necessary.
### Checklist
- [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md)
----
*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
|
diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/README.md b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/README.md
index 34978410e072b..b79f330a17acb 100644
--- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/README.md
+++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/README.md
@@ -765,3 +765,16 @@ const targetGroup = elbv2.ApplicationTargetGroup.fromTargetGroupAttributes(this,
const targetGroupMetrics: elbv2.IApplicationTargetGroupMetrics = targetGroup.metrics; // throws an Error()
```
+
+## logicalIds on ExternalApplicationListener.addTargetGroups() and .addAction()
+
+By default, the `addTargetGroups()` method does not follow the standard behavior
+of adding a `Rule` suffix to the logicalId of the `ListenerRule` it creates.
+If you are deploying new `ListenerRule`s using `addTargetGroups()` the recommendation
+is to set the `removeRuleSuffixFromLogicalId: false` property.
+If you have `ListenerRule`s deployed using the legacy behavior of `addTargetGroups()`,
+which you need to switch over to being managed by the `addAction()` method,
+then you will need to enable the `removeRuleSuffixFromLogicalId: true` property in the `addAction()` method.
+
+`ListenerRule`s have a unique `priority` for a given `Listener`.
+Because the `priority` must be unique, CloudFormation will always fail when creating a new `ListenerRule` to replace the existing one, unless you change the `priority` as well as the logicalId.
diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts
index bbb7d02f34214..abc30dbd63714 100644
--- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts
+++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts
@@ -664,15 +664,21 @@ abstract class ExternalApplicationListener extends Resource implements IApplicat
* It is not possible to add a default action to an imported IApplicationListener.
* In order to add actions to an imported IApplicationListener a `priority`
* must be provided.
+ *
+ * If you previously deployed a `ListenerRule` using the `addTargetGroups()` method
+ * and need to migrate to using the more feature rich `addAction()`
+ * method, then you will need to set the `removeRuleSuffixFromLogicalId: true`
+ * property here to avoid having CloudFormation attempt to replace your resource.
*/
public addAction(id: string, props: AddApplicationActionProps): void {
checkAddRuleProps(props);
if (props.priority !== undefined) {
+ const ruleId = props.removeSuffix ? id : id + 'Rule';
// New rule
//
// TargetGroup.registerListener is called inside ApplicationListenerRule.
- new ApplicationListenerRule(this, id + 'Rule', {
+ new ApplicationListenerRule(this, ruleId, {
listener: this,
priority: props.priority,
...props,
@@ -807,6 +813,19 @@ export interface AddApplicationActionProps extends AddRuleProps {
* Action to perform
*/
readonly action: ListenerAction;
+ /**
+ * `ListenerRule`s have a `Rule` suffix on their logicalId by default. This allows you to remove that suffix.
+ *
+ * Legacy behavior of the `addTargetGroups()` convenience method did not include the `Rule` suffix on the logicalId of the generated `ListenerRule`.
+ * At some point, increasing complexity of requirements can require users to switch from the `addTargetGroups()` method
+ * to the `addAction()` method.
+ * When migrating `ListenerRule`s deployed by a legacy version of `addTargetGroups()`,
+ * you will need to enable this flag to avoid changing the logicalId of your resource.
+ * Otherwise Cfn will attempt to replace the `ListenerRule` and fail.
+ *
+ * @default - use standard logicalId with the `Rule` suffix
+ */
+ readonly removeSuffix?: boolean;
}
/**
diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/listener.test.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/listener.test.ts
index 907cf8a20a683..0bc19b4d423eb 100644
--- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/listener.test.ts
+++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/listener.test.ts
@@ -1698,6 +1698,47 @@ describe('tests', () => {
}).toThrow(/Specify at most one/);
});
+ describe('Rule suffix for logicalId', () => {
+ const identifierToken = 'SuperMagicToken';
+ interface TestCase {
+ readonly removeSuffix?: boolean;
+ readonly expectedLogicalId: string;
+ };
+ const nonDefaultTestCases: TestCase[] = [
+ { removeSuffix: true, expectedLogicalId: identifierToken },
+ { removeSuffix: false, expectedLogicalId: identifierToken + 'Rule' },
+ ];
+ test.each<TestCase>([
+ // Default is consistent, which means it has the `Rule` suffix. This means no change from legacy behavior
+ { removeSuffix: undefined, expectedLogicalId: identifierToken + 'Rule' },
+ ...nonDefaultTestCases,
+ ])('addAction %s', ({ removeSuffix, expectedLogicalId }) => {
+ // GIVEN
+ const app = new cdk.App();
+ const stack = new cdk.Stack(app, 'TestStack', { env: { account: '123456789012', region: 'us-east-1' } });
+ const vpc = new ec2.Vpc(stack, 'Stack');
+ const targetGroup = new elbv2.ApplicationTargetGroup(stack, 'TargetGroup', { vpc, port: 80 });
+ const listener = elbv2.ApplicationListener.fromLookup(stack, 'a', {
+ loadBalancerTags: {
+ some: 'tag',
+ },
+ });
+
+ // WHEN
+ listener.addAction(identifierToken, {
+ action: elbv2.ListenerAction.weightedForward([{ targetGroup, weight: 1 }]),
+ conditions: [elbv2.ListenerCondition.pathPatterns(['/fake'])],
+ priority: 42,
+ removeSuffix,
+ });
+
+ // THEN
+ const applicationListenerRule = listener.node.children.find((v)=> v.hasOwnProperty('conditions'));
+ expect(applicationListenerRule).toBeDefined();
+ expect(applicationListenerRule!.node.id).toBe(expectedLogicalId);
+ });
+ });
+
describe('lookup', () => {
test('Can look up an ApplicationListener', () => {
// GIVEN
|
ragflow
|
https://github.com/infiniflow/ragflow
|
568322aeaf75c18090a1ffa9aabdb0c60ec48be2
|
Kung Quang
|
2024-11-19 12:06:10
|
fix(rag): fix error in viewing document chunk and cannot start task_executor server (#3481)
|
### What problem does this PR solve?
1. Fix error in viewing document chunk

<img width="1677" alt="Pasted Graphic"
src="https://github.com/user-attachments/assets/acd84cde-f38c-4190-b135-5e5139ae2613">
Viewing document chunk details in a BeartypeCallHintParamViolation
error.
Traceback (most recent call last):
File "ragflow/.venv/lib/python3.12/site-packages/flask/app.py", line
880, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "ragflow/.venv/lib/python3.12/site-packages/flask/app.py", line
865, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args)
# type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "ragflow/.venv/lib/python3.12/site-packages/flask_login/utils.py",
line 290, in decorated_view
return current_app.ensure_sync(func)(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "ragflow/api/apps/chunk_app.py", line 311, in knowledge_graph
sres = settings.retrievaler.search(req, search.index_name(tenant_id),
kb_ids)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<@beartype(rag.nlp.search.Dealer.search) at 0x3381fd800>", line
39, in search
beartype.roar.BeartypeCallHintParamViolation: Method
rag.nlp.search.Dealer.search() parameter
idx_names='ragflow_0e1e67f431d711ef98fc00155d29195d' violates type hint
list[str], as str 'ragflow_0e1e67f431d711ef98fc00155d29195d' not
instance of list.
2024-11-19 11:30:29,817 ERROR 91013 Method
rag.nlp.search.Dealer.search() parameter
idx_names='ragflow_0e1e67f431d711ef98fc00155d29195d' violates type hint
list[str], as str 'ragflow_0e1e67f431d711ef98fc00155d29195d' not
instance of list.
Traceback (most recent call last):
File "ragflow/api/apps/chunk_app.py", line 60, in list_chunk
sres = settings.retrievaler.search(query, search.index_name(tenant_id),
kb_ids, highlight=True)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<@beartype(rag.nlp.search.Dealer.search) at 0x3381fd800>", line
39, in search
beartype.roar.BeartypeCallHintParamViolation: Method
rag.nlp.search.Dealer.search() parameter
idx_names='ragflow_0e1e67f431d711ef98fc00155d29195d' violates type hint
list[str], as str 'ragflow_0e1e67f431d711ef98fc00155d29195d' not
instance of list.
because in nlp/search.py,the idx_names is only list

<img width="1098" alt="Pasted Graphic 2"
src="https://github.com/user-attachments/assets/4998cb1e-94bc-470b-b2f4-41ecb5b08f8a">
but the DocStoreConnection.search method accept list or str
<img width="1175" alt="Pasted Graphic 3"
src="https://github.com/user-attachments/assets/ee918b4a-87a5-42c9-a6d2-d0db0884b875">

and his implements also list and str
es_conn.py

<img width="1121" alt="Pasted Graphic 4"
src="https://github.com/user-attachments/assets/3e6dc030-0a0d-416c-8fd4-0b4cfd576f8c">
infinity_conn.py

<img width="1221" alt="Pasted Graphic 5"
src="https://github.com/user-attachments/assets/44edac2b-6b81-45b0-a3fc-cb1c63219015">
2. Fix cannot star task_executor server with Unresolved reference
'Mapping'
<img width="1283" alt="Pasted Graphic 6"
src="https://github.com/user-attachments/assets/421f17b8-d0a5-46d3-bc4d-d05dc9dfc934">
### Type of change
- [X] Bug Fix (non-breaking change which fixes an issue)
- [ ] New Feature (non-breaking change which adds functionality)
- [ ] Documentation Update
- [ ] Refactoring
- [ ] Performance Improvement
- [ ] Other (please describe):
|
fix(rag): fix error in viewing document chunk and cannot start task_executor server (#3481)
### What problem does this PR solve?
1. Fix error in viewing document chunk

<img width="1677" alt="Pasted Graphic"
src="https://github.com/user-attachments/assets/acd84cde-f38c-4190-b135-5e5139ae2613">
Viewing document chunk details in a BeartypeCallHintParamViolation
error.
Traceback (most recent call last):
File "ragflow/.venv/lib/python3.12/site-packages/flask/app.py", line
880, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "ragflow/.venv/lib/python3.12/site-packages/flask/app.py", line
865, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args)
# type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "ragflow/.venv/lib/python3.12/site-packages/flask_login/utils.py",
line 290, in decorated_view
return current_app.ensure_sync(func)(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "ragflow/api/apps/chunk_app.py", line 311, in knowledge_graph
sres = settings.retrievaler.search(req, search.index_name(tenant_id),
kb_ids)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<@beartype(rag.nlp.search.Dealer.search) at 0x3381fd800>", line
39, in search
beartype.roar.BeartypeCallHintParamViolation: Method
rag.nlp.search.Dealer.search() parameter
idx_names='ragflow_0e1e67f431d711ef98fc00155d29195d' violates type hint
list[str], as str 'ragflow_0e1e67f431d711ef98fc00155d29195d' not
instance of list.
2024-11-19 11:30:29,817 ERROR 91013 Method
rag.nlp.search.Dealer.search() parameter
idx_names='ragflow_0e1e67f431d711ef98fc00155d29195d' violates type hint
list[str], as str 'ragflow_0e1e67f431d711ef98fc00155d29195d' not
instance of list.
Traceback (most recent call last):
File "ragflow/api/apps/chunk_app.py", line 60, in list_chunk
sres = settings.retrievaler.search(query, search.index_name(tenant_id),
kb_ids, highlight=True)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<@beartype(rag.nlp.search.Dealer.search) at 0x3381fd800>", line
39, in search
beartype.roar.BeartypeCallHintParamViolation: Method
rag.nlp.search.Dealer.search() parameter
idx_names='ragflow_0e1e67f431d711ef98fc00155d29195d' violates type hint
list[str], as str 'ragflow_0e1e67f431d711ef98fc00155d29195d' not
instance of list.
because in nlp/search.py,the idx_names is only list

<img width="1098" alt="Pasted Graphic 2"
src="https://github.com/user-attachments/assets/4998cb1e-94bc-470b-b2f4-41ecb5b08f8a">
but the DocStoreConnection.search method accept list or str
<img width="1175" alt="Pasted Graphic 3"
src="https://github.com/user-attachments/assets/ee918b4a-87a5-42c9-a6d2-d0db0884b875">

and his implements also list and str
es_conn.py

<img width="1121" alt="Pasted Graphic 4"
src="https://github.com/user-attachments/assets/3e6dc030-0a0d-416c-8fd4-0b4cfd576f8c">
infinity_conn.py

<img width="1221" alt="Pasted Graphic 5"
src="https://github.com/user-attachments/assets/44edac2b-6b81-45b0-a3fc-cb1c63219015">
2. Fix cannot star task_executor server with Unresolved reference
'Mapping'
<img width="1283" alt="Pasted Graphic 6"
src="https://github.com/user-attachments/assets/421f17b8-d0a5-46d3-bc4d-d05dc9dfc934">
### Type of change
- [X] Bug Fix (non-breaking change which fixes an issue)
- [ ] New Feature (non-breaking change which adds functionality)
- [ ] Documentation Update
- [ ] Refactoring
- [ ] Performance Improvement
- [ ] Other (please describe):
|
diff --git a/rag/nlp/search.py b/rag/nlp/search.py
index 92c6ccf27a4..e7b70090309 100644
--- a/rag/nlp/search.py
+++ b/rag/nlp/search.py
@@ -61,7 +61,7 @@ def get_filters(self, req):
condition[key] = req[key]
return condition
- def search(self, req, idx_names: list[str], kb_ids: list[str], emb_mdl=None, highlight = False):
+ def search(self, req, idx_names: str | list[str], kb_ids: list[str], emb_mdl=None, highlight = False):
filters = self.get_filters(req)
orderBy = OrderByExpr()
|
argo-cd
|
https://github.com/argoproj/argo-cd
|
48bdf949a5aaa665887eba1a9b67475970ed04e6
|
Ishita Sequeira
|
2024-06-12 13:27:25
|
feat(appset): appset git generator verifies GPG signatures (#18545)
|
* feat(appset): appset git generator verifies GPG signatures
|
feat(appset): appset git generator verifies GPG signatures (#18545)
* feat(appset): appset git generator verifies GPG signatures
Signed-off-by: ishitasequeira <[email protected]>
* fix unit tests
Signed-off-by: ishitasequeira <[email protected]>
* fix generated code
Signed-off-by: ishitasequeira <[email protected]>
* add check for signatures in project and fix tests
Signed-off-by: ishitasequeira <[email protected]>
* fix tests
Signed-off-by: ishitasequeira <[email protected]>
* add e2e tests
Signed-off-by: ishitasequeira <[email protected]>
* address golang ci lint issue
Signed-off-by: ishitasequeira <[email protected]>
* fix golangci lint
Signed-off-by: ishitasequeira <[email protected]>
* Address comments
Signed-off-by: ishitasequeira <[email protected]>
* rebase and resolve conflicts
Signed-off-by: ishitasequeira <[email protected]>
---------
Signed-off-by: ishitasequeira <[email protected]>
Co-authored-by: pasha-codefresh <[email protected]>
|
diff --git a/applicationset/controllers/applicationset_controller.go b/applicationset/controllers/applicationset_controller.go
index a371e759b9284..111c63459979a 100644
--- a/applicationset/controllers/applicationset_controller.go
+++ b/applicationset/controllers/applicationset_controller.go
@@ -514,7 +514,7 @@ func (r *ApplicationSetReconciler) generateApplications(logCtx *log.Entry, appli
var applicationSetReason argov1alpha1.ApplicationSetReasonType
for _, requestedGenerator := range applicationSetInfo.Spec.Generators {
- t, err := generators.Transform(requestedGenerator, r.Generators, applicationSetInfo.Spec.Template, &applicationSetInfo, map[string]interface{}{})
+ t, err := generators.Transform(requestedGenerator, r.Generators, applicationSetInfo.Spec.Template, &applicationSetInfo, map[string]interface{}{}, r.Client)
if err != nil {
logCtx.WithError(err).WithField("generator", requestedGenerator).
Error("error generating application from params")
diff --git a/applicationset/controllers/applicationset_controller_test.go b/applicationset/controllers/applicationset_controller_test.go
index 869ac4ab3405f..33e27cb53ff5f 100644
--- a/applicationset/controllers/applicationset_controller_test.go
+++ b/applicationset/controllers/applicationset_controller_test.go
@@ -24,6 +24,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/cache"
crtcache "sigs.k8s.io/controller-runtime/pkg/cache"
+ "sigs.k8s.io/controller-runtime/pkg/client"
crtclient "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -81,7 +82,7 @@ func (g *generatorMock) GetTemplate(appSetGenerator *v1alpha1.ApplicationSetGene
return args.Get(0).(*v1alpha1.ApplicationSetTemplate)
}
-func (g *generatorMock) GenerateParams(appSetGenerator *v1alpha1.ApplicationSetGenerator, _ *v1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *generatorMock) GenerateParams(appSetGenerator *v1alpha1.ApplicationSetGenerator, _ *v1alpha1.ApplicationSet, client client.Client) ([]map[string]interface{}, error) {
args := g.Called(appSetGenerator)
return args.Get(0).([]map[string]interface{}), args.Error(1)
@@ -124,9 +125,6 @@ func TestExtractApplications(t *testing.T) {
err := v1alpha1.AddToScheme(scheme)
assert.NoError(t, err)
- err = v1alpha1.AddToScheme(scheme)
- assert.NoError(t, err)
-
for _, c := range []struct {
name string
params []map[string]interface{}
diff --git a/applicationset/generators/cluster.go b/applicationset/generators/cluster.go
index 6bbf893421b5c..87cf807df06e1 100644
--- a/applicationset/generators/cluster.go
+++ b/applicationset/generators/cluster.go
@@ -60,7 +60,7 @@ func (g *ClusterGenerator) GetTemplate(appSetGenerator *argoappsetv1alpha1.Appli
return &appSetGenerator.Clusters.Template
}
-func (g *ClusterGenerator) GenerateParams(appSetGenerator *argoappsetv1alpha1.ApplicationSetGenerator, appSet *argoappsetv1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *ClusterGenerator) GenerateParams(appSetGenerator *argoappsetv1alpha1.ApplicationSetGenerator, appSet *argoappsetv1alpha1.ApplicationSet, _ client.Client) ([]map[string]interface{}, error) {
if appSetGenerator == nil {
return nil, EmptyAppSetGeneratorError
}
diff --git a/applicationset/generators/cluster_test.go b/applicationset/generators/cluster_test.go
index 774bdb29e32aa..50908e7f7b705 100644
--- a/applicationset/generators/cluster_test.go
+++ b/applicationset/generators/cluster_test.go
@@ -259,7 +259,7 @@ func TestGenerateParams(t *testing.T) {
Selector: testCase.selector,
Values: testCase.values,
},
- }, &applicationSetInfo)
+ }, &applicationSetInfo, nil)
if testCase.expectedError != nil {
assert.EqualError(t, err, testCase.expectedError.Error())
@@ -632,7 +632,7 @@ func TestGenerateParamsGoTemplate(t *testing.T) {
Selector: testCase.selector,
Values: testCase.values,
},
- }, &applicationSetInfo)
+ }, &applicationSetInfo, nil)
if testCase.expectedError != nil {
assert.EqualError(t, err, testCase.expectedError.Error())
diff --git a/applicationset/generators/duck_type.go b/applicationset/generators/duck_type.go
index 90e43db635b7e..7e0dfb3570d8c 100644
--- a/applicationset/generators/duck_type.go
+++ b/applicationset/generators/duck_type.go
@@ -7,6 +7,7 @@ import (
"time"
log "github.com/sirupsen/logrus"
+ "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/argoproj/argo-cd/v2/util/settings"
@@ -58,7 +59,7 @@ func (g *DuckTypeGenerator) GetTemplate(appSetGenerator *argoprojiov1alpha1.Appl
return &appSetGenerator.ClusterDecisionResource.Template
}
-func (g *DuckTypeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *DuckTypeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet, _ client.Client) ([]map[string]interface{}, error) {
if appSetGenerator == nil {
return nil, EmptyAppSetGeneratorError
}
diff --git a/applicationset/generators/duck_type_test.go b/applicationset/generators/duck_type_test.go
index dfb800e25e24c..ed82a5c9fe075 100644
--- a/applicationset/generators/duck_type_test.go
+++ b/applicationset/generators/duck_type_test.go
@@ -308,7 +308,7 @@ func TestGenerateParamsForDuckType(t *testing.T) {
LabelSelector: testCase.labelSelector,
Values: testCase.values,
},
- }, &applicationSetInfo)
+ }, &applicationSetInfo, nil)
if testCase.expectedError != nil {
assert.EqualError(t, err, testCase.expectedError.Error())
@@ -606,7 +606,7 @@ func TestGenerateParamsForDuckTypeGoTemplate(t *testing.T) {
LabelSelector: testCase.labelSelector,
Values: testCase.values,
},
- }, &applicationSetInfo)
+ }, &applicationSetInfo, nil)
if testCase.expectedError != nil {
assert.EqualError(t, err, testCase.expectedError.Error())
diff --git a/applicationset/generators/generator_spec_processor.go b/applicationset/generators/generator_spec_processor.go
index 494b2e8d9a37d..25e6b138da749 100644
--- a/applicationset/generators/generator_spec_processor.go
+++ b/applicationset/generators/generator_spec_processor.go
@@ -5,6 +5,7 @@ import (
"reflect"
"github.com/jeremywohl/flatten"
+ "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/argoproj/argo-cd/v2/applicationset/utils"
@@ -26,7 +27,7 @@ type TransformResult struct {
}
// Transform a spec generator to list of paramSets and a template
-func Transform(requestedGenerator argoprojiov1alpha1.ApplicationSetGenerator, allGenerators map[string]Generator, baseTemplate argoprojiov1alpha1.ApplicationSetTemplate, appSet *argoprojiov1alpha1.ApplicationSet, genParams map[string]interface{}) ([]TransformResult, error) {
+func Transform(requestedGenerator argoprojiov1alpha1.ApplicationSetGenerator, allGenerators map[string]Generator, baseTemplate argoprojiov1alpha1.ApplicationSetTemplate, appSet *argoprojiov1alpha1.ApplicationSet, genParams map[string]interface{}, client client.Client) ([]TransformResult, error) {
// This is a custom version of the `LabelSelectorAsSelector` that is in k8s.io/apimachinery. This has been copied
// verbatim from that package, with the difference that we do not have any restrictions on label values. This is done
// so that, among other things, we can match on cluster urls.
@@ -64,7 +65,7 @@ func Transform(requestedGenerator argoprojiov1alpha1.ApplicationSetGenerator, al
continue
}
}
- params, err = g.GenerateParams(interpolatedGenerator, appSet)
+ params, err = g.GenerateParams(interpolatedGenerator, appSet, client)
if err != nil {
log.WithError(err).WithField("generator", g).
Error("error generating params")
diff --git a/applicationset/generators/generator_spec_processor_test.go b/applicationset/generators/generator_spec_processor_test.go
index 0459499f9fd55..8f29aba4d698b 100644
--- a/applicationset/generators/generator_spec_processor_test.go
+++ b/applicationset/generators/generator_spec_processor_test.go
@@ -88,7 +88,7 @@ func TestMatchValues(t *testing.T) {
},
data,
emptyTemplate(),
- &applicationSetInfo, nil)
+ &applicationSetInfo, nil, nil)
assert.NoError(t, err)
assert.ElementsMatch(t, testCase.expected, results[0].Params)
@@ -172,7 +172,7 @@ func TestMatchValuesGoTemplate(t *testing.T) {
},
data,
emptyTemplate(),
- &applicationSetInfo, nil)
+ &applicationSetInfo, nil, nil)
assert.NoError(t, err)
assert.ElementsMatch(t, testCase.expected, results[0].Params)
@@ -242,7 +242,7 @@ func TestTransForm(t *testing.T) {
},
testGenerators,
emptyTemplate(),
- &applicationSetInfo, nil)
+ &applicationSetInfo, nil, nil)
assert.NoError(t, err)
assert.ElementsMatch(t, testCase.expected, results[0].Params)
diff --git a/applicationset/generators/git.go b/applicationset/generators/git.go
index b318687281992..b1f6c574aa613 100644
--- a/applicationset/generators/git.go
+++ b/applicationset/generators/git.go
@@ -11,11 +11,14 @@ import (
"github.com/jeremywohl/flatten"
log "github.com/sirupsen/logrus"
+ "k8s.io/apimachinery/pkg/types"
+ "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/yaml"
"github.com/argoproj/argo-cd/v2/applicationset/services"
"github.com/argoproj/argo-cd/v2/applicationset/utils"
argoprojiov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+ "github.com/argoproj/argo-cd/v2/util/gpg"
)
var _ Generator = (*GitGenerator)(nil)
@@ -45,7 +48,7 @@ func (g *GitGenerator) GetRequeueAfter(appSetGenerator *argoprojiov1alpha1.Appli
return DefaultRequeueAfterSeconds
}
-func (g *GitGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *GitGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet, client client.Client) ([]map[string]interface{}, error) {
if appSetGenerator == nil {
return nil, EmptyAppSetGeneratorError
}
@@ -56,12 +59,27 @@ func (g *GitGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.Applic
noRevisionCache := appSet.RefreshRequired()
+ var project string
+ if strings.Contains(appSet.Spec.Template.Spec.Project, "{{") {
+ project = appSetGenerator.Git.Template.Spec.Project
+ } else {
+ project = appSet.Spec.Template.Spec.Project
+ }
+
+ appProject := &argoprojiov1alpha1.AppProject{}
+ if err := client.Get(context.TODO(), types.NamespacedName{Name: appSet.Spec.Template.Spec.Project, Namespace: appSet.Namespace}, appProject); err != nil {
+ return nil, fmt.Errorf("error getting project %s: %w", project, err)
+ }
+
+ // we need to verify the signature on the Git revision if GPG is enabled
+ verifyCommit := appProject.Spec.SignatureKeys != nil && len(appProject.Spec.SignatureKeys) > 0 && gpg.IsGPGEnabled()
+
var err error
var res []map[string]interface{}
if len(appSetGenerator.Git.Directories) != 0 {
- res, err = g.generateParamsForGitDirectories(appSetGenerator, noRevisionCache, appSet.Spec.GoTemplate, appSet.Spec.GoTemplateOptions)
+ res, err = g.generateParamsForGitDirectories(appSetGenerator, noRevisionCache, verifyCommit, appSet.Spec.GoTemplate, appSet.Spec.GoTemplateOptions)
} else if len(appSetGenerator.Git.Files) != 0 {
- res, err = g.generateParamsForGitFiles(appSetGenerator, noRevisionCache, appSet.Spec.GoTemplate, appSet.Spec.GoTemplateOptions)
+ res, err = g.generateParamsForGitFiles(appSetGenerator, noRevisionCache, verifyCommit, appSet.Spec.GoTemplate, appSet.Spec.GoTemplateOptions)
} else {
return nil, EmptyAppSetGeneratorError
}
@@ -72,9 +90,9 @@ func (g *GitGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.Applic
return res, nil
}
-func (g *GitGenerator) generateParamsForGitDirectories(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, noRevisionCache bool, useGoTemplate bool, goTemplateOptions []string) ([]map[string]interface{}, error) {
+func (g *GitGenerator) generateParamsForGitDirectories(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, noRevisionCache, verifyCommit bool, useGoTemplate bool, goTemplateOptions []string) ([]map[string]interface{}, error) {
// Directories, not files
- allPaths, err := g.repos.GetDirectories(context.TODO(), appSetGenerator.Git.RepoURL, appSetGenerator.Git.Revision, noRevisionCache)
+ allPaths, err := g.repos.GetDirectories(context.TODO(), appSetGenerator.Git.RepoURL, appSetGenerator.Git.Revision, noRevisionCache, verifyCommit)
if err != nil {
return nil, fmt.Errorf("error getting directories from repo: %w", err)
}
@@ -97,11 +115,11 @@ func (g *GitGenerator) generateParamsForGitDirectories(appSetGenerator *argoproj
return res, nil
}
-func (g *GitGenerator) generateParamsForGitFiles(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, noRevisionCache bool, useGoTemplate bool, goTemplateOptions []string) ([]map[string]interface{}, error) {
+func (g *GitGenerator) generateParamsForGitFiles(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, noRevisionCache, verifyCommit bool, useGoTemplate bool, goTemplateOptions []string) ([]map[string]interface{}, error) {
// Get all files that match the requested path string, removing duplicates
allFiles := make(map[string][]byte)
for _, requestedPath := range appSetGenerator.Git.Files {
- files, err := g.repos.GetFiles(context.TODO(), appSetGenerator.Git.RepoURL, appSetGenerator.Git.Revision, requestedPath.Path, noRevisionCache)
+ files, err := g.repos.GetFiles(context.TODO(), appSetGenerator.Git.RepoURL, appSetGenerator.Git.Revision, requestedPath.Path, noRevisionCache, verifyCommit)
if err != nil {
return nil, err
}
diff --git a/applicationset/generators/git_test.go b/applicationset/generators/git_test.go
index f2715194b4aac..275406cd6fc1a 100644
--- a/applicationset/generators/git_test.go
+++ b/applicationset/generators/git_test.go
@@ -7,8 +7,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/runtime"
+ "sigs.k8s.io/controller-runtime/pkg/client/fake"
"github.com/argoproj/argo-cd/v2/applicationset/services/mocks"
+ "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argoprojiov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
)
@@ -317,7 +320,7 @@ func TestGitGenerateParamsFromDirectories(t *testing.T) {
argoCDServiceMock := mocks.Repos{}
- argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(testCaseCopy.repoApps, testCaseCopy.repoError)
+ argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(testCaseCopy.repoApps, testCaseCopy.repoError)
gitGenerator := NewGitGenerator(&argoCDServiceMock)
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
@@ -337,7 +340,14 @@ func TestGitGenerateParamsFromDirectories(t *testing.T) {
},
}
- got, err := gitGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ scheme := runtime.NewScheme()
+ err := v1alpha1.AddToScheme(scheme)
+ assert.NoError(t, err)
+ appProject := argoprojiov1alpha1.AppProject{}
+
+ client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&appProject).Build()
+
+ got, err := gitGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, client)
if testCaseCopy.expectedError != nil {
assert.EqualError(t, err, testCaseCopy.expectedError.Error())
@@ -611,7 +621,7 @@ func TestGitGenerateParamsFromDirectoriesGoTemplate(t *testing.T) {
argoCDServiceMock := mocks.Repos{}
- argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(testCaseCopy.repoApps, testCaseCopy.repoError)
+ argoCDServiceMock.On("GetDirectories", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(testCaseCopy.repoApps, testCaseCopy.repoError)
gitGenerator := NewGitGenerator(&argoCDServiceMock)
applicationSetInfo := argoprojiov1alpha1.ApplicationSet{
@@ -631,7 +641,14 @@ func TestGitGenerateParamsFromDirectoriesGoTemplate(t *testing.T) {
},
}
- got, err := gitGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ scheme := runtime.NewScheme()
+ err := v1alpha1.AddToScheme(scheme)
+ assert.NoError(t, err)
+ appProject := argoprojiov1alpha1.AppProject{}
+
+ client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&appProject).Build()
+
+ got, err := gitGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, client)
if testCaseCopy.expectedError != nil {
assert.EqualError(t, err, testCaseCopy.expectedError.Error())
@@ -968,7 +985,7 @@ cluster:
t.Parallel()
argoCDServiceMock := mocks.Repos{}
- argoCDServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+ argoCDServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return(testCaseCopy.repoFileContents, testCaseCopy.repoPathsError)
gitGenerator := NewGitGenerator(&argoCDServiceMock)
@@ -988,7 +1005,14 @@ cluster:
},
}
- got, err := gitGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ scheme := runtime.NewScheme()
+ err := v1alpha1.AddToScheme(scheme)
+ assert.NoError(t, err)
+ appProject := argoprojiov1alpha1.AppProject{}
+
+ client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&appProject).Build()
+
+ got, err := gitGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, client)
fmt.Println(got, err)
if testCaseCopy.expectedError != nil {
@@ -1317,7 +1341,7 @@ cluster:
t.Parallel()
argoCDServiceMock := mocks.Repos{}
- argoCDServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+ argoCDServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return(testCaseCopy.repoFileContents, testCaseCopy.repoPathsError)
gitGenerator := NewGitGenerator(&argoCDServiceMock)
@@ -1337,7 +1361,14 @@ cluster:
},
}
- got, err := gitGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ scheme := runtime.NewScheme()
+ err := v1alpha1.AddToScheme(scheme)
+ assert.NoError(t, err)
+ appProject := argoprojiov1alpha1.AppProject{}
+
+ client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&appProject).Build()
+
+ got, err := gitGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, client)
fmt.Println(got, err)
if testCaseCopy.expectedError != nil {
diff --git a/applicationset/generators/interface.go b/applicationset/generators/interface.go
index 6de3dedee6ba8..ea105c7842279 100644
--- a/applicationset/generators/interface.go
+++ b/applicationset/generators/interface.go
@@ -4,6 +4,8 @@ import (
"fmt"
"time"
+ "sigs.k8s.io/controller-runtime/pkg/client"
+
argoprojiov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
)
@@ -12,7 +14,7 @@ type Generator interface {
// GenerateParams interprets the ApplicationSet and generates all relevant parameters for the application template.
// The expected / desired list of parameters is returned, it then will be render and reconciled
// against the current state of the Applications in the cluster.
- GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error)
+ GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet, client client.Client) ([]map[string]interface{}, error)
// GetRequeueAfter is the generator can controller the next reconciled loop
// In case there is more then one generator the time will be the minimum of the times.
diff --git a/applicationset/generators/list.go b/applicationset/generators/list.go
index 75e5f1f3b7e9e..7ff1010205ab1 100644
--- a/applicationset/generators/list.go
+++ b/applicationset/generators/list.go
@@ -5,6 +5,7 @@ import (
"fmt"
"time"
+ "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/yaml"
argoprojiov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@@ -27,7 +28,7 @@ func (g *ListGenerator) GetTemplate(appSetGenerator *argoprojiov1alpha1.Applicat
return &appSetGenerator.List.Template
}
-func (g *ListGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *ListGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet, _ client.Client) ([]map[string]interface{}, error) {
if appSetGenerator == nil {
return nil, EmptyAppSetGeneratorError
}
diff --git a/applicationset/generators/list_test.go b/applicationset/generators/list_test.go
index 62bbcc77310f8..cf8f0bca54938 100644
--- a/applicationset/generators/list_test.go
+++ b/applicationset/generators/list_test.go
@@ -38,7 +38,7 @@ func TestGenerateListParams(t *testing.T) {
List: &argoprojiov1alpha1.ListGenerator{
Elements: testCase.elements,
},
- }, &applicationSetInfo)
+ }, &applicationSetInfo, nil)
assert.NoError(t, err)
assert.ElementsMatch(t, testCase.expected, got)
@@ -75,7 +75,7 @@ func TestGenerateListParamsGoTemplate(t *testing.T) {
List: &argoprojiov1alpha1.ListGenerator{
Elements: testCase.elements,
},
- }, &applicationSetInfo)
+ }, &applicationSetInfo, nil)
assert.NoError(t, err)
assert.ElementsMatch(t, testCase.expected, got)
diff --git a/applicationset/generators/matrix.go b/applicationset/generators/matrix.go
index 9ca170d0417e4..35e85a45a9632 100644
--- a/applicationset/generators/matrix.go
+++ b/applicationset/generators/matrix.go
@@ -5,6 +5,7 @@ import (
"time"
"github.com/imdario/mergo"
+ "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/argoproj/argo-cd/v2/applicationset/utils"
argoprojiov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@@ -32,7 +33,7 @@ func NewMatrixGenerator(supportedGenerators map[string]Generator) Generator {
return m
}
-func (m *MatrixGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (m *MatrixGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet, client client.Client) ([]map[string]interface{}, error) {
if appSetGenerator.Matrix == nil {
return nil, EmptyAppSetGeneratorError
}
@@ -47,12 +48,12 @@ func (m *MatrixGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.App
res := []map[string]interface{}{}
- g0, err := m.getParams(appSetGenerator.Matrix.Generators[0], appSet, nil)
+ g0, err := m.getParams(appSetGenerator.Matrix.Generators[0], appSet, nil, client)
if err != nil {
return nil, fmt.Errorf("error failed to get params for first generator in matrix generator: %w", err)
}
for _, a := range g0 {
- g1, err := m.getParams(appSetGenerator.Matrix.Generators[1], appSet, a)
+ g1, err := m.getParams(appSetGenerator.Matrix.Generators[1], appSet, a, client)
if err != nil {
return nil, fmt.Errorf("failed to get params for second generator in the matrix generator: %w", err)
}
@@ -79,7 +80,7 @@ func (m *MatrixGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.App
return res, nil
}
-func (m *MatrixGenerator) getParams(appSetBaseGenerator argoprojiov1alpha1.ApplicationSetNestedGenerator, appSet *argoprojiov1alpha1.ApplicationSet, params map[string]interface{}) ([]map[string]interface{}, error) {
+func (m *MatrixGenerator) getParams(appSetBaseGenerator argoprojiov1alpha1.ApplicationSetNestedGenerator, appSet *argoprojiov1alpha1.ApplicationSet, params map[string]interface{}, client client.Client) ([]map[string]interface{}, error) {
matrixGen, err := getMatrixGenerator(appSetBaseGenerator)
if err != nil {
return nil, err
@@ -117,7 +118,8 @@ func (m *MatrixGenerator) getParams(appSetBaseGenerator argoprojiov1alpha1.Appli
m.supportedGenerators,
argoprojiov1alpha1.ApplicationSetTemplate{},
appSet,
- params)
+ params,
+ client)
if err != nil {
return nil, fmt.Errorf("child generator returned an error on parameter generation: %v", err)
}
diff --git a/applicationset/generators/matrix_test.go b/applicationset/generators/matrix_test.go
index 6426a42ede86c..86e7f236364ff 100644
--- a/applicationset/generators/matrix_test.go
+++ b/applicationset/generators/matrix_test.go
@@ -19,6 +19,7 @@ import (
"github.com/stretchr/testify/mock"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+ "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argoprojiov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
)
@@ -150,7 +151,7 @@ func TestMatrixGenerate(t *testing.T) {
Git: g.Git,
List: g.List,
}
- genMock.On("GenerateParams", mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet).Return([]map[string]interface{}{
+ genMock.On("GenerateParams", mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet, mock.Anything).Return([]map[string]interface{}{
{
"path": "app1",
"path.basename": "app1",
@@ -179,7 +180,7 @@ func TestMatrixGenerate(t *testing.T) {
Generators: testCaseCopy.baseGenerators,
Template: argoprojiov1alpha1.ApplicationSetTemplate{},
},
- }, appSet)
+ }, appSet, nil)
if testCaseCopy.expectedErr != nil {
assert.ErrorIs(t, err, testCaseCopy.expectedErr)
@@ -359,7 +360,7 @@ func TestMatrixGenerateGoTemplate(t *testing.T) {
Git: g.Git,
List: g.List,
}
- genMock.On("GenerateParams", mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet).Return([]map[string]interface{}{
+ genMock.On("GenerateParams", mock.AnythingOfType("*v1alpha1.ApplicationSetGenerator"), appSet, mock.Anything).Return([]map[string]interface{}{
{
"path": map[string]string{
"path": "app1",
@@ -392,7 +393,7 @@ func TestMatrixGenerateGoTemplate(t *testing.T) {
Generators: testCaseCopy.baseGenerators,
Template: argoprojiov1alpha1.ApplicationSetTemplate{},
},
- }, appSet)
+ }, appSet, nil)
if testCaseCopy.expectedErr != nil {
assert.ErrorIs(t, err, testCaseCopy.expectedErr)
@@ -678,7 +679,7 @@ func TestInterpolatedMatrixGenerate(t *testing.T) {
Generators: testCaseCopy.baseGenerators,
Template: argoprojiov1alpha1.ApplicationSetTemplate{},
},
- }, appSet)
+ }, appSet, nil)
if testCaseCopy.expectedErr != nil {
assert.ErrorIs(t, err, testCaseCopy.expectedErr)
@@ -863,7 +864,7 @@ func TestInterpolatedMatrixGenerateGoTemplate(t *testing.T) {
Generators: testCaseCopy.baseGenerators,
Template: argoprojiov1alpha1.ApplicationSetTemplate{},
},
- }, appSet)
+ }, appSet, nil)
if testCaseCopy.expectedErr != nil {
assert.ErrorIs(t, err, testCaseCopy.expectedErr)
@@ -1024,7 +1025,7 @@ func TestMatrixGenerateListElementsYaml(t *testing.T) {
Generators: testCaseCopy.baseGenerators,
Template: argoprojiov1alpha1.ApplicationSetTemplate{},
},
- }, appSet)
+ }, appSet, nil)
if testCaseCopy.expectedErr != nil {
assert.ErrorIs(t, err, testCaseCopy.expectedErr)
@@ -1046,7 +1047,7 @@ func (g *generatorMock) GetTemplate(appSetGenerator *argoprojiov1alpha1.Applicat
return args.Get(0).(*argoprojiov1alpha1.ApplicationSetTemplate)
}
-func (g *generatorMock) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *generatorMock) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet, _ client.Client) ([]map[string]interface{}, error) {
args := g.Called(appSetGenerator, appSet)
return args.Get(0).([]map[string]interface{}), args.Error(1)
@@ -1085,7 +1086,7 @@ func TestGitGenerator_GenerateParams_list_x_git_matrix_generator(t *testing.T) {
}
repoServiceMock := &mocks.Repos{}
- repoServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(map[string][]byte{
+ repoServiceMock.On("GetFiles", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(map[string][]byte{
"some/path.json": []byte("test: content"),
}, nil)
gitGenerator := NewGitGenerator(repoServiceMock)
@@ -1111,9 +1112,17 @@ func TestGitGenerator_GenerateParams_list_x_git_matrix_generator(t *testing.T) {
},
},
}
+
+ scheme := runtime.NewScheme()
+ err := v1alpha1.AddToScheme(scheme)
+ assert.NoError(t, err)
+ appProject := argoprojiov1alpha1.AppProject{}
+
+ client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(&appProject).Build()
+
params, err := matrixGenerator.GenerateParams(&argoprojiov1alpha1.ApplicationSetGenerator{
Matrix: matrixGeneratorSpec,
- }, &argoprojiov1alpha1.ApplicationSet{})
+ }, &argoprojiov1alpha1.ApplicationSet{}, client)
require.NoError(t, err)
assert.Equal(t, []map[string]interface{}{{
"path": "some",
diff --git a/applicationset/generators/merge.go b/applicationset/generators/merge.go
index 9757996ad4054..107ce7710a19a 100644
--- a/applicationset/generators/merge.go
+++ b/applicationset/generators/merge.go
@@ -6,6 +6,7 @@ import (
"time"
"github.com/imdario/mergo"
+ "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/argoproj/argo-cd/v2/applicationset/utils"
argoprojiov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@@ -36,10 +37,10 @@ func NewMergeGenerator(supportedGenerators map[string]Generator) Generator {
// getParamSetsForAllGenerators generates params for each child generator in a MergeGenerator. Param sets are returned
// in slices ordered according to the order of the given generators.
-func (m *MergeGenerator) getParamSetsForAllGenerators(generators []argoprojiov1alpha1.ApplicationSetNestedGenerator, appSet *argoprojiov1alpha1.ApplicationSet) ([][]map[string]interface{}, error) {
+func (m *MergeGenerator) getParamSetsForAllGenerators(generators []argoprojiov1alpha1.ApplicationSetNestedGenerator, appSet *argoprojiov1alpha1.ApplicationSet, client client.Client) ([][]map[string]interface{}, error) {
var paramSets [][]map[string]interface{}
for i, generator := range generators {
- generatorParamSets, err := m.getParams(generator, appSet)
+ generatorParamSets, err := m.getParams(generator, appSet, client)
if err != nil {
return nil, fmt.Errorf("error getting params from generator %d of %d: %w", i+1, len(generators), err)
}
@@ -50,7 +51,7 @@ func (m *MergeGenerator) getParamSetsForAllGenerators(generators []argoprojiov1a
}
// GenerateParams gets the params produced by the MergeGenerator.
-func (m *MergeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (m *MergeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet, client client.Client) ([]map[string]interface{}, error) {
if appSetGenerator.Merge == nil {
return nil, EmptyAppSetGeneratorError
}
@@ -59,7 +60,7 @@ func (m *MergeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.Appl
return nil, ErrLessThanTwoGeneratorsInMerge
}
- paramSetsFromGenerators, err := m.getParamSetsForAllGenerators(appSetGenerator.Merge.Generators, appSet)
+ paramSetsFromGenerators, err := m.getParamSetsForAllGenerators(appSetGenerator.Merge.Generators, appSet, client)
if err != nil {
return nil, fmt.Errorf("error getting param sets from generators: %w", err)
}
@@ -137,7 +138,7 @@ func getParamSetsByMergeKey(mergeKeys []string, paramSets []map[string]interface
}
// getParams get the parameters generated by this generator.
-func (m *MergeGenerator) getParams(appSetBaseGenerator argoprojiov1alpha1.ApplicationSetNestedGenerator, appSet *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (m *MergeGenerator) getParams(appSetBaseGenerator argoprojiov1alpha1.ApplicationSetNestedGenerator, appSet *argoprojiov1alpha1.ApplicationSet, client client.Client) ([]map[string]interface{}, error) {
matrixGen, err := getMatrixGenerator(appSetBaseGenerator)
if err != nil {
return nil, err
@@ -175,7 +176,7 @@ func (m *MergeGenerator) getParams(appSetBaseGenerator argoprojiov1alpha1.Applic
m.supportedGenerators,
argoprojiov1alpha1.ApplicationSetTemplate{},
appSet,
- map[string]interface{}{})
+ map[string]interface{}{}, client)
if err != nil {
return nil, fmt.Errorf("child generator returned an error on parameter generation: %v", err)
}
diff --git a/applicationset/generators/merge_test.go b/applicationset/generators/merge_test.go
index 406c183c64329..eba356c081f72 100644
--- a/applicationset/generators/merge_test.go
+++ b/applicationset/generators/merge_test.go
@@ -177,7 +177,7 @@ func TestMergeGenerate(t *testing.T) {
MergeKeys: testCaseCopy.mergeKeys,
Template: argoprojiov1alpha1.ApplicationSetTemplate{},
},
- }, appSet)
+ }, appSet, nil)
if testCaseCopy.expectedErr != nil {
assert.EqualError(t, err, testCaseCopy.expectedErr.Error())
diff --git a/applicationset/generators/plugin.go b/applicationset/generators/plugin.go
index 35c6918740d68..92e798047be90 100644
--- a/applicationset/generators/plugin.go
+++ b/applicationset/generators/plugin.go
@@ -55,7 +55,7 @@ func (g *PluginGenerator) GetTemplate(appSetGenerator *argoprojiov1alpha1.Applic
return &appSetGenerator.Plugin.Template
}
-func (g *PluginGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *PluginGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet, _ client.Client) ([]map[string]interface{}, error) {
if appSetGenerator == nil {
return nil, EmptyAppSetGeneratorError
}
diff --git a/applicationset/generators/plugin_test.go b/applicationset/generators/plugin_test.go
index f5b73075d7c02..d6ed24c8b80c0 100644
--- a/applicationset/generators/plugin_test.go
+++ b/applicationset/generators/plugin_test.go
@@ -681,7 +681,7 @@ func TestPluginGenerateParams(t *testing.T) {
},
}
- got, err := pluginGenerator.GenerateParams(&generatorConfig, &applicationSetInfo)
+ got, err := pluginGenerator.GenerateParams(&generatorConfig, &applicationSetInfo, nil)
if err != nil {
fmt.Println(err)
}
diff --git a/applicationset/generators/pull_request.go b/applicationset/generators/pull_request.go
index c1dfd5ed978e9..c74d506f65133 100644
--- a/applicationset/generators/pull_request.go
+++ b/applicationset/generators/pull_request.go
@@ -56,7 +56,7 @@ func (g *PullRequestGenerator) GetTemplate(appSetGenerator *argoprojiov1alpha1.A
return &appSetGenerator.PullRequest.Template
}
-func (g *PullRequestGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *PullRequestGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet, _ client.Client) ([]map[string]interface{}, error) {
if appSetGenerator == nil {
return nil, EmptyAppSetGeneratorError
}
diff --git a/applicationset/generators/pull_request_test.go b/applicationset/generators/pull_request_test.go
index 8683ee8b82c69..31c5841d8be46 100644
--- a/applicationset/generators/pull_request_test.go
+++ b/applicationset/generators/pull_request_test.go
@@ -203,7 +203,7 @@ func TestPullRequestGithubGenerateParams(t *testing.T) {
PullRequest: &argoprojiov1alpha1.PullRequestGenerator{},
}
- got, gotErr := gen.GenerateParams(&generatorConfig, &c.applicationSet)
+ got, gotErr := gen.GenerateParams(&generatorConfig, &c.applicationSet, nil)
assert.Equal(t, c.expectedErr, gotErr)
assert.ElementsMatch(t, c.expected, got)
}
@@ -343,7 +343,7 @@ func TestAllowedSCMProviderPullRequest(t *testing.T) {
},
}
- _, err := pullRequestGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ _, err := pullRequestGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
assert.Error(t, err, "Must return an error")
assert.ErrorAs(t, err, testCaseCopy.expectedError)
@@ -369,6 +369,6 @@ func TestSCMProviderDisabled_PRGenerator(t *testing.T) {
},
}
- _, err := generator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ _, err := generator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
assert.ErrorIs(t, err, ErrSCMProvidersDisabled)
}
diff --git a/applicationset/generators/scm_provider.go b/applicationset/generators/scm_provider.go
index 42b7789be67f0..c8ecf1c778b2e 100644
--- a/applicationset/generators/scm_provider.go
+++ b/applicationset/generators/scm_provider.go
@@ -108,7 +108,7 @@ func ScmProviderAllowed(applicationSetInfo *argoprojiov1alpha1.ApplicationSet, g
return NewErrDisallowedSCMProvider(url, allowedScmProviders)
}
-func (g *SCMProviderGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *SCMProviderGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet, _ client.Client) ([]map[string]interface{}, error) {
if appSetGenerator == nil {
return nil, EmptyAppSetGeneratorError
}
diff --git a/applicationset/generators/scm_provider_test.go b/applicationset/generators/scm_provider_test.go
index c9f61bff88edd..d2ce25f38b26a 100644
--- a/applicationset/generators/scm_provider_test.go
+++ b/applicationset/generators/scm_provider_test.go
@@ -187,7 +187,7 @@ func TestSCMProviderGenerateParams(t *testing.T) {
},
}
- got, err := scmGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ got, err := scmGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
if testCaseCopy.expectedError != nil {
assert.EqualError(t, err, testCaseCopy.expectedError.Error())
@@ -280,7 +280,7 @@ func TestAllowedSCMProvider(t *testing.T) {
},
}
- _, err := scmGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ _, err := scmGenerator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
assert.Error(t, err, "Must return an error")
assert.ErrorAs(t, err, testCaseCopy.expectedError)
@@ -306,6 +306,6 @@ func TestSCMProviderDisabled_SCMGenerator(t *testing.T) {
},
}
- _, err := generator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo)
+ _, err := generator.GenerateParams(&applicationSetInfo.Spec.Generators[0], &applicationSetInfo, nil)
assert.ErrorIs(t, err, ErrSCMProvidersDisabled)
}
diff --git a/applicationset/services/mocks/Repos.go b/applicationset/services/mocks/Repos.go
index 37f946bbb01f5..7daf3cccc7aab 100644
--- a/applicationset/services/mocks/Repos.go
+++ b/applicationset/services/mocks/Repos.go
@@ -13,9 +13,9 @@ type Repos struct {
mock.Mock
}
-// GetDirectories provides a mock function with given fields: ctx, repoURL, revision, noRevisionCache
-func (_m *Repos) GetDirectories(ctx context.Context, repoURL string, revision string, noRevisionCache bool) ([]string, error) {
- ret := _m.Called(ctx, repoURL, revision, noRevisionCache)
+// GetDirectories provides a mock function with given fields: ctx, repoURL, revision, noRevisionCache, verifyCommit
+func (_m *Repos) GetDirectories(ctx context.Context, repoURL string, revision string, noRevisionCache bool, verifyCommit bool) ([]string, error) {
+ ret := _m.Called(ctx, repoURL, revision, noRevisionCache, verifyCommit)
if len(ret) == 0 {
panic("no return value specified for GetDirectories")
@@ -23,19 +23,19 @@ func (_m *Repos) GetDirectories(ctx context.Context, repoURL string, revision st
var r0 []string
var r1 error
- if rf, ok := ret.Get(0).(func(context.Context, string, string, bool) ([]string, error)); ok {
- return rf(ctx, repoURL, revision, noRevisionCache)
+ if rf, ok := ret.Get(0).(func(context.Context, string, string, bool, bool) ([]string, error)); ok {
+ return rf(ctx, repoURL, revision, noRevisionCache, verifyCommit)
}
- if rf, ok := ret.Get(0).(func(context.Context, string, string, bool) []string); ok {
- r0 = rf(ctx, repoURL, revision, noRevisionCache)
+ if rf, ok := ret.Get(0).(func(context.Context, string, string, bool, bool) []string); ok {
+ r0 = rf(ctx, repoURL, revision, noRevisionCache, verifyCommit)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).([]string)
}
}
- if rf, ok := ret.Get(1).(func(context.Context, string, string, bool) error); ok {
- r1 = rf(ctx, repoURL, revision, noRevisionCache)
+ if rf, ok := ret.Get(1).(func(context.Context, string, string, bool, bool) error); ok {
+ r1 = rf(ctx, repoURL, revision, noRevisionCache, verifyCommit)
} else {
r1 = ret.Error(1)
}
@@ -43,9 +43,9 @@ func (_m *Repos) GetDirectories(ctx context.Context, repoURL string, revision st
return r0, r1
}
-// GetFiles provides a mock function with given fields: ctx, repoURL, revision, pattern, noRevisionCache
-func (_m *Repos) GetFiles(ctx context.Context, repoURL string, revision string, pattern string, noRevisionCache bool) (map[string][]byte, error) {
- ret := _m.Called(ctx, repoURL, revision, pattern, noRevisionCache)
+// GetFiles provides a mock function with given fields: ctx, repoURL, revision, pattern, noRevisionCache, verifyCommit
+func (_m *Repos) GetFiles(ctx context.Context, repoURL string, revision string, pattern string, noRevisionCache bool, verifyCommit bool) (map[string][]byte, error) {
+ ret := _m.Called(ctx, repoURL, revision, pattern, noRevisionCache, verifyCommit)
if len(ret) == 0 {
panic("no return value specified for GetFiles")
@@ -53,19 +53,19 @@ func (_m *Repos) GetFiles(ctx context.Context, repoURL string, revision string,
var r0 map[string][]byte
var r1 error
- if rf, ok := ret.Get(0).(func(context.Context, string, string, string, bool) (map[string][]byte, error)); ok {
- return rf(ctx, repoURL, revision, pattern, noRevisionCache)
+ if rf, ok := ret.Get(0).(func(context.Context, string, string, string, bool, bool) (map[string][]byte, error)); ok {
+ return rf(ctx, repoURL, revision, pattern, noRevisionCache, verifyCommit)
}
- if rf, ok := ret.Get(0).(func(context.Context, string, string, string, bool) map[string][]byte); ok {
- r0 = rf(ctx, repoURL, revision, pattern, noRevisionCache)
+ if rf, ok := ret.Get(0).(func(context.Context, string, string, string, bool, bool) map[string][]byte); ok {
+ r0 = rf(ctx, repoURL, revision, pattern, noRevisionCache, verifyCommit)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(map[string][]byte)
}
}
- if rf, ok := ret.Get(1).(func(context.Context, string, string, string, bool) error); ok {
- r1 = rf(ctx, repoURL, revision, pattern, noRevisionCache)
+ if rf, ok := ret.Get(1).(func(context.Context, string, string, string, bool, bool) error); ok {
+ r1 = rf(ctx, repoURL, revision, pattern, noRevisionCache, verifyCommit)
} else {
r1 = ret.Error(1)
}
diff --git a/applicationset/services/repo_service.go b/applicationset/services/repo_service.go
index e3cb4ef4ef7af..1baad1f97ff2b 100644
--- a/applicationset/services/repo_service.go
+++ b/applicationset/services/repo_service.go
@@ -22,10 +22,10 @@ type argoCDService struct {
type Repos interface {
// GetFiles returns content of files (not directories) within the target repo
- GetFiles(ctx context.Context, repoURL string, revision string, pattern string, noRevisionCache bool) (map[string][]byte, error)
+ GetFiles(ctx context.Context, repoURL string, revision string, pattern string, noRevisionCache, verifyCommit bool) (map[string][]byte, error)
// GetDirectories returns a list of directories (not files) within the target repo
- GetDirectories(ctx context.Context, repoURL string, revision string, noRevisionCache bool) ([]string, error)
+ GetDirectories(ctx context.Context, repoURL string, revision string, noRevisionCache, verifyCommit bool) ([]string, error)
}
func NewArgoCDService(getRepository func(ctx context.Context, url, project string) (*v1alpha1.Repository, error), submoduleEnabled bool, repoClientset apiclient.Clientset, newFileGlobbingEnabled bool) (Repos, error) {
@@ -37,7 +37,7 @@ func NewArgoCDService(getRepository func(ctx context.Context, url, project strin
}, nil
}
-func (a *argoCDService) GetFiles(ctx context.Context, repoURL string, revision string, pattern string, noRevisionCache bool) (map[string][]byte, error) {
+func (a *argoCDService) GetFiles(ctx context.Context, repoURL string, revision string, pattern string, noRevisionCache, verifyCommit bool) (map[string][]byte, error) {
repo, err := a.getRepository(ctx, repoURL, "")
if err != nil {
return nil, fmt.Errorf("error in GetRepository: %w", err)
@@ -50,6 +50,7 @@ func (a *argoCDService) GetFiles(ctx context.Context, repoURL string, revision s
Path: pattern,
NewGitFileGlobbingEnabled: a.newFileGlobbingEnabled,
NoRevisionCache: noRevisionCache,
+ VerifyCommit: verifyCommit,
}
closer, client, err := a.repoServerClientSet.NewRepoServerClient()
if err != nil {
@@ -64,7 +65,7 @@ func (a *argoCDService) GetFiles(ctx context.Context, repoURL string, revision s
return fileResponse.GetMap(), nil
}
-func (a *argoCDService) GetDirectories(ctx context.Context, repoURL string, revision string, noRevisionCache bool) ([]string, error) {
+func (a *argoCDService) GetDirectories(ctx context.Context, repoURL string, revision string, noRevisionCache, verifyCommit bool) ([]string, error) {
repo, err := a.getRepository(ctx, repoURL, "")
if err != nil {
return nil, fmt.Errorf("error in GetRepository: %w", err)
@@ -75,6 +76,7 @@ func (a *argoCDService) GetDirectories(ctx context.Context, repoURL string, revi
SubmoduleEnabled: a.submoduleEnabled,
Revision: revision,
NoRevisionCache: noRevisionCache,
+ VerifyCommit: verifyCommit,
}
closer, client, err := a.repoServerClientSet.NewRepoServerClient()
diff --git a/applicationset/services/repo_service_test.go b/applicationset/services/repo_service_test.go
index c15047ac6e21f..7660502130ce5 100644
--- a/applicationset/services/repo_service_test.go
+++ b/applicationset/services/repo_service_test.go
@@ -27,6 +27,7 @@ func TestGetDirectories(t *testing.T) {
repoURL string
revision string
noRevisionCache bool
+ verifyCommit bool
}
tests := []struct {
name string
@@ -62,6 +63,16 @@ func TestGetDirectories(t *testing.T) {
},
},
}, args: args{}, want: []string{"foo", "foo/bar", "bar/foo"}, wantErr: assert.NoError},
+ {name: "ErrorVerifyingCommit", fields: fields{
+ getRepository: func(ctx context.Context, url, project string) (*v1alpha1.Repository, error) {
+ return &v1alpha1.Repository{}, nil
+ },
+ repoServerClientFuncs: []func(*repo_mocks.RepoServerServiceClient){
+ func(client *repo_mocks.RepoServerServiceClient) {
+ client.On("GetGitDirectories", mock.Anything, mock.Anything).Return(nil, fmt.Errorf("revision HEAD is not signed"))
+ },
+ },
+ }, args: args{}, want: nil, wantErr: assert.Error},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@@ -77,7 +88,7 @@ func TestGetDirectories(t *testing.T) {
submoduleEnabled: tt.fields.submoduleEnabled,
repoServerClientSet: &repo_mocks.Clientset{RepoServerServiceClient: mockRepoClient},
}
- got, err := a.GetDirectories(tt.args.ctx, tt.args.repoURL, tt.args.revision, tt.args.noRevisionCache)
+ got, err := a.GetDirectories(tt.args.ctx, tt.args.repoURL, tt.args.revision, tt.args.noRevisionCache, tt.args.verifyCommit)
if !tt.wantErr(t, err, fmt.Sprintf("GetDirectories(%v, %v, %v, %v)", tt.args.ctx, tt.args.repoURL, tt.args.revision, tt.args.noRevisionCache)) {
return
}
@@ -99,6 +110,7 @@ func TestGetFiles(t *testing.T) {
revision string
pattern string
noRevisionCache bool
+ verifyCommit bool
}
tests := []struct {
name string
@@ -140,6 +152,16 @@ func TestGetFiles(t *testing.T) {
"foo.json": []byte("hello: world!"),
"bar.yaml": []byte("yay: appsets"),
}, wantErr: assert.NoError},
+ {name: "ErrorVerifyingCommit", fields: fields{
+ getRepository: func(ctx context.Context, url, project string) (*v1alpha1.Repository, error) {
+ return &v1alpha1.Repository{}, nil
+ },
+ repoServerClientFuncs: []func(*repo_mocks.RepoServerServiceClient){
+ func(client *repo_mocks.RepoServerServiceClient) {
+ client.On("GetGitFiles", mock.Anything, mock.Anything).Return(nil, fmt.Errorf("revision HEAD is not signed"))
+ },
+ },
+ }, args: args{}, want: nil, wantErr: assert.Error},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@@ -155,7 +177,7 @@ func TestGetFiles(t *testing.T) {
submoduleEnabled: tt.fields.submoduleEnabled,
repoServerClientSet: &repo_mocks.Clientset{RepoServerServiceClient: mockRepoClient},
}
- got, err := a.GetFiles(tt.args.ctx, tt.args.repoURL, tt.args.revision, tt.args.pattern, tt.args.noRevisionCache)
+ got, err := a.GetFiles(tt.args.ctx, tt.args.repoURL, tt.args.revision, tt.args.pattern, tt.args.noRevisionCache, tt.args.verifyCommit)
if !tt.wantErr(t, err, fmt.Sprintf("GetFiles(%v, %v, %v, %v, %v)", tt.args.ctx, tt.args.repoURL, tt.args.revision, tt.args.pattern, tt.args.noRevisionCache)) {
return
}
diff --git a/applicationset/webhook/webhook.go b/applicationset/webhook/webhook.go
index 800bc2b4e1a98..7a74ddae35d4b 100644
--- a/applicationset/webhook/webhook.go
+++ b/applicationset/webhook/webhook.go
@@ -512,7 +512,7 @@ func (h *WebhookHandler) shouldRefreshMatrixGenerator(gen *v1alpha1.MatrixGenera
relGenerators := generators.GetRelevantGenerators(requestedGenerator0, h.generators)
params := []map[string]interface{}{}
for _, g := range relGenerators {
- p, err := g.GenerateParams(requestedGenerator0, appSet)
+ p, err := g.GenerateParams(requestedGenerator0, appSet, h.client)
if err != nil {
log.Error(err)
return false
diff --git a/applicationset/webhook/webhook_test.go b/applicationset/webhook/webhook_test.go
index 610c3bb0d71e7..6c1f6be29cfc4 100644
--- a/applicationset/webhook/webhook_test.go
+++ b/applicationset/webhook/webhook_test.go
@@ -18,6 +18,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
kubefake "k8s.io/client-go/kubernetes/fake"
+ "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -37,7 +38,7 @@ func (g *generatorMock) GetTemplate(appSetGenerator *v1alpha1.ApplicationSetGene
return &v1alpha1.ApplicationSetTemplate{}
}
-func (g *generatorMock) GenerateParams(appSetGenerator *v1alpha1.ApplicationSetGenerator, _ *v1alpha1.ApplicationSet) ([]map[string]interface{}, error) {
+func (g *generatorMock) GenerateParams(appSetGenerator *v1alpha1.ApplicationSetGenerator, _ *v1alpha1.ApplicationSet, client client.Client) ([]map[string]interface{}, error) {
return []map[string]interface{}{}, nil
}
diff --git a/reposerver/apiclient/repository.pb.go b/reposerver/apiclient/repository.pb.go
index 707e1e95d9220..549137a342809 100644
--- a/reposerver/apiclient/repository.pb.go
+++ b/reposerver/apiclient/repository.pb.go
@@ -1919,6 +1919,7 @@ type GitFilesRequest struct {
Path string `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"`
NewGitFileGlobbingEnabled bool `protobuf:"varint,5,opt,name=NewGitFileGlobbingEnabled,proto3" json:"NewGitFileGlobbingEnabled,omitempty"`
NoRevisionCache bool `protobuf:"varint,6,opt,name=noRevisionCache,proto3" json:"noRevisionCache,omitempty"`
+ VerifyCommit bool `protobuf:"varint,7,opt,name=verifyCommit,proto3" json:"verifyCommit,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -1999,6 +2000,13 @@ func (m *GitFilesRequest) GetNoRevisionCache() bool {
return false
}
+func (m *GitFilesRequest) GetVerifyCommit() bool {
+ if m != nil {
+ return m.VerifyCommit
+ }
+ return false
+}
+
type GitFilesResponse struct {
// Map consisting of path of the path to its contents in bytes
Map map[string][]byte `protobuf:"bytes,1,rep,name=map,proto3" json:"map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -2052,6 +2060,7 @@ type GitDirectoriesRequest struct {
SubmoduleEnabled bool `protobuf:"varint,2,opt,name=submoduleEnabled,proto3" json:"submoduleEnabled,omitempty"`
Revision string `protobuf:"bytes,3,opt,name=revision,proto3" json:"revision,omitempty"`
NoRevisionCache bool `protobuf:"varint,4,opt,name=noRevisionCache,proto3" json:"noRevisionCache,omitempty"`
+ VerifyCommit bool `protobuf:"varint,5,opt,name=verifyCommit,proto3" json:"verifyCommit,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -2118,6 +2127,13 @@ func (m *GitDirectoriesRequest) GetNoRevisionCache() bool {
return false
}
+func (m *GitDirectoriesRequest) GetVerifyCommit() bool {
+ if m != nil {
+ return m.VerifyCommit
+ }
+ return false
+}
+
type GitDirectoriesResponse struct {
// A set of directory paths
Paths []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
@@ -2398,150 +2414,151 @@ func init() {
}
var fileDescriptor_dd8723cfcc820480 = []byte{
- // 2285 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0x5f, 0x73, 0x1b, 0x49,
- 0x11, 0xf7, 0x4a, 0xb2, 0x2c, 0xb5, 0x1d, 0x5b, 0x9e, 0x24, 0xce, 0x46, 0x97, 0xb8, 0x7c, 0x0b,
- 0x49, 0xe5, 0x92, 0x3b, 0xa9, 0xe2, 0xd4, 0x5d, 0x20, 0x77, 0x1c, 0xe5, 0xcb, 0x25, 0x76, 0x2e,
- 0x71, 0x62, 0x36, 0x39, 0xa8, 0x40, 0x80, 0x1a, 0xad, 0x46, 0xd2, 0x9e, 0x56, 0xbb, 0x93, 0xdd,
- 0x59, 0x1f, 0x4a, 0x15, 0x4f, 0x50, 0x7c, 0x04, 0x1e, 0x78, 0xe5, 0x0b, 0x50, 0x45, 0x51, 0x3c,
- 0xf2, 0x40, 0xf1, 0xe7, 0x91, 0xe2, 0x0b, 0x40, 0xe5, 0x85, 0x2a, 0x3e, 0x05, 0x35, 0x7f, 0xf6,
- 0xaf, 0x56, 0x8a, 0x0f, 0x39, 0x3e, 0xb8, 0x17, 0x7b, 0xa7, 0x67, 0xa6, 0xbb, 0xa7, 0xa7, 0xbb,
- 0xe7, 0xd7, 0x33, 0x82, 0xcb, 0x3e, 0xa1, 0x5e, 0x40, 0xfc, 0x43, 0xe2, 0xb7, 0xc5, 0xa7, 0xcd,
- 0x3c, 0x7f, 0x9c, 0xfa, 0x6c, 0x51, 0xdf, 0x63, 0x1e, 0x82, 0x84, 0xd2, 0x7c, 0xd0, 0xb7, 0xd9,
- 0x20, 0xec, 0xb4, 0x2c, 0x6f, 0xd4, 0xc6, 0x7e, 0xdf, 0xa3, 0xbe, 0xf7, 0x99, 0xf8, 0x78, 0xc7,
- 0xea, 0xb6, 0x0f, 0xb7, 0xdb, 0x74, 0xd8, 0x6f, 0x63, 0x6a, 0x07, 0x6d, 0x4c, 0xa9, 0x63, 0x5b,
- 0x98, 0xd9, 0x9e, 0xdb, 0x3e, 0xbc, 0x8e, 0x1d, 0x3a, 0xc0, 0xd7, 0xdb, 0x7d, 0xe2, 0x12, 0x1f,
- 0x33, 0xd2, 0x95, 0x9c, 0x9b, 0x6f, 0xf4, 0x3d, 0xaf, 0xef, 0x90, 0xb6, 0x68, 0x75, 0xc2, 0x5e,
- 0x9b, 0x8c, 0x28, 0x53, 0x62, 0x8d, 0x7f, 0xaf, 0xc0, 0xda, 0x3e, 0x76, 0xed, 0x1e, 0x09, 0x98,
- 0x49, 0x9e, 0x87, 0x24, 0x60, 0xe8, 0x19, 0x54, 0xb8, 0x32, 0xba, 0xb6, 0xa5, 0x5d, 0x59, 0xde,
- 0xde, 0x6b, 0x25, 0xda, 0xb4, 0x22, 0x6d, 0xc4, 0xc7, 0x8f, 0xad, 0x6e, 0xeb, 0x70, 0xbb, 0x45,
- 0x87, 0xfd, 0x16, 0xd7, 0xa6, 0x95, 0xd2, 0xa6, 0x15, 0x69, 0xd3, 0x32, 0xe3, 0x65, 0x99, 0x82,
- 0x2b, 0x6a, 0x42, 0xcd, 0x27, 0x87, 0x76, 0x60, 0x7b, 0xae, 0x5e, 0xda, 0xd2, 0xae, 0xd4, 0xcd,
- 0xb8, 0x8d, 0x74, 0x58, 0x72, 0xbd, 0xdb, 0xd8, 0x1a, 0x10, 0xbd, 0xbc, 0xa5, 0x5d, 0xa9, 0x99,
- 0x51, 0x13, 0x6d, 0xc1, 0x32, 0xa6, 0xf4, 0x01, 0xee, 0x10, 0xe7, 0x3e, 0x19, 0xeb, 0x15, 0x31,
- 0x31, 0x4d, 0xe2, 0x73, 0x31, 0xa5, 0x0f, 0xf1, 0x88, 0xe8, 0x8b, 0xa2, 0x37, 0x6a, 0xa2, 0x0b,
- 0x50, 0x77, 0xf1, 0x88, 0x04, 0x14, 0x5b, 0x44, 0xaf, 0x89, 0xbe, 0x84, 0x80, 0x7e, 0x0a, 0xeb,
- 0x29, 0xc5, 0x1f, 0x7b, 0xa1, 0x6f, 0x11, 0x1d, 0xc4, 0xd2, 0x1f, 0xcd, 0xb7, 0xf4, 0x9d, 0x3c,
- 0x5b, 0x73, 0x52, 0x12, 0xfa, 0x11, 0x2c, 0x8a, 0x9d, 0xd7, 0x97, 0xb7, 0xca, 0xc7, 0x6a, 0x6d,
- 0xc9, 0x16, 0xb9, 0xb0, 0x44, 0x9d, 0xb0, 0x6f, 0xbb, 0x81, 0xbe, 0x22, 0x24, 0x3c, 0x99, 0x4f,
- 0xc2, 0x6d, 0xcf, 0xed, 0xd9, 0xfd, 0x7d, 0xec, 0xe2, 0x3e, 0x19, 0x11, 0x97, 0x1d, 0x08, 0xe6,
- 0x66, 0x24, 0x04, 0xbd, 0x80, 0xc6, 0x30, 0x0c, 0x98, 0x37, 0xb2, 0x5f, 0x90, 0x47, 0x94, 0xcf,
- 0x0d, 0xf4, 0x53, 0xc2, 0x9a, 0x0f, 0xe7, 0x13, 0x7c, 0x3f, 0xc7, 0xd5, 0x9c, 0x90, 0xc3, 0x9d,
- 0x64, 0x18, 0x76, 0xc8, 0x77, 0x89, 0x2f, 0xbc, 0x6b, 0x55, 0x3a, 0x49, 0x8a, 0x24, 0xdd, 0xc8,
- 0x56, 0xad, 0x40, 0x5f, 0xdb, 0x2a, 0x4b, 0x37, 0x8a, 0x49, 0xe8, 0x0a, 0xac, 0x1d, 0x12, 0xdf,
- 0xee, 0x8d, 0x1f, 0xdb, 0x7d, 0x17, 0xb3, 0xd0, 0x27, 0x7a, 0x43, 0xb8, 0x62, 0x9e, 0x8c, 0x46,
- 0x70, 0x6a, 0x40, 0x9c, 0x11, 0x37, 0xf9, 0x6d, 0x9f, 0x74, 0x03, 0x7d, 0x5d, 0xd8, 0x77, 0x77,
- 0xfe, 0x1d, 0x14, 0xec, 0xcc, 0x2c, 0x77, 0xae, 0x98, 0xeb, 0x99, 0x2a, 0x52, 0x64, 0x8c, 0x20,
- 0xa9, 0x58, 0x8e, 0x8c, 0x2e, 0xc3, 0x2a, 0xf3, 0xb1, 0x35, 0xb4, 0xdd, 0xfe, 0x3e, 0x61, 0x03,
- 0xaf, 0xab, 0x9f, 0x16, 0x96, 0xc8, 0x51, 0x91, 0x05, 0x88, 0xb8, 0xb8, 0xe3, 0x90, 0xae, 0xf4,
- 0xc5, 0x27, 0x63, 0x4a, 0x02, 0xfd, 0x8c, 0x58, 0xc5, 0x8d, 0x56, 0x2a, 0x43, 0xe5, 0x12, 0x44,
- 0xeb, 0xce, 0xc4, 0xac, 0x3b, 0x2e, 0xf3, 0xc7, 0x66, 0x01, 0x3b, 0x34, 0x84, 0x65, 0xbe, 0x8e,
- 0xc8, 0x15, 0xce, 0x0a, 0x57, 0xb8, 0x37, 0x9f, 0x8d, 0xf6, 0x12, 0x86, 0x66, 0x9a, 0x3b, 0x6a,
- 0x01, 0x1a, 0xe0, 0x60, 0x3f, 0x74, 0x98, 0x4d, 0x1d, 0x22, 0xd5, 0x08, 0xf4, 0x0d, 0x61, 0xa6,
- 0x82, 0x1e, 0x74, 0x1f, 0xc0, 0x27, 0xbd, 0x68, 0xdc, 0x39, 0xb1, 0xf2, 0x6b, 0xb3, 0x56, 0x6e,
- 0xc6, 0xa3, 0xe5, 0x8a, 0x53, 0xd3, 0xb9, 0x70, 0xbe, 0x0c, 0x62, 0x31, 0x15, 0xed, 0x22, 0xac,
- 0x75, 0xe1, 0x62, 0x05, 0x3d, 0xdc, 0x17, 0x15, 0x55, 0x24, 0xad, 0xf3, 0xd2, 0x5b, 0x53, 0xa4,
- 0xe6, 0x1d, 0x38, 0x37, 0xc5, 0xd4, 0xa8, 0x01, 0xe5, 0x21, 0x19, 0x8b, 0x14, 0x5d, 0x37, 0xf9,
- 0x27, 0x3a, 0x03, 0x8b, 0x87, 0xd8, 0x09, 0x89, 0x48, 0xaa, 0x35, 0x53, 0x36, 0x6e, 0x95, 0xbe,
- 0xa1, 0x35, 0x7f, 0xa1, 0xc1, 0x5a, 0x4e, 0xf1, 0x82, 0xf9, 0x3f, 0x4c, 0xcf, 0x3f, 0x06, 0x37,
- 0xee, 0x3d, 0xc1, 0x7e, 0x9f, 0xb0, 0x94, 0x22, 0xc6, 0xdf, 0x35, 0xd0, 0x73, 0x16, 0xfd, 0x9e,
- 0xcd, 0x06, 0x77, 0x6d, 0x87, 0x04, 0xe8, 0x26, 0x2c, 0xf9, 0x92, 0xa6, 0x0e, 0x9e, 0x37, 0x66,
- 0x6c, 0xc4, 0xde, 0x82, 0x19, 0x8d, 0x46, 0x1f, 0x42, 0x6d, 0x44, 0x18, 0xee, 0x62, 0x86, 0x95,
- 0xee, 0x5b, 0x45, 0x33, 0xb9, 0x94, 0x7d, 0x35, 0x6e, 0x6f, 0xc1, 0x8c, 0xe7, 0xa0, 0x77, 0x61,
- 0xd1, 0x1a, 0x84, 0xee, 0x50, 0x1c, 0x39, 0xcb, 0xdb, 0x17, 0xa7, 0x4d, 0xbe, 0xcd, 0x07, 0xed,
- 0x2d, 0x98, 0x72, 0xf4, 0x47, 0x55, 0xa8, 0x50, 0xec, 0x33, 0xe3, 0x2e, 0x9c, 0x29, 0x12, 0xc1,
- 0xcf, 0x39, 0x6b, 0x40, 0xac, 0x61, 0x10, 0x8e, 0x94, 0x99, 0xe3, 0x36, 0x42, 0x50, 0x09, 0xec,
- 0x17, 0xd2, 0xd4, 0x65, 0x53, 0x7c, 0x1b, 0x6f, 0xc1, 0xfa, 0x84, 0x34, 0xbe, 0xa9, 0x52, 0x37,
- 0xce, 0x61, 0x45, 0x89, 0x36, 0x42, 0x38, 0xfb, 0x44, 0xd8, 0x22, 0x4e, 0xf6, 0x27, 0x71, 0x72,
- 0x1b, 0x7b, 0xb0, 0x91, 0x17, 0x1b, 0x50, 0xcf, 0x0d, 0x08, 0x77, 0x7d, 0x91, 0x1d, 0x6d, 0xd2,
- 0x4d, 0x7a, 0x85, 0x16, 0x35, 0xb3, 0xa0, 0xc7, 0xf8, 0x75, 0x09, 0x36, 0x4c, 0x12, 0x78, 0xce,
- 0x21, 0x89, 0x52, 0xd7, 0xc9, 0x80, 0x8f, 0x1f, 0x40, 0x19, 0x53, 0xaa, 0xdc, 0xe4, 0xde, 0xb1,
- 0x1d, 0xef, 0x26, 0xe7, 0x8a, 0xde, 0x86, 0x75, 0x3c, 0xea, 0xd8, 0xfd, 0xd0, 0x0b, 0x83, 0x68,
- 0x59, 0xc2, 0xa9, 0xea, 0xe6, 0x64, 0x07, 0x0f, 0xff, 0x40, 0x44, 0xe4, 0x3d, 0xb7, 0x4b, 0x7e,
- 0x22, 0x10, 0x4d, 0xd9, 0x4c, 0x93, 0x0c, 0x0b, 0xce, 0x4d, 0x18, 0x49, 0x19, 0x3c, 0x0d, 0xa2,
- 0xb4, 0x1c, 0x88, 0x2a, 0x54, 0xa3, 0x34, 0x45, 0x0d, 0xe3, 0xcf, 0x1a, 0x34, 0x92, 0xe0, 0x52,
- 0xec, 0x2f, 0x40, 0x7d, 0xa4, 0x68, 0x81, 0xae, 0x89, 0x0c, 0x96, 0x10, 0xb2, 0x78, 0xaa, 0x94,
- 0xc7, 0x53, 0x1b, 0x50, 0x95, 0x70, 0x57, 0x2d, 0x5d, 0xb5, 0x32, 0x2a, 0x57, 0x72, 0x2a, 0x6f,
- 0x02, 0x04, 0x71, 0x86, 0xd3, 0xab, 0xa2, 0x37, 0x45, 0x41, 0x06, 0xac, 0xc8, 0xd3, 0xd7, 0x24,
- 0x41, 0xe8, 0x30, 0x7d, 0x49, 0x8c, 0xc8, 0xd0, 0x0c, 0x0f, 0xd6, 0x1e, 0xd8, 0x7c, 0x0d, 0xbd,
- 0xe0, 0x64, 0xc2, 0xe1, 0x3d, 0xa8, 0x70, 0x61, 0x7c, 0x61, 0x1d, 0x1f, 0xbb, 0xd6, 0x80, 0x44,
- 0xb6, 0x8a, 0xdb, 0x3c, 0xd0, 0x19, 0xee, 0x07, 0x7a, 0x49, 0xd0, 0xc5, 0xb7, 0xf1, 0xfb, 0x92,
- 0xd4, 0x74, 0x87, 0xd2, 0xe0, 0xcb, 0x87, 0xdc, 0xc5, 0x20, 0xa0, 0x3c, 0x09, 0x02, 0x72, 0x2a,
- 0x7f, 0x11, 0x10, 0x70, 0x4c, 0x07, 0x99, 0x11, 0xc2, 0xd2, 0x0e, 0xa5, 0x5c, 0x11, 0x74, 0x1d,
- 0x2a, 0x98, 0x52, 0x69, 0xf0, 0x5c, 0xce, 0x56, 0x43, 0xf8, 0x7f, 0xa5, 0x92, 0x18, 0xda, 0xbc,
- 0x09, 0xf5, 0x98, 0xf4, 0x2a, 0xb1, 0xf5, 0xb4, 0xd8, 0x2d, 0x00, 0x89, 0x72, 0xef, 0xb9, 0x3d,
- 0x8f, 0x6f, 0x29, 0x77, 0x76, 0x35, 0x55, 0x7c, 0x1b, 0xb7, 0xa2, 0x11, 0x42, 0xb7, 0xb7, 0x61,
- 0xd1, 0x66, 0x64, 0x14, 0x29, 0xb7, 0x91, 0x56, 0x2e, 0x61, 0x64, 0xca, 0x41, 0xc6, 0x5f, 0x6a,
- 0x70, 0x9e, 0xef, 0xd8, 0x63, 0x11, 0x26, 0x3b, 0x94, 0x7e, 0x4c, 0x18, 0xb6, 0x9d, 0xe0, 0x3b,
- 0x21, 0xf1, 0xc7, 0xaf, 0xd9, 0x31, 0xfa, 0x50, 0x95, 0x51, 0xa6, 0x32, 0xe2, 0xb1, 0x17, 0x3c,
- 0x8a, 0x7d, 0x52, 0xe5, 0x94, 0x5f, 0x4f, 0x95, 0x53, 0x54, 0x75, 0x54, 0x4e, 0xa8, 0xea, 0x98,
- 0x5e, 0x78, 0xa6, 0xca, 0xd9, 0x6a, 0xb6, 0x9c, 0x2d, 0x00, 0xf3, 0x4b, 0x47, 0x05, 0xf3, 0xb5,
- 0x42, 0x30, 0x3f, 0x2a, 0x8c, 0xe3, 0xba, 0x30, 0xf7, 0xb7, 0xd2, 0x1e, 0x38, 0xd5, 0xd7, 0xe6,
- 0x81, 0xf5, 0xf0, 0x5a, 0x61, 0xfd, 0xa7, 0x19, 0x98, 0x2e, 0x0b, 0xe5, 0x77, 0x8f, 0xb6, 0xa6,
- 0x19, 0x80, 0xfd, 0x2b, 0x07, 0xaf, 0x7f, 0x2e, 0x50, 0x15, 0xf5, 0x12, 0x1b, 0xc4, 0x07, 0x3a,
- 0x3f, 0x87, 0xf8, 0xd1, 0xaa, 0x92, 0x16, 0xff, 0x46, 0xd7, 0xa0, 0xc2, 0x8d, 0xac, 0x60, 0xef,
- 0xb9, 0xb4, 0x3d, 0xf9, 0x4e, 0xec, 0x50, 0xfa, 0x98, 0x12, 0xcb, 0x14, 0x83, 0xd0, 0x2d, 0xa8,
- 0xc7, 0x8e, 0xaf, 0x22, 0xeb, 0x42, 0x7a, 0x46, 0x1c, 0x27, 0xd1, 0xb4, 0x64, 0x38, 0x9f, 0xdb,
- 0xb5, 0x7d, 0x62, 0x09, 0x50, 0xb8, 0x38, 0x39, 0xf7, 0xe3, 0xa8, 0x33, 0x9e, 0x1b, 0x0f, 0x47,
- 0xd7, 0xa1, 0x2a, 0x6f, 0x16, 0x44, 0x04, 0x2d, 0x6f, 0x9f, 0x9f, 0x4c, 0xa6, 0xd1, 0x2c, 0x35,
- 0xd0, 0xf8, 0x93, 0x06, 0x6f, 0x26, 0x0e, 0x11, 0x45, 0x53, 0x84, 0xcb, 0xbf, 0xfc, 0x13, 0xf7,
- 0x32, 0xac, 0x8a, 0x42, 0x20, 0xb9, 0x60, 0x90, 0x77, 0x5d, 0x39, 0xaa, 0xf1, 0x3b, 0x0d, 0x2e,
- 0x4d, 0xae, 0xe3, 0xf6, 0x00, 0xfb, 0x2c, 0xde, 0xde, 0x93, 0x58, 0x4b, 0x74, 0xe0, 0x95, 0x92,
- 0x03, 0x2f, 0xb3, 0xbe, 0x72, 0x76, 0x7d, 0xc6, 0x1f, 0x4a, 0xb0, 0x9c, 0x72, 0xa0, 0xa2, 0x03,
- 0x93, 0x03, 0x3e, 0xe1, 0xb7, 0xa2, 0xf4, 0x13, 0x87, 0x42, 0xdd, 0x4c, 0x51, 0xd0, 0x10, 0x80,
- 0x62, 0x1f, 0x8f, 0x08, 0x23, 0x3e, 0xcf, 0xe4, 0x3c, 0xe2, 0xef, 0xcf, 0x9f, 0x5d, 0x0e, 0x22,
- 0x9e, 0x66, 0x8a, 0x3d, 0x47, 0xac, 0x42, 0x74, 0xa0, 0xf2, 0xb7, 0x6a, 0xa1, 0xcf, 0x61, 0xb5,
- 0x67, 0x3b, 0xe4, 0x20, 0x51, 0xa4, 0x2a, 0x14, 0x79, 0x34, 0xbf, 0x22, 0x77, 0xd3, 0x7c, 0xcd,
- 0x9c, 0x18, 0xe3, 0x2a, 0x34, 0xf2, 0xf1, 0xc4, 0x95, 0xb4, 0x47, 0xb8, 0x1f, 0x5b, 0x4b, 0xb5,
- 0x0c, 0x04, 0x8d, 0x7c, 0xfc, 0x18, 0xff, 0x28, 0xc1, 0xd9, 0x98, 0xdd, 0x8e, 0xeb, 0x7a, 0xa1,
- 0x6b, 0x89, 0xcb, 0xba, 0xc2, 0xbd, 0x38, 0x03, 0x8b, 0xcc, 0x66, 0x4e, 0x0c, 0x7c, 0x44, 0x83,
- 0x9f, 0x5d, 0xcc, 0xf3, 0x1c, 0x66, 0x53, 0xb5, 0xc1, 0x51, 0x53, 0xee, 0xfd, 0xf3, 0xd0, 0xf6,
- 0x49, 0x57, 0x64, 0x82, 0x9a, 0x19, 0xb7, 0x79, 0x1f, 0x47, 0x35, 0x02, 0xc6, 0x4b, 0x63, 0xc6,
- 0x6d, 0xe1, 0xf7, 0x9e, 0xe3, 0x10, 0x8b, 0x9b, 0x23, 0x05, 0xf4, 0x73, 0x54, 0x51, 0x40, 0x30,
- 0xdf, 0x76, 0xfb, 0x0a, 0xe6, 0xab, 0x16, 0xd7, 0x13, 0xfb, 0x3e, 0x1e, 0xeb, 0x35, 0x61, 0x00,
- 0xd9, 0x40, 0x1f, 0x40, 0x79, 0x84, 0xa9, 0x3a, 0xe8, 0xae, 0x66, 0xb2, 0x43, 0x91, 0x05, 0x5a,
- 0xfb, 0x98, 0xca, 0x93, 0x80, 0x4f, 0x6b, 0xbe, 0x07, 0xb5, 0x88, 0xf0, 0x85, 0x20, 0xe1, 0x67,
- 0x70, 0x2a, 0x93, 0x7c, 0xd0, 0x53, 0xd8, 0x48, 0x3c, 0x2a, 0x2d, 0x50, 0x81, 0xc0, 0x37, 0x5f,
- 0xa9, 0x99, 0x39, 0x85, 0x81, 0xf1, 0x1c, 0xd6, 0xb9, 0xcb, 0x88, 0xc0, 0x3f, 0xa1, 0xd2, 0xe6,
- 0x7d, 0xa8, 0xc7, 0x22, 0x0b, 0x7d, 0xa6, 0x09, 0xb5, 0xc3, 0xe8, 0x12, 0x55, 0xd6, 0x36, 0x71,
- 0xdb, 0xd8, 0x01, 0x94, 0xd6, 0x57, 0x9d, 0x40, 0xd7, 0xb2, 0xa0, 0xf8, 0x6c, 0xfe, 0xb8, 0x11,
- 0xc3, 0x23, 0x4c, 0xfc, 0xdb, 0x12, 0xac, 0xed, 0xda, 0xe2, 0x1e, 0xe4, 0x84, 0x92, 0xdc, 0x55,
- 0x68, 0x04, 0x61, 0x67, 0xe4, 0x75, 0x43, 0x87, 0x28, 0x50, 0xa0, 0x4e, 0xfa, 0x09, 0xfa, 0xac,
- 0xe4, 0xc7, 0x8d, 0x45, 0x31, 0x1b, 0xa8, 0x0a, 0x57, 0x7c, 0xa3, 0x0f, 0xe0, 0xfc, 0x43, 0xf2,
- 0xb9, 0x5a, 0xcf, 0xae, 0xe3, 0x75, 0x3a, 0xb6, 0xdb, 0x8f, 0x84, 0x2c, 0x0a, 0x21, 0xd3, 0x07,
- 0x14, 0x41, 0xc5, 0x6a, 0x21, 0x54, 0x34, 0x7e, 0xa6, 0x41, 0x23, 0xb1, 0x9a, 0xb2, 0xfb, 0x4d,
- 0x19, 0x1f, 0xd2, 0xea, 0x97, 0xd2, 0x56, 0xcf, 0x0f, 0xfd, 0xef, 0x43, 0x63, 0x25, 0x1d, 0x1a,
- 0xff, 0xd2, 0xe0, 0xec, 0xae, 0xcd, 0xa2, 0xa4, 0x64, 0xff, 0xbf, 0xed, 0x60, 0x81, 0xbd, 0x2b,
- 0xc5, 0xf6, 0x6e, 0xc1, 0x46, 0x7e, 0xa1, 0xca, 0xe8, 0x67, 0x60, 0x91, 0xef, 0x7c, 0x74, 0x1f,
- 0x20, 0x1b, 0xc6, 0x6f, 0xaa, 0x70, 0xf1, 0x53, 0xda, 0xc5, 0x2c, 0xbe, 0xcf, 0xb9, 0xeb, 0xf9,
- 0x07, 0xbc, 0xeb, 0x64, 0x2c, 0x94, 0x7b, 0x43, 0x2b, 0xcd, 0x7c, 0x43, 0x2b, 0xcf, 0x78, 0x43,
- 0xab, 0x1c, 0xe9, 0x0d, 0x6d, 0xf1, 0xc4, 0xde, 0xd0, 0x26, 0x6b, 0xa4, 0x6a, 0x61, 0x8d, 0xf4,
- 0x34, 0x53, 0x47, 0x2c, 0x89, 0x90, 0xf8, 0x66, 0x3a, 0x24, 0x66, 0xee, 0xce, 0xcc, 0xcb, 0xff,
- 0xdc, 0xd3, 0x53, 0xed, 0x95, 0x4f, 0x4f, 0xf5, 0xc9, 0xa7, 0xa7, 0xe2, 0xd7, 0x0b, 0x98, 0xfa,
- 0x7a, 0x71, 0x19, 0x56, 0x83, 0xb1, 0x6b, 0x91, 0x6e, 0x7c, 0xcb, 0xb7, 0x2c, 0x97, 0x9d, 0xa5,
- 0x66, 0xbc, 0x7d, 0x25, 0xe7, 0xed, 0xb1, 0xa7, 0x9e, 0x4a, 0x79, 0xea, 0xff, 0x4e, 0x49, 0xb3,
- 0x05, 0x9b, 0xd3, 0xf6, 0x44, 0x86, 0xda, 0xf6, 0x1f, 0x01, 0xd6, 0x13, 0x94, 0xcc, 0xff, 0xda,
- 0x16, 0x41, 0x8f, 0xa0, 0xb1, 0xab, 0x9e, 0xc1, 0xa3, 0xcb, 0x4d, 0x34, 0xeb, 0x3d, 0xa1, 0x79,
- 0xa1, 0xb8, 0x53, 0x0a, 0x31, 0x16, 0x90, 0x05, 0xe7, 0xf3, 0x0c, 0x93, 0xa7, 0x8b, 0xaf, 0xcf,
- 0xe0, 0x1c, 0x8f, 0x7a, 0x95, 0x88, 0x2b, 0x1a, 0x7a, 0x0a, 0xab, 0xd9, 0x0b, 0x76, 0x94, 0x81,
- 0x0d, 0x85, 0x77, 0xfe, 0x4d, 0x63, 0xd6, 0x90, 0x58, 0xff, 0x67, 0x7c, 0x43, 0x33, 0x77, 0xc9,
- 0xc8, 0xc8, 0x56, 0xd0, 0x45, 0xb7, 0xf1, 0xcd, 0xaf, 0xcd, 0x1c, 0x13, 0x73, 0x7f, 0x1f, 0x6a,
- 0xd1, 0xdd, 0x6b, 0xd6, 0xcc, 0xb9, 0x1b, 0xd9, 0x66, 0x23, 0xcb, 0xaf, 0x17, 0x18, 0x0b, 0xe8,
- 0x43, 0x39, 0x79, 0x87, 0xd2, 0x82, 0xc9, 0xa9, 0x1b, 0xc7, 0xe6, 0xe9, 0x82, 0x5b, 0x3e, 0x63,
- 0x01, 0x7d, 0x1b, 0x96, 0xf9, 0xd7, 0x81, 0x7a, 0x80, 0xde, 0x68, 0xc9, 0xdf, 0x3b, 0xb4, 0xa2,
- 0xdf, 0x3b, 0xb4, 0xee, 0x8c, 0x28, 0x1b, 0x37, 0x0b, 0xae, 0xe1, 0x14, 0x83, 0x67, 0x70, 0x6a,
- 0x97, 0xb0, 0xa4, 0x6a, 0x46, 0x97, 0x8e, 0x74, 0xb7, 0xd0, 0x34, 0xf2, 0xc3, 0x26, 0x0b, 0x6f,
- 0x63, 0x01, 0xfd, 0x52, 0x83, 0xd3, 0xbb, 0x84, 0xe5, 0xeb, 0x50, 0xf4, 0x4e, 0xb1, 0x90, 0x29,
- 0xf5, 0x6a, 0xf3, 0xe1, 0xbc, 0xd1, 0x95, 0x65, 0x6b, 0x2c, 0xa0, 0x5f, 0x69, 0x70, 0x2e, 0xa5,
- 0x58, 0xba, 0xb0, 0x44, 0xd7, 0x67, 0x2b, 0x57, 0x50, 0x84, 0x36, 0x3f, 0x99, 0xf3, 0x77, 0x05,
- 0x29, 0x96, 0xc6, 0x02, 0x3a, 0x10, 0x7b, 0x92, 0xe0, 0x48, 0x74, 0xb1, 0x10, 0x30, 0xc6, 0xd2,
- 0x37, 0xa7, 0x75, 0xc7, 0xfb, 0xf0, 0x09, 0x2c, 0xef, 0x12, 0x16, 0x81, 0x9e, 0xac, 0xa7, 0xe5,
- 0xb0, 0x66, 0x36, 0x54, 0xf3, 0x38, 0x49, 0x78, 0xcc, 0xba, 0xe4, 0x95, 0x3a, 0xfc, 0xb3, 0xb1,
- 0x5a, 0x88, 0x80, 0xb2, 0x1e, 0x53, 0x8c, 0x1d, 0x8c, 0x05, 0xf4, 0x1c, 0x36, 0x8a, 0x93, 0x1e,
- 0x7a, 0xeb, 0xc8, 0x87, 0x55, 0xf3, 0xea, 0x51, 0x86, 0x46, 0x22, 0x3f, 0xda, 0xf9, 0xeb, 0xcb,
- 0x4d, 0xed, 0x6f, 0x2f, 0x37, 0xb5, 0x7f, 0xbe, 0xdc, 0xd4, 0xbe, 0x7f, 0xe3, 0x15, 0xbf, 0x3f,
- 0x4a, 0xfd, 0xa4, 0x09, 0x53, 0xdb, 0x72, 0x6c, 0xe2, 0xb2, 0x4e, 0x55, 0xc4, 0xdb, 0x8d, 0xff,
- 0x04, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x5b, 0x4a, 0xde, 0xf1, 0x24, 0x00, 0x00,
+ // 2298 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcd, 0x73, 0x1c, 0x47,
+ 0x15, 0xd7, 0x7e, 0x6a, 0xf7, 0x49, 0xd6, 0x47, 0xdb, 0x96, 0xc7, 0x1b, 0x5b, 0xa5, 0x0c, 0xd8,
+ 0xe5, 0xd8, 0xc9, 0x6e, 0x59, 0xae, 0xc4, 0xe0, 0x84, 0x50, 0x8a, 0x62, 0x4b, 0x8e, 0x2d, 0x5b,
+ 0x8c, 0x1d, 0x28, 0x83, 0x81, 0xea, 0x9d, 0xed, 0xdd, 0x9d, 0xec, 0x7c, 0xb4, 0x67, 0x7a, 0x14,
+ 0xd6, 0x55, 0x9c, 0xa0, 0xb8, 0x70, 0xe7, 0xc0, 0x95, 0x7f, 0x80, 0x0b, 0xc5, 0x91, 0x03, 0xc5,
+ 0xc7, 0x91, 0xe2, 0xc2, 0x11, 0xca, 0x47, 0xfe, 0x0a, 0xaa, 0x3f, 0xe6, 0x73, 0x67, 0xd7, 0x0a,
+ 0x6b, 0x2b, 0x90, 0x8b, 0x34, 0xfd, 0xba, 0xfb, 0xbd, 0xd7, 0xaf, 0xdf, 0x7b, 0xfd, 0x7b, 0xdd,
+ 0x0b, 0x97, 0x7d, 0x42, 0xbd, 0x80, 0xf8, 0x47, 0xc4, 0xef, 0x88, 0x4f, 0x8b, 0x79, 0xfe, 0x38,
+ 0xf5, 0xd9, 0xa6, 0xbe, 0xc7, 0x3c, 0x04, 0x09, 0xa5, 0x75, 0x7f, 0x60, 0xb1, 0x61, 0xd8, 0x6d,
+ 0x9b, 0x9e, 0xd3, 0xc1, 0xfe, 0xc0, 0xa3, 0xbe, 0xf7, 0x99, 0xf8, 0x78, 0xc7, 0xec, 0x75, 0x8e,
+ 0xb6, 0x3b, 0x74, 0x34, 0xe8, 0x60, 0x6a, 0x05, 0x1d, 0x4c, 0xa9, 0x6d, 0x99, 0x98, 0x59, 0x9e,
+ 0xdb, 0x39, 0xba, 0x8e, 0x6d, 0x3a, 0xc4, 0xd7, 0x3b, 0x03, 0xe2, 0x12, 0x1f, 0x33, 0xd2, 0x93,
+ 0x9c, 0x5b, 0x6f, 0x0c, 0x3c, 0x6f, 0x60, 0x93, 0x8e, 0x68, 0x75, 0xc3, 0x7e, 0x87, 0x38, 0x94,
+ 0x29, 0xb1, 0xfa, 0xbf, 0x97, 0x61, 0xf5, 0x00, 0xbb, 0x56, 0x9f, 0x04, 0xcc, 0x20, 0xcf, 0x42,
+ 0x12, 0x30, 0xf4, 0x14, 0xaa, 0x5c, 0x19, 0xad, 0xb4, 0x55, 0xba, 0xb2, 0xb4, 0xbd, 0xdf, 0x4e,
+ 0xb4, 0x69, 0x47, 0xda, 0x88, 0x8f, 0x1f, 0x9b, 0xbd, 0xf6, 0xd1, 0x76, 0x9b, 0x8e, 0x06, 0x6d,
+ 0xae, 0x4d, 0x3b, 0xa5, 0x4d, 0x3b, 0xd2, 0xa6, 0x6d, 0xc4, 0xcb, 0x32, 0x04, 0x57, 0xd4, 0x82,
+ 0x86, 0x4f, 0x8e, 0xac, 0xc0, 0xf2, 0x5c, 0xad, 0xbc, 0x55, 0xba, 0xd2, 0x34, 0xe2, 0x36, 0xd2,
+ 0x60, 0xd1, 0xf5, 0x76, 0xb1, 0x39, 0x24, 0x5a, 0x65, 0xab, 0x74, 0xa5, 0x61, 0x44, 0x4d, 0xb4,
+ 0x05, 0x4b, 0x98, 0xd2, 0xfb, 0xb8, 0x4b, 0xec, 0x7b, 0x64, 0xac, 0x55, 0xc5, 0xc4, 0x34, 0x89,
+ 0xcf, 0xc5, 0x94, 0x3e, 0xc0, 0x0e, 0xd1, 0x6a, 0xa2, 0x37, 0x6a, 0xa2, 0x0b, 0xd0, 0x74, 0xb1,
+ 0x43, 0x02, 0x8a, 0x4d, 0xa2, 0x35, 0x44, 0x5f, 0x42, 0x40, 0x3f, 0x85, 0xf5, 0x94, 0xe2, 0x8f,
+ 0xbc, 0xd0, 0x37, 0x89, 0x06, 0x62, 0xe9, 0x0f, 0xe7, 0x5b, 0xfa, 0x4e, 0x9e, 0xad, 0x31, 0x29,
+ 0x09, 0xfd, 0x08, 0x6a, 0x62, 0xe7, 0xb5, 0xa5, 0xad, 0xca, 0x2b, 0xb5, 0xb6, 0x64, 0x8b, 0x5c,
+ 0x58, 0xa4, 0x76, 0x38, 0xb0, 0xdc, 0x40, 0x5b, 0x16, 0x12, 0x1e, 0xcf, 0x27, 0x61, 0xd7, 0x73,
+ 0xfb, 0xd6, 0xe0, 0x00, 0xbb, 0x78, 0x40, 0x1c, 0xe2, 0xb2, 0x43, 0xc1, 0xdc, 0x88, 0x84, 0xa0,
+ 0xe7, 0xb0, 0x36, 0x0a, 0x03, 0xe6, 0x39, 0xd6, 0x73, 0xf2, 0x90, 0xf2, 0xb9, 0x81, 0x76, 0x4a,
+ 0x58, 0xf3, 0xc1, 0x7c, 0x82, 0xef, 0xe5, 0xb8, 0x1a, 0x13, 0x72, 0xb8, 0x93, 0x8c, 0xc2, 0x2e,
+ 0xf9, 0x2e, 0xf1, 0x85, 0x77, 0xad, 0x48, 0x27, 0x49, 0x91, 0xa4, 0x1b, 0x59, 0xaa, 0x15, 0x68,
+ 0xab, 0x5b, 0x15, 0xe9, 0x46, 0x31, 0x09, 0x5d, 0x81, 0xd5, 0x23, 0xe2, 0x5b, 0xfd, 0xf1, 0x23,
+ 0x6b, 0xe0, 0x62, 0x16, 0xfa, 0x44, 0x5b, 0x13, 0xae, 0x98, 0x27, 0x23, 0x07, 0x4e, 0x0d, 0x89,
+ 0xed, 0x70, 0x93, 0xef, 0xfa, 0xa4, 0x17, 0x68, 0xeb, 0xc2, 0xbe, 0x7b, 0xf3, 0xef, 0xa0, 0x60,
+ 0x67, 0x64, 0xb9, 0x73, 0xc5, 0x5c, 0xcf, 0x50, 0x91, 0x22, 0x63, 0x04, 0x49, 0xc5, 0x72, 0x64,
+ 0x74, 0x19, 0x56, 0x98, 0x8f, 0xcd, 0x91, 0xe5, 0x0e, 0x0e, 0x08, 0x1b, 0x7a, 0x3d, 0xed, 0xb4,
+ 0xb0, 0x44, 0x8e, 0x8a, 0x4c, 0x40, 0xc4, 0xc5, 0x5d, 0x9b, 0xf4, 0xa4, 0x2f, 0x3e, 0x1e, 0x53,
+ 0x12, 0x68, 0x67, 0xc4, 0x2a, 0x6e, 0xb4, 0x53, 0x19, 0x2a, 0x97, 0x20, 0xda, 0xb7, 0x27, 0x66,
+ 0xdd, 0x76, 0x99, 0x3f, 0x36, 0x0a, 0xd8, 0xa1, 0x11, 0x2c, 0xf1, 0x75, 0x44, 0xae, 0x70, 0x56,
+ 0xb8, 0xc2, 0xdd, 0xf9, 0x6c, 0xb4, 0x9f, 0x30, 0x34, 0xd2, 0xdc, 0x51, 0x1b, 0xd0, 0x10, 0x07,
+ 0x07, 0xa1, 0xcd, 0x2c, 0x6a, 0x13, 0xa9, 0x46, 0xa0, 0x6d, 0x08, 0x33, 0x15, 0xf4, 0xa0, 0x7b,
+ 0x00, 0x3e, 0xe9, 0x47, 0xe3, 0xce, 0x89, 0x95, 0x5f, 0x9b, 0xb5, 0x72, 0x23, 0x1e, 0x2d, 0x57,
+ 0x9c, 0x9a, 0xce, 0x85, 0xf3, 0x65, 0x10, 0x93, 0xa9, 0x68, 0x17, 0x61, 0xad, 0x09, 0x17, 0x2b,
+ 0xe8, 0xe1, 0xbe, 0xa8, 0xa8, 0x22, 0x69, 0x9d, 0x97, 0xde, 0x9a, 0x22, 0xb5, 0x6e, 0xc3, 0xb9,
+ 0x29, 0xa6, 0x46, 0x6b, 0x50, 0x19, 0x91, 0xb1, 0x48, 0xd1, 0x4d, 0x83, 0x7f, 0xa2, 0x33, 0x50,
+ 0x3b, 0xc2, 0x76, 0x48, 0x44, 0x52, 0x6d, 0x18, 0xb2, 0x71, 0xab, 0xfc, 0x8d, 0x52, 0xeb, 0x17,
+ 0x25, 0x58, 0xcd, 0x29, 0x5e, 0x30, 0xff, 0x87, 0xe9, 0xf9, 0xaf, 0xc0, 0x8d, 0xfb, 0x8f, 0xb1,
+ 0x3f, 0x20, 0x2c, 0xa5, 0x88, 0xfe, 0xf7, 0x12, 0x68, 0x39, 0x8b, 0x7e, 0xcf, 0x62, 0xc3, 0x3b,
+ 0x96, 0x4d, 0x02, 0x74, 0x13, 0x16, 0x7d, 0x49, 0x53, 0x07, 0xcf, 0x1b, 0x33, 0x36, 0x62, 0x7f,
+ 0xc1, 0x88, 0x46, 0xa3, 0x0f, 0xa1, 0xe1, 0x10, 0x86, 0x7b, 0x98, 0x61, 0xa5, 0xfb, 0x56, 0xd1,
+ 0x4c, 0x2e, 0xe5, 0x40, 0x8d, 0xdb, 0x5f, 0x30, 0xe2, 0x39, 0xe8, 0x5d, 0xa8, 0x99, 0xc3, 0xd0,
+ 0x1d, 0x89, 0x23, 0x67, 0x69, 0xfb, 0xe2, 0xb4, 0xc9, 0xbb, 0x7c, 0xd0, 0xfe, 0x82, 0x21, 0x47,
+ 0x7f, 0x54, 0x87, 0x2a, 0xc5, 0x3e, 0xd3, 0xef, 0xc0, 0x99, 0x22, 0x11, 0xfc, 0x9c, 0x33, 0x87,
+ 0xc4, 0x1c, 0x05, 0xa1, 0xa3, 0xcc, 0x1c, 0xb7, 0x11, 0x82, 0x6a, 0x60, 0x3d, 0x97, 0xa6, 0xae,
+ 0x18, 0xe2, 0x5b, 0x7f, 0x0b, 0xd6, 0x27, 0xa4, 0xf1, 0x4d, 0x95, 0xba, 0x71, 0x0e, 0xcb, 0x4a,
+ 0xb4, 0x1e, 0xc2, 0xd9, 0xc7, 0xc2, 0x16, 0x71, 0xb2, 0x3f, 0x89, 0x93, 0x5b, 0xdf, 0x87, 0x8d,
+ 0xbc, 0xd8, 0x80, 0x7a, 0x6e, 0x40, 0xb8, 0xeb, 0x8b, 0xec, 0x68, 0x91, 0x5e, 0xd2, 0x2b, 0xb4,
+ 0x68, 0x18, 0x05, 0x3d, 0xfa, 0x6f, 0xca, 0xb0, 0x61, 0x90, 0xc0, 0xb3, 0x8f, 0x48, 0x94, 0xba,
+ 0x4e, 0x06, 0x7c, 0xfc, 0x00, 0x2a, 0x98, 0x52, 0xe5, 0x26, 0x77, 0x5f, 0xd9, 0xf1, 0x6e, 0x70,
+ 0xae, 0xe8, 0x6d, 0x58, 0xc7, 0x4e, 0xd7, 0x1a, 0x84, 0x5e, 0x18, 0x44, 0xcb, 0x12, 0x4e, 0xd5,
+ 0x34, 0x26, 0x3b, 0x78, 0xf8, 0x07, 0x22, 0x22, 0xef, 0xba, 0x3d, 0xf2, 0x13, 0x81, 0x68, 0x2a,
+ 0x46, 0x9a, 0xa4, 0x9b, 0x70, 0x6e, 0xc2, 0x48, 0xca, 0xe0, 0x69, 0x10, 0x55, 0xca, 0x81, 0xa8,
+ 0x42, 0x35, 0xca, 0x53, 0xd4, 0xd0, 0xff, 0x5c, 0x82, 0xb5, 0x24, 0xb8, 0x14, 0xfb, 0x0b, 0xd0,
+ 0x74, 0x14, 0x2d, 0xd0, 0x4a, 0x22, 0x83, 0x25, 0x84, 0x2c, 0x9e, 0x2a, 0xe7, 0xf1, 0xd4, 0x06,
+ 0xd4, 0x25, 0xdc, 0x55, 0x4b, 0x57, 0xad, 0x8c, 0xca, 0xd5, 0x9c, 0xca, 0x9b, 0x00, 0x41, 0x9c,
+ 0xe1, 0xb4, 0xba, 0xe8, 0x4d, 0x51, 0x90, 0x0e, 0xcb, 0xf2, 0xf4, 0x35, 0x48, 0x10, 0xda, 0x4c,
+ 0x5b, 0x14, 0x23, 0x32, 0x34, 0xdd, 0x83, 0xd5, 0xfb, 0x16, 0x5f, 0x43, 0x3f, 0x38, 0x99, 0x70,
+ 0x78, 0x0f, 0xaa, 0x5c, 0x18, 0x5f, 0x58, 0xd7, 0xc7, 0xae, 0x39, 0x24, 0x91, 0xad, 0xe2, 0x36,
+ 0x0f, 0x74, 0x86, 0x07, 0x81, 0x56, 0x16, 0x74, 0xf1, 0xad, 0xff, 0xbe, 0x2c, 0x35, 0xdd, 0xa1,
+ 0x34, 0xf8, 0xf2, 0x21, 0x77, 0x31, 0x08, 0xa8, 0x4c, 0x82, 0x80, 0x9c, 0xca, 0x5f, 0x04, 0x04,
+ 0xbc, 0xa2, 0x83, 0x4c, 0x0f, 0x61, 0x71, 0x87, 0x52, 0xae, 0x08, 0xba, 0x0e, 0x55, 0x4c, 0xa9,
+ 0x34, 0x78, 0x2e, 0x67, 0xab, 0x21, 0xfc, 0xbf, 0x52, 0x49, 0x0c, 0x6d, 0xdd, 0x84, 0x66, 0x4c,
+ 0x7a, 0x99, 0xd8, 0x66, 0x5a, 0xec, 0x16, 0x80, 0x44, 0xb9, 0x77, 0xdd, 0xbe, 0xc7, 0xb7, 0x94,
+ 0x3b, 0xbb, 0x9a, 0x2a, 0xbe, 0xf5, 0x5b, 0xd1, 0x08, 0xa1, 0xdb, 0xdb, 0x50, 0xb3, 0x18, 0x71,
+ 0x22, 0xe5, 0x36, 0xd2, 0xca, 0x25, 0x8c, 0x0c, 0x39, 0x48, 0xff, 0x4b, 0x03, 0xce, 0xf3, 0x1d,
+ 0x7b, 0x24, 0xc2, 0x64, 0x87, 0xd2, 0x8f, 0x09, 0xc3, 0x96, 0x1d, 0x7c, 0x27, 0x24, 0xfe, 0xf8,
+ 0x35, 0x3b, 0xc6, 0x00, 0xea, 0x32, 0xca, 0x54, 0x46, 0x7c, 0xe5, 0x05, 0x8f, 0x62, 0x9f, 0x54,
+ 0x39, 0x95, 0xd7, 0x53, 0xe5, 0x14, 0x55, 0x1d, 0xd5, 0x13, 0xaa, 0x3a, 0xa6, 0x17, 0x9e, 0xa9,
+ 0x72, 0xb6, 0x9e, 0x2d, 0x67, 0x0b, 0xc0, 0xfc, 0xe2, 0x71, 0xc1, 0x7c, 0xa3, 0x10, 0xcc, 0x3b,
+ 0x85, 0x71, 0xdc, 0x14, 0xe6, 0xfe, 0x56, 0xda, 0x03, 0xa7, 0xfa, 0xda, 0x3c, 0xb0, 0x1e, 0x5e,
+ 0x2b, 0xac, 0xff, 0x34, 0x03, 0xd3, 0x65, 0xa1, 0xfc, 0xee, 0xf1, 0xd6, 0x34, 0x03, 0xb0, 0x7f,
+ 0xe5, 0xe0, 0xf5, 0xcf, 0x05, 0xaa, 0xa2, 0x5e, 0x62, 0x83, 0xf8, 0x40, 0xe7, 0xe7, 0x10, 0x3f,
+ 0x5a, 0x55, 0xd2, 0xe2, 0xdf, 0xe8, 0x1a, 0x54, 0xb9, 0x91, 0x15, 0xec, 0x3d, 0x97, 0xb6, 0x27,
+ 0xdf, 0x89, 0x1d, 0x4a, 0x1f, 0x51, 0x62, 0x1a, 0x62, 0x10, 0xba, 0x05, 0xcd, 0xd8, 0xf1, 0x55,
+ 0x64, 0x5d, 0x48, 0xcf, 0x88, 0xe3, 0x24, 0x9a, 0x96, 0x0c, 0xe7, 0x73, 0x7b, 0x96, 0x4f, 0x4c,
+ 0x01, 0x0a, 0x6b, 0x93, 0x73, 0x3f, 0x8e, 0x3a, 0xe3, 0xb9, 0xf1, 0x70, 0x74, 0x1d, 0xea, 0xf2,
+ 0x66, 0x41, 0x44, 0xd0, 0xd2, 0xf6, 0xf9, 0xc9, 0x64, 0x1a, 0xcd, 0x52, 0x03, 0xf5, 0x3f, 0x95,
+ 0xe0, 0xcd, 0xc4, 0x21, 0xa2, 0x68, 0x8a, 0x70, 0xf9, 0x97, 0x7f, 0xe2, 0x5e, 0x86, 0x15, 0x51,
+ 0x08, 0x24, 0x17, 0x0c, 0xf2, 0xae, 0x2b, 0x47, 0xd5, 0x7f, 0x57, 0x82, 0x4b, 0x93, 0xeb, 0xd8,
+ 0x1d, 0x62, 0x9f, 0xc5, 0xdb, 0x7b, 0x12, 0x6b, 0x89, 0x0e, 0xbc, 0x72, 0x72, 0xe0, 0x65, 0xd6,
+ 0x57, 0xc9, 0xae, 0x4f, 0xff, 0x43, 0x19, 0x96, 0x52, 0x0e, 0x54, 0x74, 0x60, 0x72, 0xc0, 0x27,
+ 0xfc, 0x56, 0x94, 0x7e, 0xe2, 0x50, 0x68, 0x1a, 0x29, 0x0a, 0x1a, 0x01, 0x50, 0xec, 0x63, 0x87,
+ 0x30, 0xe2, 0xf3, 0x4c, 0xce, 0x23, 0xfe, 0xde, 0xfc, 0xd9, 0xe5, 0x30, 0xe2, 0x69, 0xa4, 0xd8,
+ 0x73, 0xc4, 0x2a, 0x44, 0x07, 0x2a, 0x7f, 0xab, 0x16, 0xfa, 0x1c, 0x56, 0xfa, 0x96, 0x4d, 0x0e,
+ 0x13, 0x45, 0xea, 0x42, 0x91, 0x87, 0xf3, 0x2b, 0x72, 0x27, 0xcd, 0xd7, 0xc8, 0x89, 0xd1, 0xaf,
+ 0xc2, 0x5a, 0x3e, 0x9e, 0xb8, 0x92, 0x96, 0x83, 0x07, 0xb1, 0xb5, 0x54, 0x4b, 0x47, 0xb0, 0x96,
+ 0x8f, 0x1f, 0xfd, 0x9f, 0x65, 0x38, 0x1b, 0xb3, 0xdb, 0x71, 0x5d, 0x2f, 0x74, 0x4d, 0x71, 0x59,
+ 0x57, 0xb8, 0x17, 0x67, 0xa0, 0xc6, 0x2c, 0x66, 0xc7, 0xc0, 0x47, 0x34, 0xf8, 0xd9, 0xc5, 0x3c,
+ 0xcf, 0x66, 0x16, 0x55, 0x1b, 0x1c, 0x35, 0xe5, 0xde, 0x3f, 0x0b, 0x2d, 0x9f, 0xf4, 0x44, 0x26,
+ 0x68, 0x18, 0x71, 0x9b, 0xf7, 0x71, 0x54, 0x23, 0x60, 0xbc, 0x34, 0x66, 0xdc, 0x16, 0x7e, 0xef,
+ 0xd9, 0x36, 0x31, 0xb9, 0x39, 0x52, 0x40, 0x3f, 0x47, 0x15, 0x05, 0x04, 0xf3, 0x2d, 0x77, 0xa0,
+ 0x60, 0xbe, 0x6a, 0x71, 0x3d, 0xb1, 0xef, 0xe3, 0xb1, 0xd6, 0x10, 0x06, 0x90, 0x0d, 0xf4, 0x01,
+ 0x54, 0x1c, 0x4c, 0xd5, 0x41, 0x77, 0x35, 0x93, 0x1d, 0x8a, 0x2c, 0xd0, 0x3e, 0xc0, 0x54, 0x9e,
+ 0x04, 0x7c, 0x5a, 0xeb, 0x3d, 0x68, 0x44, 0x84, 0x2f, 0x04, 0x09, 0x3f, 0x83, 0x53, 0x99, 0xe4,
+ 0x83, 0x9e, 0xc0, 0x46, 0xe2, 0x51, 0x69, 0x81, 0x0a, 0x04, 0xbe, 0xf9, 0x52, 0xcd, 0x8c, 0x29,
+ 0x0c, 0xf4, 0x67, 0xb0, 0xce, 0x5d, 0x46, 0x04, 0xfe, 0x09, 0x95, 0x36, 0xef, 0x43, 0x33, 0x16,
+ 0x59, 0xe8, 0x33, 0x2d, 0x68, 0x1c, 0x45, 0x97, 0xa8, 0xb2, 0xb6, 0x89, 0xdb, 0xfa, 0x0e, 0xa0,
+ 0xb4, 0xbe, 0xea, 0x04, 0xba, 0x96, 0x05, 0xc5, 0x67, 0xf3, 0xc7, 0x8d, 0x18, 0x1e, 0x61, 0xe2,
+ 0x7f, 0x94, 0x61, 0x75, 0xcf, 0x12, 0xf7, 0x20, 0x27, 0x94, 0xe4, 0xae, 0xc2, 0x5a, 0x10, 0x76,
+ 0x1d, 0xaf, 0x17, 0xda, 0x44, 0x81, 0x02, 0x75, 0xd2, 0x4f, 0xd0, 0x67, 0x25, 0x3f, 0x6e, 0x2c,
+ 0x8a, 0xd9, 0x50, 0x55, 0xb8, 0xe2, 0x1b, 0x7d, 0x00, 0xe7, 0x1f, 0x90, 0xcf, 0xd5, 0x7a, 0xf6,
+ 0x6c, 0xaf, 0xdb, 0xb5, 0xdc, 0x41, 0x24, 0xa4, 0x26, 0x84, 0x4c, 0x1f, 0x50, 0x04, 0x15, 0xeb,
+ 0xc5, 0x50, 0x31, 0xae, 0x92, 0x77, 0x3d, 0xc7, 0xb1, 0x98, 0x42, 0x94, 0x19, 0x9a, 0xfe, 0xb3,
+ 0x12, 0xac, 0x25, 0x96, 0x55, 0x7b, 0x73, 0x53, 0xc6, 0x90, 0xdc, 0x99, 0x4b, 0xe9, 0x9d, 0xc9,
+ 0x0f, 0xfd, 0xef, 0xc3, 0x67, 0x39, 0x1d, 0x3e, 0xbf, 0x2c, 0xc3, 0xd9, 0x3d, 0x8b, 0x45, 0x89,
+ 0xcb, 0xfa, 0x7f, 0xdb, 0xe5, 0x82, 0x3d, 0xa9, 0x1e, 0x6f, 0x4f, 0x6a, 0x05, 0x7b, 0xd2, 0x86,
+ 0x8d, 0xbc, 0x31, 0xd4, 0xc6, 0x9c, 0x81, 0x1a, 0xf7, 0xa0, 0xe8, 0x5e, 0x41, 0x36, 0xf4, 0xdf,
+ 0xd6, 0xe1, 0xe2, 0xa7, 0xb4, 0x87, 0x59, 0x7c, 0x2f, 0x74, 0xc7, 0xf3, 0x0f, 0x79, 0xd7, 0xc9,
+ 0x58, 0x31, 0xf7, 0x16, 0x57, 0x9e, 0xf9, 0x16, 0x57, 0x99, 0xf1, 0x16, 0x57, 0x3d, 0xd6, 0x5b,
+ 0x5c, 0xed, 0xc4, 0xde, 0xe2, 0x26, 0x6b, 0xad, 0x7a, 0x61, 0xad, 0xf5, 0x24, 0x53, 0x8f, 0x2c,
+ 0x8a, 0xb0, 0xf9, 0x66, 0x3a, 0x6c, 0x66, 0xee, 0xce, 0xcc, 0x47, 0x84, 0xdc, 0x13, 0x56, 0xe3,
+ 0xa5, 0x4f, 0x58, 0xcd, 0xc9, 0x27, 0xac, 0xe2, 0x57, 0x10, 0x98, 0xfa, 0x0a, 0x72, 0x19, 0x56,
+ 0x82, 0xb1, 0x6b, 0x92, 0x5e, 0x7c, 0x5b, 0xb8, 0x24, 0x97, 0x9d, 0xa5, 0x66, 0x22, 0x62, 0x39,
+ 0x17, 0x11, 0xb1, 0xa7, 0x9e, 0x4a, 0x79, 0xea, 0xff, 0x4e, 0x69, 0xb4, 0x05, 0x9b, 0xd3, 0xf6,
+ 0x44, 0x86, 0xda, 0xf6, 0x1f, 0x01, 0xd6, 0x13, 0xb4, 0xcd, 0xff, 0x5a, 0x26, 0x41, 0x0f, 0x61,
+ 0x6d, 0x4f, 0x3d, 0xa7, 0x47, 0x97, 0xa4, 0x68, 0xd6, 0xbb, 0x44, 0xeb, 0x42, 0x71, 0xa7, 0x14,
+ 0xa2, 0x2f, 0x20, 0x13, 0xce, 0xe7, 0x19, 0x26, 0x4f, 0x20, 0x5f, 0x9f, 0xc1, 0x39, 0x1e, 0xf5,
+ 0x32, 0x11, 0x57, 0x4a, 0xe8, 0x09, 0xac, 0x64, 0x2f, 0xea, 0x51, 0x06, 0x7e, 0x14, 0xbe, 0x1d,
+ 0xb4, 0xf4, 0x59, 0x43, 0x62, 0xfd, 0x9f, 0xf2, 0x0d, 0xcd, 0xdc, 0x49, 0x23, 0x3d, 0x5b, 0x89,
+ 0x17, 0xdd, 0xea, 0xb7, 0xbe, 0x36, 0x73, 0x4c, 0xcc, 0xfd, 0x7d, 0x68, 0x44, 0x77, 0xb8, 0x59,
+ 0x33, 0xe7, 0x6e, 0x76, 0x5b, 0x6b, 0x59, 0x7e, 0xfd, 0x40, 0x5f, 0x40, 0x1f, 0xca, 0xc9, 0x3b,
+ 0x94, 0x16, 0x4c, 0x4e, 0xdd, 0x5c, 0xb6, 0x4e, 0x17, 0xdc, 0x16, 0xea, 0x0b, 0xe8, 0xdb, 0xb0,
+ 0xc4, 0xbf, 0x0e, 0xd5, 0x43, 0xf6, 0x46, 0x5b, 0xfe, 0x6e, 0xa2, 0x1d, 0xfd, 0x6e, 0xa2, 0x7d,
+ 0xdb, 0xa1, 0x6c, 0xdc, 0x2a, 0xb8, 0xce, 0x53, 0x0c, 0x9e, 0xc2, 0xa9, 0x3d, 0xc2, 0x92, 0xea,
+ 0x1b, 0x5d, 0x3a, 0xd6, 0x1d, 0x45, 0x4b, 0xcf, 0x0f, 0x9b, 0x2c, 0xe0, 0xf5, 0x05, 0xf4, 0xab,
+ 0x12, 0x9c, 0xde, 0x23, 0x2c, 0x5f, 0xcf, 0xa2, 0x77, 0x8a, 0x85, 0x4c, 0xa9, 0x7b, 0x5b, 0x0f,
+ 0xe6, 0x8d, 0xae, 0x2c, 0x5b, 0x7d, 0x01, 0xfd, 0xba, 0x04, 0xe7, 0x52, 0x8a, 0xa5, 0x0b, 0x54,
+ 0x74, 0x7d, 0xb6, 0x72, 0x05, 0xc5, 0x6c, 0xeb, 0x93, 0x39, 0x7f, 0x9f, 0x90, 0x62, 0xa9, 0x2f,
+ 0xa0, 0x43, 0xb1, 0x27, 0x09, 0x1e, 0x45, 0x17, 0x0b, 0x81, 0x67, 0x2c, 0x7d, 0x73, 0x5a, 0x77,
+ 0xbc, 0x0f, 0x9f, 0xc0, 0xd2, 0x1e, 0x61, 0x11, 0x30, 0xca, 0x7a, 0x5a, 0x0e, 0xb3, 0x66, 0x43,
+ 0x35, 0x8f, 0xa5, 0x84, 0xc7, 0xac, 0x4b, 0x5e, 0xa9, 0xc3, 0x3f, 0x1b, 0xab, 0x85, 0x28, 0x29,
+ 0xeb, 0x31, 0xc5, 0xd8, 0x41, 0x5f, 0x40, 0xcf, 0x60, 0xa3, 0x38, 0xe9, 0xa1, 0xb7, 0x8e, 0x7d,
+ 0x58, 0xb5, 0xae, 0x1e, 0x67, 0x68, 0x24, 0xf2, 0xa3, 0x9d, 0xbf, 0xbe, 0xd8, 0x2c, 0xfd, 0xed,
+ 0xc5, 0x66, 0xe9, 0x5f, 0x2f, 0x36, 0x4b, 0xdf, 0xbf, 0xf1, 0x92, 0xdf, 0x31, 0xa5, 0x7e, 0x1a,
+ 0x85, 0xa9, 0x65, 0xda, 0x16, 0x71, 0x59, 0xb7, 0x2e, 0xe2, 0xed, 0xc6, 0x7f, 0x02, 0x00, 0x00,
+ 0xff, 0xff, 0xb7, 0x8d, 0xc3, 0x0e, 0x39, 0x25, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -4941,6 +4958,16 @@ func (m *GitFilesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
+ if m.VerifyCommit {
+ i--
+ if m.VerifyCommit {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i--
+ dAtA[i] = 0x38
+ }
if m.NoRevisionCache {
i--
if m.NoRevisionCache {
@@ -5072,6 +5099,16 @@ func (m *GitDirectoriesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
+ if m.VerifyCommit {
+ i--
+ if m.VerifyCommit {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i--
+ dAtA[i] = 0x28
+ }
if m.NoRevisionCache {
i--
if m.NoRevisionCache {
@@ -6155,6 +6192,9 @@ func (m *GitFilesRequest) Size() (n int) {
if m.NoRevisionCache {
n += 2
}
+ if m.VerifyCommit {
+ n += 2
+ }
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@@ -6205,6 +6245,9 @@ func (m *GitDirectoriesRequest) Size() (n int) {
if m.NoRevisionCache {
n += 2
}
+ if m.VerifyCommit {
+ n += 2
+ }
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@@ -11473,6 +11516,26 @@ func (m *GitFilesRequest) Unmarshal(dAtA []byte) error {
}
}
m.NoRevisionCache = bool(v != 0)
+ case 7:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field VerifyCommit", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowRepository
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.VerifyCommit = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipRepository(dAtA[iNdEx:])
@@ -11811,6 +11874,26 @@ func (m *GitDirectoriesRequest) Unmarshal(dAtA []byte) error {
}
}
m.NoRevisionCache = bool(v != 0)
+ case 5:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field VerifyCommit", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowRepository
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.VerifyCommit = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipRepository(dAtA[iNdEx:])
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
index e92a7425774ac..a632f10304924 100644
--- a/reposerver/repository/repository.go
+++ b/reposerver/repository/repository.go
@@ -2557,6 +2557,10 @@ func (s *Service) GetGitFiles(_ context.Context, request *apiclient.GitFilesRequ
return nil, status.Errorf(codes.Internal, "unable to resolve git revision %s: %v", revision, err)
}
+ if err := verifyCommitSignature(request.VerifyCommit, gitClient, revision, repo); err != nil {
+ return nil, err
+ }
+
// check the cache and return the results if present
if cachedFiles, err := s.cache.GetGitFiles(repo.Repo, revision, gitPath); err == nil {
log.Debugf("cache hit for repo: %s revision: %s pattern: %s", repo.Repo, revision, gitPath)
@@ -2602,6 +2606,28 @@ func (s *Service) GetGitFiles(_ context.Context, request *apiclient.GitFilesRequ
}, nil
}
+func verifyCommitSignature(verifyCommit bool, gitClient git.Client, revision string, repo *v1alpha1.Repository) error {
+ if gpg.IsGPGEnabled() && verifyCommit {
+ cs, err := gitClient.VerifyCommitSignature(revision)
+ if err != nil {
+ log.Errorf("error verifying signature of commit '%s' in repo '%s': %v", revision, repo.Repo, err)
+ return err
+ }
+
+ if cs == "" {
+ return fmt.Errorf("revision %s is not signed", revision)
+ } else {
+ vr := gpg.ParseGitCommitVerification(cs)
+ if vr.Result == gpg.VerifyResultUnknown {
+ return fmt.Errorf("UNKNOWN signature: %s", vr.Message)
+ } else {
+ log.Debugf("%s signature from %s key %s", vr.Result, vr.Cipher, gpg.KeyID(vr.KeyID))
+ }
+ }
+ }
+ return nil
+}
+
func (s *Service) GetGitDirectories(_ context.Context, request *apiclient.GitDirectoriesRequest) (*apiclient.GitDirectoriesResponse, error) {
repo := request.GetRepo()
revision := request.GetRevision()
@@ -2615,6 +2641,10 @@ func (s *Service) GetGitDirectories(_ context.Context, request *apiclient.GitDir
return nil, status.Errorf(codes.Internal, "unable to resolve git revision %s: %v", revision, err)
}
+ if err := verifyCommitSignature(request.VerifyCommit, gitClient, revision, repo); err != nil {
+ return nil, err
+ }
+
// check the cache and return the results if present
if cachedPaths, err := s.cache.GetGitDirectories(repo.Repo, revision); err == nil {
log.Debugf("cache hit for repo: %s revision: %s", repo.Repo, revision)
diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto
index f715ff8ce4c8c..d0a72d09902a9 100644
--- a/reposerver/repository/repository.proto
+++ b/reposerver/repository/repository.proto
@@ -238,6 +238,7 @@ message GitFilesRequest {
string path = 4;
bool NewGitFileGlobbingEnabled = 5;
bool noRevisionCache = 6;
+ bool verifyCommit = 7;
}
message GitFilesResponse {
@@ -250,6 +251,7 @@ message GitDirectoriesRequest {
bool submoduleEnabled = 2;
string revision = 3;
bool noRevisionCache = 4;
+ bool verifyCommit = 5;
}
message GitDirectoriesResponse {
diff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go
index 289ff51826460..e7ae829e14bff 100644
--- a/reposerver/repository/repository_test.go
+++ b/reposerver/repository/repository_test.go
@@ -3318,6 +3318,25 @@ func TestErrorGetGitDirectories(t *testing.T) {
Revision: "sadfsadf",
},
}, want: nil, wantErr: assert.Error},
+ {name: "ErrorVerifyCommit", fields: fields{service: func() *Service {
+ s, _, _ := newServiceWithOpt(t, func(gitClient *gitmocks.Client, helmClient *helmmocks.Client, paths *iomocks.TempPaths) {
+ gitClient.On("Checkout", mock.Anything, mock.Anything).Return(nil)
+ gitClient.On("LsRemote", mock.Anything).Return("", fmt.Errorf("ah error"))
+ gitClient.On("VerifyCommitSignature", mock.Anything).Return("", fmt.Errorf("revision %s is not signed", "sadfsadf"))
+ gitClient.On("Root").Return(root)
+ paths.On("GetPath", mock.Anything).Return(".", nil)
+ paths.On("GetPathIfExists", mock.Anything).Return(".", nil)
+ }, ".")
+ return s
+ }()}, args: args{
+ ctx: context.TODO(),
+ request: &apiclient.GitDirectoriesRequest{
+ Repo: &argoappv1.Repository{Repo: "not-a-valid-url"},
+ SubmoduleEnabled: false,
+ Revision: "sadfsadf",
+ VerifyCommit: true,
+ },
+ }, want: nil, wantErr: assert.Error},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@@ -3948,3 +3967,59 @@ func TestGetRevisionChartDetails(t *testing.T) {
assert.Equal(t, []string{"test-maintainer"}, chartDetails.Maintainers)
})
}
+
+func TestVerifyCommitSignature(t *testing.T) {
+ repo := &v1alpha1.Repository{
+ Repo: "https://github.com/example/repo.git",
+ }
+
+ t.Run("VerifyCommitSignature with valid signature", func(t *testing.T) {
+ t.Setenv("ARGOCD_GPG_ENABLED", "true")
+ mockGitClient := &gitmocks.Client{}
+ mockGitClient.On("VerifyCommitSignature", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+ Return(testSignature, nil)
+
+ err := verifyCommitSignature(true, mockGitClient, "abcd1234", repo)
+ assert.NoError(t, err)
+ })
+
+ t.Run("VerifyCommitSignature with invalid signature", func(t *testing.T) {
+ t.Setenv("ARGOCD_GPG_ENABLED", "true")
+ mockGitClient := &gitmocks.Client{}
+ mockGitClient.On("VerifyCommitSignature", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+ Return("", nil)
+
+ err := verifyCommitSignature(true, mockGitClient, "abcd1234", repo)
+ assert.Error(t, err)
+ assert.Equal(t, "revision abcd1234 is not signed", err.Error())
+ })
+
+ t.Run("VerifyCommitSignature with unknown signature", func(t *testing.T) {
+ t.Setenv("ARGOCD_GPG_ENABLED", "true")
+ mockGitClient := &gitmocks.Client{}
+ mockGitClient.On("VerifyCommitSignature", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+ Return("", fmt.Errorf("UNKNOWN signature: gpg: Unknown signature from ABCDEFGH"))
+
+ err := verifyCommitSignature(true, mockGitClient, "abcd1234", repo)
+ assert.Error(t, err)
+ assert.Equal(t, "UNKNOWN signature: gpg: Unknown signature from ABCDEFGH", err.Error())
+ })
+
+ t.Run("VerifyCommitSignature with error verifying signature", func(t *testing.T) {
+ t.Setenv("ARGOCD_GPG_ENABLED", "true")
+ mockGitClient := &gitmocks.Client{}
+ mockGitClient.On("VerifyCommitSignature", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+ Return("", fmt.Errorf("error verifying signature of commit 'abcd1234' in repo 'https://github.com/example/repo.git': failed to verify signature"))
+
+ err := verifyCommitSignature(true, mockGitClient, "abcd1234", repo)
+ assert.Error(t, err)
+ assert.Equal(t, "error verifying signature of commit 'abcd1234' in repo 'https://github.com/example/repo.git': failed to verify signature", err.Error())
+ })
+
+ t.Run("VerifyCommitSignature with signature verification disabled", func(t *testing.T) {
+ t.Setenv("ARGOCD_GPG_ENABLED", "false")
+ mockGitClient := &gitmocks.Client{}
+ err := verifyCommitSignature(false, mockGitClient, "abcd1234", repo)
+ assert.NoError(t, err)
+ })
+}
diff --git a/test/e2e/applicationset_test.go b/test/e2e/applicationset_test.go
index 1c5d407c16f9f..886a645027c20 100644
--- a/test/e2e/applicationset_test.go
+++ b/test/e2e/applicationset_test.go
@@ -15,6 +15,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
+ "github.com/argoproj/pkg/rand"
+
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v2/test/e2e/fixture"
@@ -1429,6 +1431,213 @@ func TestSimpleGitDirectoryGeneratorGoTemplate(t *testing.T) {
Delete().Then().Expect(ApplicationsDoNotExist(expectedAppsNewNamespace))
}
+func TestSimpleGitDirectoryGeneratorGPGEnabledUnsignedCommits(t *testing.T) {
+ expectedErrorMessage := `error generating params from git: error getting directories from repo: error retrieving Git Directories: rpc error: code = Unknown desc = permission denied`
+ expectedConditionsParamsError := []v1alpha1.ApplicationSetCondition{
+ {
+ Type: v1alpha1.ApplicationSetConditionErrorOccurred,
+ Status: v1alpha1.ApplicationSetConditionStatusTrue,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonApplicationParamsGenerationError,
+ },
+ {
+ Type: v1alpha1.ApplicationSetConditionParametersGenerated,
+ Status: v1alpha1.ApplicationSetConditionStatusFalse,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonErrorOccurred,
+ },
+ {
+ Type: v1alpha1.ApplicationSetConditionResourcesUpToDate,
+ Status: v1alpha1.ApplicationSetConditionStatusFalse,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonApplicationParamsGenerationError,
+ },
+ }
+ generateExpectedApp := func(name string) argov1alpha1.Application {
+ return argov1alpha1.Application{
+ TypeMeta: metav1.TypeMeta{
+ Kind: application.ApplicationKind,
+ APIVersion: "argoproj.io/v1alpha1",
+ },
+ ObjectMeta: metav1.ObjectMeta{
+ Name: name,
+ Namespace: fixture.TestNamespace(),
+ Finalizers: []string{"resources-finalizer.argocd.argoproj.io"},
+ },
+ Spec: argov1alpha1.ApplicationSpec{
+ Project: "default",
+ Source: &argov1alpha1.ApplicationSource{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ TargetRevision: "HEAD",
+ Path: name,
+ },
+ Destination: argov1alpha1.ApplicationDestination{
+ Server: "https://kubernetes.default.svc",
+ Namespace: name,
+ },
+ },
+ }
+ }
+
+ expectedApps := []argov1alpha1.Application{
+ generateExpectedApp("guestbook"),
+ }
+ project := "gpg"
+
+ fixture.EnsureCleanState(t)
+ Given(t).
+ Project(project).
+ When().
+ // Create a GitGenerator-based ApplicationSet
+ Create(v1alpha1.ApplicationSet{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "simple-git-generator",
+ },
+ Spec: v1alpha1.ApplicationSetSpec{
+ Template: v1alpha1.ApplicationSetTemplate{
+ ApplicationSetTemplateMeta: v1alpha1.ApplicationSetTemplateMeta{Name: "{{path.basename}}"},
+ Spec: argov1alpha1.ApplicationSpec{
+ Project: project,
+ Source: &argov1alpha1.ApplicationSource{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ TargetRevision: "HEAD",
+ Path: "{{path}}",
+ },
+ Destination: argov1alpha1.ApplicationDestination{
+ Server: "https://kubernetes.default.svc",
+ Namespace: "{{path.basename}}",
+ },
+ },
+ },
+ Generators: []v1alpha1.ApplicationSetGenerator{
+ {
+ Git: &v1alpha1.GitGenerator{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ Directories: []v1alpha1.GitDirectoryGeneratorItem{
+ {
+ Path: guestbookPath,
+ },
+ },
+ },
+ },
+ },
+ },
+ }).
+ Then().Expect(ApplicationsDoNotExist(expectedApps)).
+ // verify the ApplicationSet error status conditions were set correctly
+ Expect(ApplicationSetHasConditions("simple-git-generator", expectedConditionsParamsError)).
+ When().
+ Delete().Then().Expect(ApplicationsDoNotExist(expectedApps))
+}
+
+func TestSimpleGitDirectoryGeneratorGPGEnabledWithoutKnownKeys(t *testing.T) {
+ expectedErrorMessage := `error generating params from git: error getting directories from repo: error retrieving Git Directories: rpc error: code = Unknown desc = permission denied`
+ expectedConditionsParamsError := []v1alpha1.ApplicationSetCondition{
+ {
+ Type: v1alpha1.ApplicationSetConditionErrorOccurred,
+ Status: v1alpha1.ApplicationSetConditionStatusTrue,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonApplicationParamsGenerationError,
+ },
+ {
+ Type: v1alpha1.ApplicationSetConditionParametersGenerated,
+ Status: v1alpha1.ApplicationSetConditionStatusFalse,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonErrorOccurred,
+ },
+ {
+ Type: v1alpha1.ApplicationSetConditionResourcesUpToDate,
+ Status: v1alpha1.ApplicationSetConditionStatusFalse,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonApplicationParamsGenerationError,
+ },
+ }
+ generateExpectedApp := func(name string) argov1alpha1.Application {
+ return argov1alpha1.Application{
+ TypeMeta: metav1.TypeMeta{
+ Kind: application.ApplicationKind,
+ APIVersion: "argoproj.io/v1alpha1",
+ },
+ ObjectMeta: metav1.ObjectMeta{
+ Name: name,
+ Namespace: fixture.TestNamespace(),
+ Finalizers: []string{"resources-finalizer.argocd.argoproj.io"},
+ },
+ Spec: argov1alpha1.ApplicationSpec{
+ Project: "default",
+ Source: &argov1alpha1.ApplicationSource{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ TargetRevision: "HEAD",
+ Path: name,
+ },
+ Destination: argov1alpha1.ApplicationDestination{
+ Server: "https://kubernetes.default.svc",
+ Namespace: name,
+ },
+ },
+ }
+ }
+
+ expectedApps := []argov1alpha1.Application{
+ generateExpectedApp("guestbook"),
+ }
+
+ project := "gpg"
+
+ str, _ := rand.RandString(1)
+
+ Given(t).
+ Project(project).
+ Path(guestbookPath).
+ When().
+ AddSignedFile("test.yaml", str).IgnoreErrors().
+ IgnoreErrors().
+ // Create a GitGenerator-based ApplicationSet
+ Create(v1alpha1.ApplicationSet{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "simple-git-generator",
+ },
+ Spec: v1alpha1.ApplicationSetSpec{
+ Template: v1alpha1.ApplicationSetTemplate{
+ ApplicationSetTemplateMeta: v1alpha1.ApplicationSetTemplateMeta{Name: "{{path.basename}}"},
+ Spec: argov1alpha1.ApplicationSpec{
+ Project: project,
+ Source: &argov1alpha1.ApplicationSource{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ TargetRevision: "HEAD",
+ Path: "{{path}}",
+ },
+ Destination: argov1alpha1.ApplicationDestination{
+ Server: "https://kubernetes.default.svc",
+ Namespace: "{{path.basename}}",
+ },
+ // Automatically create resources
+ SyncPolicy: &argov1alpha1.SyncPolicy{
+ Automated: &argov1alpha1.SyncPolicyAutomated{},
+ },
+ },
+ },
+ Generators: []v1alpha1.ApplicationSetGenerator{
+ {
+ Git: &v1alpha1.GitGenerator{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ Directories: []v1alpha1.GitDirectoryGeneratorItem{
+ {
+ Path: guestbookPath,
+ },
+ },
+ },
+ },
+ },
+ },
+ }).Then().
+ // verify the ApplicationSet error status conditions were set correctly
+ Expect(ApplicationSetHasConditions("simple-git-generator", expectedConditionsParamsError)).
+ Expect(ApplicationsDoNotExist(expectedApps)).
+ When().
+ Delete().Then().Expect(ApplicationsDoNotExist(expectedApps))
+}
+
func TestSimpleGitFilesGenerator(t *testing.T) {
generateExpectedApp := func(name string) argov1alpha1.Application {
return argov1alpha1.Application{
@@ -1538,6 +1747,210 @@ func TestSimpleGitFilesGenerator(t *testing.T) {
Delete().Then().Expect(ApplicationsDoNotExist(expectedAppsNewNamespace))
}
+func TestSimpleGitFilesGeneratorGPGEnabledUnsignedCommits(t *testing.T) {
+ expectedErrorMessage := `error generating params from git: error retrieving Git files: rpc error: code = Unknown desc = permission denied`
+ expectedConditionsParamsError := []v1alpha1.ApplicationSetCondition{
+ {
+ Type: v1alpha1.ApplicationSetConditionErrorOccurred,
+ Status: v1alpha1.ApplicationSetConditionStatusTrue,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonApplicationParamsGenerationError,
+ },
+ {
+ Type: v1alpha1.ApplicationSetConditionParametersGenerated,
+ Status: v1alpha1.ApplicationSetConditionStatusFalse,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonErrorOccurred,
+ },
+ {
+ Type: v1alpha1.ApplicationSetConditionResourcesUpToDate,
+ Status: v1alpha1.ApplicationSetConditionStatusFalse,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonApplicationParamsGenerationError,
+ },
+ }
+ project := "gpg"
+ generateExpectedApp := func(name string) argov1alpha1.Application {
+ return argov1alpha1.Application{
+ TypeMeta: metav1.TypeMeta{
+ Kind: application.ApplicationKind,
+ APIVersion: "argoproj.io/v1alpha1",
+ },
+ ObjectMeta: metav1.ObjectMeta{
+ Name: name,
+ Namespace: fixture.TestNamespace(),
+ Finalizers: []string{"resources-finalizer.argocd.argoproj.io"},
+ },
+ Spec: argov1alpha1.ApplicationSpec{
+ Project: project,
+ Source: &argov1alpha1.ApplicationSource{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ TargetRevision: "HEAD",
+ Path: "guestbook",
+ },
+ Destination: argov1alpha1.ApplicationDestination{
+ Server: "https://kubernetes.default.svc",
+ Namespace: "guestbook",
+ },
+ },
+ }
+ }
+
+ expectedApps := []argov1alpha1.Application{
+ generateExpectedApp("engineering-dev-guestbook"),
+ generateExpectedApp("engineering-prod-guestbook"),
+ }
+
+ fixture.EnsureCleanState(t)
+ Given(t).
+ Project(project).
+ When().
+ // Create a GitGenerator-based ApplicationSet
+ Create(v1alpha1.ApplicationSet{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "simple-git-generator",
+ },
+ Spec: v1alpha1.ApplicationSetSpec{
+ Template: v1alpha1.ApplicationSetTemplate{
+ ApplicationSetTemplateMeta: v1alpha1.ApplicationSetTemplateMeta{Name: "{{cluster.name}}-guestbook"},
+ Spec: argov1alpha1.ApplicationSpec{
+ Project: project,
+ Source: &argov1alpha1.ApplicationSource{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ TargetRevision: "HEAD",
+ Path: "guestbook",
+ },
+ Destination: argov1alpha1.ApplicationDestination{
+ Server: "https://kubernetes.default.svc",
+ Namespace: "guestbook",
+ },
+ },
+ },
+ Generators: []v1alpha1.ApplicationSetGenerator{
+ {
+ Git: &v1alpha1.GitGenerator{
+ RepoURL: "https://github.com/argoproj/applicationset.git",
+ Files: []v1alpha1.GitFileGeneratorItem{
+ {
+ Path: "examples/git-generator-files-discovery/cluster-config/**/config.json",
+ },
+ },
+ },
+ },
+ },
+ },
+ }).Then().Expect(ApplicationsDoNotExist(expectedApps)).
+ // verify the ApplicationSet error status conditions were set correctly
+ Expect(ApplicationSetHasConditions("simple-git-generator", expectedConditionsParamsError)).
+ When().
+ Delete().Then().Expect(ApplicationsDoNotExist(expectedApps))
+}
+
+func TestSimpleGitFilesGeneratorGPGEnabledWithoutKnownKeys(t *testing.T) {
+ expectedErrorMessage := `error generating params from git: error retrieving Git files: rpc error: code = Unknown desc = permission denied`
+ expectedConditionsParamsError := []v1alpha1.ApplicationSetCondition{
+ {
+ Type: v1alpha1.ApplicationSetConditionErrorOccurred,
+ Status: v1alpha1.ApplicationSetConditionStatusTrue,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonApplicationParamsGenerationError,
+ },
+ {
+ Type: v1alpha1.ApplicationSetConditionParametersGenerated,
+ Status: v1alpha1.ApplicationSetConditionStatusFalse,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonErrorOccurred,
+ },
+ {
+ Type: v1alpha1.ApplicationSetConditionResourcesUpToDate,
+ Status: v1alpha1.ApplicationSetConditionStatusFalse,
+ Message: expectedErrorMessage,
+ Reason: v1alpha1.ApplicationSetReasonApplicationParamsGenerationError,
+ },
+ }
+ project := "gpg"
+ generateExpectedApp := func(name string) argov1alpha1.Application {
+ return argov1alpha1.Application{
+ TypeMeta: metav1.TypeMeta{
+ Kind: application.ApplicationKind,
+ APIVersion: "argoproj.io/v1alpha1",
+ },
+ ObjectMeta: metav1.ObjectMeta{
+ Name: name,
+ Namespace: fixture.TestNamespace(),
+ Finalizers: []string{"resources-finalizer.argocd.argoproj.io"},
+ },
+ Spec: argov1alpha1.ApplicationSpec{
+ Project: project,
+ Source: &argov1alpha1.ApplicationSource{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ TargetRevision: "HEAD",
+ Path: "guestbook",
+ },
+ Destination: argov1alpha1.ApplicationDestination{
+ Server: "https://kubernetes.default.svc",
+ Namespace: "guestbook",
+ },
+ },
+ }
+ }
+
+ str, _ := rand.RandString(1)
+
+ expectedApps := []argov1alpha1.Application{
+ generateExpectedApp("engineering-dev-guestbook"),
+ generateExpectedApp("engineering-prod-guestbook"),
+ }
+
+ fixture.EnsureCleanState(t)
+ Given(t).
+ Project(project).
+ Path(guestbookPath).
+ When().
+ AddSignedFile("test.yaml", str).IgnoreErrors().
+ IgnoreErrors().
+ // Create a GitGenerator-based ApplicationSet
+ Create(v1alpha1.ApplicationSet{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "simple-git-generator",
+ },
+ Spec: v1alpha1.ApplicationSetSpec{
+ Template: v1alpha1.ApplicationSetTemplate{
+ ApplicationSetTemplateMeta: v1alpha1.ApplicationSetTemplateMeta{Name: "{{cluster.name}}-guestbook"},
+ Spec: argov1alpha1.ApplicationSpec{
+ Project: project,
+ Source: &argov1alpha1.ApplicationSource{
+ RepoURL: "https://github.com/argoproj/argocd-example-apps.git",
+ TargetRevision: "HEAD",
+ Path: "guestbook",
+ },
+ Destination: argov1alpha1.ApplicationDestination{
+ Server: "https://kubernetes.default.svc",
+ Namespace: "guestbook",
+ },
+ },
+ },
+ Generators: []v1alpha1.ApplicationSetGenerator{
+ {
+ Git: &v1alpha1.GitGenerator{
+ RepoURL: "https://github.com/argoproj/applicationset.git",
+ Files: []v1alpha1.GitFileGeneratorItem{
+ {
+ Path: "examples/git-generator-files-discovery/cluster-config/**/config.json",
+ },
+ },
+ },
+ },
+ },
+ },
+ }).Then().
+ // verify the ApplicationSet error status conditions were set correctly
+ Expect(ApplicationSetHasConditions("simple-git-generator", expectedConditionsParamsError)).
+ Expect(ApplicationsDoNotExist(expectedApps)).
+ When().
+ Delete().Then().Expect(ApplicationsDoNotExist(expectedApps))
+}
+
func TestSimpleGitFilesGeneratorGoTemplate(t *testing.T) {
generateExpectedApp := func(name string) argov1alpha1.Application {
return argov1alpha1.Application{
diff --git a/test/e2e/fixture/applicationsets/actions.go b/test/e2e/fixture/applicationsets/actions.go
index a4fc0d3fea6e7..1a5b214f75482 100644
--- a/test/e2e/fixture/applicationsets/actions.go
+++ b/test/e2e/fixture/applicationsets/actions.go
@@ -521,3 +521,9 @@ func (a *Actions) runCli(args ...string) {
a.lastOutput, a.lastError = fixture.RunCli(args...)
a.verifyAction()
}
+
+func (a *Actions) AddSignedFile(fileName, fileContents string) *Actions {
+ a.context.t.Helper()
+ fixture.AddSignedFile(a.context.path+"/"+fileName, fileContents)
+ return a
+}
diff --git a/test/e2e/fixture/applicationsets/context.go b/test/e2e/fixture/applicationsets/context.go
index a7e91f4d0c8ff..daa2474ea01d5 100644
--- a/test/e2e/fixture/applicationsets/context.go
+++ b/test/e2e/fixture/applicationsets/context.go
@@ -5,6 +5,7 @@ import (
"time"
"github.com/argoproj/argo-cd/v2/test/e2e/fixture/applicationsets/utils"
+ "github.com/argoproj/argo-cd/v2/test/e2e/fixture/gpgkeys"
)
// Context implements the "given" part of given/when/then
@@ -15,6 +16,8 @@ type Context struct {
name string
namespace string
switchToNamespace utils.ExternalNamespace
+ project string
+ path string
}
func Given(t *testing.T) *Context {
@@ -37,3 +40,18 @@ func (c *Context) And(block func()) *Context {
block()
return c
}
+
+func (c *Context) Project(project string) *Context {
+ c.project = project
+ return c
+}
+
+func (c *Context) Path(path string) *Context {
+ c.path = path
+ return c
+}
+
+func (c *Context) GPGPublicKeyAdded() *Context {
+ gpgkeys.AddGPGPublicKey()
+ return c
+}
diff --git a/util/git/client.go b/util/git/client.go
index c1d9b61e3b2b2..232ebfb5cc22b 100644
--- a/util/git/client.go
+++ b/util/git/client.go
@@ -752,7 +752,8 @@ func (m *nativeGitClient) RevisionMetadata(revision string) (*RevisionMetadata,
func (m *nativeGitClient) VerifyCommitSignature(revision string) (string, error) {
out, err := m.runGnuPGWrapper("git-verify-wrapper.sh", revision)
if err != nil {
- return "", err
+ log.Errorf("error verifying commit signature: %v", err)
+ return "", fmt.Errorf("permission denied")
}
return out, nil
}
|
aws-cdk
|
https://github.com/aws/aws-cdk
|
bc4427cc874e7eea7cfba5f88d536a805d771bc6
|
Cory Hall
|
2022-09-09 05:55:32
|
fix(lambda-python): bundling artifacts are written to the entry path (#21967)
|
When performing function bundling sometimes the bundling steps will write files. Currently all these commands are run from the `entry` which is the actually source code location. This leads to contaminating the source code with bundling artifacts.
This PR re-orders the bundling steps to first move the `entry` to the `outputDir` and then perform the bundling steps there.
I've also updated all of the integration tests to use the new integration test framework and assertions.
|
fix(lambda-python): bundling artifacts are written to the entry path (#21967)
When performing function bundling sometimes the bundling steps will write files. Currently all these commands are run from the `entry` which is the actually source code location. This leads to contaminating the source code with bundling artifacts.
This PR re-orders the bundling steps to first move the `entry` to the `outputDir` and then perform the bundling steps there.
I've also updated all of the integration tests to use the new integration test framework and assertions.
fixes #19231
----
### All Submissions:
* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)
### Adding new Unconventional Dependencies:
* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies)
### New Features
* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)?
*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
|
diff --git a/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts b/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts
index 27c8d24f83558..4790b8f08e0eb 100644
--- a/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts
+++ b/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts
@@ -91,11 +91,12 @@ export class Bundling implements CdkBundlingOptions {
private createBundlingCommand(options: BundlingCommandOptions): string[] {
const packaging = Packaging.fromEntry(options.entry);
let bundlingCommands: string[] = [];
+ bundlingCommands.push(`cp -rTL ${options.inputDir}/ ${options.outputDir}`);
+ bundlingCommands.push(`cd ${options.outputDir}`);
bundlingCommands.push(packaging.exportCommand ?? '');
if (packaging.dependenciesFile) {
bundlingCommands.push(`python -m pip install -r ${DependenciesFile.PIP} -t ${options.outputDir}`);
}
- bundlingCommands.push(`cp -rT ${options.inputDir}/ ${options.outputDir}`);
return bundlingCommands;
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/bundling.test.ts b/packages/@aws-cdk/aws-lambda-python/test/bundling.test.ts
index 8c9bc93d08cfc..e9c598d795af7 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/bundling.test.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/bundling.test.ts
@@ -37,7 +37,7 @@ test('Bundling a function without dependencies', () => {
bundling: expect.objectContaining({
command: [
'bash', '-c',
- 'cp -rT /asset-input/ /asset-output',
+ 'cp -rTL /asset-input/ /asset-output && cd /asset-output',
],
}),
}));
@@ -66,7 +66,7 @@ test('Bundling a function with requirements.txt', () => {
bundling: expect.objectContaining({
command: [
'bash', '-c',
- 'python -m pip install -r requirements.txt -t /asset-output && cp -rT /asset-input/ /asset-output',
+ 'cp -rTL /asset-input/ /asset-output && cd /asset-output && python -m pip install -r requirements.txt -t /asset-output',
],
}),
}));
@@ -89,7 +89,7 @@ test('Bundling Python 2.7 with requirements.txt installed', () => {
bundling: expect.objectContaining({
command: [
'bash', '-c',
- 'python -m pip install -r requirements.txt -t /asset-output && cp -rT /asset-input/ /asset-output',
+ 'cp -rTL /asset-input/ /asset-output && cd /asset-output && python -m pip install -r requirements.txt -t /asset-output',
],
}),
}));
@@ -109,7 +109,7 @@ test('Bundling a layer with dependencies', () => {
bundling: expect.objectContaining({
command: [
'bash', '-c',
- 'python -m pip install -r requirements.txt -t /asset-output/python && cp -rT /asset-input/ /asset-output/python',
+ 'cp -rTL /asset-input/ /asset-output/python && cd /asset-output/python && python -m pip install -r requirements.txt -t /asset-output/python',
],
}),
}));
@@ -129,7 +129,7 @@ test('Bundling a python code layer', () => {
bundling: expect.objectContaining({
command: [
'bash', '-c',
- 'cp -rT /asset-input/ /asset-output/python',
+ 'cp -rTL /asset-input/ /asset-output/python && cd /asset-output/python',
],
}),
}));
@@ -149,7 +149,7 @@ test('Bundling a function with pipenv dependencies', () => {
bundling: expect.objectContaining({
command: [
'bash', '-c',
- 'PIPENV_VENV_IN_PROJECT=1 pipenv lock -r > requirements.txt && rm -rf .venv && python -m pip install -r requirements.txt -t /asset-output/python && cp -rT /asset-input/ /asset-output/python',
+ 'cp -rTL /asset-input/ /asset-output/python && cd /asset-output/python && PIPENV_VENV_IN_PROJECT=1 pipenv lock -r > requirements.txt && rm -rf .venv && python -m pip install -r requirements.txt -t /asset-output/python',
],
}),
}));
@@ -176,7 +176,7 @@ test('Bundling a function with poetry dependencies', () => {
bundling: expect.objectContaining({
command: [
'bash', '-c',
- 'poetry export --with-credentials --format requirements.txt --output requirements.txt && python -m pip install -r requirements.txt -t /asset-output/python && cp -rT /asset-input/ /asset-output/python',
+ 'cp -rTL /asset-input/ /asset-output/python && cd /asset-output/python && poetry export --with-credentials --format requirements.txt --output requirements.txt && python -m pip install -r requirements.txt -t /asset-output/python',
],
}),
}));
@@ -206,7 +206,7 @@ test('Bundling a function with custom bundling image', () => {
image,
command: [
'bash', '-c',
- 'python -m pip install -r requirements.txt -t /asset-output/python && cp -rT /asset-input/ /asset-output/python',
+ 'cp -rTL /asset-input/ /asset-output/python && cd /asset-output/python && python -m pip install -r requirements.txt -t /asset-output/python',
],
}),
}));
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.ab9c2b6025059cecbb1d54da74eb950315bc9fee8233e18822cefc8cff5806a0/Dockerfile b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.ab9c2b6025059cecbb1d54da74eb950315bc9fee8233e18822cefc8cff5806a0/Dockerfile
deleted file mode 100644
index 4204e9e4e3bd8..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.ab9c2b6025059cecbb1d54da74eb950315bc9fee8233e18822cefc8cff5806a0/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM public.ecr.aws/sam/build-python3.7
-
-CMD [ "python" ]
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.ab9c2b6025059cecbb1d54da74eb950315bc9fee8233e18822cefc8cff5806a0/index.py b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.ab9c2b6025059cecbb1d54da74eb950315bc9fee8233e18822cefc8cff5806a0/index.py
deleted file mode 100644
index 04f99eb108b30..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.ab9c2b6025059cecbb1d54da74eb950315bc9fee8233e18822cefc8cff5806a0/index.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import requests
-
-def handler(event, context):
- response = requests.get('https://a0.awsstatic.com/main/images/logos/aws_smile-header-desktop-en-white_59x35.png', stream=True)
-
- print(response.status_code)
-
- return response.status_code
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk-integ-lambda-custom-build.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk-integ-lambda-custom-build.assets.json
index be29726ec9194..2746f376dbc10 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk-integ-lambda-custom-build.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk-integ-lambda-custom-build.assets.json
@@ -1,20 +1,20 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"files": {
- "89ca5c5b2234f7dbbadd142cad0414d3cdf1293dc1edfa1618f4eac392958c82": {
+ "ba7fde4a6e034e2591e4b55fb4371a38236de097c96f5bba56c3fba49d3f18fa": {
"source": {
- "path": "asset.89ca5c5b2234f7dbbadd142cad0414d3cdf1293dc1edfa1618f4eac392958c82",
+ "path": "asset.ba7fde4a6e034e2591e4b55fb4371a38236de097c96f5bba56c3fba49d3f18fa",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "89ca5c5b2234f7dbbadd142cad0414d3cdf1293dc1edfa1618f4eac392958c82.zip",
+ "objectKey": "ba7fde4a6e034e2591e4b55fb4371a38236de097c96f5bba56c3fba49d3f18fa.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "a55d53ade2b8a8371454f5560cd4016fc7558d30dded2109b5ad4221bccced10": {
+ "d323c84453a473bd19a2e7a0be4c3333c23ce2c5ffd51914bd3de042bb9b3966": {
"source": {
"path": "cdk-integ-lambda-custom-build.template.json",
"packaging": "file"
@@ -22,7 +22,7 @@
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "a55d53ade2b8a8371454f5560cd4016fc7558d30dded2109b5ad4221bccced10.json",
+ "objectKey": "d323c84453a473bd19a2e7a0be4c3333c23ce2c5ffd51914bd3de042bb9b3966.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk-integ-lambda-custom-build.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk-integ-lambda-custom-build.template.json
index fc438cec9e9ca..f6bbfba487760 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk-integ-lambda-custom-build.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk-integ-lambda-custom-build.template.json
@@ -38,7 +38,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "89ca5c5b2234f7dbbadd142cad0414d3cdf1293dc1edfa1618f4eac392958c82.zip"
+ "S3Key": "ba7fde4a6e034e2591e4b55fb4371a38236de097c96f5bba56c3fba49d3f18fa.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -55,12 +55,12 @@
}
},
"Outputs": {
- "FunctionArn": {
+ "ExportsOutputRefmyhandlerD202FA8E369E8804": {
"Value": {
- "Fn::GetAtt": [
- "myhandlerD202FA8E",
- "Arn"
- ]
+ "Ref": "myhandlerD202FA8E"
+ },
+ "Export": {
+ "Name": "cdk-integ-lambda-custom-build:ExportsOutputRefmyhandlerD202FA8E369E8804"
}
}
},
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk.out
index 588d7b269d34f..8ecc185e9dbee 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk.out
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
\ No newline at end of file
+{"version":"21.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/integ.json
index c8a882d15b805..d5df57a441edd 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/integ.json
@@ -1,14 +1,13 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"testCases": {
- "integ.function.custom-build": {
+ "lambda-python-custom-build/DefaultTest": {
"stacks": [
"cdk-integ-lambda-custom-build"
],
- "diffAssets": false,
- "stackUpdateWorkflow": false
+ "stackUpdateWorkflow": false,
+ "assertionStack": "lambda-python-custom-build/DefaultTest/DeployAssert",
+ "assertionStackName": "lambdapythoncustombuildDefaultTestDeployAssert3F59C307"
}
- },
- "synthContext": {},
- "enableLookups": false
+ }
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/lambdapythoncustombuildDefaultTestDeployAssert3F59C307.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/lambdapythoncustombuildDefaultTestDeployAssert3F59C307.assets.json
new file mode 100644
index 0000000000000..d4618bec8843a
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/lambdapythoncustombuildDefaultTestDeployAssert3F59C307.assets.json
@@ -0,0 +1,32 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "6beacef24c1aedda67c91937d03e9a75f0ac3628ce3a6454581350bd880618b2": {
+ "source": {
+ "path": "lambdapythoncustombuildDefaultTestDeployAssert3F59C307.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "6beacef24c1aedda67c91937d03e9a75f0ac3628ce3a6454581350bd880618b2.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/lambdapythoncustombuildDefaultTestDeployAssert3F59C307.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/lambdapythoncustombuildDefaultTestDeployAssert3F59C307.template.json
new file mode 100644
index 0000000000000..c59286e5e0921
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/lambdapythoncustombuildDefaultTestDeployAssert3F59C307.template.json
@@ -0,0 +1,198 @@
+{
+ "Resources": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "cdk-integ-lambda-custom-build:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662650920315"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "cdk-integ-lambda-custom-build:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662650920316"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "cdk-integ-lambda-custom-build:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvokef5fe78069daba2e1e1326b4e96756d0b": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B",
+ "data"
+ ]
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/manifest.json
index 6633a91a6d8f2..0079eddaeea82 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
@@ -23,7 +23,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a55d53ade2b8a8371454f5560cd4016fc7558d30dded2109b5ad4221bccced10.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d323c84453a473bd19a2e7a0be4c3333c23ce2c5ffd51914bd3de042bb9b3966.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
@@ -51,10 +51,10 @@
"data": "myhandlerD202FA8E"
}
],
- "/cdk-integ-lambda-custom-build/FunctionArn": [
+ "/cdk-integ-lambda-custom-build/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}": [
{
"type": "aws:cdk:logicalId",
- "data": "FunctionArn"
+ "data": "ExportsOutputRefmyhandlerD202FA8E369E8804"
}
],
"/cdk-integ-lambda-custom-build/BootstrapVersion": [
@@ -68,9 +68,111 @@
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
+ ],
+ "myhandler2ServiceRole0C463495": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myhandler2ServiceRole0C463495",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
+ ],
+ "myhandler292D4927D": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myhandler292D4927D",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
]
},
"displayName": "cdk-integ-lambda-custom-build"
+ },
+ "lambdapythoncustombuildDefaultTestDeployAssert3F59C307.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "lambdapythoncustombuildDefaultTestDeployAssert3F59C307.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "lambdapythoncustombuildDefaultTestDeployAssert3F59C307": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "lambdapythoncustombuildDefaultTestDeployAssert3F59C307.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6beacef24c1aedda67c91937d03e9a75f0ac3628ce3a6454581350bd880618b2.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "lambdapythoncustombuildDefaultTestDeployAssert3F59C307.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "cdk-integ-lambda-custom-build",
+ "lambdapythoncustombuildDefaultTestDeployAssert3F59C307.assets"
+ ],
+ "metadata": {
+ "/lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16"
+ }
+ ],
+ "/lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F"
+ }
+ ],
+ "/lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B"
+ }
+ ],
+ "/lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvokef5fe78069daba2e1e1326b4e96756d0b"
+ }
+ ],
+ "/lambda-python-custom-build/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/lambda-python-custom-build/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/lambda-python-custom-build/DefaultTest/DeployAssert/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/lambda-python-custom-build/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "lambda-python-custom-build/DefaultTest/DeployAssert"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/tree.json
index 1e0f36c20cfea..7f21f4010b842 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/tree.json
@@ -9,7 +9,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
},
"cdk-integ-lambda-custom-build": {
@@ -77,8 +77,8 @@
"id": "Stage",
"path": "cdk-integ-lambda-custom-build/my_handler/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
@@ -105,7 +105,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "89ca5c5b2234f7dbbadd142cad0414d3cdf1293dc1edfa1618f4eac392958c82.zip"
+ "s3Key": "ba7fde4a6e034e2591e4b55fb4371a38236de097c96f5bba56c3fba49d3f18fa.zip"
},
"role": {
"Fn::GetAtt": [
@@ -128,24 +128,214 @@
"version": "0.0.0"
}
},
- "FunctionArn": {
- "id": "FunctionArn",
- "path": "cdk-integ-lambda-custom-build/FunctionArn",
+ "Exports": {
+ "id": "Exports",
+ "path": "cdk-integ-lambda-custom-build/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerD202FA8E\"}": {
+ "id": "Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "path": "cdk-integ-lambda-custom-build/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ },
+ "lambda-python-custom-build": {
+ "id": "lambda-python-custom-build",
+ "path": "lambda-python-custom-build",
+ "children": {
+ "DefaultTest": {
+ "id": "DefaultTest",
+ "path": "lambda-python-custom-build/DefaultTest",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-custom-build/DefaultTest/Default",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "DeployAssert": {
+ "id": "DeployAssert",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "id": "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.AssertionsProvider",
+ "version": "0.0.0"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.AssertionsProvider",
+ "version": "0.0.0"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.EqualsAssertion",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.LambdaInvokeFunction",
+ "version": "0.0.0"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "lambda-python-custom-build/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.IntegTestCase",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.IntegTest",
+ "version": "0.0.0"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.App",
+ "version": "0.0.0"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py
deleted file mode 100644
index 04f99eb108b30..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import requests
-
-def handler(event, context):
- response = requests.get('https://a0.awsstatic.com/main/images/logos/aws_smile-header-desktop-en-white_59x35.png', stream=True)
-
- print(response.status_code)
-
- return response.status_code
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt
deleted file mode 100644
index 4fcd85719fe3a..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Lock versions of pip packages
-certifi==2020.6.20
-chardet==3.0.4
-idna==2.10
-urllib3==1.26.7
-# Requests used by this lambda
-requests==2.26.0
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk.out
index 588d7b269d34f..8ecc185e9dbee 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk.out
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
\ No newline at end of file
+{"version":"21.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk-integ-lambda-python.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ-lambda-python-function.assets.json
similarity index 60%
rename from packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk-integ-lambda-python.assets.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ-lambda-python-function.assets.json
index 4f05821bf51db..43f3d57a184f8 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk-integ-lambda-python.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ-lambda-python-function.assets.json
@@ -1,28 +1,28 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"files": {
- "8c24af4ca0853fa9cd2372aa99864ccd1554740ac76e69773c82ba334df77f04": {
+ "75eef6be4f79fab5d65ef63569aac0de3aab47ca778c063cdea466e47c4ea755": {
"source": {
- "path": "asset.8c24af4ca0853fa9cd2372aa99864ccd1554740ac76e69773c82ba334df77f04",
+ "path": "asset.75eef6be4f79fab5d65ef63569aac0de3aab47ca778c063cdea466e47c4ea755",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "8c24af4ca0853fa9cd2372aa99864ccd1554740ac76e69773c82ba334df77f04.zip",
+ "objectKey": "75eef6be4f79fab5d65ef63569aac0de3aab47ca778c063cdea466e47c4ea755.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "281037e987baf7d3abbb443b0ceb1c7e3a6eaaade8bb12ca2c25c236a3c065d7": {
+ "d759a2959a657473cc039ac933b56005d266cfc872bb8a2cb0b6a4c07aafff56": {
"source": {
- "path": "cdk-integ-lambda-python.template.json",
+ "path": "integ-lambda-python-function.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "281037e987baf7d3abbb443b0ceb1c7e3a6eaaade8bb12ca2c25c236a3c065d7.json",
+ "objectKey": "d759a2959a657473cc039ac933b56005d266cfc872bb8a2cb0b6a4c07aafff56.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk-integ-lambda-python.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ-lambda-python-function.template.json
similarity index 86%
rename from packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk-integ-lambda-python.template.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ-lambda-python-function.template.json
index 06f084806a477..154f82a3e4dd6 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk-integ-lambda-python.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ-lambda-python-function.template.json
@@ -38,7 +38,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b.zip"
+ "S3Key": "75eef6be4f79fab5d65ef63569aac0de3aab47ca778c063cdea466e47c4ea755.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -62,6 +62,14 @@
"Arn"
]
}
+ },
+ "ExportsOutputRefmyhandlerD202FA8E369E8804": {
+ "Value": {
+ "Ref": "myhandlerD202FA8E"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-function:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
}
},
"Parameters": {
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ.json
index 7e46b862a610b..c9e27957a3b6a 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/integ.json
@@ -1,14 +1,13 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"testCases": {
- "integ.function": {
+ "lambda-python-function/DefaultTest": {
"stacks": [
- "cdk-integ-lambda-python"
+ "integ-lambda-python-function"
],
- "diffAssets": false,
- "stackUpdateWorkflow": false
+ "stackUpdateWorkflow": false,
+ "assertionStack": "lambda-python-function/DefaultTest/DeployAssert",
+ "assertionStackName": "lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F"
}
- },
- "synthContext": {},
- "enableLookups": false
+ }
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.assets.json
new file mode 100644
index 0000000000000..3197f8c05ca02
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.assets.json
@@ -0,0 +1,32 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "f6fe40c0c1113210f5fd8c07b8e5ded3f7c35a6cfb554b207fc1523f10d9eaa9": {
+ "source": {
+ "path": "lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "f6fe40c0c1113210f5fd8c07b8e5ded3f7c35a6cfb554b207fc1523f10d9eaa9.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.template.json
new file mode 100644
index 0000000000000..e35047e6cae8d
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.template.json
@@ -0,0 +1,198 @@
+{
+ "Resources": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-function:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643989220"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-function:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643989220"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-function:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvoke64d766e0ddfdf2e2979fef994a5cd2aa": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B",
+ "data"
+ ]
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/manifest.json
index f636be5ffadca..1e64a7aae2f14 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
@@ -7,27 +7,27 @@
"file": "tree.json"
}
},
- "cdk-integ-lambda-python.assets": {
+ "integ-lambda-python-function.assets": {
"type": "cdk:asset-manifest",
"properties": {
- "file": "cdk-integ-lambda-python.assets.json",
+ "file": "integ-lambda-python-function.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
- "cdk-integ-lambda-python": {
+ "integ-lambda-python-function": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
- "templateFile": "cdk-integ-lambda-python.template.json",
+ "templateFile": "integ-lambda-python-function.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/477af51f71509ffb829d8b6113fc09006db7cbb48fb4a8e5427edd2caf847b43.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d759a2959a657473cc039ac933b56005d266cfc872bb8a2cb0b6a4c07aafff56.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-function.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
@@ -36,41 +36,131 @@
}
},
"dependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-function.assets"
],
"metadata": {
- "/cdk-integ-lambda-python/my_handler/ServiceRole/Resource": [
+ "/integ-lambda-python-function/my_handler/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerServiceRole77891068"
}
],
- "/cdk-integ-lambda-python/my_handler/Resource": [
+ "/integ-lambda-python-function/my_handler/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerD202FA8E"
}
],
- "/cdk-integ-lambda-python/FunctionArn": [
+ "/integ-lambda-python-function/FunctionArn": [
{
"type": "aws:cdk:logicalId",
"data": "FunctionArn"
}
],
- "/cdk-integ-lambda-python/BootstrapVersion": [
+ "/integ-lambda-python-function/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ],
+ "/integ-lambda-python-function/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/integ-lambda-python-function/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "integ-lambda-python-function"
+ },
+ "lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f6fe40c0c1113210f5fd8c07b8e5ded3f7c35a6cfb554b207fc1523f10d9eaa9.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "integ-lambda-python-function",
+ "lambdapythonfunctionDefaultTestDeployAssertC9C6EE6F.assets"
+ ],
+ "metadata": {
+ "/lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16"
+ }
+ ],
+ "/lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F"
+ }
+ ],
+ "/lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B"
+ }
+ ],
+ "/lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke64d766e0ddfdf2e2979fef994a5cd2aa"
+ }
+ ],
+ "/lambda-python-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/lambda-python-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/lambda-python-function/DefaultTest/DeployAssert/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
- "/cdk-integ-lambda-python/CheckBootstrapVersion": [
+ "/lambda-python-function/DefaultTest/DeployAssert/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
- "displayName": "cdk-integ-lambda-python"
+ "displayName": "lambda-python-function/DefaultTest/DeployAssert"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/tree.json
index 430541f9b0e5e..fb6f36cb47f0c 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/tree.json
@@ -9,24 +9,24 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
},
- "cdk-integ-lambda-python": {
- "id": "cdk-integ-lambda-python",
- "path": "cdk-integ-lambda-python",
+ "integ-lambda-python-function": {
+ "id": "integ-lambda-python-function",
+ "path": "integ-lambda-python-function",
"children": {
"my_handler": {
"id": "my_handler",
- "path": "cdk-integ-lambda-python/my_handler",
+ "path": "integ-lambda-python-function/my_handler",
"children": {
"ServiceRole": {
"id": "ServiceRole",
- "path": "cdk-integ-lambda-python/my_handler/ServiceRole",
+ "path": "integ-lambda-python-function/my_handler/ServiceRole",
"children": {
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler/ServiceRole/Resource",
+ "path": "integ-lambda-python-function/my_handler/ServiceRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
@@ -71,19 +71,19 @@
},
"Code": {
"id": "Code",
- "path": "cdk-integ-lambda-python/my_handler/Code",
+ "path": "integ-lambda-python-function/my_handler/Code",
"children": {
"Stage": {
"id": "Stage",
- "path": "cdk-integ-lambda-python/my_handler/Code/Stage",
+ "path": "integ-lambda-python-function/my_handler/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
"id": "AssetBucket",
- "path": "cdk-integ-lambda-python/my_handler/Code/AssetBucket",
+ "path": "integ-lambda-python-function/my_handler/Code/AssetBucket",
"constructInfo": {
"fqn": "@aws-cdk/aws-s3.BucketBase",
"version": "0.0.0"
@@ -97,7 +97,7 @@
},
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler/Resource",
+ "path": "integ-lambda-python-function/my_handler/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Lambda::Function",
"aws:cdk:cloudformation:props": {
@@ -105,7 +105,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b.zip"
+ "s3Key": "75eef6be4f79fab5d65ef63569aac0de3aab47ca778c063cdea466e47c4ea755.zip"
},
"role": {
"Fn::GetAtt": [
@@ -130,22 +130,220 @@
},
"FunctionArn": {
"id": "FunctionArn",
- "path": "cdk-integ-lambda-python/FunctionArn",
+ "path": "integ-lambda-python-function/FunctionArn",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ },
+ "Exports": {
+ "id": "Exports",
+ "path": "integ-lambda-python-function/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerD202FA8E\"}": {
+ "id": "Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "path": "integ-lambda-python-function/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ },
+ "lambda-python-function": {
+ "id": "lambda-python-function",
+ "path": "lambda-python-function",
+ "children": {
+ "DefaultTest": {
+ "id": "DefaultTest",
+ "path": "lambda-python-function/DefaultTest",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-function/DefaultTest/Default",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "DeployAssert": {
+ "id": "DeployAssert",
+ "path": "lambda-python-function/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "id": "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "lambda-python-function/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ }
+ },
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.App",
+ "version": "0.0.0"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.288e5ca58229165a54fd3bfcfd7765b7726ba2acc91b765d7e92b70bbd91a859/index.py b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.288e5ca58229165a54fd3bfcfd7765b7726ba2acc91b765d7e92b70bbd91a859/index.py
deleted file mode 100644
index d7b2ce8db00e9..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.288e5ca58229165a54fd3bfcfd7765b7726ba2acc91b765d7e92b70bbd91a859/index.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from http import HTTPStatus
-
-def handler(event, context):
- print('No dependencies')
- return HTTPStatus.OK.value
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.8c24af4ca0853fa9cd2372aa99864ccd1554740ac76e69773c82ba334df77f04/index.py b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.8c24af4ca0853fa9cd2372aa99864ccd1554740ac76e69773c82ba334df77f04/index.py
deleted file mode 100644
index d7b2ce8db00e9..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/asset.8c24af4ca0853fa9cd2372aa99864ccd1554740ac76e69773c82ba334df77f04/index.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from http import HTTPStatus
-
-def handler(event, context):
- print('No dependencies')
- return HTTPStatus.OK.value
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk.out
index 588d7b269d34f..8ecc185e9dbee 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk.out
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
\ No newline at end of file
+{"version":"21.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk-integ-lambda-python.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ-lambda-python-nodeps.assets.json
similarity index 60%
rename from packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk-integ-lambda-python.assets.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ-lambda-python-nodeps.assets.json
index 99c7bfe99ecce..773a6dfface53 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.integ.snapshot/cdk-integ-lambda-python.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ-lambda-python-nodeps.assets.json
@@ -1,28 +1,28 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"files": {
- "7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b": {
+ "12865c7bd1f821f245cacee7dc33770eae9ee5949892a310a41215c18f7981ba": {
"source": {
- "path": "asset.7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b",
+ "path": "asset.12865c7bd1f821f245cacee7dc33770eae9ee5949892a310a41215c18f7981ba",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b.zip",
+ "objectKey": "12865c7bd1f821f245cacee7dc33770eae9ee5949892a310a41215c18f7981ba.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "477af51f71509ffb829d8b6113fc09006db7cbb48fb4a8e5427edd2caf847b43": {
+ "6c83238cbeaebf4555ddfb62f76638b6e1b8cb26ea7f6d8d74b17829b772a2a9": {
"source": {
- "path": "cdk-integ-lambda-python.template.json",
+ "path": "integ-lambda-python-nodeps.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "477af51f71509ffb829d8b6113fc09006db7cbb48fb4a8e5427edd2caf847b43.json",
+ "objectKey": "6c83238cbeaebf4555ddfb62f76638b6e1b8cb26ea7f6d8d74b17829b772a2a9.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk-integ-lambda-python.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ-lambda-python-nodeps.template.json
similarity index 86%
rename from packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk-integ-lambda-python.template.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ-lambda-python-nodeps.template.json
index f924f6b715805..a3a1475d783ff 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/cdk-integ-lambda-python.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ-lambda-python-nodeps.template.json
@@ -38,7 +38,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "8c24af4ca0853fa9cd2372aa99864ccd1554740ac76e69773c82ba334df77f04.zip"
+ "S3Key": "12865c7bd1f821f245cacee7dc33770eae9ee5949892a310a41215c18f7981ba.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -62,6 +62,14 @@
"Arn"
]
}
+ },
+ "ExportsOutputRefmyhandlerD202FA8E369E8804": {
+ "Value": {
+ "Ref": "myhandlerD202FA8E"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-nodeps:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
}
},
"Parameters": {
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ.json
index 9c2b4f90fafc5..91644289f1c9b 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/integ.json
@@ -1,14 +1,13 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"testCases": {
- "integ.function.nodeps": {
+ "lambda-python-nodeps/DefaultTest": {
"stacks": [
- "cdk-integ-lambda-python"
+ "integ-lambda-python-nodeps"
],
- "diffAssets": false,
- "stackUpdateWorkflow": true
+ "stackUpdateWorkflow": false,
+ "assertionStack": "lambda-python-nodeps/DefaultTest/DeployAssert",
+ "assertionStackName": "lambdapythonnodepsDefaultTestDeployAssert72A584F7"
}
- },
- "synthContext": {},
- "enableLookups": false
+ }
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/lambdapythonnodepsDefaultTestDeployAssert72A584F7.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/lambdapythonnodepsDefaultTestDeployAssert72A584F7.assets.json
new file mode 100644
index 0000000000000..25987fbfff275
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/lambdapythonnodepsDefaultTestDeployAssert72A584F7.assets.json
@@ -0,0 +1,32 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "f932a81c9e35cee37f730db7ffdbfc20701787edba3b3ed67a6792c204e969f2": {
+ "source": {
+ "path": "lambdapythonnodepsDefaultTestDeployAssert72A584F7.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "f932a81c9e35cee37f730db7ffdbfc20701787edba3b3ed67a6792c204e969f2.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/lambdapythonnodepsDefaultTestDeployAssert72A584F7.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/lambdapythonnodepsDefaultTestDeployAssert72A584F7.template.json
new file mode 100644
index 0000000000000..6121cf793e527
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/lambdapythonnodepsDefaultTestDeployAssert72A584F7.template.json
@@ -0,0 +1,198 @@
+{
+ "Resources": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-nodeps:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643910889"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-nodeps:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643910889"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-nodeps:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvoke355665d3c1afb350a666dab592942021": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B",
+ "data"
+ ]
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/manifest.json
index da2874f130c5e..dc728215f0233 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
@@ -7,27 +7,27 @@
"file": "tree.json"
}
},
- "cdk-integ-lambda-python.assets": {
+ "integ-lambda-python-nodeps.assets": {
"type": "cdk:asset-manifest",
"properties": {
- "file": "cdk-integ-lambda-python.assets.json",
+ "file": "integ-lambda-python-nodeps.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
- "cdk-integ-lambda-python": {
+ "integ-lambda-python-nodeps": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
- "templateFile": "cdk-integ-lambda-python.template.json",
+ "templateFile": "integ-lambda-python-nodeps.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/281037e987baf7d3abbb443b0ceb1c7e3a6eaaade8bb12ca2c25c236a3c065d7.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6c83238cbeaebf4555ddfb62f76638b6e1b8cb26ea7f6d8d74b17829b772a2a9.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-nodeps.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
@@ -36,41 +36,131 @@
}
},
"dependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-nodeps.assets"
],
"metadata": {
- "/cdk-integ-lambda-python/my_handler/ServiceRole/Resource": [
+ "/integ-lambda-python-nodeps/my_handler/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerServiceRole77891068"
}
],
- "/cdk-integ-lambda-python/my_handler/Resource": [
+ "/integ-lambda-python-nodeps/my_handler/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerD202FA8E"
}
],
- "/cdk-integ-lambda-python/FunctionArn": [
+ "/integ-lambda-python-nodeps/FunctionArn": [
{
"type": "aws:cdk:logicalId",
"data": "FunctionArn"
}
],
- "/cdk-integ-lambda-python/BootstrapVersion": [
+ "/integ-lambda-python-nodeps/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ],
+ "/integ-lambda-python-nodeps/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/integ-lambda-python-nodeps/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "integ-lambda-python-nodeps"
+ },
+ "lambdapythonnodepsDefaultTestDeployAssert72A584F7.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "lambdapythonnodepsDefaultTestDeployAssert72A584F7.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "lambdapythonnodepsDefaultTestDeployAssert72A584F7": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "lambdapythonnodepsDefaultTestDeployAssert72A584F7.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f932a81c9e35cee37f730db7ffdbfc20701787edba3b3ed67a6792c204e969f2.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "lambdapythonnodepsDefaultTestDeployAssert72A584F7.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "integ-lambda-python-nodeps",
+ "lambdapythonnodepsDefaultTestDeployAssert72A584F7.assets"
+ ],
+ "metadata": {
+ "/lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16"
+ }
+ ],
+ "/lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F"
+ }
+ ],
+ "/lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B"
+ }
+ ],
+ "/lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke355665d3c1afb350a666dab592942021"
+ }
+ ],
+ "/lambda-python-nodeps/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/lambda-python-nodeps/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/lambda-python-nodeps/DefaultTest/DeployAssert/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
- "/cdk-integ-lambda-python/CheckBootstrapVersion": [
+ "/lambda-python-nodeps/DefaultTest/DeployAssert/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
- "displayName": "cdk-integ-lambda-python"
+ "displayName": "lambda-python-nodeps/DefaultTest/DeployAssert"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/tree.json
index 54c5c82dcfdac..88a2a88bdaf1e 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.nodeps.integ.snapshot/tree.json
@@ -9,24 +9,24 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
},
- "cdk-integ-lambda-python": {
- "id": "cdk-integ-lambda-python",
- "path": "cdk-integ-lambda-python",
+ "integ-lambda-python-nodeps": {
+ "id": "integ-lambda-python-nodeps",
+ "path": "integ-lambda-python-nodeps",
"children": {
"my_handler": {
"id": "my_handler",
- "path": "cdk-integ-lambda-python/my_handler",
+ "path": "integ-lambda-python-nodeps/my_handler",
"children": {
"ServiceRole": {
"id": "ServiceRole",
- "path": "cdk-integ-lambda-python/my_handler/ServiceRole",
+ "path": "integ-lambda-python-nodeps/my_handler/ServiceRole",
"children": {
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler/ServiceRole/Resource",
+ "path": "integ-lambda-python-nodeps/my_handler/ServiceRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
@@ -71,19 +71,19 @@
},
"Code": {
"id": "Code",
- "path": "cdk-integ-lambda-python/my_handler/Code",
+ "path": "integ-lambda-python-nodeps/my_handler/Code",
"children": {
"Stage": {
"id": "Stage",
- "path": "cdk-integ-lambda-python/my_handler/Code/Stage",
+ "path": "integ-lambda-python-nodeps/my_handler/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
"id": "AssetBucket",
- "path": "cdk-integ-lambda-python/my_handler/Code/AssetBucket",
+ "path": "integ-lambda-python-nodeps/my_handler/Code/AssetBucket",
"constructInfo": {
"fqn": "@aws-cdk/aws-s3.BucketBase",
"version": "0.0.0"
@@ -97,7 +97,7 @@
},
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler/Resource",
+ "path": "integ-lambda-python-nodeps/my_handler/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Lambda::Function",
"aws:cdk:cloudformation:props": {
@@ -105,7 +105,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "8c24af4ca0853fa9cd2372aa99864ccd1554740ac76e69773c82ba334df77f04.zip"
+ "s3Key": "12865c7bd1f821f245cacee7dc33770eae9ee5949892a310a41215c18f7981ba.zip"
},
"role": {
"Fn::GetAtt": [
@@ -130,22 +130,220 @@
},
"FunctionArn": {
"id": "FunctionArn",
- "path": "cdk-integ-lambda-python/FunctionArn",
+ "path": "integ-lambda-python-nodeps/FunctionArn",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ },
+ "Exports": {
+ "id": "Exports",
+ "path": "integ-lambda-python-nodeps/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerD202FA8E\"}": {
+ "id": "Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "path": "integ-lambda-python-nodeps/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ },
+ "lambda-python-nodeps": {
+ "id": "lambda-python-nodeps",
+ "path": "lambda-python-nodeps",
+ "children": {
+ "DefaultTest": {
+ "id": "DefaultTest",
+ "path": "lambda-python-nodeps/DefaultTest",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-nodeps/DefaultTest/Default",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "DeployAssert": {
+ "id": "DeployAssert",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "id": "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "lambda-python-nodeps/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ }
+ },
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.App",
+ "version": "0.0.0"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/Pipfile b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/Pipfile
deleted file mode 100644
index 78d783bc4b9b0..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/Pipfile
+++ /dev/null
@@ -1,7 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[packages]
-requests = "==2.26.0"
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/Pipfile.lock b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/Pipfile.lock
deleted file mode 100644
index 441acc679505f..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/Pipfile.lock
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "_meta": {
- "hash": {
- "sha256": "6cfaa5a495be5cf47942a14b04d50e639f14743101e621684e86449dbac8da61"
- },
- "pipfile-spec": 6,
- "requires": {},
- "sources": [
- {
- "name": "pypi",
- "url": "https://pypi.org/simple",
- "verify_ssl": true
- }
- ]
- },
- "default": {
- "certifi": {
- "hashes": [
- "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
- "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
- ],
- "version": "==2021.10.8"
- },
- "charset-normalizer": {
- "hashes": [
- "sha256:876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd",
- "sha256:cb957888737fc0bbcd78e3df769addb41fd1ff8cf950dc9e7ad7793f1bf44455"
- ],
- "markers": "python_version >= '3'",
- "version": "==2.0.10"
- },
- "idna": {
- "hashes": [
- "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff",
- "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
- ],
- "markers": "python_version >= '3'",
- "version": "==3.3"
- },
- "requests": {
- "hashes": [
- "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24",
- "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"
- ],
- "index": "pypi",
- "version": "==2.26.0"
- },
- "urllib3": {
- "hashes": [
- "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed",
- "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
- "version": "==1.26.8"
- }
- },
- "develop": {}
-}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/index.py b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/index.py
deleted file mode 100644
index 04f99eb108b30..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/index.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import requests
-
-def handler(event, context):
- response = requests.get('https://a0.awsstatic.com/main/images/logos/aws_smile-header-desktop-en-white_59x35.png', stream=True)
-
- print(response.status_code)
-
- return response.status_code
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/requirements.txt b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/requirements.txt
deleted file mode 100644
index e206b765533cc..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/requirements.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# These requirements were autogenerated by pipenv
-# To regenerate from the project's Pipfile, run:
-#
-# pipenv lock --requirements
-#
-
--i https://pypi.org/simple
-certifi==2021.10.8
-charset-normalizer==2.0.10; python_version >= '3'
-idna==3.3; python_version >= '3'
-requests==2.26.0
-urllib3==1.26.8; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk-integ-lambda-python.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk-integ-lambda-python.assets.json
deleted file mode 100644
index 466a50355cf31..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk-integ-lambda-python.assets.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "version": "20.0.0",
- "files": {
- "8d7289aede51c7665a9df0be604eabacb55f0dc5979ea64c70fe3686e60ae5ae": {
- "source": {
- "path": "asset.8d7289aede51c7665a9df0be604eabacb55f0dc5979ea64c70fe3686e60ae5ae",
- "packaging": "zip"
- },
- "destinations": {
- "current_account-current_region": {
- "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "8d7289aede51c7665a9df0be604eabacb55f0dc5979ea64c70fe3686e60ae5ae.zip",
- "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
- }
- }
- },
- "48df79eafe4c27c7b40259916623d0b5a9722e315827d20e6f2dd91c5103352a": {
- "source": {
- "path": "asset.48df79eafe4c27c7b40259916623d0b5a9722e315827d20e6f2dd91c5103352a",
- "packaging": "zip"
- },
- "destinations": {
- "current_account-current_region": {
- "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "48df79eafe4c27c7b40259916623d0b5a9722e315827d20e6f2dd91c5103352a.zip",
- "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
- }
- }
- },
- "0a79cd3b6ac700ba99344c3dcf151ca901b64ee2635bb30d90e9f9cabd809612": {
- "source": {
- "path": "cdk-integ-lambda-python.template.json",
- "packaging": "file"
- },
- "destinations": {
- "current_account-current_region": {
- "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "0a79cd3b6ac700ba99344c3dcf151ca901b64ee2635bb30d90e9f9cabd809612.json",
- "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
- }
- }
- }
- },
- "dockerImages": {}
-}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk.out
index 588d7b269d34f..8ecc185e9dbee 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk.out
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
\ No newline at end of file
+{"version":"21.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/cdk-integ-lambda-python.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ-lambda-python-pipenv.assets.json
similarity index 60%
rename from packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/cdk-integ-lambda-python.assets.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ-lambda-python-pipenv.assets.json
index 59b1159d82b6e..06fc3c46efd8b 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/cdk-integ-lambda-python.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ-lambda-python-pipenv.assets.json
@@ -1,54 +1,54 @@
{
"version": "21.0.0",
"files": {
- "377b8c7d7d74049daef959af1f7f0f0f2eaeb6ccb4c85fe80f8c00936183b6ff": {
+ "803e66cf17a8155efd491fa5e68f796bb74ae8337c455b23b5e52d0e5927b2a7": {
"source": {
- "path": "asset.377b8c7d7d74049daef959af1f7f0f0f2eaeb6ccb4c85fe80f8c00936183b6ff",
+ "path": "asset.803e66cf17a8155efd491fa5e68f796bb74ae8337c455b23b5e52d0e5927b2a7",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "377b8c7d7d74049daef959af1f7f0f0f2eaeb6ccb4c85fe80f8c00936183b6ff.zip",
+ "objectKey": "803e66cf17a8155efd491fa5e68f796bb74ae8337c455b23b5e52d0e5927b2a7.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "f27e50ce3e964bd188b2fad96e1819a8e68a7a7a17e1f701b6bdcc054e29503a": {
+ "2a6fcac567a26e1be604dec572e270fbd091180dccf23a209e21c5900ce24ff0": {
"source": {
- "path": "asset.f27e50ce3e964bd188b2fad96e1819a8e68a7a7a17e1f701b6bdcc054e29503a",
+ "path": "asset.2a6fcac567a26e1be604dec572e270fbd091180dccf23a209e21c5900ce24ff0",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "f27e50ce3e964bd188b2fad96e1819a8e68a7a7a17e1f701b6bdcc054e29503a.zip",
+ "objectKey": "2a6fcac567a26e1be604dec572e270fbd091180dccf23a209e21c5900ce24ff0.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "d165152de494c90bdd8c4aa643a5b1e99b2a5cbacb7f4594319b3b45d6845fd3": {
+ "e223ff54d4d46f8f1e5876b5697de59a81ba36113fa0bf2b46d29917fcbee403": {
"source": {
- "path": "asset.d165152de494c90bdd8c4aa643a5b1e99b2a5cbacb7f4594319b3b45d6845fd3",
+ "path": "asset.e223ff54d4d46f8f1e5876b5697de59a81ba36113fa0bf2b46d29917fcbee403",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "d165152de494c90bdd8c4aa643a5b1e99b2a5cbacb7f4594319b3b45d6845fd3.zip",
+ "objectKey": "e223ff54d4d46f8f1e5876b5697de59a81ba36113fa0bf2b46d29917fcbee403.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "5187de9a41f36d4b41ca1553d50265326d21791726e2a3dd0a3201910180fc0f": {
+ "0ed561f0d555914dbd2d0c6af29be68dd27eb65ee922d0f6eee6d50d3a0b5362": {
"source": {
- "path": "cdk-integ-lambda-python.template.json",
+ "path": "integ-lambda-python-pipenv.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "5187de9a41f36d4b41ca1553d50265326d21791726e2a3dd0a3201910180fc0f.json",
+ "objectKey": "0ed561f0d555914dbd2d0c6af29be68dd27eb65ee922d0f6eee6d50d3a0b5362.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/cdk-integ-lambda-python.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ-lambda-python-pipenv.template.json
similarity index 83%
rename from packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/cdk-integ-lambda-python.template.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ-lambda-python-pipenv.template.json
index 14440fd8aa966..3e664aeb17e51 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/cdk-integ-lambda-python.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ-lambda-python-pipenv.template.json
@@ -38,7 +38,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "377b8c7d7d74049daef959af1f7f0f0f2eaeb6ccb4c85fe80f8c00936183b6ff.zip"
+ "S3Key": "803e66cf17a8155efd491fa5e68f796bb74ae8337c455b23b5e52d0e5927b2a7.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -91,7 +91,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "f27e50ce3e964bd188b2fad96e1819a8e68a7a7a17e1f701b6bdcc054e29503a.zip"
+ "S3Key": "2a6fcac567a26e1be604dec572e270fbd091180dccf23a209e21c5900ce24ff0.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -144,7 +144,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "d165152de494c90bdd8c4aa643a5b1e99b2a5cbacb7f4594319b3b45d6845fd3.zip"
+ "S3Key": "e223ff54d4d46f8f1e5876b5697de59a81ba36113fa0bf2b46d29917fcbee403.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -161,14 +161,28 @@
}
},
"Outputs": {
- "InlineFunctionName": {
+ "ExportsOutputRefmyhandlerinline53D120C7B0898676": {
"Value": {
"Ref": "myhandlerinline53D120C7"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerinline53D120C7B0898676"
}
},
- "Python38FunctionName": {
+ "ExportsOutputRefmyhandlerpython384D62BBB58AA8B940": {
"Value": {
"Ref": "myhandlerpython384D62BBB5"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ }
+ },
+ "ExportsOutputRefmyhandlerpython37C34039A7BB71D94D": {
+ "Value": {
+ "Ref": "myhandlerpython37C34039A7"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
}
}
},
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ.json
index d10304994cd71..37e33ee99af21 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/integ.json
@@ -1,14 +1,13 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"testCases": {
- "integ.function.pipenv": {
+ "pipenv/DefaultTest": {
"stacks": [
- "cdk-integ-lambda-python"
+ "integ-lambda-python-pipenv"
],
- "diffAssets": false,
- "stackUpdateWorkflow": false
+ "stackUpdateWorkflow": false,
+ "assertionStack": "pipenv/DefaultTest/DeployAssert",
+ "assertionStackName": "pipenvDefaultTestDeployAssertF8231517"
}
- },
- "synthContext": {},
- "enableLookups": false
+ }
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/manifest.json
index b031837c355b7..7758c7d1f91fe 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
@@ -7,27 +7,27 @@
"file": "tree.json"
}
},
- "cdk-integ-lambda-python.assets": {
+ "integ-lambda-python-pipenv.assets": {
"type": "cdk:asset-manifest",
"properties": {
- "file": "cdk-integ-lambda-python.assets.json",
+ "file": "integ-lambda-python-pipenv.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
- "cdk-integ-lambda-python": {
+ "integ-lambda-python-pipenv": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
- "templateFile": "cdk-integ-lambda-python.template.json",
+ "templateFile": "integ-lambda-python-pipenv.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0a79cd3b6ac700ba99344c3dcf151ca901b64ee2635bb30d90e9f9cabd809612.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0ed561f0d555914dbd2d0c6af29be68dd27eb65ee922d0f6eee6d50d3a0b5362.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-pipenv.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
@@ -36,59 +36,209 @@
}
},
"dependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-pipenv.assets"
],
"metadata": {
- "/cdk-integ-lambda-python/my_handler_inline/ServiceRole/Resource": [
+ "/integ-lambda-python-pipenv/my_handler_inline/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerinlineServiceRole10C681F6"
}
],
- "/cdk-integ-lambda-python/my_handler_inline/Resource": [
+ "/integ-lambda-python-pipenv/my_handler_inline/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerinline53D120C7"
}
],
- "/cdk-integ-lambda-python/InlineFunctionName": [
+ "/integ-lambda-python-pipenv/my_handler_python_38/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
- "data": "InlineFunctionName"
+ "data": "myhandlerpython38ServiceRole2049AFF7"
}
],
- "/cdk-integ-lambda-python/my_handler_python_38/ServiceRole/Resource": [
+ "/integ-lambda-python-pipenv/my_handler_python_38/Resource": [
{
"type": "aws:cdk:logicalId",
- "data": "myhandlerpython38ServiceRole2049AFF7"
+ "data": "myhandlerpython384D62BBB5"
}
],
- "/cdk-integ-lambda-python/my_handler_python_38/Resource": [
+ "/integ-lambda-python-pipenv/my_handler_python_37/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
- "data": "myhandlerpython384D62BBB5"
+ "data": "myhandlerpython37ServiceRole45CBD18D"
+ }
+ ],
+ "/integ-lambda-python-pipenv/my_handler_python_37/Resource": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myhandlerpython37C34039A7"
+ }
+ ],
+ "/integ-lambda-python-pipenv/Exports/Output{\"Ref\":\"myhandlerinline53D120C7\"}": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ExportsOutputRefmyhandlerinline53D120C7B0898676"
+ }
+ ],
+ "/integ-lambda-python-pipenv/Exports/Output{\"Ref\":\"myhandlerpython384D62BBB5\"}": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ }
+ ],
+ "/integ-lambda-python-pipenv/Exports/Output{\"Ref\":\"myhandlerpython37C34039A7\"}": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
+ }
+ ],
+ "/integ-lambda-python-pipenv/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/integ-lambda-python-pipenv/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "integ-lambda-python-pipenv"
+ },
+ "pipenvDefaultTestDeployAssertF8231517.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "pipenvDefaultTestDeployAssertF8231517.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "pipenvDefaultTestDeployAssertF8231517": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "pipenvDefaultTestDeployAssertF8231517.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/60915425ae6d91c88b04adf7c9631b4ea5f48c4764bbff1edc0bc70d57705d3f.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "pipenvDefaultTestDeployAssertF8231517.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "integ-lambda-python-pipenv",
+ "pipenvDefaultTestDeployAssertF8231517.assets"
+ ],
+ "metadata": {
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke81c9998b1b428b309c8501e21b919d3d"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke81c9998b1b428b309c8501e21b919d3dInvokeEBA46CA4"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke81c9998b1b428b309c8501e21b919d3dAssertEqualsLambdainvoke0BDD9934"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke556559ea7575e3a52e6d6c32e2c07934"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292InvokeFD76DE7B"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292AssertEqualsLambdainvoke3F6858A2"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke921b66a1d8c9b23c2c2caef76d4b249b"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75Invoke11F9A252"
+ }
+ ],
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75AssertEqualsLambdainvoke2346EE1F"
}
],
- "/cdk-integ-lambda-python/Python38FunctionName": [
+ "/pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/AssertionResults": [
{
"type": "aws:cdk:logicalId",
- "data": "Python38FunctionName"
+ "data": "AssertionResultsAssertEqualsLambdainvoke98ea6f3253baf793823267fb4d86d1ed"
}
],
- "/cdk-integ-lambda-python/BootstrapVersion": [
+ "/pipenv/DefaultTest/DeployAssert/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
- "/cdk-integ-lambda-python/CheckBootstrapVersion": [
+ "/pipenv/DefaultTest/DeployAssert/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
- "displayName": "cdk-integ-lambda-python"
+ "displayName": "pipenv/DefaultTest/DeployAssert"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/pipenvDefaultTestDeployAssertF8231517.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/pipenvDefaultTestDeployAssertF8231517.assets.json
new file mode 100644
index 0000000000000..636ffaeafc5ce
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/pipenvDefaultTestDeployAssertF8231517.assets.json
@@ -0,0 +1,32 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "60915425ae6d91c88b04adf7c9631b4ea5f48c4764bbff1edc0bc70d57705d3f": {
+ "source": {
+ "path": "pipenvDefaultTestDeployAssertF8231517.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "60915425ae6d91c88b04adf7c9631b4ea5f48c4764bbff1edc0bc70d57705d3f.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/pipenvDefaultTestDeployAssertF8231517.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/pipenvDefaultTestDeployAssertF8231517.template.json
new file mode 100644
index 0000000000000..4c9ade29468ec
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/pipenvDefaultTestDeployAssertF8231517.template.json
@@ -0,0 +1,410 @@
+{
+ "Resources": {
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3d": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerinline53D120C7B0898676"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643820432"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3dInvokeEBA46CA4": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerinline53D120C7B0898676"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3dAssertEqualsLambdainvoke0BDD9934": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3d",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643820433"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerinline53D120C7B0898676"
+ }
+ ]
+ ]
+ }
+ ]
+ },
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ }
+ ]
+ ]
+ }
+ ]
+ },
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643820434"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292InvokeFD76DE7B": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292AssertEqualsLambdainvoke3F6858A2": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643820434"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643820434"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75Invoke11F9A252": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-pipenv:ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75AssertEqualsLambdainvoke2346EE1F": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643820434"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvoke556559ea7575e3a52e6d6c32e2c07934": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3dAssertEqualsLambdainvoke0BDD9934",
+ "data"
+ ]
+ }
+ },
+ "AssertionResultsAssertEqualsLambdainvoke921b66a1d8c9b23c2c2caef76d4b249b": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292AssertEqualsLambdainvoke3F6858A2",
+ "data"
+ ]
+ }
+ },
+ "AssertionResultsAssertEqualsLambdainvoke98ea6f3253baf793823267fb4d86d1ed": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75AssertEqualsLambdainvoke2346EE1F",
+ "data"
+ ]
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/tree.json
index 139a6e5e3ee19..c8fc3ed91b09b 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/tree.json
@@ -9,24 +9,24 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
},
- "cdk-integ-lambda-python": {
- "id": "cdk-integ-lambda-python",
- "path": "cdk-integ-lambda-python",
+ "integ-lambda-python-pipenv": {
+ "id": "integ-lambda-python-pipenv",
+ "path": "integ-lambda-python-pipenv",
"children": {
"my_handler_inline": {
"id": "my_handler_inline",
- "path": "cdk-integ-lambda-python/my_handler_inline",
+ "path": "integ-lambda-python-pipenv/my_handler_inline",
"children": {
"ServiceRole": {
"id": "ServiceRole",
- "path": "cdk-integ-lambda-python/my_handler_inline/ServiceRole",
+ "path": "integ-lambda-python-pipenv/my_handler_inline/ServiceRole",
"children": {
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_inline/ServiceRole/Resource",
+ "path": "integ-lambda-python-pipenv/my_handler_inline/ServiceRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
@@ -71,19 +71,19 @@
},
"Code": {
"id": "Code",
- "path": "cdk-integ-lambda-python/my_handler_inline/Code",
+ "path": "integ-lambda-python-pipenv/my_handler_inline/Code",
"children": {
"Stage": {
"id": "Stage",
- "path": "cdk-integ-lambda-python/my_handler_inline/Code/Stage",
+ "path": "integ-lambda-python-pipenv/my_handler_inline/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
"id": "AssetBucket",
- "path": "cdk-integ-lambda-python/my_handler_inline/Code/AssetBucket",
+ "path": "integ-lambda-python-pipenv/my_handler_inline/Code/AssetBucket",
"constructInfo": {
"fqn": "@aws-cdk/aws-s3.BucketBase",
"version": "0.0.0"
@@ -97,7 +97,7 @@
},
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_inline/Resource",
+ "path": "integ-lambda-python-pipenv/my_handler_inline/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Lambda::Function",
"aws:cdk:cloudformation:props": {
@@ -105,7 +105,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "8d7289aede51c7665a9df0be604eabacb55f0dc5979ea64c70fe3686e60ae5ae.zip"
+ "s3Key": "803e66cf17a8155efd491fa5e68f796bb74ae8337c455b23b5e52d0e5927b2a7.zip"
},
"role": {
"Fn::GetAtt": [
@@ -128,25 +128,17 @@
"version": "0.0.0"
}
},
- "InlineFunctionName": {
- "id": "InlineFunctionName",
- "path": "cdk-integ-lambda-python/InlineFunctionName",
- "constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
- }
- },
"my_handler_python_38": {
"id": "my_handler_python_38",
- "path": "cdk-integ-lambda-python/my_handler_python_38",
+ "path": "integ-lambda-python-pipenv/my_handler_python_38",
"children": {
"ServiceRole": {
"id": "ServiceRole",
- "path": "cdk-integ-lambda-python/my_handler_python_38/ServiceRole",
+ "path": "integ-lambda-python-pipenv/my_handler_python_38/ServiceRole",
"children": {
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_python_38/ServiceRole/Resource",
+ "path": "integ-lambda-python-pipenv/my_handler_python_38/ServiceRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
@@ -191,19 +183,19 @@
},
"Code": {
"id": "Code",
- "path": "cdk-integ-lambda-python/my_handler_python_38/Code",
+ "path": "integ-lambda-python-pipenv/my_handler_python_38/Code",
"children": {
"Stage": {
"id": "Stage",
- "path": "cdk-integ-lambda-python/my_handler_python_38/Code/Stage",
+ "path": "integ-lambda-python-pipenv/my_handler_python_38/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
"id": "AssetBucket",
- "path": "cdk-integ-lambda-python/my_handler_python_38/Code/AssetBucket",
+ "path": "integ-lambda-python-pipenv/my_handler_python_38/Code/AssetBucket",
"constructInfo": {
"fqn": "@aws-cdk/aws-s3.BucketBase",
"version": "0.0.0"
@@ -217,7 +209,7 @@
},
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_python_38/Resource",
+ "path": "integ-lambda-python-pipenv/my_handler_python_38/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Lambda::Function",
"aws:cdk:cloudformation:props": {
@@ -225,7 +217,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "48df79eafe4c27c7b40259916623d0b5a9722e315827d20e6f2dd91c5103352a.zip"
+ "s3Key": "2a6fcac567a26e1be604dec572e270fbd091180dccf23a209e21c5900ce24ff0.zip"
},
"role": {
"Fn::GetAtt": [
@@ -248,24 +240,558 @@
"version": "0.0.0"
}
},
- "Python38FunctionName": {
- "id": "Python38FunctionName",
- "path": "cdk-integ-lambda-python/Python38FunctionName",
+ "my_handler_python_37": {
+ "id": "my_handler_python_37",
+ "path": "integ-lambda-python-pipenv/my_handler_python_37",
+ "children": {
+ "ServiceRole": {
+ "id": "ServiceRole",
+ "path": "integ-lambda-python-pipenv/my_handler_python_37/ServiceRole",
+ "children": {
+ "Resource": {
+ "id": "Resource",
+ "path": "integ-lambda-python-pipenv/my_handler_python_37/ServiceRole/Resource",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::IAM::Role",
+ "aws:cdk:cloudformation:props": {
+ "assumeRolePolicyDocument": {
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ],
+ "Version": "2012-10-17"
+ },
+ "managedPolicyArns": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ ]
+ ]
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-iam.CfnRole",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-iam.Role",
+ "version": "0.0.0"
+ }
+ },
+ "Code": {
+ "id": "Code",
+ "path": "integ-lambda-python-pipenv/my_handler_python_37/Code",
+ "children": {
+ "Stage": {
+ "id": "Stage",
+ "path": "integ-lambda-python-pipenv/my_handler_python_37/Code/Stage",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "AssetBucket": {
+ "id": "AssetBucket",
+ "path": "integ-lambda-python-pipenv/my_handler_python_37/Code/AssetBucket",
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-s3.BucketBase",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-s3-assets.Asset",
+ "version": "0.0.0"
+ }
+ },
+ "Resource": {
+ "id": "Resource",
+ "path": "integ-lambda-python-pipenv/my_handler_python_37/Resource",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::Lambda::Function",
+ "aws:cdk:cloudformation:props": {
+ "code": {
+ "s3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "s3Key": "e223ff54d4d46f8f1e5876b5697de59a81ba36113fa0bf2b46d29917fcbee403.zip"
+ },
+ "role": {
+ "Fn::GetAtt": [
+ "myhandlerpython37ServiceRole45CBD18D",
+ "Arn"
+ ]
+ },
+ "handler": "index.handler",
+ "runtime": "python3.7"
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-lambda-python.PythonFunction",
+ "version": "0.0.0"
+ }
+ },
+ "Exports": {
+ "id": "Exports",
+ "path": "integ-lambda-python-pipenv/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerinline53D120C7\"}": {
+ "id": "Output{\"Ref\":\"myhandlerinline53D120C7\"}",
+ "path": "integ-lambda-python-pipenv/Exports/Output{\"Ref\":\"myhandlerinline53D120C7\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ },
+ "Output{\"Ref\":\"myhandlerpython384D62BBB5\"}": {
+ "id": "Output{\"Ref\":\"myhandlerpython384D62BBB5\"}",
+ "path": "integ-lambda-python-pipenv/Exports/Output{\"Ref\":\"myhandlerpython384D62BBB5\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ },
+ "Output{\"Ref\":\"myhandlerpython37C34039A7\"}": {
+ "id": "Output{\"Ref\":\"myhandlerpython37C34039A7\"}",
+ "path": "integ-lambda-python-pipenv/Exports/Output{\"Ref\":\"myhandlerpython37C34039A7\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ },
+ "pipenv": {
+ "id": "pipenv",
+ "path": "pipenv",
+ "children": {
+ "DefaultTest": {
+ "id": "DefaultTest",
+ "path": "pipenv/DefaultTest",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/Default",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "DeployAssert": {
+ "id": "DeployAssert",
+ "path": "pipenv/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3d": {
+ "id": "LambdaInvoke81c9998b1b428b309c8501e21b919d3d",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "pipenv/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "pipenv/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "pipenv/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "pipenv/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292": {
+ "id": "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75": {
+ "id": "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "pipenv/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ }
+ },
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.App",
+ "version": "0.0.0"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ-lambda-python-poetry.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ-lambda-python-poetry.assets.json
new file mode 100644
index 0000000000000..1b2daf3089b55
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ-lambda-python-poetry.assets.json
@@ -0,0 +1,58 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "c61e0f11a70b8ae390550b4477f611d7548cddc58c9a1808b8fa738c84e8849a": {
+ "source": {
+ "path": "asset.c61e0f11a70b8ae390550b4477f611d7548cddc58c9a1808b8fa738c84e8849a",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "c61e0f11a70b8ae390550b4477f611d7548cddc58c9a1808b8fa738c84e8849a.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "6d591f099499066675f839dee783892f055c6748cad3ec707031bfb839a7dcf6": {
+ "source": {
+ "path": "asset.6d591f099499066675f839dee783892f055c6748cad3ec707031bfb839a7dcf6",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "6d591f099499066675f839dee783892f055c6748cad3ec707031bfb839a7dcf6.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "bc90fc78bab5daff01b73ec5433b085e4324b6956f1c77d320a2d54fb8eb03f1": {
+ "source": {
+ "path": "asset.bc90fc78bab5daff01b73ec5433b085e4324b6956f1c77d320a2d54fb8eb03f1",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "bc90fc78bab5daff01b73ec5433b085e4324b6956f1c77d320a2d54fb8eb03f1.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "8112ad5508e2643bdc358860414feb34c0375b34b86dfdaec27fab32c38ea900": {
+ "source": {
+ "path": "integ-lambda-python-poetry.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "8112ad5508e2643bdc358860414feb34c0375b34b86dfdaec27fab32c38ea900.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk-integ-lambda-python.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ-lambda-python-poetry.template.json
similarity index 61%
rename from packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk-integ-lambda-python.template.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ-lambda-python-poetry.template.json
index 417490cd7cb8e..c9954042be36b 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/cdk-integ-lambda-python.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ-lambda-python-poetry.template.json
@@ -38,7 +38,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "8d7289aede51c7665a9df0be604eabacb55f0dc5979ea64c70fe3686e60ae5ae.zip"
+ "S3Key": "c61e0f11a70b8ae390550b4477f611d7548cddc58c9a1808b8fa738c84e8849a.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -91,7 +91,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "48df79eafe4c27c7b40259916623d0b5a9722e315827d20e6f2dd91c5103352a.zip"
+ "S3Key": "6d591f099499066675f839dee783892f055c6748cad3ec707031bfb839a7dcf6.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -105,17 +105,84 @@
"DependsOn": [
"myhandlerpython38ServiceRole2049AFF7"
]
+ },
+ "myhandlerpython37ServiceRole45CBD18D": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ],
+ "Version": "2012-10-17"
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ ]
+ ]
+ }
+ ]
+ }
+ },
+ "myhandlerpython37C34039A7": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "bc90fc78bab5daff01b73ec5433b085e4324b6956f1c77d320a2d54fb8eb03f1.zip"
+ },
+ "Role": {
+ "Fn::GetAtt": [
+ "myhandlerpython37ServiceRole45CBD18D",
+ "Arn"
+ ]
+ },
+ "Handler": "index.handler",
+ "Runtime": "python3.7"
+ },
+ "DependsOn": [
+ "myhandlerpython37ServiceRole45CBD18D"
+ ]
}
},
"Outputs": {
- "InlineFunctionName": {
+ "ExportsOutputRefmyhandlerinline53D120C7B0898676": {
"Value": {
"Ref": "myhandlerinline53D120C7"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerinline53D120C7B0898676"
}
},
- "Python38FunctionName": {
+ "ExportsOutputRefmyhandlerpython384D62BBB58AA8B940": {
"Value": {
"Ref": "myhandlerpython384D62BBB5"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ }
+ },
+ "ExportsOutputRefmyhandlerpython37C34039A7BB71D94D": {
+ "Value": {
+ "Ref": "myhandlerpython37C34039A7"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
}
}
},
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ.json
index 9d43d6f6375d1..373db0c4530d7 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/integ.json
@@ -3,7 +3,7 @@
"testCases": {
"poetry/DefaultTest": {
"stacks": [
- "cdk-integ-lambda-python"
+ "integ-lambda-python-poetry"
],
"stackUpdateWorkflow": false,
"assertionStack": "poetry/DefaultTest/DeployAssert",
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/manifest.json
index 87d4bef76061d..ca49d8411e8cf 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/manifest.json
@@ -7,27 +7,27 @@
"file": "tree.json"
}
},
- "cdk-integ-lambda-python.assets": {
+ "integ-lambda-python-poetry.assets": {
"type": "cdk:asset-manifest",
"properties": {
- "file": "cdk-integ-lambda-python.assets.json",
+ "file": "integ-lambda-python-poetry.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
- "cdk-integ-lambda-python": {
+ "integ-lambda-python-poetry": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
- "templateFile": "cdk-integ-lambda-python.template.json",
+ "templateFile": "integ-lambda-python-poetry.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/5187de9a41f36d4b41ca1553d50265326d21791726e2a3dd0a3201910180fc0f.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8112ad5508e2643bdc358860414feb34c0375b34b86dfdaec27fab32c38ea900.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-poetry.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
@@ -36,71 +36,77 @@
}
},
"dependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-poetry.assets"
],
"metadata": {
- "/cdk-integ-lambda-python/my_handler_inline/ServiceRole/Resource": [
+ "/integ-lambda-python-poetry/my_handler_inline/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerinlineServiceRole10C681F6"
}
],
- "/cdk-integ-lambda-python/my_handler_inline/Resource": [
+ "/integ-lambda-python-poetry/my_handler_inline/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerinline53D120C7"
}
],
- "/cdk-integ-lambda-python/InlineFunctionName": [
+ "/integ-lambda-python-poetry/my_handler_python_38/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
- "data": "InlineFunctionName"
+ "data": "myhandlerpython38ServiceRole2049AFF7"
}
],
- "/cdk-integ-lambda-python/my_handler_python_38/ServiceRole/Resource": [
+ "/integ-lambda-python-poetry/my_handler_python_38/Resource": [
{
"type": "aws:cdk:logicalId",
- "data": "myhandlerpython38ServiceRole2049AFF7"
+ "data": "myhandlerpython384D62BBB5"
}
],
- "/cdk-integ-lambda-python/my_handler_python_38/Resource": [
+ "/integ-lambda-python-poetry/my_handler_python_37/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
- "data": "myhandlerpython384D62BBB5"
+ "data": "myhandlerpython37ServiceRole45CBD18D"
}
],
- "/cdk-integ-lambda-python/Python38FunctionName": [
+ "/integ-lambda-python-poetry/my_handler_python_37/Resource": [
{
"type": "aws:cdk:logicalId",
- "data": "Python38FunctionName"
+ "data": "myhandlerpython37C34039A7"
}
],
- "/cdk-integ-lambda-python/my_handler_python_37/ServiceRole/Resource": [
+ "/integ-lambda-python-poetry/Exports/Output{\"Ref\":\"myhandlerinline53D120C7\"}": [
{
"type": "aws:cdk:logicalId",
- "data": "myhandlerpython37ServiceRole45CBD18D"
+ "data": "ExportsOutputRefmyhandlerinline53D120C7B0898676"
}
],
- "/cdk-integ-lambda-python/my_handler_python_37/Resource": [
+ "/integ-lambda-python-poetry/Exports/Output{\"Ref\":\"myhandlerpython384D62BBB5\"}": [
{
"type": "aws:cdk:logicalId",
- "data": "myhandlerpython37C34039A7"
+ "data": "ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
}
],
- "/cdk-integ-lambda-python/BootstrapVersion": [
+ "/integ-lambda-python-poetry/Exports/Output{\"Ref\":\"myhandlerpython37C34039A7\"}": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
+ }
+ ],
+ "/integ-lambda-python-poetry/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
- "/cdk-integ-lambda-python/CheckBootstrapVersion": [
+ "/integ-lambda-python-poetry/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
- "displayName": "cdk-integ-lambda-python"
+ "displayName": "integ-lambda-python-poetry"
},
"poetryDefaultTestDeployAssertE9C9CB8F.assets": {
"type": "cdk:asset-manifest",
@@ -118,7 +124,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6124f12c447c253e12d289b2cbb005676d5dd3f56d70cb3213d2c534caae16cc.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
@@ -131,9 +137,94 @@
}
},
"dependencies": [
+ "integ-lambda-python-poetry",
"poetryDefaultTestDeployAssertE9C9CB8F.assets"
],
"metadata": {
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke81c9998b1b428b309c8501e21b919d3d"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke81c9998b1b428b309c8501e21b919d3dInvokeEBA46CA4"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke81c9998b1b428b309c8501e21b919d3dAssertEqualsLambdainvoke0BDD9934"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke7418f30d48b25a0240557aece0f9bcb3"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292InvokeFD76DE7B"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292AssertEqualsLambdainvoke3F6858A2"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke3a1682daaa67c2d3f1c57ad30bb121be"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75Invoke11F9A252"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75AssertEqualsLambdainvoke2346EE1F"
+ }
+ ],
+ "/poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke71fd18c839842d08b4fd70cd8691cb1f"
+ }
+ ],
"/poetry/DefaultTest/DeployAssert/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/poetryDefaultTestDeployAssertE9C9CB8F.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/poetryDefaultTestDeployAssertE9C9CB8F.assets.json
index d73b790ad18fa..1d5bf07a5344f 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/poetryDefaultTestDeployAssertE9C9CB8F.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/poetryDefaultTestDeployAssertE9C9CB8F.assets.json
@@ -1,7 +1,20 @@
{
"version": "21.0.0",
"files": {
- "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "6124f12c447c253e12d289b2cbb005676d5dd3f56d70cb3213d2c534caae16cc": {
"source": {
"path": "poetryDefaultTestDeployAssertE9C9CB8F.template.json",
"packaging": "file"
@@ -9,7 +22,7 @@
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+ "objectKey": "6124f12c447c253e12d289b2cbb005676d5dd3f56d70cb3213d2c534caae16cc.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/poetryDefaultTestDeployAssertE9C9CB8F.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/poetryDefaultTestDeployAssertE9C9CB8F.template.json
index ad9d0fb73d1dd..634e3f92ddaf6 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/poetryDefaultTestDeployAssertE9C9CB8F.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/poetryDefaultTestDeployAssertE9C9CB8F.template.json
@@ -1,4 +1,378 @@
{
+ "Resources": {
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3d": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerinline53D120C7B0898676"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643425337"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3dInvokeEBA46CA4": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerinline53D120C7B0898676"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3dAssertEqualsLambdainvoke0BDD9934": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3d",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643425338"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerinline53D120C7B0898676"
+ }
+ ]
+ ]
+ }
+ ]
+ },
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ }
+ ]
+ ]
+ }
+ ]
+ },
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643425339"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292InvokeFD76DE7B": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerpython384D62BBB58AA8B940"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292AssertEqualsLambdainvoke3F6858A2": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643425339"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643425339"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75Invoke11F9A252": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-poetry:ExportsOutputRefmyhandlerpython37C34039A7BB71D94D"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75AssertEqualsLambdainvoke2346EE1F": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643425339"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvoke7418f30d48b25a0240557aece0f9bcb3": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3dAssertEqualsLambdainvoke0BDD9934",
+ "data"
+ ]
+ }
+ },
+ "AssertionResultsAssertEqualsLambdainvoke3a1682daaa67c2d3f1c57ad30bb121be": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292AssertEqualsLambdainvoke3F6858A2",
+ "data"
+ ]
+ }
+ },
+ "AssertionResultsAssertEqualsLambdainvoke71fd18c839842d08b4fd70cd8691cb1f": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75AssertEqualsLambdainvoke2346EE1F",
+ "data"
+ ]
+ }
+ }
+ },
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/tree.json
index 9e9b09c2a9c47..79fdc9449e9f8 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.poetry.integ.snapshot/tree.json
@@ -12,21 +12,21 @@
"version": "10.1.95"
}
},
- "cdk-integ-lambda-python": {
- "id": "cdk-integ-lambda-python",
- "path": "cdk-integ-lambda-python",
+ "integ-lambda-python-poetry": {
+ "id": "integ-lambda-python-poetry",
+ "path": "integ-lambda-python-poetry",
"children": {
"my_handler_inline": {
"id": "my_handler_inline",
- "path": "cdk-integ-lambda-python/my_handler_inline",
+ "path": "integ-lambda-python-poetry/my_handler_inline",
"children": {
"ServiceRole": {
"id": "ServiceRole",
- "path": "cdk-integ-lambda-python/my_handler_inline/ServiceRole",
+ "path": "integ-lambda-python-poetry/my_handler_inline/ServiceRole",
"children": {
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_inline/ServiceRole/Resource",
+ "path": "integ-lambda-python-poetry/my_handler_inline/ServiceRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
@@ -71,11 +71,11 @@
},
"Code": {
"id": "Code",
- "path": "cdk-integ-lambda-python/my_handler_inline/Code",
+ "path": "integ-lambda-python-poetry/my_handler_inline/Code",
"children": {
"Stage": {
"id": "Stage",
- "path": "cdk-integ-lambda-python/my_handler_inline/Code/Stage",
+ "path": "integ-lambda-python-poetry/my_handler_inline/Code/Stage",
"constructInfo": {
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
@@ -83,7 +83,7 @@
},
"AssetBucket": {
"id": "AssetBucket",
- "path": "cdk-integ-lambda-python/my_handler_inline/Code/AssetBucket",
+ "path": "integ-lambda-python-poetry/my_handler_inline/Code/AssetBucket",
"constructInfo": {
"fqn": "@aws-cdk/aws-s3.BucketBase",
"version": "0.0.0"
@@ -97,7 +97,7 @@
},
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_inline/Resource",
+ "path": "integ-lambda-python-poetry/my_handler_inline/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Lambda::Function",
"aws:cdk:cloudformation:props": {
@@ -105,7 +105,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "377b8c7d7d74049daef959af1f7f0f0f2eaeb6ccb4c85fe80f8c00936183b6ff.zip"
+ "s3Key": "c61e0f11a70b8ae390550b4477f611d7548cddc58c9a1808b8fa738c84e8849a.zip"
},
"role": {
"Fn::GetAtt": [
@@ -128,25 +128,17 @@
"version": "0.0.0"
}
},
- "InlineFunctionName": {
- "id": "InlineFunctionName",
- "path": "cdk-integ-lambda-python/InlineFunctionName",
- "constructInfo": {
- "fqn": "@aws-cdk/core.CfnOutput",
- "version": "0.0.0"
- }
- },
"my_handler_python_38": {
"id": "my_handler_python_38",
- "path": "cdk-integ-lambda-python/my_handler_python_38",
+ "path": "integ-lambda-python-poetry/my_handler_python_38",
"children": {
"ServiceRole": {
"id": "ServiceRole",
- "path": "cdk-integ-lambda-python/my_handler_python_38/ServiceRole",
+ "path": "integ-lambda-python-poetry/my_handler_python_38/ServiceRole",
"children": {
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_python_38/ServiceRole/Resource",
+ "path": "integ-lambda-python-poetry/my_handler_python_38/ServiceRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
@@ -191,11 +183,11 @@
},
"Code": {
"id": "Code",
- "path": "cdk-integ-lambda-python/my_handler_python_38/Code",
+ "path": "integ-lambda-python-poetry/my_handler_python_38/Code",
"children": {
"Stage": {
"id": "Stage",
- "path": "cdk-integ-lambda-python/my_handler_python_38/Code/Stage",
+ "path": "integ-lambda-python-poetry/my_handler_python_38/Code/Stage",
"constructInfo": {
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
@@ -203,7 +195,7 @@
},
"AssetBucket": {
"id": "AssetBucket",
- "path": "cdk-integ-lambda-python/my_handler_python_38/Code/AssetBucket",
+ "path": "integ-lambda-python-poetry/my_handler_python_38/Code/AssetBucket",
"constructInfo": {
"fqn": "@aws-cdk/aws-s3.BucketBase",
"version": "0.0.0"
@@ -217,7 +209,7 @@
},
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_python_38/Resource",
+ "path": "integ-lambda-python-poetry/my_handler_python_38/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Lambda::Function",
"aws:cdk:cloudformation:props": {
@@ -225,7 +217,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "f27e50ce3e964bd188b2fad96e1819a8e68a7a7a17e1f701b6bdcc054e29503a.zip"
+ "s3Key": "6d591f099499066675f839dee783892f055c6748cad3ec707031bfb839a7dcf6.zip"
},
"role": {
"Fn::GetAtt": [
@@ -248,25 +240,17 @@
"version": "0.0.0"
}
},
- "Python38FunctionName": {
- "id": "Python38FunctionName",
- "path": "cdk-integ-lambda-python/Python38FunctionName",
- "constructInfo": {
- "fqn": "@aws-cdk/core.CfnOutput",
- "version": "0.0.0"
- }
- },
"my_handler_python_37": {
"id": "my_handler_python_37",
- "path": "cdk-integ-lambda-python/my_handler_python_37",
+ "path": "integ-lambda-python-poetry/my_handler_python_37",
"children": {
"ServiceRole": {
"id": "ServiceRole",
- "path": "cdk-integ-lambda-python/my_handler_python_37/ServiceRole",
+ "path": "integ-lambda-python-poetry/my_handler_python_37/ServiceRole",
"children": {
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_python_37/ServiceRole/Resource",
+ "path": "integ-lambda-python-poetry/my_handler_python_37/ServiceRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
@@ -311,11 +295,11 @@
},
"Code": {
"id": "Code",
- "path": "cdk-integ-lambda-python/my_handler_python_37/Code",
+ "path": "integ-lambda-python-poetry/my_handler_python_37/Code",
"children": {
"Stage": {
"id": "Stage",
- "path": "cdk-integ-lambda-python/my_handler_python_37/Code/Stage",
+ "path": "integ-lambda-python-poetry/my_handler_python_37/Code/Stage",
"constructInfo": {
"fqn": "@aws-cdk/core.AssetStaging",
"version": "0.0.0"
@@ -323,7 +307,7 @@
},
"AssetBucket": {
"id": "AssetBucket",
- "path": "cdk-integ-lambda-python/my_handler_python_37/Code/AssetBucket",
+ "path": "integ-lambda-python-poetry/my_handler_python_37/Code/AssetBucket",
"constructInfo": {
"fqn": "@aws-cdk/aws-s3.BucketBase",
"version": "0.0.0"
@@ -337,7 +321,7 @@
},
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler_python_37/Resource",
+ "path": "integ-lambda-python-poetry/my_handler_python_37/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Lambda::Function",
"aws:cdk:cloudformation:props": {
@@ -345,7 +329,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "d165152de494c90bdd8c4aa643a5b1e99b2a5cbacb7f4594319b3b45d6845fd3.zip"
+ "s3Key": "bc90fc78bab5daff01b73ec5433b085e4324b6956f1c77d320a2d54fb8eb03f1.zip"
},
"role": {
"Fn::GetAtt": [
@@ -367,6 +351,40 @@
"fqn": "@aws-cdk/aws-lambda-python.PythonFunction",
"version": "0.0.0"
}
+ },
+ "Exports": {
+ "id": "Exports",
+ "path": "integ-lambda-python-poetry/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerinline53D120C7\"}": {
+ "id": "Output{\"Ref\":\"myhandlerinline53D120C7\"}",
+ "path": "integ-lambda-python-poetry/Exports/Output{\"Ref\":\"myhandlerinline53D120C7\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ },
+ "Output{\"Ref\":\"myhandlerpython384D62BBB5\"}": {
+ "id": "Output{\"Ref\":\"myhandlerpython384D62BBB5\"}",
+ "path": "integ-lambda-python-poetry/Exports/Output{\"Ref\":\"myhandlerpython384D62BBB5\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ },
+ "Output{\"Ref\":\"myhandlerpython37C34039A7\"}": {
+ "id": "Output{\"Ref\":\"myhandlerpython37C34039A7\"}",
+ "path": "integ-lambda-python-poetry/Exports/Output{\"Ref\":\"myhandlerpython37C34039A7\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
}
},
"constructInfo": {
@@ -393,6 +411,366 @@
"DeployAssert": {
"id": "DeployAssert",
"path": "poetry/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke81c9998b1b428b309c8501e21b919d3d": {
+ "id": "LambdaInvoke81c9998b1b428b309c8501e21b919d3d",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke81c9998b1b428b309c8501e21b919d3d/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "poetry/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "poetry/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "poetry/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "poetry/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292": {
+ "id": "LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke9a0beb4ea6cc38db92e9ff664c085292/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75": {
+ "id": "LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "poetry/DefaultTest/DeployAssert/LambdaInvoke631dde0680edf7d2f0eea8d9b9c06c75/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
"constructInfo": {
"fqn": "@aws-cdk/core.Stack",
"version": "0.0.0"
@@ -400,14 +778,14 @@
}
},
"constructInfo": {
- "fqn": "@aws-cdk/integ-tests.IntegTestCase",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "@aws-cdk/integ-tests.IntegTest",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
}
}
},
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.16976a5b4fcf4379b644e054aec3b6f87482e14284beff7337971995fa21e98c/index.py b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.16976a5b4fcf4379b644e054aec3b6f87482e14284beff7337971995fa21e98c/index.py
deleted file mode 100644
index fb1e8bb1ce0ab..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.16976a5b4fcf4379b644e054aec3b6f87482e14284beff7337971995fa21e98c/index.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import requests
-import shared
-
-def handler(event, context):
- response = requests.get(shared.get_url(), stream=True)
-
- print(response.status_code)
-
- return response.status_code
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.af982faba6f73b0b56c28d879814d9332c23cef5e285f6ed34a0c492b45bbae6/requirements.txt b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.af982faba6f73b0b56c28d879814d9332c23cef5e285f6ed34a0c492b45bbae6/requirements.txt
deleted file mode 100644
index eff24435fa632..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.af982faba6f73b0b56c28d879814d9332c23cef5e285f6ed34a0c492b45bbae6/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Lock versions of pip packages
-certifi==2020.6.20
-chardet==3.0.4
-idna==2.10
-urllib3==1.26.7
-# Requests used by this lambda
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.af982faba6f73b0b56c28d879814d9332c23cef5e285f6ed34a0c492b45bbae6/shared.py b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.af982faba6f73b0b56c28d879814d9332c23cef5e285f6ed34a0c492b45bbae6/shared.py
deleted file mode 100644
index b17623b83b881..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/asset.af982faba6f73b0b56c28d879814d9332c23cef5e285f6ed34a0c492b45bbae6/shared.py
+++ /dev/null
@@ -1,2 +0,0 @@
-def get_url() -> str:
- return 'https://a0.awsstatic.com/main/images/logos/aws_smile-header-desktop-en-white_59x35.png'
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk-integ-lambda-function-project.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk-integ-lambda-function-project.assets.json
index 2a0e44bab5e84..17e695185c098 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk-integ-lambda-function-project.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk-integ-lambda-function-project.assets.json
@@ -1,33 +1,33 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"files": {
- "f1eb849ae54216b1a7785bca3aa8031a4671eac68c1997e3b6a500336fd6d8fa": {
+ "33674c5088a855fbd87f051a085794b3bd1bd41823d88091874d5f4f1b8ad884": {
"source": {
- "path": "asset.f1eb849ae54216b1a7785bca3aa8031a4671eac68c1997e3b6a500336fd6d8fa",
+ "path": "asset.33674c5088a855fbd87f051a085794b3bd1bd41823d88091874d5f4f1b8ad884",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "f1eb849ae54216b1a7785bca3aa8031a4671eac68c1997e3b6a500336fd6d8fa.zip",
+ "objectKey": "33674c5088a855fbd87f051a085794b3bd1bd41823d88091874d5f4f1b8ad884.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "55a6269bb8a00cf3b6d0b295a87c2fb8670afbeceb4427622bd38f248abfd3ed": {
+ "708ad240e424cc18dd8b85017f9e1173ac983ddd3b387b9f4df3577ea60e4a65": {
"source": {
- "path": "asset.55a6269bb8a00cf3b6d0b295a87c2fb8670afbeceb4427622bd38f248abfd3ed",
+ "path": "asset.708ad240e424cc18dd8b85017f9e1173ac983ddd3b387b9f4df3577ea60e4a65",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "55a6269bb8a00cf3b6d0b295a87c2fb8670afbeceb4427622bd38f248abfd3ed.zip",
+ "objectKey": "708ad240e424cc18dd8b85017f9e1173ac983ddd3b387b9f4df3577ea60e4a65.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "faed325694c61d70ce19c9e4425aaf59cd3478fd954936a51abe14daae853de3": {
+ "7444af4af0d237c9fc39ed1bcb1a601d3c2bf2fc1be3b14de2e94d38d8d1895a": {
"source": {
"path": "cdk-integ-lambda-function-project.template.json",
"packaging": "file"
@@ -35,7 +35,7 @@
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "faed325694c61d70ce19c9e4425aaf59cd3478fd954936a51abe14daae853de3.json",
+ "objectKey": "7444af4af0d237c9fc39ed1bcb1a601d3c2bf2fc1be3b14de2e94d38d8d1895a.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk-integ-lambda-function-project.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk-integ-lambda-function-project.template.json
index 4d33cd269a11c..0fe267774286a 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk-integ-lambda-function-project.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk-integ-lambda-function-project.template.json
@@ -7,7 +7,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "f1eb849ae54216b1a7785bca3aa8031a4671eac68c1997e3b6a500336fd6d8fa.zip"
+ "S3Key": "33674c5088a855fbd87f051a085794b3bd1bd41823d88091874d5f4f1b8ad884.zip"
},
"CompatibleRuntimes": [
"python3.9"
@@ -52,7 +52,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "55a6269bb8a00cf3b6d0b295a87c2fb8670afbeceb4427622bd38f248abfd3ed.zip"
+ "S3Key": "708ad240e424cc18dd8b85017f9e1173ac983ddd3b387b9f4df3577ea60e4a65.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -74,12 +74,12 @@
}
},
"Outputs": {
- "FunctionArn": {
+ "ExportsOutputRefmyhandlerD202FA8E369E8804": {
"Value": {
- "Fn::GetAtt": [
- "myhandlerD202FA8E",
- "Arn"
- ]
+ "Ref": "myhandlerD202FA8E"
+ },
+ "Export": {
+ "Name": "cdk-integ-lambda-function-project:ExportsOutputRefmyhandlerD202FA8E369E8804"
}
}
},
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk.out
index 588d7b269d34f..8ecc185e9dbee 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk.out
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
\ No newline at end of file
+{"version":"21.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/integ.json
index e554380361b1a..7c1dd35a87e06 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/integ.json
@@ -1,14 +1,13 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"testCases": {
- "integ.function.project": {
+ "lambda-python-project/DefaultTest": {
"stacks": [
"cdk-integ-lambda-function-project"
],
- "diffAssets": false,
- "stackUpdateWorkflow": false
+ "stackUpdateWorkflow": false,
+ "assertionStack": "lambda-python-project/DefaultTest/DeployAssert",
+ "assertionStackName": "lambdapythonprojectDefaultTestDeployAssert35F9254C"
}
- },
- "synthContext": {},
- "enableLookups": false
+ }
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/lambdapythonprojectDefaultTestDeployAssert35F9254C.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/lambdapythonprojectDefaultTestDeployAssert35F9254C.assets.json
new file mode 100644
index 0000000000000..8ab3539edcbc7
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/lambdapythonprojectDefaultTestDeployAssert35F9254C.assets.json
@@ -0,0 +1,32 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "ea5d18a1dfe899a7d6663515813ddbaac0be15837184d8e091c140a5f9a3b5a7": {
+ "source": {
+ "path": "lambdapythonprojectDefaultTestDeployAssert35F9254C.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "ea5d18a1dfe899a7d6663515813ddbaac0be15837184d8e091c140a5f9a3b5a7.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/lambdapythonprojectDefaultTestDeployAssert35F9254C.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/lambdapythonprojectDefaultTestDeployAssert35F9254C.template.json
new file mode 100644
index 0000000000000..02657b219f069
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/lambdapythonprojectDefaultTestDeployAssert35F9254C.template.json
@@ -0,0 +1,198 @@
+{
+ "Resources": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "cdk-integ-lambda-function-project:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662650651537"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "cdk-integ-lambda-function-project:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662650651538"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "cdk-integ-lambda-function-project:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvokeb3d9316f0fb548427dcfcc9cb47a7866": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B",
+ "data"
+ ]
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/manifest.json
index 65ed3c511fa98..7498f14bf2395 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
@@ -23,7 +23,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/faed325694c61d70ce19c9e4425aaf59cd3478fd954936a51abe14daae853de3.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7444af4af0d237c9fc39ed1bcb1a601d3c2bf2fc1be3b14de2e94d38d8d1895a.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
@@ -42,10 +42,7 @@
"/cdk-integ-lambda-function-project/Shared/Resource": [
{
"type": "aws:cdk:logicalId",
- "data": "SharedDACC02AA",
- "trace": [
- "!!DESTRUCTIVE_CHANGES: WILL_REPLACE"
- ]
+ "data": "SharedDACC02AA"
}
],
"/cdk-integ-lambda-function-project/my_handler/ServiceRole/Resource": [
@@ -60,10 +57,10 @@
"data": "myhandlerD202FA8E"
}
],
- "/cdk-integ-lambda-function-project/FunctionArn": [
+ "/cdk-integ-lambda-function-project/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}": [
{
"type": "aws:cdk:logicalId",
- "data": "FunctionArn"
+ "data": "ExportsOutputRefmyhandlerD202FA8E369E8804"
}
],
"/cdk-integ-lambda-function-project/BootstrapVersion": [
@@ -80,6 +77,90 @@
]
},
"displayName": "cdk-integ-lambda-function-project"
+ },
+ "lambdapythonprojectDefaultTestDeployAssert35F9254C.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "lambdapythonprojectDefaultTestDeployAssert35F9254C.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "lambdapythonprojectDefaultTestDeployAssert35F9254C": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "lambdapythonprojectDefaultTestDeployAssert35F9254C.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ea5d18a1dfe899a7d6663515813ddbaac0be15837184d8e091c140a5f9a3b5a7.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "lambdapythonprojectDefaultTestDeployAssert35F9254C.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "cdk-integ-lambda-function-project",
+ "lambdapythonprojectDefaultTestDeployAssert35F9254C.assets"
+ ],
+ "metadata": {
+ "/lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16"
+ }
+ ],
+ "/lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F"
+ }
+ ],
+ "/lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B"
+ }
+ ],
+ "/lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvokeb3d9316f0fb548427dcfcc9cb47a7866"
+ }
+ ],
+ "/lambda-python-project/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/lambda-python-project/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/lambda-python-project/DefaultTest/DeployAssert/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/lambda-python-project/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "lambda-python-project/DefaultTest/DeployAssert"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/tree.json
index 6574b1a011588..7bee60621ae5c 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.project.integ.snapshot/tree.json
@@ -9,7 +9,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
},
"cdk-integ-lambda-function-project": {
@@ -28,8 +28,8 @@
"id": "Stage",
"path": "cdk-integ-lambda-function-project/Shared/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
@@ -56,7 +56,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "f1eb849ae54216b1a7785bca3aa8031a4671eac68c1997e3b6a500336fd6d8fa.zip"
+ "s3Key": "33674c5088a855fbd87f051a085794b3bd1bd41823d88091874d5f4f1b8ad884.zip"
},
"compatibleRuntimes": [
"python3.9"
@@ -135,8 +135,8 @@
"id": "Stage",
"path": "cdk-integ-lambda-function-project/my_handler/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
@@ -163,7 +163,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "55a6269bb8a00cf3b6d0b295a87c2fb8670afbeceb4427622bd38f248abfd3ed.zip"
+ "s3Key": "708ad240e424cc18dd8b85017f9e1173ac983ddd3b387b9f4df3577ea60e4a65.zip"
},
"role": {
"Fn::GetAtt": [
@@ -191,24 +191,214 @@
"version": "0.0.0"
}
},
- "FunctionArn": {
- "id": "FunctionArn",
- "path": "cdk-integ-lambda-function-project/FunctionArn",
+ "Exports": {
+ "id": "Exports",
+ "path": "cdk-integ-lambda-function-project/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerD202FA8E\"}": {
+ "id": "Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "path": "cdk-integ-lambda-function-project/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ },
+ "lambda-python-project": {
+ "id": "lambda-python-project",
+ "path": "lambda-python-project",
+ "children": {
+ "DefaultTest": {
+ "id": "DefaultTest",
+ "path": "lambda-python-project/DefaultTest",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-project/DefaultTest/Default",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "DeployAssert": {
+ "id": "DeployAssert",
+ "path": "lambda-python-project/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "id": "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.AssertionsProvider",
+ "version": "0.0.0"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.AssertionsProvider",
+ "version": "0.0.0"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.EqualsAssertion",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.LambdaInvokeFunction",
+ "version": "0.0.0"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "lambda-python-project/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.IntegTestCase",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.IntegTest",
+ "version": "0.0.0"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.App",
+ "version": "0.0.0"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py
deleted file mode 100644
index 04f99eb108b30..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import requests
-
-def handler(event, context):
- response = requests.get('https://a0.awsstatic.com/main/images/logos/aws_smile-header-desktop-en-white_59x35.png', stream=True)
-
- print(response.status_code)
-
- return response.status_code
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt
deleted file mode 100644
index 4fcd85719fe3a..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Lock versions of pip packages
-certifi==2020.6.20
-chardet==3.0.4
-idna==2.10
-urllib3==1.26.7
-# Requests used by this lambda
-requests==2.26.0
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk-integ-lambda-python-38.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk-integ-lambda-python-38.assets.json
index c4286a0556e95..4b8d12c7c31ae 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk-integ-lambda-python-38.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk-integ-lambda-python-38.assets.json
@@ -1,20 +1,20 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"files": {
- "a4b6626caa13d8b9bdd848a73402d0d6359d26541692aa37347f2e8d3a11bee0": {
+ "bbaaba57f949375edc8d6f111608aacbd9aed02c8e33d0ad355375461590948b": {
"source": {
- "path": "asset.a4b6626caa13d8b9bdd848a73402d0d6359d26541692aa37347f2e8d3a11bee0",
+ "path": "asset.bbaaba57f949375edc8d6f111608aacbd9aed02c8e33d0ad355375461590948b",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "a4b6626caa13d8b9bdd848a73402d0d6359d26541692aa37347f2e8d3a11bee0.zip",
+ "objectKey": "bbaaba57f949375edc8d6f111608aacbd9aed02c8e33d0ad355375461590948b.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "d6ffbf3ee613bc8f0ca6cd812d528f166a0f706ff538a0eb33908bf02ef7dff3": {
+ "20b8f61550e4055a7b76b72e1f7d47451dff1959235b6b4425a74fc910cc2c4f": {
"source": {
"path": "cdk-integ-lambda-python-38.template.json",
"packaging": "file"
@@ -22,7 +22,7 @@
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "d6ffbf3ee613bc8f0ca6cd812d528f166a0f706ff538a0eb33908bf02ef7dff3.json",
+ "objectKey": "20b8f61550e4055a7b76b72e1f7d47451dff1959235b6b4425a74fc910cc2c4f.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk-integ-lambda-python-38.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk-integ-lambda-python-38.template.json
index a3c934e9d0aea..15e04b05e373a 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk-integ-lambda-python-38.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk-integ-lambda-python-38.template.json
@@ -38,7 +38,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "a4b6626caa13d8b9bdd848a73402d0d6359d26541692aa37347f2e8d3a11bee0.zip"
+ "S3Key": "bbaaba57f949375edc8d6f111608aacbd9aed02c8e33d0ad355375461590948b.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -62,6 +62,14 @@
"Arn"
]
}
+ },
+ "ExportsOutputRefmyhandlerD202FA8E369E8804": {
+ "Value": {
+ "Ref": "myhandlerD202FA8E"
+ },
+ "Export": {
+ "Name": "cdk-integ-lambda-python-38:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
}
},
"Parameters": {
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk.out
index 588d7b269d34f..8ecc185e9dbee 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk.out
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
\ No newline at end of file
+{"version":"21.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/integ.json
index 53257f01c1b6f..6d3655058dd24 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/integ.json
@@ -1,14 +1,13 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"testCases": {
- "integ.function.py38": {
+ "lambda-python-38/DefaultTest": {
"stacks": [
"cdk-integ-lambda-python-38"
],
- "diffAssets": false,
- "stackUpdateWorkflow": false
+ "stackUpdateWorkflow": false,
+ "assertionStack": "lambda-python-38/DefaultTest/DeployAssert",
+ "assertionStackName": "lambdapython38DefaultTestDeployAssertDDBFEEAF"
}
- },
- "synthContext": {},
- "enableLookups": false
+ }
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/lambdapython38DefaultTestDeployAssertDDBFEEAF.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/lambdapython38DefaultTestDeployAssertDDBFEEAF.assets.json
new file mode 100644
index 0000000000000..8a194561ee133
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/lambdapython38DefaultTestDeployAssertDDBFEEAF.assets.json
@@ -0,0 +1,32 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "1e709498a8f74a83d4737886ebbfe372fdddc55f4aa1843685f587a6b594c6be": {
+ "source": {
+ "path": "lambdapython38DefaultTestDeployAssertDDBFEEAF.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "1e709498a8f74a83d4737886ebbfe372fdddc55f4aa1843685f587a6b594c6be.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/lambdapython38DefaultTestDeployAssertDDBFEEAF.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/lambdapython38DefaultTestDeployAssertDDBFEEAF.template.json
new file mode 100644
index 0000000000000..79870b2d95ef9
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/lambdapython38DefaultTestDeployAssertDDBFEEAF.template.json
@@ -0,0 +1,198 @@
+{
+ "Resources": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "cdk-integ-lambda-python-38:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662643640442"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "cdk-integ-lambda-python-38:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662643640443"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "cdk-integ-lambda-python-38:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvoke602537204bd4bab1eecafd00eb20f462": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B",
+ "data"
+ ]
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/manifest.json
index b2a5c34508ac8..2992875b68650 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
@@ -23,7 +23,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d6ffbf3ee613bc8f0ca6cd812d528f166a0f706ff538a0eb33908bf02ef7dff3.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/20b8f61550e4055a7b76b72e1f7d47451dff1959235b6b4425a74fc910cc2c4f.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
@@ -57,6 +57,12 @@
"data": "FunctionArn"
}
],
+ "/cdk-integ-lambda-python-38/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ],
"/cdk-integ-lambda-python-38/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
@@ -71,6 +77,90 @@
]
},
"displayName": "cdk-integ-lambda-python-38"
+ },
+ "lambdapython38DefaultTestDeployAssertDDBFEEAF.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "lambdapython38DefaultTestDeployAssertDDBFEEAF.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "lambdapython38DefaultTestDeployAssertDDBFEEAF": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "lambdapython38DefaultTestDeployAssertDDBFEEAF.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1e709498a8f74a83d4737886ebbfe372fdddc55f4aa1843685f587a6b594c6be.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "lambdapython38DefaultTestDeployAssertDDBFEEAF.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "cdk-integ-lambda-python-38",
+ "lambdapython38DefaultTestDeployAssertDDBFEEAF.assets"
+ ],
+ "metadata": {
+ "/lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16"
+ }
+ ],
+ "/lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F"
+ }
+ ],
+ "/lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B"
+ }
+ ],
+ "/lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke602537204bd4bab1eecafd00eb20f462"
+ }
+ ],
+ "/lambda-python-38/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/lambda-python-38/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/lambda-python-38/DefaultTest/DeployAssert/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/lambda-python-38/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "lambda-python-38/DefaultTest/DeployAssert"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/tree.json
index ac0e0921c71e9..25223dbbbdcc9 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.py38.integ.snapshot/tree.json
@@ -9,7 +9,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
},
"cdk-integ-lambda-python-38": {
@@ -77,8 +77,8 @@
"id": "Stage",
"path": "cdk-integ-lambda-python-38/my_handler/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
@@ -105,7 +105,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "a4b6626caa13d8b9bdd848a73402d0d6359d26541692aa37347f2e8d3a11bee0.zip"
+ "s3Key": "bbaaba57f949375edc8d6f111608aacbd9aed02c8e33d0ad355375461590948b.zip"
},
"role": {
"Fn::GetAtt": [
@@ -131,21 +131,219 @@
"FunctionArn": {
"id": "FunctionArn",
"path": "cdk-integ-lambda-python-38/FunctionArn",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ },
+ "Exports": {
+ "id": "Exports",
+ "path": "cdk-integ-lambda-python-38/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerD202FA8E\"}": {
+ "id": "Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "path": "cdk-integ-lambda-python-38/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ },
+ "lambda-python-38": {
+ "id": "lambda-python-38",
+ "path": "lambda-python-38",
+ "children": {
+ "DefaultTest": {
+ "id": "DefaultTest",
+ "path": "lambda-python-38/DefaultTest",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-38/DefaultTest/Default",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "DeployAssert": {
+ "id": "DeployAssert",
+ "path": "lambda-python-38/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "id": "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "lambda-python-38/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ }
+ },
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.App",
+ "version": "0.0.0"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/asset.35995f8d8e738c0883e84fd6711175c4c488f2f2bc854d464bbda64ce097e1ab/inner/custom_index.py b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/asset.35995f8d8e738c0883e84fd6711175c4c488f2f2bc854d464bbda64ce097e1ab/inner/custom_index.py
deleted file mode 100644
index d7b2ce8db00e9..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/asset.35995f8d8e738c0883e84fd6711175c4c488f2f2bc854d464bbda64ce097e1ab/inner/custom_index.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from http import HTTPStatus
-
-def handler(event, context):
- print('No dependencies')
- return HTTPStatus.OK.value
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk.out
index 588d7b269d34f..8ecc185e9dbee 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk.out
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
\ No newline at end of file
+{"version":"21.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/functionsubDefaultTestDeployAssert6BC1DDE4.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/functionsubDefaultTestDeployAssert6BC1DDE4.assets.json
new file mode 100644
index 0000000000000..a97c153918d5a
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/functionsubDefaultTestDeployAssert6BC1DDE4.assets.json
@@ -0,0 +1,32 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "4439d15cb8dd748604834c9a98792e2ea21368368df94b230582c349afbde616": {
+ "source": {
+ "path": "functionsubDefaultTestDeployAssert6BC1DDE4.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "4439d15cb8dd748604834c9a98792e2ea21368368df94b230582c349afbde616.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/functionsubDefaultTestDeployAssert6BC1DDE4.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/functionsubDefaultTestDeployAssert6BC1DDE4.template.json
new file mode 100644
index 0000000000000..d74992c0a1d41
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/functionsubDefaultTestDeployAssert6BC1DDE4.template.json
@@ -0,0 +1,198 @@
+{
+ "Resources": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-function-sub:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662646331047"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "integ-lambda-python-function-sub:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662646331047"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "integ-lambda-python-function-sub:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvoke355665d3c1afb350a666dab592942021": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B",
+ "data"
+ ]
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk-integ-lambda-python.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ-lambda-python-function-sub.assets.json
similarity index 60%
rename from packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk-integ-lambda-python.assets.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ-lambda-python-function-sub.assets.json
index e9b1b142625f1..738e106f892e9 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk-integ-lambda-python.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ-lambda-python-function-sub.assets.json
@@ -1,28 +1,28 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"files": {
- "15c6226da35cc14f12fdaece3b3d66dde7401588e7d26238ecd92d6200f19231": {
+ "eef2fb23b619f037f697f4a27f8222232f65cb2bcc1e46ee560f3cdbdc685b1f": {
"source": {
- "path": "asset.15c6226da35cc14f12fdaece3b3d66dde7401588e7d26238ecd92d6200f19231",
+ "path": "asset.eef2fb23b619f037f697f4a27f8222232f65cb2bcc1e46ee560f3cdbdc685b1f",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "15c6226da35cc14f12fdaece3b3d66dde7401588e7d26238ecd92d6200f19231.zip",
+ "objectKey": "eef2fb23b619f037f697f4a27f8222232f65cb2bcc1e46ee560f3cdbdc685b1f.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "3ac51f034af66ed4cf5ec29e168dc5079869d2f535647dc8ce28de4fe50c9dfe": {
+ "88108bc4d7ce82d1dde591e2faeeb55741b5f7dc1dafeb9ee143582c7ff74da0": {
"source": {
- "path": "cdk-integ-lambda-python.template.json",
+ "path": "integ-lambda-python-function-sub.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "3ac51f034af66ed4cf5ec29e168dc5079869d2f535647dc8ce28de4fe50c9dfe.json",
+ "objectKey": "88108bc4d7ce82d1dde591e2faeeb55741b5f7dc1dafeb9ee143582c7ff74da0.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk-integ-lambda-python.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ-lambda-python-function-sub.template.json
similarity index 86%
rename from packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk-integ-lambda-python.template.json
rename to packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ-lambda-python-function-sub.template.json
index df906236291f3..4a623c42d3144 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/cdk-integ-lambda-python.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ-lambda-python-function-sub.template.json
@@ -38,7 +38,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "15c6226da35cc14f12fdaece3b3d66dde7401588e7d26238ecd92d6200f19231.zip"
+ "S3Key": "eef2fb23b619f037f697f4a27f8222232f65cb2bcc1e46ee560f3cdbdc685b1f.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -62,6 +62,14 @@
"Arn"
]
}
+ },
+ "ExportsOutputRefmyhandlerD202FA8E369E8804": {
+ "Value": {
+ "Ref": "myhandlerD202FA8E"
+ },
+ "Export": {
+ "Name": "integ-lambda-python-function-sub:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
}
},
"Parameters": {
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ.json
index 8ca519a667e48..4ef83b65d513b 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/integ.json
@@ -1,14 +1,13 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"testCases": {
- "integ.function.sub": {
+ "function-sub/DefaultTest": {
"stacks": [
- "cdk-integ-lambda-python"
+ "integ-lambda-python-function-sub"
],
- "diffAssets": false,
- "stackUpdateWorkflow": false
+ "stackUpdateWorkflow": false,
+ "assertionStack": "function-sub/DefaultTest/DeployAssert",
+ "assertionStackName": "functionsubDefaultTestDeployAssert6BC1DDE4"
}
- },
- "synthContext": {},
- "enableLookups": false
+ }
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/manifest.json
index 206688a3b8e61..55dfb9d0c5c16 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
@@ -7,27 +7,27 @@
"file": "tree.json"
}
},
- "cdk-integ-lambda-python.assets": {
+ "integ-lambda-python-function-sub.assets": {
"type": "cdk:asset-manifest",
"properties": {
- "file": "cdk-integ-lambda-python.assets.json",
+ "file": "integ-lambda-python-function-sub.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
- "cdk-integ-lambda-python": {
+ "integ-lambda-python-function-sub": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
- "templateFile": "cdk-integ-lambda-python.template.json",
+ "templateFile": "integ-lambda-python-function-sub.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3ac51f034af66ed4cf5ec29e168dc5079869d2f535647dc8ce28de4fe50c9dfe.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/88108bc4d7ce82d1dde591e2faeeb55741b5f7dc1dafeb9ee143582c7ff74da0.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-function-sub.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
@@ -36,41 +36,131 @@
}
},
"dependencies": [
- "cdk-integ-lambda-python.assets"
+ "integ-lambda-python-function-sub.assets"
],
"metadata": {
- "/cdk-integ-lambda-python/my_handler/ServiceRole/Resource": [
+ "/integ-lambda-python-function-sub/my_handler/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerServiceRole77891068"
}
],
- "/cdk-integ-lambda-python/my_handler/Resource": [
+ "/integ-lambda-python-function-sub/my_handler/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "myhandlerD202FA8E"
}
],
- "/cdk-integ-lambda-python/FunctionArn": [
+ "/integ-lambda-python-function-sub/FunctionArn": [
{
"type": "aws:cdk:logicalId",
"data": "FunctionArn"
}
],
- "/cdk-integ-lambda-python/BootstrapVersion": [
+ "/integ-lambda-python-function-sub/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ],
+ "/integ-lambda-python-function-sub/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/integ-lambda-python-function-sub/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "integ-lambda-python-function-sub"
+ },
+ "functionsubDefaultTestDeployAssert6BC1DDE4.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "functionsubDefaultTestDeployAssert6BC1DDE4.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "functionsubDefaultTestDeployAssert6BC1DDE4": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "functionsubDefaultTestDeployAssert6BC1DDE4.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4439d15cb8dd748604834c9a98792e2ea21368368df94b230582c349afbde616.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "functionsubDefaultTestDeployAssert6BC1DDE4.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "integ-lambda-python-function-sub",
+ "functionsubDefaultTestDeployAssert6BC1DDE4.assets"
+ ],
+ "metadata": {
+ "/function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16"
+ }
+ ],
+ "/function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F"
+ }
+ ],
+ "/function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B"
+ }
+ ],
+ "/function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke355665d3c1afb350a666dab592942021"
+ }
+ ],
+ "/function-sub/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/function-sub/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/function-sub/DefaultTest/DeployAssert/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
- "/cdk-integ-lambda-python/CheckBootstrapVersion": [
+ "/function-sub/DefaultTest/DeployAssert/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
- "displayName": "cdk-integ-lambda-python"
+ "displayName": "function-sub/DefaultTest/DeployAssert"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/tree.json
index ebeece5c20395..4585432982d5a 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.sub.integ.snapshot/tree.json
@@ -9,24 +9,24 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
},
- "cdk-integ-lambda-python": {
- "id": "cdk-integ-lambda-python",
- "path": "cdk-integ-lambda-python",
+ "integ-lambda-python-function-sub": {
+ "id": "integ-lambda-python-function-sub",
+ "path": "integ-lambda-python-function-sub",
"children": {
"my_handler": {
"id": "my_handler",
- "path": "cdk-integ-lambda-python/my_handler",
+ "path": "integ-lambda-python-function-sub/my_handler",
"children": {
"ServiceRole": {
"id": "ServiceRole",
- "path": "cdk-integ-lambda-python/my_handler/ServiceRole",
+ "path": "integ-lambda-python-function-sub/my_handler/ServiceRole",
"children": {
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler/ServiceRole/Resource",
+ "path": "integ-lambda-python-function-sub/my_handler/ServiceRole/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::IAM::Role",
"aws:cdk:cloudformation:props": {
@@ -71,19 +71,19 @@
},
"Code": {
"id": "Code",
- "path": "cdk-integ-lambda-python/my_handler/Code",
+ "path": "integ-lambda-python-function-sub/my_handler/Code",
"children": {
"Stage": {
"id": "Stage",
- "path": "cdk-integ-lambda-python/my_handler/Code/Stage",
+ "path": "integ-lambda-python-function-sub/my_handler/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
"id": "AssetBucket",
- "path": "cdk-integ-lambda-python/my_handler/Code/AssetBucket",
+ "path": "integ-lambda-python-function-sub/my_handler/Code/AssetBucket",
"constructInfo": {
"fqn": "@aws-cdk/aws-s3.BucketBase",
"version": "0.0.0"
@@ -97,7 +97,7 @@
},
"Resource": {
"id": "Resource",
- "path": "cdk-integ-lambda-python/my_handler/Resource",
+ "path": "integ-lambda-python-function-sub/my_handler/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::Lambda::Function",
"aws:cdk:cloudformation:props": {
@@ -105,7 +105,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "15c6226da35cc14f12fdaece3b3d66dde7401588e7d26238ecd92d6200f19231.zip"
+ "s3Key": "eef2fb23b619f037f697f4a27f8222232f65cb2bcc1e46ee560f3cdbdc685b1f.zip"
},
"role": {
"Fn::GetAtt": [
@@ -130,22 +130,220 @@
},
"FunctionArn": {
"id": "FunctionArn",
- "path": "cdk-integ-lambda-python/FunctionArn",
+ "path": "integ-lambda-python-function-sub/FunctionArn",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ },
+ "Exports": {
+ "id": "Exports",
+ "path": "integ-lambda-python-function-sub/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerD202FA8E\"}": {
+ "id": "Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "path": "integ-lambda-python-function-sub/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ },
+ "function-sub": {
+ "id": "function-sub",
+ "path": "function-sub",
+ "children": {
+ "DefaultTest": {
+ "id": "DefaultTest",
+ "path": "function-sub/DefaultTest",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "function-sub/DefaultTest/Default",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "DeployAssert": {
+ "id": "DeployAssert",
+ "path": "function-sub/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "id": "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.AssertionsProvider",
+ "version": "0.0.0"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.AssertionsProvider",
+ "version": "0.0.0"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "function-sub/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.EqualsAssertion",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.LambdaInvokeFunction",
+ "version": "0.0.0"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "function-sub/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "function-sub/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "function-sub/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "function-sub/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.IntegTestCase",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.IntegTest",
+ "version": "0.0.0"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.App",
+ "version": "0.0.0"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
new file mode 100644
index 0000000000000..ba956d47f51fe
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle/index.js
@@ -0,0 +1,612 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+ mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/assertions/providers/lambda-handler/index.ts
+var lambda_handler_exports = {};
+__export(lambda_handler_exports, {
+ handler: () => handler
+});
+module.exports = __toCommonJS(lambda_handler_exports);
+
+// ../assertions/lib/matcher.ts
+var Matcher = class {
+ static isMatcher(x) {
+ return x && x instanceof Matcher;
+ }
+};
+var MatchResult = class {
+ constructor(target) {
+ this.failures = [];
+ this.captures = /* @__PURE__ */ new Map();
+ this.finalized = false;
+ this.target = target;
+ }
+ push(matcher, path, message) {
+ return this.recordFailure({ matcher, path, message });
+ }
+ recordFailure(failure) {
+ this.failures.push(failure);
+ return this;
+ }
+ hasFailed() {
+ return this.failures.length !== 0;
+ }
+ get failCount() {
+ return this.failures.length;
+ }
+ compose(id, inner) {
+ const innerF = inner.failures;
+ this.failures.push(...innerF.map((f) => {
+ return { path: [id, ...f.path], message: f.message, matcher: f.matcher };
+ }));
+ inner.captures.forEach((vals, capture) => {
+ vals.forEach((value) => this.recordCapture({ capture, value }));
+ });
+ return this;
+ }
+ finished() {
+ if (this.finalized) {
+ return this;
+ }
+ if (this.failCount === 0) {
+ this.captures.forEach((vals, cap) => cap._captured.push(...vals));
+ }
+ this.finalized = true;
+ return this;
+ }
+ toHumanStrings() {
+ return this.failures.map((r) => {
+ const loc = r.path.length === 0 ? "" : ` at ${r.path.join("")}`;
+ return "" + r.message + loc + ` (using ${r.matcher.name} matcher)`;
+ });
+ }
+ recordCapture(options) {
+ let values = this.captures.get(options.capture);
+ if (values === void 0) {
+ values = [];
+ }
+ values.push(options.value);
+ this.captures.set(options.capture, values);
+ }
+};
+
+// ../assertions/lib/private/matchers/absent.ts
+var AbsentMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual !== void 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Received ${actual}, but key should be absent`
+ });
+ }
+ return result;
+ }
+};
+
+// ../assertions/lib/private/type.ts
+function getType(obj) {
+ return Array.isArray(obj) ? "array" : typeof obj;
+}
+
+// ../assertions/lib/match.ts
+var Match = class {
+ static absent() {
+ return new AbsentMatch("absent");
+ }
+ static arrayWith(pattern) {
+ return new ArrayMatch("arrayWith", pattern);
+ }
+ static arrayEquals(pattern) {
+ return new ArrayMatch("arrayEquals", pattern, { subsequence: false });
+ }
+ static exact(pattern) {
+ return new LiteralMatch("exact", pattern, { partialObjects: false });
+ }
+ static objectLike(pattern) {
+ return new ObjectMatch("objectLike", pattern);
+ }
+ static objectEquals(pattern) {
+ return new ObjectMatch("objectEquals", pattern, { partial: false });
+ }
+ static not(pattern) {
+ return new NotMatch("not", pattern);
+ }
+ static serializedJson(pattern) {
+ return new SerializedJson("serializedJson", pattern);
+ }
+ static anyValue() {
+ return new AnyMatch("anyValue");
+ }
+ static stringLikeRegexp(pattern) {
+ return new StringLikeRegexpMatch("stringLikeRegexp", pattern);
+ }
+};
+var LiteralMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partialObjects = options.partialObjects ?? false;
+ if (Matcher.isMatcher(this.pattern)) {
+ throw new Error("LiteralMatch cannot directly contain another matcher. Remove the top-level matcher or nest it more deeply.");
+ }
+ }
+ test(actual) {
+ if (Array.isArray(this.pattern)) {
+ return new ArrayMatch(this.name, this.pattern, { subsequence: false, partialObjects: this.partialObjects }).test(actual);
+ }
+ if (typeof this.pattern === "object") {
+ return new ObjectMatch(this.name, this.pattern, { partial: this.partialObjects }).test(actual);
+ }
+ const result = new MatchResult(actual);
+ if (typeof this.pattern !== typeof actual) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type ${typeof this.pattern} but received ${getType(actual)}`
+ });
+ return result;
+ }
+ if (actual !== this.pattern) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected ${this.pattern} but received ${actual}`
+ });
+ }
+ return result;
+ }
+};
+var ArrayMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.subsequence = options.subsequence ?? true;
+ this.partialObjects = options.partialObjects ?? false;
+ }
+ test(actual) {
+ if (!Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type array but received ${getType(actual)}`
+ });
+ }
+ if (!this.subsequence && this.pattern.length !== actual.length) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected array of length ${this.pattern.length} but received ${actual.length}`
+ });
+ }
+ let patternIdx = 0;
+ let actualIdx = 0;
+ const result = new MatchResult(actual);
+ while (patternIdx < this.pattern.length && actualIdx < actual.length) {
+ const patternElement = this.pattern[patternIdx];
+ const matcher = Matcher.isMatcher(patternElement) ? patternElement : new LiteralMatch(this.name, patternElement, { partialObjects: this.partialObjects });
+ const matcherName = matcher.name;
+ if (this.subsequence && (matcherName == "absent" || matcherName == "anyValue")) {
+ throw new Error(`The Matcher ${matcherName}() cannot be nested within arrayWith()`);
+ }
+ const innerResult = matcher.test(actual[actualIdx]);
+ if (!this.subsequence || !innerResult.hasFailed()) {
+ result.compose(`[${actualIdx}]`, innerResult);
+ patternIdx++;
+ actualIdx++;
+ } else {
+ actualIdx++;
+ }
+ }
+ for (; patternIdx < this.pattern.length; patternIdx++) {
+ const pattern = this.pattern[patternIdx];
+ const element = Matcher.isMatcher(pattern) || typeof pattern === "object" ? " " : ` [${pattern}] `;
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Missing element${element}at pattern index ${patternIdx}`
+ });
+ }
+ return result;
+ }
+};
+var ObjectMatch = class extends Matcher {
+ constructor(name, pattern, options = {}) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ this.partial = options.partial ?? true;
+ }
+ test(actual) {
+ if (typeof actual !== "object" || Array.isArray(actual)) {
+ return new MatchResult(actual).recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected type object but received ${getType(actual)}`
+ });
+ }
+ const result = new MatchResult(actual);
+ if (!this.partial) {
+ for (const a of Object.keys(actual)) {
+ if (!(a in this.pattern)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${a}`],
+ message: "Unexpected key"
+ });
+ }
+ }
+ }
+ for (const [patternKey, patternVal] of Object.entries(this.pattern)) {
+ if (!(patternKey in actual) && !(patternVal instanceof AbsentMatch)) {
+ result.recordFailure({
+ matcher: this,
+ path: [`/${patternKey}`],
+ message: `Missing key '${patternKey}' among {${Object.keys(actual).join(",")}}`
+ });
+ continue;
+ }
+ const matcher = Matcher.isMatcher(patternVal) ? patternVal : new LiteralMatch(this.name, patternVal, { partialObjects: this.partial });
+ const inner = matcher.test(actual[patternKey]);
+ result.compose(`/${patternKey}`, inner);
+ }
+ return result;
+ }
+};
+var SerializedJson = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (getType(actual) !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected JSON as a string but found ${getType(actual)}`
+ });
+ return result;
+ }
+ let parsed;
+ try {
+ parsed = JSON.parse(actual);
+ } catch (err) {
+ if (err instanceof SyntaxError) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Invalid JSON string: ${actual}`
+ });
+ return result;
+ } else {
+ throw err;
+ }
+ }
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(parsed);
+ result.compose(`(${this.name})`, innerResult);
+ return result;
+ }
+};
+var NotMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const matcher = Matcher.isMatcher(this.pattern) ? this.pattern : new LiteralMatch(this.name, this.pattern);
+ const innerResult = matcher.test(actual);
+ const result = new MatchResult(actual);
+ if (innerResult.failCount === 0) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Found unexpected match: ${JSON.stringify(actual, void 0, 2)}`
+ });
+ }
+ return result;
+ }
+};
+var AnyMatch = class extends Matcher {
+ constructor(name) {
+ super();
+ this.name = name;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ if (actual == null) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: "Expected a value but found none"
+ });
+ }
+ return result;
+ }
+};
+var StringLikeRegexpMatch = class extends Matcher {
+ constructor(name, pattern) {
+ super();
+ this.name = name;
+ this.pattern = pattern;
+ }
+ test(actual) {
+ const result = new MatchResult(actual);
+ const regex = new RegExp(this.pattern, "gm");
+ if (typeof actual !== "string") {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `Expected a string, but got '${typeof actual}'`
+ });
+ }
+ if (!regex.test(actual)) {
+ result.recordFailure({
+ matcher: this,
+ path: [],
+ message: `String '${actual}' did not match pattern '${this.pattern}'`
+ });
+ }
+ return result;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/base.ts
+var https = __toESM(require("https"));
+var url = __toESM(require("url"));
+var CustomResourceHandler = class {
+ constructor(event, context) {
+ this.event = event;
+ this.context = context;
+ this.timedOut = false;
+ this.timeout = setTimeout(async () => {
+ await this.respond({
+ status: "FAILED",
+ reason: "Lambda Function Timeout",
+ data: this.context.logStreamName
+ });
+ this.timedOut = true;
+ }, context.getRemainingTimeInMillis() - 1200);
+ this.event = event;
+ this.physicalResourceId = extractPhysicalResourceId(event);
+ }
+ async handle() {
+ try {
+ console.log(`Event: ${JSON.stringify({ ...this.event, ResponseURL: "..." })}`);
+ const response = await this.processEvent(this.event.ResourceProperties);
+ console.log(`Event output : ${JSON.stringify(response)}`);
+ await this.respond({
+ status: "SUCCESS",
+ reason: "OK",
+ data: response
+ });
+ } catch (e) {
+ console.log(e);
+ await this.respond({
+ status: "FAILED",
+ reason: e.message ?? "Internal Error"
+ });
+ } finally {
+ clearTimeout(this.timeout);
+ }
+ }
+ respond(response) {
+ if (this.timedOut) {
+ return;
+ }
+ const cfResponse = {
+ Status: response.status,
+ Reason: response.reason,
+ PhysicalResourceId: this.physicalResourceId,
+ StackId: this.event.StackId,
+ RequestId: this.event.RequestId,
+ LogicalResourceId: this.event.LogicalResourceId,
+ NoEcho: false,
+ Data: response.data
+ };
+ const responseBody = JSON.stringify(cfResponse);
+ console.log("Responding to CloudFormation", responseBody);
+ const parsedUrl = url.parse(this.event.ResponseURL);
+ const requestOptions = {
+ hostname: parsedUrl.hostname,
+ path: parsedUrl.path,
+ method: "PUT",
+ headers: { "content-type": "", "content-length": responseBody.length }
+ };
+ return new Promise((resolve, reject) => {
+ try {
+ const request2 = https.request(requestOptions, resolve);
+ request2.on("error", reject);
+ request2.write(responseBody);
+ request2.end();
+ } catch (e) {
+ reject(e);
+ }
+ });
+ }
+};
+function extractPhysicalResourceId(event) {
+ switch (event.RequestType) {
+ case "Create":
+ return event.LogicalResourceId;
+ case "Update":
+ case "Delete":
+ return event.PhysicalResourceId;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/assertion.ts
+var AssertionHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ let actual = decodeCall(request2.actual);
+ const expected = decodeCall(request2.expected);
+ let result;
+ const matcher = new MatchCreator(expected).getMatcher();
+ console.log(`Testing equality between ${JSON.stringify(request2.actual)} and ${JSON.stringify(request2.expected)}`);
+ const matchResult = matcher.test(actual);
+ matchResult.finished();
+ if (matchResult.hasFailed()) {
+ result = {
+ data: JSON.stringify({
+ status: "fail",
+ message: [
+ ...matchResult.toHumanStrings(),
+ JSON.stringify(matchResult.target, void 0, 2)
+ ].join("\n")
+ })
+ };
+ if (request2.failDeployment) {
+ throw new Error(result.data);
+ }
+ } else {
+ result = {
+ data: JSON.stringify({
+ status: "success"
+ })
+ };
+ }
+ return result;
+ }
+};
+var MatchCreator = class {
+ constructor(obj) {
+ this.parsedObj = {
+ matcher: obj
+ };
+ }
+ getMatcher() {
+ try {
+ const final = JSON.parse(JSON.stringify(this.parsedObj), function(_k, v) {
+ const nested = Object.keys(v)[0];
+ switch (nested) {
+ case "$ArrayWith":
+ return Match.arrayWith(v[nested]);
+ case "$ObjectLike":
+ return Match.objectLike(v[nested]);
+ case "$StringLike":
+ return Match.stringLikeRegexp(v[nested]);
+ default:
+ return v;
+ }
+ });
+ if (Matcher.isMatcher(final.matcher)) {
+ return final.matcher;
+ }
+ return Match.exact(final.matcher);
+ } catch {
+ return Match.exact(this.parsedObj.matcher);
+ }
+ }
+};
+function decodeCall(call) {
+ if (!call) {
+ return void 0;
+ }
+ try {
+ const parsed = JSON.parse(call);
+ return parsed;
+ } catch (e) {
+ return call;
+ }
+}
+
+// lib/assertions/providers/lambda-handler/utils.ts
+function decode(object) {
+ return JSON.parse(JSON.stringify(object), (_k, v) => {
+ switch (v) {
+ case "TRUE:BOOLEAN":
+ return true;
+ case "FALSE:BOOLEAN":
+ return false;
+ default:
+ return v;
+ }
+ });
+}
+
+// lib/assertions/providers/lambda-handler/sdk.ts
+function flatten(object) {
+ return Object.assign(
+ {},
+ ...function _flatten(child, path = []) {
+ return [].concat(...Object.keys(child).map((key) => {
+ const childKey = Buffer.isBuffer(child[key]) ? child[key].toString("utf8") : child[key];
+ return typeof childKey === "object" && childKey !== null ? _flatten(childKey, path.concat([key])) : { [path.concat([key]).join(".")]: childKey };
+ }));
+ }(object)
+ );
+}
+var AwsApiCallHandler = class extends CustomResourceHandler {
+ async processEvent(request2) {
+ const AWS = require("aws-sdk");
+ console.log(`AWS SDK VERSION: ${AWS.VERSION}`);
+ const service = new AWS[request2.service]();
+ const response = await service[request2.api](request2.parameters && decode(request2.parameters)).promise();
+ console.log(`SDK response received ${JSON.stringify(response)}`);
+ delete response.ResponseMetadata;
+ const respond = {
+ apiCallResponse: response
+ };
+ const flatData = {
+ ...flatten(respond)
+ };
+ return request2.flattenResponse === "true" ? flatData : respond;
+ }
+};
+
+// lib/assertions/providers/lambda-handler/types.ts
+var ASSERT_RESOURCE_TYPE = "Custom::DeployAssert@AssertEquals";
+var SDK_RESOURCE_TYPE_PREFIX = "Custom::DeployAssert@SdkCall";
+
+// lib/assertions/providers/lambda-handler/index.ts
+async function handler(event, context) {
+ const provider = createResourceHandler(event, context);
+ await provider.handle();
+}
+function createResourceHandler(event, context) {
+ if (event.ResourceType.startsWith(SDK_RESOURCE_TYPE_PREFIX)) {
+ return new AwsApiCallHandler(event, context);
+ }
+ switch (event.ResourceType) {
+ case ASSERT_RESOURCE_TYPE:
+ return new AssertionHandler(event, context);
+ default:
+ throw new Error(`Unsupported resource type "${event.ResourceType}`);
+ }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+ handler
+});
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py
deleted file mode 100644
index 04f99eb108b30..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/index.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import requests
-
-def handler(event, context):
- response = requests.get('https://a0.awsstatic.com/main/images/logos/aws_smile-header-desktop-en-white_59x35.png', stream=True)
-
- print(response.status_code)
-
- return response.status_code
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt
deleted file mode 100644
index 4fcd85719fe3a..0000000000000
--- a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/asset.e3d888d855ebd2b6173af510e2eba9e1542084655559f4bb05adbb2e6ca63b73/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Lock versions of pip packages
-certifi==2020.6.20
-chardet==3.0.4
-idna==2.10
-urllib3==1.26.7
-# Requests used by this lambda
-requests==2.26.0
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk-integ-lambda-python-vpc.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk-integ-lambda-python-vpc.assets.json
index 8073e5cfdc435..ec304783a2880 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk-integ-lambda-python-vpc.assets.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk-integ-lambda-python-vpc.assets.json
@@ -1,20 +1,20 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"files": {
- "7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b": {
+ "3b4e770c8242272e96f6faafd45d2446549a060a25dcce2d246445447e356ca9": {
"source": {
- "path": "asset.7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b",
+ "path": "asset.3b4e770c8242272e96f6faafd45d2446549a060a25dcce2d246445447e356ca9",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b.zip",
+ "objectKey": "3b4e770c8242272e96f6faafd45d2446549a060a25dcce2d246445447e356ca9.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
- "9f8f235bc0574a06fafca37baeeb5e4f4e0307e4bb952f68d7bd493ab6c2ff78": {
+ "6ce6ccc522282d726af7d10e96bac782bf7551895e5a1ec08cdac3512dccd530": {
"source": {
"path": "cdk-integ-lambda-python-vpc.template.json",
"packaging": "file"
@@ -22,7 +22,7 @@
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "9f8f235bc0574a06fafca37baeeb5e4f4e0307e4bb952f68d7bd493ab6c2ff78.json",
+ "objectKey": "6ce6ccc522282d726af7d10e96bac782bf7551895e5a1ec08cdac3512dccd530.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk-integ-lambda-python-vpc.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk-integ-lambda-python-vpc.template.json
index 23a2370687805..25363a20c9ad4 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk-integ-lambda-python-vpc.template.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk-integ-lambda-python-vpc.template.json
@@ -15,7 +15,7 @@
]
}
},
- "myvpcingressSubnet1Subnet82F0259C": {
+ "myvpcPublicSubnet1Subnet6BD75C12": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"VpcId": {
@@ -29,12 +29,12 @@
}
]
},
- "CidrBlock": "10.0.0.0/24",
+ "CidrBlock": "10.0.0.0/18",
"MapPublicIpOnLaunch": true,
"Tags": [
{
"Key": "aws-cdk:subnet-name",
- "Value": "ingress"
+ "Value": "Public"
},
{
"Key": "aws-cdk:subnet-type",
@@ -42,12 +42,12 @@
},
{
"Key": "Name",
- "Value": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1"
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1"
}
]
}
},
- "myvpcingressSubnet1RouteTableD6322DD5": {
+ "myvpcPublicSubnet1RouteTableF7E8D7F1": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
"VpcId": {
@@ -56,27 +56,27 @@
"Tags": [
{
"Key": "Name",
- "Value": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1"
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1"
}
]
}
},
- "myvpcingressSubnet1RouteTableAssociation12FE9C06": {
+ "myvpcPublicSubnet1RouteTableAssociationC697FA56": {
"Type": "AWS::EC2::SubnetRouteTableAssociation",
"Properties": {
"RouteTableId": {
- "Ref": "myvpcingressSubnet1RouteTableD6322DD5"
+ "Ref": "myvpcPublicSubnet1RouteTableF7E8D7F1"
},
"SubnetId": {
- "Ref": "myvpcingressSubnet1Subnet82F0259C"
+ "Ref": "myvpcPublicSubnet1Subnet6BD75C12"
}
}
},
- "myvpcingressSubnet1DefaultRoute6FCDFDDF": {
+ "myvpcPublicSubnet1DefaultRouteBE259807": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
- "Ref": "myvpcingressSubnet1RouteTableD6322DD5"
+ "Ref": "myvpcPublicSubnet1RouteTableF7E8D7F1"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
@@ -87,7 +87,43 @@
"myvpcVPCGWD483DB64"
]
},
- "myvpcingressSubnet2Subnet56945106": {
+ "myvpcPublicSubnet1EIP88D18203": {
+ "Type": "AWS::EC2::EIP",
+ "Properties": {
+ "Domain": "vpc",
+ "Tags": [
+ {
+ "Key": "Name",
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1"
+ }
+ ]
+ }
+ },
+ "myvpcPublicSubnet1NATGatewayD3DC5B8D": {
+ "Type": "AWS::EC2::NatGateway",
+ "Properties": {
+ "SubnetId": {
+ "Ref": "myvpcPublicSubnet1Subnet6BD75C12"
+ },
+ "AllocationId": {
+ "Fn::GetAtt": [
+ "myvpcPublicSubnet1EIP88D18203",
+ "AllocationId"
+ ]
+ },
+ "Tags": [
+ {
+ "Key": "Name",
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1"
+ }
+ ]
+ },
+ "DependsOn": [
+ "myvpcPublicSubnet1DefaultRouteBE259807",
+ "myvpcPublicSubnet1RouteTableAssociationC697FA56"
+ ]
+ },
+ "myvpcPublicSubnet2Subnet844B7F05": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"VpcId": {
@@ -101,12 +137,12 @@
}
]
},
- "CidrBlock": "10.0.1.0/24",
+ "CidrBlock": "10.0.64.0/18",
"MapPublicIpOnLaunch": true,
"Tags": [
{
"Key": "aws-cdk:subnet-name",
- "Value": "ingress"
+ "Value": "Public"
},
{
"Key": "aws-cdk:subnet-type",
@@ -114,12 +150,12 @@
},
{
"Key": "Name",
- "Value": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2"
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2"
}
]
}
},
- "myvpcingressSubnet2RouteTable2112B53A": {
+ "myvpcPublicSubnet2RouteTable9A4CA50C": {
"Type": "AWS::EC2::RouteTable",
"Properties": {
"VpcId": {
@@ -128,27 +164,27 @@
"Tags": [
{
"Key": "Name",
- "Value": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2"
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2"
}
]
}
},
- "myvpcingressSubnet2RouteTableAssociation08B3BE06": {
+ "myvpcPublicSubnet2RouteTableAssociation28F6DD6F": {
"Type": "AWS::EC2::SubnetRouteTableAssociation",
"Properties": {
"RouteTableId": {
- "Ref": "myvpcingressSubnet2RouteTable2112B53A"
+ "Ref": "myvpcPublicSubnet2RouteTable9A4CA50C"
},
"SubnetId": {
- "Ref": "myvpcingressSubnet2Subnet56945106"
+ "Ref": "myvpcPublicSubnet2Subnet844B7F05"
}
}
},
- "myvpcingressSubnet2DefaultRouteBF3C1EC8": {
+ "myvpcPublicSubnet2DefaultRoute22D543BA": {
"Type": "AWS::EC2::Route",
"Properties": {
"RouteTableId": {
- "Ref": "myvpcingressSubnet2RouteTable2112B53A"
+ "Ref": "myvpcPublicSubnet2RouteTable9A4CA50C"
},
"DestinationCidrBlock": "0.0.0.0/0",
"GatewayId": {
@@ -159,6 +195,180 @@
"myvpcVPCGWD483DB64"
]
},
+ "myvpcPublicSubnet2EIPA3AF827D": {
+ "Type": "AWS::EC2::EIP",
+ "Properties": {
+ "Domain": "vpc",
+ "Tags": [
+ {
+ "Key": "Name",
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2"
+ }
+ ]
+ }
+ },
+ "myvpcPublicSubnet2NATGateway45472CCD": {
+ "Type": "AWS::EC2::NatGateway",
+ "Properties": {
+ "SubnetId": {
+ "Ref": "myvpcPublicSubnet2Subnet844B7F05"
+ },
+ "AllocationId": {
+ "Fn::GetAtt": [
+ "myvpcPublicSubnet2EIPA3AF827D",
+ "AllocationId"
+ ]
+ },
+ "Tags": [
+ {
+ "Key": "Name",
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2"
+ }
+ ]
+ },
+ "DependsOn": [
+ "myvpcPublicSubnet2DefaultRoute22D543BA",
+ "myvpcPublicSubnet2RouteTableAssociation28F6DD6F"
+ ]
+ },
+ "myvpcPrivateSubnet1SubnetAE3DECEE": {
+ "Type": "AWS::EC2::Subnet",
+ "Properties": {
+ "VpcId": {
+ "Ref": "myvpc9455A260"
+ },
+ "AvailabilityZone": {
+ "Fn::Select": [
+ 0,
+ {
+ "Fn::GetAZs": ""
+ }
+ ]
+ },
+ "CidrBlock": "10.0.128.0/18",
+ "MapPublicIpOnLaunch": false,
+ "Tags": [
+ {
+ "Key": "aws-cdk:subnet-name",
+ "Value": "Private"
+ },
+ {
+ "Key": "aws-cdk:subnet-type",
+ "Value": "Private"
+ },
+ {
+ "Key": "Name",
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1"
+ }
+ ]
+ }
+ },
+ "myvpcPrivateSubnet1RouteTable991B69A9": {
+ "Type": "AWS::EC2::RouteTable",
+ "Properties": {
+ "VpcId": {
+ "Ref": "myvpc9455A260"
+ },
+ "Tags": [
+ {
+ "Key": "Name",
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1"
+ }
+ ]
+ }
+ },
+ "myvpcPrivateSubnet1RouteTableAssociation91351DDE": {
+ "Type": "AWS::EC2::SubnetRouteTableAssociation",
+ "Properties": {
+ "RouteTableId": {
+ "Ref": "myvpcPrivateSubnet1RouteTable991B69A9"
+ },
+ "SubnetId": {
+ "Ref": "myvpcPrivateSubnet1SubnetAE3DECEE"
+ }
+ }
+ },
+ "myvpcPrivateSubnet1DefaultRouteA1815BF3": {
+ "Type": "AWS::EC2::Route",
+ "Properties": {
+ "RouteTableId": {
+ "Ref": "myvpcPrivateSubnet1RouteTable991B69A9"
+ },
+ "DestinationCidrBlock": "0.0.0.0/0",
+ "NatGatewayId": {
+ "Ref": "myvpcPublicSubnet1NATGatewayD3DC5B8D"
+ }
+ }
+ },
+ "myvpcPrivateSubnet2SubnetE09939FB": {
+ "Type": "AWS::EC2::Subnet",
+ "Properties": {
+ "VpcId": {
+ "Ref": "myvpc9455A260"
+ },
+ "AvailabilityZone": {
+ "Fn::Select": [
+ 1,
+ {
+ "Fn::GetAZs": ""
+ }
+ ]
+ },
+ "CidrBlock": "10.0.192.0/18",
+ "MapPublicIpOnLaunch": false,
+ "Tags": [
+ {
+ "Key": "aws-cdk:subnet-name",
+ "Value": "Private"
+ },
+ {
+ "Key": "aws-cdk:subnet-type",
+ "Value": "Private"
+ },
+ {
+ "Key": "Name",
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2"
+ }
+ ]
+ }
+ },
+ "myvpcPrivateSubnet2RouteTableF2B44BF5": {
+ "Type": "AWS::EC2::RouteTable",
+ "Properties": {
+ "VpcId": {
+ "Ref": "myvpc9455A260"
+ },
+ "Tags": [
+ {
+ "Key": "Name",
+ "Value": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2"
+ }
+ ]
+ }
+ },
+ "myvpcPrivateSubnet2RouteTableAssociation071745F0": {
+ "Type": "AWS::EC2::SubnetRouteTableAssociation",
+ "Properties": {
+ "RouteTableId": {
+ "Ref": "myvpcPrivateSubnet2RouteTableF2B44BF5"
+ },
+ "SubnetId": {
+ "Ref": "myvpcPrivateSubnet2SubnetE09939FB"
+ }
+ }
+ },
+ "myvpcPrivateSubnet2DefaultRouteB54E314A": {
+ "Type": "AWS::EC2::Route",
+ "Properties": {
+ "RouteTableId": {
+ "Ref": "myvpcPrivateSubnet2RouteTableF2B44BF5"
+ },
+ "DestinationCidrBlock": "0.0.0.0/0",
+ "NatGatewayId": {
+ "Ref": "myvpcPublicSubnet2NATGateway45472CCD"
+ }
+ }
+ },
"myvpcIGW24C0BBAE": {
"Type": "AWS::EC2::InternetGateway",
"Properties": {
@@ -224,10 +434,10 @@
]
},
"DependsOn": [
- "myvpcingressSubnet1DefaultRoute6FCDFDDF",
- "myvpcingressSubnet1RouteTableAssociation12FE9C06",
- "myvpcingressSubnet2DefaultRouteBF3C1EC8",
- "myvpcingressSubnet2RouteTableAssociation08B3BE06"
+ "myvpcPrivateSubnet1DefaultRouteA1815BF3",
+ "myvpcPrivateSubnet1RouteTableAssociation91351DDE",
+ "myvpcPrivateSubnet2DefaultRouteB54E314A",
+ "myvpcPrivateSubnet2RouteTableAssociation071745F0"
]
},
"myhandlerSecurityGroupF566A239": {
@@ -246,10 +456,10 @@
}
},
"DependsOn": [
- "myvpcingressSubnet1DefaultRoute6FCDFDDF",
- "myvpcingressSubnet1RouteTableAssociation12FE9C06",
- "myvpcingressSubnet2DefaultRouteBF3C1EC8",
- "myvpcingressSubnet2RouteTableAssociation08B3BE06"
+ "myvpcPrivateSubnet1DefaultRouteA1815BF3",
+ "myvpcPrivateSubnet1RouteTableAssociation91351DDE",
+ "myvpcPrivateSubnet2DefaultRouteB54E314A",
+ "myvpcPrivateSubnet2RouteTableAssociation071745F0"
]
},
"myhandlerD202FA8E": {
@@ -259,7 +469,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "S3Key": "7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b.zip"
+ "S3Key": "3b4e770c8242272e96f6faafd45d2446549a060a25dcce2d246445447e356ca9.zip"
},
"Role": {
"Fn::GetAtt": [
@@ -280,30 +490,30 @@
],
"SubnetIds": [
{
- "Ref": "myvpcingressSubnet1Subnet82F0259C"
+ "Ref": "myvpcPrivateSubnet1SubnetAE3DECEE"
},
{
- "Ref": "myvpcingressSubnet2Subnet56945106"
+ "Ref": "myvpcPrivateSubnet2SubnetE09939FB"
}
]
}
},
"DependsOn": [
"myhandlerServiceRole77891068",
- "myvpcingressSubnet1DefaultRoute6FCDFDDF",
- "myvpcingressSubnet1RouteTableAssociation12FE9C06",
- "myvpcingressSubnet2DefaultRouteBF3C1EC8",
- "myvpcingressSubnet2RouteTableAssociation08B3BE06"
+ "myvpcPrivateSubnet1DefaultRouteA1815BF3",
+ "myvpcPrivateSubnet1RouteTableAssociation91351DDE",
+ "myvpcPrivateSubnet2DefaultRouteB54E314A",
+ "myvpcPrivateSubnet2RouteTableAssociation071745F0"
]
}
},
"Outputs": {
- "FunctionArn": {
+ "ExportsOutputRefmyhandlerD202FA8E369E8804": {
"Value": {
- "Fn::GetAtt": [
- "myhandlerD202FA8E",
- "Arn"
- ]
+ "Ref": "myhandlerD202FA8E"
+ },
+ "Export": {
+ "Name": "cdk-integ-lambda-python-vpc:ExportsOutputRefmyhandlerD202FA8E369E8804"
}
}
},
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk.out
index 588d7b269d34f..8ecc185e9dbee 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk.out
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
\ No newline at end of file
+{"version":"21.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/integ.json
index de22ed99acbac..8461763dfe874 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/integ.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/integ.json
@@ -1,14 +1,13 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"testCases": {
- "integ.function.vpc": {
+ "lambda-python-vpc/DefaultTest": {
"stacks": [
"cdk-integ-lambda-python-vpc"
],
- "diffAssets": false,
- "stackUpdateWorkflow": false
+ "stackUpdateWorkflow": false,
+ "assertionStack": "lambda-python-vpc/DefaultTest/DeployAssert",
+ "assertionStackName": "lambdapythonvpcDefaultTestDeployAssert54E0DCFB"
}
- },
- "synthContext": {},
- "enableLookups": false
+ }
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/lambdapythonvpcDefaultTestDeployAssert54E0DCFB.assets.json b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/lambdapythonvpcDefaultTestDeployAssert54E0DCFB.assets.json
new file mode 100644
index 0000000000000..3e5328c622b49
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/lambdapythonvpcDefaultTestDeployAssert54E0DCFB.assets.json
@@ -0,0 +1,32 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7": {
+ "source": {
+ "path": "asset.84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.bundle",
+ "packaging": "zip"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ },
+ "a0651ad741f16b986ca00083720eb4e40348df935c5cfef88d6f8b4bff635617": {
+ "source": {
+ "path": "lambdapythonvpcDefaultTestDeployAssert54E0DCFB.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "a0651ad741f16b986ca00083720eb4e40348df935c5cfef88d6f8b4bff635617.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/lambdapythonvpcDefaultTestDeployAssert54E0DCFB.template.json b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/lambdapythonvpcDefaultTestDeployAssert54E0DCFB.template.json
new file mode 100644
index 0000000000000..47cc77c11984e
--- /dev/null
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/lambdapythonvpcDefaultTestDeployAssert54E0DCFB.template.json
@@ -0,0 +1,198 @@
+{
+ "Resources": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "Type": "Custom::DeployAssert@SdkCallLambdainvoke",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "service": "Lambda",
+ "api": "invoke",
+ "parameters": {
+ "FunctionName": {
+ "Fn::ImportValue": "cdk-integ-lambda-python-vpc:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ },
+ "flattenResponse": "false",
+ "salt": "1662649883464"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F": {
+ "Type": "AWS::Lambda::Permission",
+ "Properties": {
+ "Action": "lambda:InvokeFunction",
+ "FunctionName": {
+ "Fn::ImportValue": "cdk-integ-lambda-python-vpc:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ },
+ "Principal": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ },
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B": {
+ "Type": "Custom::DeployAssert@AssertEquals",
+ "Properties": {
+ "ServiceToken": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F",
+ "Arn"
+ ]
+ },
+ "actual": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "apiCallResponse"
+ ]
+ },
+ "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}",
+ "salt": "1662649883465"
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73": {
+ "Type": "AWS::IAM::Role",
+ "Properties": {
+ "AssumeRolePolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": "sts:AssumeRole",
+ "Effect": "Allow",
+ "Principal": {
+ "Service": "lambda.amazonaws.com"
+ }
+ }
+ ]
+ },
+ "ManagedPolicyArns": [
+ {
+ "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+ }
+ ],
+ "Policies": [
+ {
+ "PolicyName": "Inline",
+ "PolicyDocument": {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "lambda:Invoke"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "*"
+ ]
+ },
+ {
+ "Action": [
+ "lambda:InvokeFunction"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":lambda:",
+ {
+ "Ref": "AWS::Region"
+ },
+ ":",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":function:",
+ {
+ "Fn::ImportValue": "cdk-integ-lambda-python-vpc:ExportsOutputRefmyhandlerD202FA8E369E8804"
+ }
+ ]
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
+ "Type": "AWS::Lambda::Function",
+ "Properties": {
+ "Runtime": "nodejs14.x",
+ "Code": {
+ "S3Bucket": {
+ "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+ },
+ "S3Key": "84802aa01d2d2c9e7d8d69705ee832c97f1ebad2d73c72be5c32d53f16cf90a7.zip"
+ },
+ "Timeout": 120,
+ "Handler": "index.handler",
+ "Role": {
+ "Fn::GetAtt": [
+ "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73",
+ "Arn"
+ ]
+ }
+ }
+ }
+ },
+ "Outputs": {
+ "AssertionResultsAssertEqualsLambdainvoke29290e026919ecb85e75d0aca122fdc1": {
+ "Value": {
+ "Fn::GetAtt": [
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B",
+ "data"
+ ]
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/manifest.json
index 0cec9544ad689..b07900e26e901 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/manifest.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "20.0.0",
+ "version": "21.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
@@ -23,7 +23,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9f8f235bc0574a06fafca37baeeb5e4f4e0307e4bb952f68d7bd493ab6c2ff78.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6ce6ccc522282d726af7d10e96bac782bf7551895e5a1ec08cdac3512dccd530.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
@@ -45,52 +45,124 @@
"data": "myvpc9455A260"
}
],
- "/cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/Subnet": [
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/Subnet": [
{
"type": "aws:cdk:logicalId",
- "data": "myvpcingressSubnet1Subnet82F0259C"
+ "data": "myvpcPublicSubnet1Subnet6BD75C12"
}
],
- "/cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/RouteTable": [
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/RouteTable": [
{
"type": "aws:cdk:logicalId",
- "data": "myvpcingressSubnet1RouteTableD6322DD5"
+ "data": "myvpcPublicSubnet1RouteTableF7E8D7F1"
}
],
- "/cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/RouteTableAssociation": [
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/RouteTableAssociation": [
{
"type": "aws:cdk:logicalId",
- "data": "myvpcingressSubnet1RouteTableAssociation12FE9C06"
+ "data": "myvpcPublicSubnet1RouteTableAssociationC697FA56"
}
],
- "/cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/DefaultRoute": [
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/DefaultRoute": [
{
"type": "aws:cdk:logicalId",
- "data": "myvpcingressSubnet1DefaultRoute6FCDFDDF"
+ "data": "myvpcPublicSubnet1DefaultRouteBE259807"
}
],
- "/cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/Subnet": [
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/EIP": [
{
"type": "aws:cdk:logicalId",
- "data": "myvpcingressSubnet2Subnet56945106"
+ "data": "myvpcPublicSubnet1EIP88D18203"
}
],
- "/cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/RouteTable": [
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/NATGateway": [
{
"type": "aws:cdk:logicalId",
- "data": "myvpcingressSubnet2RouteTable2112B53A"
+ "data": "myvpcPublicSubnet1NATGatewayD3DC5B8D"
}
],
- "/cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/RouteTableAssociation": [
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/Subnet": [
{
"type": "aws:cdk:logicalId",
- "data": "myvpcingressSubnet2RouteTableAssociation08B3BE06"
+ "data": "myvpcPublicSubnet2Subnet844B7F05"
}
],
- "/cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/DefaultRoute": [
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/RouteTable": [
{
"type": "aws:cdk:logicalId",
- "data": "myvpcingressSubnet2DefaultRouteBF3C1EC8"
+ "data": "myvpcPublicSubnet2RouteTable9A4CA50C"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/RouteTableAssociation": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPublicSubnet2RouteTableAssociation28F6DD6F"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/DefaultRoute": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPublicSubnet2DefaultRoute22D543BA"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/EIP": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPublicSubnet2EIPA3AF827D"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/NATGateway": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPublicSubnet2NATGateway45472CCD"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/Subnet": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPrivateSubnet1SubnetAE3DECEE"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/RouteTable": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPrivateSubnet1RouteTable991B69A9"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/RouteTableAssociation": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPrivateSubnet1RouteTableAssociation91351DDE"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/DefaultRoute": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPrivateSubnet1DefaultRouteA1815BF3"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/Subnet": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPrivateSubnet2SubnetE09939FB"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/RouteTable": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPrivateSubnet2RouteTableF2B44BF5"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/RouteTableAssociation": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPrivateSubnet2RouteTableAssociation071745F0"
+ }
+ ],
+ "/cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/DefaultRoute": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcPrivateSubnet2DefaultRouteB54E314A"
}
],
"/cdk-integ-lambda-python-vpc/my_vpc/IGW": [
@@ -123,10 +195,10 @@
"data": "myhandlerD202FA8E"
}
],
- "/cdk-integ-lambda-python-vpc/FunctionArn": [
+ "/cdk-integ-lambda-python-vpc/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}": [
{
"type": "aws:cdk:logicalId",
- "data": "FunctionArn"
+ "data": "ExportsOutputRefmyhandlerD202FA8E369E8804"
}
],
"/cdk-integ-lambda-python-vpc/BootstrapVersion": [
@@ -140,9 +212,165 @@
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
+ ],
+ "myvpcingressSubnet1Subnet82F0259C": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcingressSubnet1Subnet82F0259C",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
+ ],
+ "myvpcingressSubnet1RouteTableD6322DD5": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcingressSubnet1RouteTableD6322DD5",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
+ ],
+ "myvpcingressSubnet1RouteTableAssociation12FE9C06": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcingressSubnet1RouteTableAssociation12FE9C06",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
+ ],
+ "myvpcingressSubnet1DefaultRoute6FCDFDDF": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcingressSubnet1DefaultRoute6FCDFDDF",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
+ ],
+ "myvpcingressSubnet2Subnet56945106": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcingressSubnet2Subnet56945106",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
+ ],
+ "myvpcingressSubnet2RouteTable2112B53A": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcingressSubnet2RouteTable2112B53A",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
+ ],
+ "myvpcingressSubnet2RouteTableAssociation08B3BE06": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcingressSubnet2RouteTableAssociation08B3BE06",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
+ ],
+ "myvpcingressSubnet2DefaultRouteBF3C1EC8": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "myvpcingressSubnet2DefaultRouteBF3C1EC8",
+ "trace": [
+ "!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
+ ]
+ }
]
},
"displayName": "cdk-integ-lambda-python-vpc"
+ },
+ "lambdapythonvpcDefaultTestDeployAssert54E0DCFB.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "lambdapythonvpcDefaultTestDeployAssert54E0DCFB.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "lambdapythonvpcDefaultTestDeployAssert54E0DCFB": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "lambdapythonvpcDefaultTestDeployAssert54E0DCFB.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a0651ad741f16b986ca00083720eb4e40348df935c5cfef88d6f8b4bff635617.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "lambdapythonvpcDefaultTestDeployAssert54E0DCFB.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "cdk-integ-lambda-python-vpc",
+ "lambdapythonvpcDefaultTestDeployAssert54E0DCFB.assets"
+ ],
+ "metadata": {
+ "/lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16"
+ }
+ ],
+ "/lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16Invoke9BC0E67F"
+ }
+ ],
+ "/lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "LambdaInvoke431773224924ebf10c8a31d363a6bf16AssertEqualsLambdainvokeF6179C6B"
+ }
+ ],
+ "/lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "AssertionResultsAssertEqualsLambdainvoke29290e026919ecb85e75d0aca122fdc1"
+ }
+ ],
+ "/lambda-python-vpc/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73"
+ }
+ ],
+ "/lambda-python-vpc/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F"
+ }
+ ],
+ "/lambda-python-vpc/DefaultTest/DeployAssert/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/lambda-python-vpc/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "lambda-python-vpc/DefaultTest/DeployAssert"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/tree.json
index d2df9d322e68b..129f8a922c050 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/tree.json
+++ b/packages/@aws-cdk/aws-lambda-python/test/function.vpc.integ.snapshot/tree.json
@@ -9,7 +9,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
},
"cdk-integ-lambda-python-vpc": {
@@ -43,13 +43,13 @@
"version": "0.0.0"
}
},
- "ingressSubnet1": {
- "id": "ingressSubnet1",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1",
+ "PublicSubnet1": {
+ "id": "PublicSubnet1",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1",
"children": {
"Subnet": {
"id": "Subnet",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/Subnet",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/Subnet",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
"aws:cdk:cloudformation:props": {
@@ -64,12 +64,12 @@
}
]
},
- "cidrBlock": "10.0.0.0/24",
+ "cidrBlock": "10.0.0.0/18",
"mapPublicIpOnLaunch": true,
"tags": [
{
"key": "aws-cdk:subnet-name",
- "value": "ingress"
+ "value": "Public"
},
{
"key": "aws-cdk:subnet-type",
@@ -77,7 +77,7 @@
},
{
"key": "Name",
- "value": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1"
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1"
}
]
}
@@ -89,15 +89,15 @@
},
"Acl": {
"id": "Acl",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/Acl",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/Acl",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.Resource",
+ "version": "0.0.0"
}
},
"RouteTable": {
"id": "RouteTable",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/RouteTable",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/RouteTable",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
"aws:cdk:cloudformation:props": {
@@ -107,7 +107,7 @@
"tags": [
{
"key": "Name",
- "value": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1"
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1"
}
]
}
@@ -119,15 +119,15 @@
},
"RouteTableAssociation": {
"id": "RouteTableAssociation",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/RouteTableAssociation",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/RouteTableAssociation",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
"aws:cdk:cloudformation:props": {
"routeTableId": {
- "Ref": "myvpcingressSubnet1RouteTableD6322DD5"
+ "Ref": "myvpcPublicSubnet1RouteTableF7E8D7F1"
},
"subnetId": {
- "Ref": "myvpcingressSubnet1Subnet82F0259C"
+ "Ref": "myvpcPublicSubnet1Subnet6BD75C12"
}
}
},
@@ -138,12 +138,12 @@
},
"DefaultRoute": {
"id": "DefaultRoute",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet1/DefaultRoute",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/DefaultRoute",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::EC2::Route",
"aws:cdk:cloudformation:props": {
"routeTableId": {
- "Ref": "myvpcingressSubnet1RouteTableD6322DD5"
+ "Ref": "myvpcPublicSubnet1RouteTableF7E8D7F1"
},
"destinationCidrBlock": "0.0.0.0/0",
"gatewayId": {
@@ -155,6 +155,54 @@
"fqn": "@aws-cdk/aws-ec2.CfnRoute",
"version": "0.0.0"
}
+ },
+ "EIP": {
+ "id": "EIP",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/EIP",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::EIP",
+ "aws:cdk:cloudformation:props": {
+ "domain": "vpc",
+ "tags": [
+ {
+ "key": "Name",
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1"
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnEIP",
+ "version": "0.0.0"
+ }
+ },
+ "NATGateway": {
+ "id": "NATGateway",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1/NATGateway",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway",
+ "aws:cdk:cloudformation:props": {
+ "subnetId": {
+ "Ref": "myvpcPublicSubnet1Subnet6BD75C12"
+ },
+ "allocationId": {
+ "Fn::GetAtt": [
+ "myvpcPublicSubnet1EIP88D18203",
+ "AllocationId"
+ ]
+ },
+ "tags": [
+ {
+ "key": "Name",
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet1"
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnNatGateway",
+ "version": "0.0.0"
+ }
}
},
"constructInfo": {
@@ -162,13 +210,13 @@
"version": "0.0.0"
}
},
- "ingressSubnet2": {
- "id": "ingressSubnet2",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2",
+ "PublicSubnet2": {
+ "id": "PublicSubnet2",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2",
"children": {
"Subnet": {
"id": "Subnet",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/Subnet",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/Subnet",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
"aws:cdk:cloudformation:props": {
@@ -183,12 +231,12 @@
}
]
},
- "cidrBlock": "10.0.1.0/24",
+ "cidrBlock": "10.0.64.0/18",
"mapPublicIpOnLaunch": true,
"tags": [
{
"key": "aws-cdk:subnet-name",
- "value": "ingress"
+ "value": "Public"
},
{
"key": "aws-cdk:subnet-type",
@@ -196,7 +244,7 @@
},
{
"key": "Name",
- "value": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2"
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2"
}
]
}
@@ -208,15 +256,15 @@
},
"Acl": {
"id": "Acl",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/Acl",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/Acl",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.Resource",
+ "version": "0.0.0"
}
},
"RouteTable": {
"id": "RouteTable",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/RouteTable",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/RouteTable",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
"aws:cdk:cloudformation:props": {
@@ -226,7 +274,7 @@
"tags": [
{
"key": "Name",
- "value": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2"
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2"
}
]
}
@@ -238,15 +286,15 @@
},
"RouteTableAssociation": {
"id": "RouteTableAssociation",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/RouteTableAssociation",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/RouteTableAssociation",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
"aws:cdk:cloudformation:props": {
"routeTableId": {
- "Ref": "myvpcingressSubnet2RouteTable2112B53A"
+ "Ref": "myvpcPublicSubnet2RouteTable9A4CA50C"
},
"subnetId": {
- "Ref": "myvpcingressSubnet2Subnet56945106"
+ "Ref": "myvpcPublicSubnet2Subnet844B7F05"
}
}
},
@@ -257,12 +305,12 @@
},
"DefaultRoute": {
"id": "DefaultRoute",
- "path": "cdk-integ-lambda-python-vpc/my_vpc/ingressSubnet2/DefaultRoute",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/DefaultRoute",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::EC2::Route",
"aws:cdk:cloudformation:props": {
"routeTableId": {
- "Ref": "myvpcingressSubnet2RouteTable2112B53A"
+ "Ref": "myvpcPublicSubnet2RouteTable9A4CA50C"
},
"destinationCidrBlock": "0.0.0.0/0",
"gatewayId": {
@@ -274,6 +322,54 @@
"fqn": "@aws-cdk/aws-ec2.CfnRoute",
"version": "0.0.0"
}
+ },
+ "EIP": {
+ "id": "EIP",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/EIP",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::EIP",
+ "aws:cdk:cloudformation:props": {
+ "domain": "vpc",
+ "tags": [
+ {
+ "key": "Name",
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2"
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnEIP",
+ "version": "0.0.0"
+ }
+ },
+ "NATGateway": {
+ "id": "NATGateway",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2/NATGateway",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::NatGateway",
+ "aws:cdk:cloudformation:props": {
+ "subnetId": {
+ "Ref": "myvpcPublicSubnet2Subnet844B7F05"
+ },
+ "allocationId": {
+ "Fn::GetAtt": [
+ "myvpcPublicSubnet2EIPA3AF827D",
+ "AllocationId"
+ ]
+ },
+ "tags": [
+ {
+ "key": "Name",
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PublicSubnet2"
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnNatGateway",
+ "version": "0.0.0"
+ }
}
},
"constructInfo": {
@@ -281,6 +377,244 @@
"version": "0.0.0"
}
},
+ "PrivateSubnet1": {
+ "id": "PrivateSubnet1",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1",
+ "children": {
+ "Subnet": {
+ "id": "Subnet",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/Subnet",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
+ "aws:cdk:cloudformation:props": {
+ "vpcId": {
+ "Ref": "myvpc9455A260"
+ },
+ "availabilityZone": {
+ "Fn::Select": [
+ 0,
+ {
+ "Fn::GetAZs": ""
+ }
+ ]
+ },
+ "cidrBlock": "10.0.128.0/18",
+ "mapPublicIpOnLaunch": false,
+ "tags": [
+ {
+ "key": "aws-cdk:subnet-name",
+ "value": "Private"
+ },
+ {
+ "key": "aws-cdk:subnet-type",
+ "value": "Private"
+ },
+ {
+ "key": "Name",
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1"
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnSubnet",
+ "version": "0.0.0"
+ }
+ },
+ "Acl": {
+ "id": "Acl",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/Acl",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Resource",
+ "version": "0.0.0"
+ }
+ },
+ "RouteTable": {
+ "id": "RouteTable",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/RouteTable",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
+ "aws:cdk:cloudformation:props": {
+ "vpcId": {
+ "Ref": "myvpc9455A260"
+ },
+ "tags": [
+ {
+ "key": "Name",
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1"
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnRouteTable",
+ "version": "0.0.0"
+ }
+ },
+ "RouteTableAssociation": {
+ "id": "RouteTableAssociation",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/RouteTableAssociation",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
+ "aws:cdk:cloudformation:props": {
+ "routeTableId": {
+ "Ref": "myvpcPrivateSubnet1RouteTable991B69A9"
+ },
+ "subnetId": {
+ "Ref": "myvpcPrivateSubnet1SubnetAE3DECEE"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation",
+ "version": "0.0.0"
+ }
+ },
+ "DefaultRoute": {
+ "id": "DefaultRoute",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet1/DefaultRoute",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::Route",
+ "aws:cdk:cloudformation:props": {
+ "routeTableId": {
+ "Ref": "myvpcPrivateSubnet1RouteTable991B69A9"
+ },
+ "destinationCidrBlock": "0.0.0.0/0",
+ "natGatewayId": {
+ "Ref": "myvpcPublicSubnet1NATGatewayD3DC5B8D"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnRoute",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.PrivateSubnet",
+ "version": "0.0.0"
+ }
+ },
+ "PrivateSubnet2": {
+ "id": "PrivateSubnet2",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2",
+ "children": {
+ "Subnet": {
+ "id": "Subnet",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/Subnet",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::Subnet",
+ "aws:cdk:cloudformation:props": {
+ "vpcId": {
+ "Ref": "myvpc9455A260"
+ },
+ "availabilityZone": {
+ "Fn::Select": [
+ 1,
+ {
+ "Fn::GetAZs": ""
+ }
+ ]
+ },
+ "cidrBlock": "10.0.192.0/18",
+ "mapPublicIpOnLaunch": false,
+ "tags": [
+ {
+ "key": "aws-cdk:subnet-name",
+ "value": "Private"
+ },
+ {
+ "key": "aws-cdk:subnet-type",
+ "value": "Private"
+ },
+ {
+ "key": "Name",
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2"
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnSubnet",
+ "version": "0.0.0"
+ }
+ },
+ "Acl": {
+ "id": "Acl",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/Acl",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Resource",
+ "version": "0.0.0"
+ }
+ },
+ "RouteTable": {
+ "id": "RouteTable",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/RouteTable",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::RouteTable",
+ "aws:cdk:cloudformation:props": {
+ "vpcId": {
+ "Ref": "myvpc9455A260"
+ },
+ "tags": [
+ {
+ "key": "Name",
+ "value": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2"
+ }
+ ]
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnRouteTable",
+ "version": "0.0.0"
+ }
+ },
+ "RouteTableAssociation": {
+ "id": "RouteTableAssociation",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/RouteTableAssociation",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::SubnetRouteTableAssociation",
+ "aws:cdk:cloudformation:props": {
+ "routeTableId": {
+ "Ref": "myvpcPrivateSubnet2RouteTableF2B44BF5"
+ },
+ "subnetId": {
+ "Ref": "myvpcPrivateSubnet2SubnetE09939FB"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnSubnetRouteTableAssociation",
+ "version": "0.0.0"
+ }
+ },
+ "DefaultRoute": {
+ "id": "DefaultRoute",
+ "path": "cdk-integ-lambda-python-vpc/my_vpc/PrivateSubnet2/DefaultRoute",
+ "attributes": {
+ "aws:cdk:cloudformation:type": "AWS::EC2::Route",
+ "aws:cdk:cloudformation:props": {
+ "routeTableId": {
+ "Ref": "myvpcPrivateSubnet2RouteTableF2B44BF5"
+ },
+ "destinationCidrBlock": "0.0.0.0/0",
+ "natGatewayId": {
+ "Ref": "myvpcPublicSubnet2NATGateway45472CCD"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.CfnRoute",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/aws-ec2.PrivateSubnet",
+ "version": "0.0.0"
+ }
+ },
"IGW": {
"id": "IGW",
"path": "cdk-integ-lambda-python-vpc/my_vpc/IGW",
@@ -398,8 +732,8 @@
"id": "Stage",
"path": "cdk-integ-lambda-python-vpc/my_handler/Code/Stage",
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
}
},
"AssetBucket": {
@@ -460,7 +794,7 @@
"s3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
- "s3Key": "7641c95c909cbd220aa45f8b7dca8606bd48b9a84f0c5d28fa697c90c810983b.zip"
+ "s3Key": "3b4e770c8242272e96f6faafd45d2446549a060a25dcce2d246445447e356ca9.zip"
},
"role": {
"Fn::GetAtt": [
@@ -473,10 +807,10 @@
"vpcConfig": {
"subnetIds": [
{
- "Ref": "myvpcingressSubnet1Subnet82F0259C"
+ "Ref": "myvpcPrivateSubnet1SubnetAE3DECEE"
},
{
- "Ref": "myvpcingressSubnet2Subnet56945106"
+ "Ref": "myvpcPrivateSubnet2SubnetE09939FB"
}
],
"securityGroupIds": [
@@ -501,24 +835,214 @@
"version": "0.0.0"
}
},
- "FunctionArn": {
- "id": "FunctionArn",
- "path": "cdk-integ-lambda-python-vpc/FunctionArn",
+ "Exports": {
+ "id": "Exports",
+ "path": "cdk-integ-lambda-python-vpc/Exports",
+ "children": {
+ "Output{\"Ref\":\"myhandlerD202FA8E\"}": {
+ "id": "Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "path": "cdk-integ-lambda-python-vpc/Exports/Output{\"Ref\":\"myhandlerD202FA8E\"}",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
"constructInfo": {
"fqn": "constructs.Construct",
- "version": "10.1.85"
+ "version": "10.1.95"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ },
+ "lambda-python-vpc": {
+ "id": "lambda-python-vpc",
+ "path": "lambda-python-vpc",
+ "children": {
+ "DefaultTest": {
+ "id": "DefaultTest",
+ "path": "lambda-python-vpc/DefaultTest",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-vpc/DefaultTest/Default",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ },
+ "DeployAssert": {
+ "id": "DeployAssert",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert",
+ "children": {
+ "LambdaInvoke431773224924ebf10c8a31d363a6bf16": {
+ "id": "LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16",
+ "children": {
+ "SdkProvider": {
+ "id": "SdkProvider",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/SdkProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.AssertionsProvider",
+ "version": "0.0.0"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "Invoke": {
+ "id": "Invoke",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/Invoke",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertEqualsLambdainvoke": {
+ "id": "AssertEqualsLambdainvoke",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke",
+ "children": {
+ "AssertionProvider": {
+ "id": "AssertionProvider",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider",
+ "children": {
+ "AssertionsProvider": {
+ "id": "AssertionsProvider",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionProvider/AssertionsProvider",
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.AssertionsProvider",
+ "version": "0.0.0"
+ }
+ },
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default",
+ "children": {
+ "Default": {
+ "id": "Default",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/Default/Default",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CustomResource",
+ "version": "0.0.0"
+ }
+ },
+ "AssertionResults": {
+ "id": "AssertionResults",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/LambdaInvoke431773224924ebf10c8a31d363a6bf16/AssertEqualsLambdainvoke/AssertionResults",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnOutput",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.EqualsAssertion",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.LambdaInvokeFunction",
+ "version": "0.0.0"
+ }
+ },
+ "SingletonFunction1488541a7b23466481b69b4408076b81": {
+ "id": "SingletonFunction1488541a7b23466481b69b4408076b81",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81",
+ "children": {
+ "Staging": {
+ "id": "Staging",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Staging",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.AssetStaging",
+ "version": "0.0.0"
+ }
+ },
+ "Role": {
+ "id": "Role",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ },
+ "Handler": {
+ "id": "Handler",
+ "path": "lambda-python-vpc/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Handler",
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.CfnResource",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "constructs.Construct",
+ "version": "10.1.95"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/core.Stack",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.IntegTestCase",
+ "version": "0.0.0"
+ }
+ }
+ },
+ "constructInfo": {
+ "fqn": "@aws-cdk/integ-tests.IntegTest",
+ "version": "0.0.0"
}
}
},
"constructInfo": {
- "fqn": "constructs.Construct",
- "version": "10.1.85"
+ "fqn": "@aws-cdk/core.App",
+ "version": "0.0.0"
}
}
}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.custom-build.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.custom-build.ts
index 4b584062317bf..f2b24641287e7 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.custom-build.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.custom-build.ts
@@ -1,9 +1,7 @@
-// disabling update workflow because we don't want to include the assets in the snapshot
-// python bundling changes the asset hash pretty frequently
-/// !cdk-integ pragma:disable-update-workflow
import * as path from 'path';
import { Runtime } from '@aws-cdk/aws-lambda';
-import { App, CfnOutput, DockerImage, Stack, StackProps } from '@aws-cdk/core';
+import { App, DockerImage, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -13,6 +11,7 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionName: string;
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
@@ -22,13 +21,22 @@ class TestStack extends Stack {
bundling: { image: DockerImage.fromBuild(path.join(entry)) },
runtime: Runtime.PYTHON_3_8,
});
-
- new CfnOutput(this, 'FunctionArn', {
- value: fn.functionArn,
- });
+ this.functionName = fn.functionName;
}
}
const app = new App();
-new TestStack(app, 'cdk-integ-lambda-custom-build');
+const testCase = new TestStack(app, 'cdk-integ-lambda-custom-build');
+const integ = new IntegTest(app, 'lambda-python-custom-build', {
+ testCases: [testCase],
+ stackUpdateWorkflow: false,
+});
+
+const invoke = integ.assertions.invokeFunction({
+ functionName: testCase.functionName,
+});
+
+invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+}));
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.nodeps.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.nodeps.ts
index 54d7eadd516c1..5dcf7bb572e11 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.nodeps.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.nodeps.ts
@@ -1,6 +1,7 @@
import * as path from 'path';
import { Runtime } from '@aws-cdk/aws-lambda';
import { App, CfnOutput, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -10,6 +11,7 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionName: string;
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
@@ -17,6 +19,7 @@ class TestStack extends Stack {
entry: path.join(__dirname, 'lambda-handler-nodeps'),
runtime: Runtime.PYTHON_3_8,
});
+ this.functionName = fn.functionName;
new CfnOutput(this, 'FunctionArn', {
value: fn.functionArn,
@@ -25,5 +28,17 @@ class TestStack extends Stack {
}
const app = new App();
-new TestStack(app, 'cdk-integ-lambda-python');
+const testCase = new TestStack(app, 'integ-lambda-python-nodeps');
+const integ = new IntegTest(app, 'lambda-python-nodeps', {
+ testCases: [testCase],
+ stackUpdateWorkflow: false,
+});
+
+const invoke = integ.assertions.invokeFunction({
+ functionName: testCase.functionName,
+});
+
+invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+}));
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.pipenv.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.pipenv.ts
index 49f3fb0d8e23f..3d5a31dac63f9 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.pipenv.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.pipenv.ts
@@ -3,7 +3,8 @@
/// !cdk-integ pragma:disable-update-workflow
import * as path from 'path';
import { Runtime } from '@aws-cdk/aws-lambda';
-import { App, CfnOutput, Stack, StackProps } from '@aws-cdk/core';
+import { App, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -13,27 +14,46 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionNames: string[] = [];
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
- const pythonFunctionInline = new lambda.PythonFunction(this, 'my_handler_inline', {
+ const pythonFunction39 = new lambda.PythonFunction(this, 'my_handler_inline', {
entry: path.join(__dirname, 'lambda-handler-pipenv'),
runtime: Runtime.PYTHON_3_9,
});
- new CfnOutput(this, 'InlineFunctionName', {
- value: pythonFunctionInline.functionName,
- });
+ this.functionNames.push(pythonFunction39.functionName);
const pythonFunction38 = new lambda.PythonFunction(this, 'my_handler_python_38', {
entry: path.join(__dirname, 'lambda-handler-pipenv'),
runtime: Runtime.PYTHON_3_8,
});
- new CfnOutput(this, 'Python38FunctionName', {
- value: pythonFunction38.functionName,
+ this.functionNames.push(pythonFunction38.functionName);
+
+ const pythonFunction37 = new lambda.PythonFunction(this, 'my_handler_python_37', {
+ entry: path.join(__dirname, 'lambda-handler-pipenv'),
+ runtime: Runtime.PYTHON_3_7,
});
+ this.functionNames.push(pythonFunction37.functionName);
}
}
const app = new App();
-new TestStack(app, 'cdk-integ-lambda-python');
+const testCase = new TestStack(app, 'integ-lambda-python-pipenv');
+const integ = new IntegTest(app, 'pipenv', {
+ testCases: [testCase],
+ // disabling update workflow because we don't want to include the assets in the snapshot
+ // python bundling changes the asset hash pretty frequently
+ stackUpdateWorkflow: false,
+});
+
+testCase.functionNames.forEach(functionName => {
+ const invoke = integ.assertions.invokeFunction({
+ functionName: functionName,
+ });
+
+ invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+ }));
+});
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.poetry.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.poetry.ts
index 3fecb2206eb73..162edff2db14c 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.poetry.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.poetry.ts
@@ -1,7 +1,7 @@
import * as path from 'path';
import { Runtime } from '@aws-cdk/aws-lambda';
-import { App, CfnOutput, Stack, StackProps } from '@aws-cdk/core';
-import { IntegTest } from '@aws-cdk/integ-tests';
+import { App, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -11,41 +11,49 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionNames: string[] = [];
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
- const pythonFunctionInline = new lambda.PythonFunction(this, 'my_handler_inline', {
+ const pythonFunction39 = new lambda.PythonFunction(this, 'my_handler_inline', {
entry: path.join(__dirname, 'lambda-handler-poetry'),
runtime: Runtime.PYTHON_3_9,
});
- new CfnOutput(this, 'InlineFunctionName', {
- value: pythonFunctionInline.functionName,
- });
+ this.functionNames.push(pythonFunction39.functionName);
const pythonFunction38 = new lambda.PythonFunction(this, 'my_handler_python_38', {
entry: path.join(__dirname, 'lambda-handler-poetry'),
runtime: Runtime.PYTHON_3_8,
});
- new CfnOutput(this, 'Python38FunctionName', {
- value: pythonFunction38.functionName,
- });
+ this.functionNames.push(pythonFunction38.functionName);
- new lambda.PythonFunction(this, 'my_handler_python_37', {
+ const pythonFunction37 = new lambda.PythonFunction(this, 'my_handler_python_37', {
entry: path.join(__dirname, 'lambda-handler-poetry'),
runtime: Runtime.PYTHON_3_7,
});
+ this.functionNames.push(pythonFunction37.functionName);
}
}
const app = new App();
-const testCase = new TestStack(app, 'cdk-integ-lambda-python');
+const testCase = new TestStack(app, 'integ-lambda-python-poetry');
-new IntegTest(app, 'poetry', {
+const integ = new IntegTest(app, 'poetry', {
testCases: [testCase],
// disabling update workflow because we don't want to include the assets in the snapshot
// python bundling changes the asset hash pretty frequently
stackUpdateWorkflow: false,
});
+testCase.functionNames.forEach(functionName => {
+ const invoke = integ.assertions.invokeFunction({
+ functionName: functionName,
+ });
+
+ invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+ }));
+});
+
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.project.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.project.ts
index 535a684e67470..ee83939d11a5f 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.project.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.project.ts
@@ -3,7 +3,8 @@
/// !cdk-integ pragma:disable-update-workflow
import * as path from 'path';
import { Runtime } from '@aws-cdk/aws-lambda';
-import { App, CfnOutput, Stack, StackProps } from '@aws-cdk/core';
+import { App, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -13,6 +14,7 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionName: string;
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
@@ -27,13 +29,22 @@ class TestStack extends Stack {
}),
],
});
-
- new CfnOutput(this, 'FunctionArn', {
- value: fn.functionArn,
- });
+ this.functionName = fn.functionName;
}
}
const app = new App();
-new TestStack(app, 'cdk-integ-lambda-function-project');
+const testCase = new TestStack(app, 'cdk-integ-lambda-function-project');
+const integ = new IntegTest(app, 'lambda-python-project', {
+ testCases: [testCase],
+ stackUpdateWorkflow: false,
+});
+
+const invoke = integ.assertions.invokeFunction({
+ functionName: testCase.functionName,
+});
+
+invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+}));
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.py38.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.py38.ts
index 3acfba5cfab7c..e228ba5e38035 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.py38.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.py38.ts
@@ -4,6 +4,7 @@
import * as path from 'path';
import { Runtime } from '@aws-cdk/aws-lambda';
import { App, CfnOutput, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -13,6 +14,7 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionName: string;
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
@@ -20,6 +22,7 @@ class TestStack extends Stack {
entry: path.join(__dirname, 'lambda-handler'),
runtime: Runtime.PYTHON_3_8,
});
+ this.functionName = fn.functionName;
new CfnOutput(this, 'FunctionArn', {
value: fn.functionArn,
@@ -28,5 +31,17 @@ class TestStack extends Stack {
}
const app = new App();
-new TestStack(app, 'cdk-integ-lambda-python-38');
+const testCase = new TestStack(app, 'cdk-integ-lambda-python-38');
+const integ = new IntegTest(app, 'lambda-python-38', {
+ testCases: [testCase],
+ stackUpdateWorkflow: false,
+});
+
+const invoke = integ.assertions.invokeFunction({
+ functionName: testCase.functionName,
+});
+
+invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+}));
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.sub.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.sub.ts
index 73ef4efe13228..59a637a16417d 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.sub.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.sub.ts
@@ -1,9 +1,7 @@
-// disabling update workflow because we don't want to include the assets in the snapshot
-// python bundling changes the asset hash pretty frequently
-/// !cdk-integ pragma:disable-update-workflow
import * as path from 'path';
import { Runtime } from '@aws-cdk/aws-lambda';
import { App, CfnOutput, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -13,6 +11,7 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionName: string;
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
@@ -22,6 +21,7 @@ class TestStack extends Stack {
handler: 'custom_handler',
runtime: Runtime.PYTHON_3_8,
});
+ this.functionName = fn.functionName;
new CfnOutput(this, 'FunctionArn', {
value: fn.functionArn,
@@ -30,5 +30,17 @@ class TestStack extends Stack {
}
const app = new App();
-new TestStack(app, 'cdk-integ-lambda-python');
+const testCase = new TestStack(app, 'integ-lambda-python-function-sub');
+const integ = new IntegTest(app, 'function-sub', {
+ testCases: [testCase],
+ stackUpdateWorkflow: false,
+});
+
+const invoke = integ.assertions.invokeFunction({
+ functionName: testCase.functionName,
+});
+
+invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+}));
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.ts
index c2d88d7ebf99a..e794c7afbb7a8 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.ts
@@ -4,6 +4,7 @@
import * as path from 'path';
import { Runtime } from '@aws-cdk/aws-lambda';
import { App, CfnOutput, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -13,6 +14,7 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionName: string;
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
@@ -20,6 +22,7 @@ class TestStack extends Stack {
entry: path.join(__dirname, 'lambda-handler'),
runtime: Runtime.PYTHON_3_9,
});
+ this.functionName = fn.functionName;
new CfnOutput(this, 'FunctionArn', {
value: fn.functionArn,
@@ -28,5 +31,18 @@ class TestStack extends Stack {
}
const app = new App();
-new TestStack(app, 'cdk-integ-lambda-python');
+const testCase = new TestStack(app, 'integ-lambda-python-function');
+const integ = new IntegTest(app, 'lambda-python-function', {
+ testCases: [testCase],
+ stackUpdateWorkflow: false,
+});
+
+const invoke = integ.assertions.invokeFunction({
+ functionName: testCase.functionName,
+});
+
+invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+}));
+
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/integ.function.vpc.ts b/packages/@aws-cdk/aws-lambda-python/test/integ.function.vpc.ts
index fe3defdc185f5..b1b25d021b3eb 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/integ.function.vpc.ts
+++ b/packages/@aws-cdk/aws-lambda-python/test/integ.function.vpc.ts
@@ -2,9 +2,10 @@
// python bundling changes the asset hash pretty frequently
/// !cdk-integ pragma:disable-update-workflow
import * as path from 'path';
-import { Vpc, SubnetType } from '@aws-cdk/aws-ec2';
+import { Vpc } from '@aws-cdk/aws-ec2';
import { Runtime } from '@aws-cdk/aws-lambda';
-import { App, CfnOutput, Stack, StackProps } from '@aws-cdk/core';
+import { App, Stack, StackProps } from '@aws-cdk/core';
+import { IntegTest, ExpectedResult } from '@aws-cdk/integ-tests';
import { Construct } from 'constructs';
import * as lambda from '../lib';
@@ -14,29 +15,34 @@ import * as lambda from '../lib';
*/
class TestStack extends Stack {
+ public readonly functionName: string;
constructor(scope: Construct, id: string, props?: StackProps) {
super(scope, id, props);
- const vpc = new Vpc(this, 'my_vpc', {
- natGateways: 0,
- subnetConfiguration: [
- { cidrMask: 24, name: 'ingress', subnetType: SubnetType.PUBLIC },
- ],
- });
+ const vpc = new Vpc(this, 'my_vpc');
const fn = new lambda.PythonFunction(this, 'my_handler', {
entry: path.join(__dirname, 'lambda-handler'),
runtime: Runtime.PYTHON_3_9,
vpc,
- allowPublicSubnet: true,
- });
-
- new CfnOutput(this, 'FunctionArn', {
- value: fn.functionArn,
});
+ this.functionName = fn.functionName;
}
}
const app = new App();
-new TestStack(app, 'cdk-integ-lambda-python-vpc');
+const testCase = new TestStack(app, 'cdk-integ-lambda-python-vpc');
+
+const integ = new IntegTest(app, 'lambda-python-vpc', {
+ testCases: [testCase],
+ stackUpdateWorkflow: false,
+});
+
+const invoke = integ.assertions.invokeFunction({
+ functionName: testCase.functionName,
+});
+
+invoke.expect(ExpectedResult.objectLike({
+ Payload: '200',
+}));
app.synth();
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.ab9c2b6025059cecbb1d54da74eb950315bc9fee8233e18822cefc8cff5806a0/requirements.txt b/packages/@aws-cdk/aws-lambda-python/test/lambda-handler-project/lambda/requirements.txt
similarity index 100%
rename from packages/@aws-cdk/aws-lambda-python/test/function.custom-build.integ.snapshot/asset.ab9c2b6025059cecbb1d54da74eb950315bc9fee8233e18822cefc8cff5806a0/requirements.txt
rename to packages/@aws-cdk/aws-lambda-python/test/lambda-handler-project/lambda/requirements.txt
diff --git a/packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/.ignorefile b/packages/@aws-cdk/aws-lambda-python/test/lambda-handler-sub/inner/__init__.py
similarity index 100%
rename from packages/@aws-cdk/aws-lambda-python/test/function.pipenv.integ.snapshot/asset.c1175cf2b10c78c2687560b17053e3d51a3636b7aac017e713e5a586470606ff/.ignorefile
rename to packages/@aws-cdk/aws-lambda-python/test/lambda-handler-sub/inner/__init__.py
diff --git a/packages/@aws-cdk/aws-lambda-python/test/lambda-handler-sub/inner/custom_index.py b/packages/@aws-cdk/aws-lambda-python/test/lambda-handler-sub/inner/custom_index.py
index d7b2ce8db00e9..8ea5f42d80637 100644
--- a/packages/@aws-cdk/aws-lambda-python/test/lambda-handler-sub/inner/custom_index.py
+++ b/packages/@aws-cdk/aws-lambda-python/test/lambda-handler-sub/inner/custom_index.py
@@ -1,5 +1,5 @@
from http import HTTPStatus
-def handler(event, context):
+def custom_handler(event, context):
print('No dependencies')
return HTTPStatus.OK.value
diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/assertions.ts b/packages/@aws-cdk/integ-tests/lib/assertions/assertions.ts
index 507d6c1d158cc..6442c07318aee 100644
--- a/packages/@aws-cdk/integ-tests/lib/assertions/assertions.ts
+++ b/packages/@aws-cdk/integ-tests/lib/assertions/assertions.ts
@@ -1,6 +1,7 @@
import { CustomResource, CfnOutput } from '@aws-cdk/core';
import { Construct } from 'constructs';
import { ExpectedResult, ActualResult } from './common';
+import { md5hash } from './private/hash';
import { AssertionRequest, AssertionsProvider, ASSERT_RESOURCE_TYPE } from './providers';
/**
@@ -60,6 +61,6 @@ export class EqualsAssertion extends Construct {
new CfnOutput(this, 'AssertionResults', {
value: this.result,
- }).overrideLogicalId(`AssertionResults${id}`);
+ }).overrideLogicalId(`AssertionResults${id}${md5hash({ actual: props.actual.result, expected: props.expected.result })}`);
}
}
|
google-api-nodejs-client
|
https://github.com/googleapis/google-api-nodejs-client
|
e6ba462408d14ae49da8348557c8a5161f7de78f
|
Yoshi Automation
|
2024-01-03 06:09:44
|
fix(calendar): update the API
|
#### calendar:v3
The following keys were changed:
- resources.events.methods.list.parameters.eventTypes.description
- resources.events.methods.watch.parameters.eventTypes.description
- schemas.Event.properties.eventType.description
- schemas.Event.properties.focusTimeProperties.description
- schemas.Event.properties.outOfOfficeProperties.description
|
fix(calendar): update the API
#### calendar:v3
The following keys were changed:
- resources.events.methods.list.parameters.eventTypes.description
- resources.events.methods.watch.parameters.eventTypes.description
- schemas.Event.properties.eventType.description
- schemas.Event.properties.focusTimeProperties.description
- schemas.Event.properties.outOfOfficeProperties.description
|
diff --git a/discovery/calendar-v3.json b/discovery/calendar-v3.json
index 8a4db5e299..2393bde0e8 100644
--- a/discovery/calendar-v3.json
+++ b/discovery/calendar-v3.json
@@ -1088,7 +1088,7 @@
"type": "string"
},
"eventTypes": {
- "description": "Event types to return. Optional. Possible values are: \n- \"default\" \n- \"focusTime\" \n- \"outOfOffice\" \n- \"workingLocation\"This parameter can be repeated multiple times to return events of different types. Currently, these are the only allowed values for this field: \n- [\"default\", \"focusTime\", \"outOfOffice\"] \n- [\"default\", \"focusTime\", \"outOfOffice\", \"workingLocation\"] \n- [\"workingLocation\"] The default is [\"default\", \"focusTime\", \"outOfOffice\"].\nAdditional combinations of these four event types will be made available in later releases.",
+ "description": "Event types to return. Optional. Possible values are: \n- \"default\" \n- \"focusTime\" \n- \"outOfOffice\" \n- \"workingLocation\"This parameter can be repeated multiple times to return events of different types. The default is [\"default\", \"focusTime\", \"outOfOffice\"].",
"location": "query",
"repeated": true,
"type": "string"
@@ -1491,7 +1491,7 @@
"type": "string"
},
"eventTypes": {
- "description": "Event types to return. Optional. Possible values are: \n- \"default\" \n- \"focusTime\" \n- \"outOfOffice\" \n- \"workingLocation\"This parameter can be repeated multiple times to return events of different types. Currently, these are the only allowed values for this field: \n- [\"default\", \"focusTime\", \"outOfOffice\"] \n- [\"default\", \"focusTime\", \"outOfOffice\", \"workingLocation\"] \n- [\"workingLocation\"] The default is [\"default\", \"focusTime\", \"outOfOffice\"].\nAdditional combinations of these four event types will be made available in later releases.",
+ "description": "Event types to return. Optional. Possible values are: \n- \"default\" \n- \"focusTime\" \n- \"outOfOffice\" \n- \"workingLocation\"This parameter can be repeated multiple times to return events of different types. The default is [\"default\", \"focusTime\", \"outOfOffice\"].",
"location": "query",
"repeated": true,
"type": "string"
@@ -1735,7 +1735,7 @@
}
}
},
- "revision": "20231116",
+ "revision": "20231201",
"rootUrl": "https://www.googleapis.com/",
"schemas": {
"Acl": {
@@ -2392,7 +2392,7 @@
},
"eventType": {
"default": "default",
- "description": "Specific type of the event. This cannot be modified after the event is created. Possible values are: \n- \"default\" - A regular event or not further specified. \n- \"outOfOffice\" - An out-of-office event. \n- \"focusTime\" - A focus-time event. \n- \"workingLocation\" - A working location event. Currently, only \"default \" and \"workingLocation\" events can be created using the API. Extended support for other event types will be made available in later releases.",
+ "description": "Specific type of the event. This cannot be modified after the event is created. Possible values are: \n- \"default\" - A regular event or not further specified. \n- \"outOfOffice\" - An out-of-office event. An outOfOfficeProperties parameter must be supplied to make a valid event (even if empty). \n- \"focusTime\" - A focus-time event. A focusTimeProperties parameter must be supplied to make a valid event (even if empty). \n- \"workingLocation\" - A working location event. Currently, only \"default \" and \"workingLocation\" events can be created using the API. Extended support for other event types will be made available in later releases.",
"type": "string"
},
"extendedProperties": {
@@ -2419,7 +2419,7 @@
},
"focusTimeProperties": {
"$ref": "EventFocusTimeProperties",
- "description": "Focus Time event data."
+ "description": "Focus Time event data. Required if eventType is focusTime."
},
"gadget": {
"description": "A gadget that extends this event. Gadgets are deprecated; this structure is instead only used for returning birthday calendar metadata.",
@@ -2544,7 +2544,7 @@
},
"outOfOfficeProperties": {
"$ref": "EventOutOfOfficeProperties",
- "description": "Out of office event data."
+ "description": "Out of office event data. Required if eventType is outOfOffice."
},
"privateCopy": {
"default": "false",
diff --git a/src/apis/calendar/v3.ts b/src/apis/calendar/v3.ts
index 4ae3baa31b..d67ff7e1b4 100644
--- a/src/apis/calendar/v3.ts
+++ b/src/apis/calendar/v3.ts
@@ -654,8 +654,8 @@ export namespace calendar_v3 {
/**
* Specific type of the event. This cannot be modified after the event is created. Possible values are:
* - "default" - A regular event or not further specified.
- * - "outOfOffice" - An out-of-office event.
- * - "focusTime" - A focus-time event.
+ * - "outOfOffice" - An out-of-office event. An outOfOfficeProperties parameter must be supplied to make a valid event (even if empty).
+ * - "focusTime" - A focus-time event. A focusTimeProperties parameter must be supplied to make a valid event (even if empty).
* - "workingLocation" - A working location event. Currently, only "default " and "workingLocation" events can be created using the API. Extended support for other event types will be made available in later releases.
*/
eventType?: string | null;
@@ -667,7 +667,7 @@ export namespace calendar_v3 {
shared?: {[key: string]: string};
} | null;
/**
- * Focus Time event data.
+ * Focus Time event data. Required if eventType is focusTime.
*/
focusTimeProperties?: Schema$EventFocusTimeProperties;
/**
@@ -743,7 +743,7 @@ export namespace calendar_v3 {
*/
originalStartTime?: Schema$EventDateTime;
/**
- * Out of office event data.
+ * Out of office event data. Required if eventType is outOfOffice.
*/
outOfOfficeProperties?: Schema$EventOutOfOfficeProperties;
/**
@@ -4476,11 +4476,7 @@ export namespace calendar_v3 {
* - "default"
* - "focusTime"
* - "outOfOffice"
- * - "workingLocation"This parameter can be repeated multiple times to return events of different types. Currently, these are the only allowed values for this field:
- * - ["default", "focusTime", "outOfOffice"]
- * - ["default", "focusTime", "outOfOffice", "workingLocation"]
- * - ["workingLocation"] The default is ["default", "focusTime", "outOfOffice"].
- * Additional combinations of these four event types will be made available in later releases.
+ * - "workingLocation"This parameter can be repeated multiple times to return events of different types. The default is ["default", "focusTime", "outOfOffice"].
*/
eventTypes?: string[];
/**
@@ -4712,11 +4708,7 @@ export namespace calendar_v3 {
* - "default"
* - "focusTime"
* - "outOfOffice"
- * - "workingLocation"This parameter can be repeated multiple times to return events of different types. Currently, these are the only allowed values for this field:
- * - ["default", "focusTime", "outOfOffice"]
- * - ["default", "focusTime", "outOfOffice", "workingLocation"]
- * - ["workingLocation"] The default is ["default", "focusTime", "outOfOffice"].
- * Additional combinations of these four event types will be made available in later releases.
+ * - "workingLocation"This parameter can be repeated multiple times to return events of different types. The default is ["default", "focusTime", "outOfOffice"].
*/
eventTypes?: string[];
/**
|
cppfront
|
https://github.com/hsutter/cppfront
|
d7857bbda7cc6ec69ea2c4a1bfd6046330faf1ce
|
Johel Ernesto Guerrero Peña
|
2023-08-10 10:31:41
|
fix(cpp1): support assignment from expression list (#487)
|
* fix(cpp1): support assignment from expression list
* Update cppfront.cpp
Added size check so we don't add `{` `}` around single-element lists
|
fix(cpp1): support assignment from expression list (#487)
* fix(cpp1): support assignment from expression list
* Update cppfront.cpp
Added size check so we don't add `{` `}` around single-element lists
Signed-off-by: Herb Sutter <[email protected]>
* Update cppfront.cpp
`std::ssize` for consistency, and `!= 1` so we still emit `{` `}` around empty lists.
Signed-off-by: Herb Sutter <[email protected]>
* Update cppfront.cpp
Signed-off-by: Herb Sutter <[email protected]>
---------
Signed-off-by: Herb Sutter <[email protected]>
Co-authored-by: Herb Sutter <[email protected]>
|
diff --git a/regression-tests/pure2-bugfix-for-assign-expression-list.cpp2 b/regression-tests/pure2-bugfix-for-assign-expression-list.cpp2
new file mode 100644
index 0000000000..7d6b639a8b
--- /dev/null
+++ b/regression-tests/pure2-bugfix-for-assign-expression-list.cpp2
@@ -0,0 +1,10 @@
+main: () = {
+ vec: type == std::vector<int>;
+ v: vec = (0);
+ v = ();
+ [[assert: v == :vec = ()]]
+ v = (1);
+ [[assert: v == :vec = (1)]]
+ v = (2, 3);
+ [[assert: v == :vec = (2, 3)]]
+}
diff --git a/regression-tests/test-results/gcc-13/pure2-bugfix-for-assign-expression-list.cpp.execution b/regression-tests/test-results/gcc-13/pure2-bugfix-for-assign-expression-list.cpp.execution
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/regression-tests/test-results/gcc-13/pure2-bugfix-for-assign-expression-list.cpp.output b/regression-tests/test-results/gcc-13/pure2-bugfix-for-assign-expression-list.cpp.output
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp b/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp
new file mode 100644
index 0000000000..b631658705
--- /dev/null
+++ b/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp
@@ -0,0 +1,30 @@
+
+#define CPP2_USE_MODULES Yes
+
+//=== Cpp2 type declarations ====================================================
+
+
+#include "cpp2util.h"
+
+
+
+//=== Cpp2 type definitions and function declarations ===========================
+
+#line 1 "pure2-bugfix-for-assign-expression-list.cpp2"
+auto main() -> int;
+
+
+//=== Cpp2 function definitions =================================================
+
+#line 1 "pure2-bugfix-for-assign-expression-list.cpp2"
+auto main() -> int{
+ using vec = std::vector<int>;
+ vec v {0};
+ v = { };
+ cpp2::Default.expects(v==vec{}, "");
+ v = { 1 };
+ cpp2::Default.expects(v==vec{1}, "");
+ v = { 2, 3 };
+ cpp2::Default.expects(std::move(v)==vec{2, 3}, "");
+}
+
diff --git a/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp2.output b/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp2.output
new file mode 100644
index 0000000000..00ff9b2585
--- /dev/null
+++ b/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp2.output
@@ -0,0 +1,2 @@
+pure2-bugfix-for-assign-expression-list.cpp2... ok (all Cpp2, passes safety checks)
+
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp b/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp
index 5e659de8e5..a96af4b6ef 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp
@@ -143,7 +143,7 @@ auto main() -> int{
CPP2_UFCS(print, z, " cp-assign ", " <- ");
CPP2_UFCS(print, y, "", "\n");
- z = std::move(y);
+ z = { std::move(y) };
CPP2_UFCS(print, std::move(z), " mv-assign ", " <- ");
CPP2_UFCS(print, std::move(y), "", "\n");
}
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp
index a6c54323ce..40645f9d89 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp
@@ -148,7 +148,7 @@ auto main() -> int{
CPP2_UFCS(print, z, " cp-assign ", " <- ");
CPP2_UFCS(print, y, "", "\n");
- z = std::move(y);
+ z = { std::move(y) };
CPP2_UFCS(print, std::move(z), " mv-assign ", " <- ");
CPP2_UFCS(print, std::move(y), "", "\n");
}
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp
index e17b83c9c3..50b518b037 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp
@@ -147,7 +147,7 @@ auto main() -> int{
CPP2_UFCS(print, z, " cp-assign ", " <- ");
CPP2_UFCS(print, y, "", "\n");
- z = std::move(y);
+ z = { std::move(y) };
CPP2_UFCS(print, std::move(z), " mv-assign ", " <- ");
CPP2_UFCS(print, std::move(y), "", "\n");
}
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp
index 80ea3cf341..36701ed1c6 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp
@@ -147,7 +147,7 @@ auto main() -> int{
CPP2_UFCS(print, z, " cp-assign ", " <- ");
CPP2_UFCS(print, y, "", "\n");
- z = std::move(y);
+ z = { std::move(y) };
CPP2_UFCS(print, std::move(z), " mv-assign ", " <- ");
CPP2_UFCS(print, std::move(y), "", "\n");
}
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp b/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp
index aae06789df..7c2754bfac 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp
@@ -153,7 +153,7 @@ auto main() -> int{
CPP2_UFCS(print, z, " cp-assign ", " <- ");
CPP2_UFCS(print, y, "", "\n");
- z = std::move(y);
+ z = { std::move(y) };
CPP2_UFCS(print, std::move(z), " mv-assign ", " <- ");
CPP2_UFCS(print, std::move(y), "", "\n");
}
diff --git a/source/cppfront.cpp b/source/cppfront.cpp
index 0b5076a5e2..7c169fb9a1 100644
--- a/source/cppfront.cpp
+++ b/source/cppfront.cpp
@@ -3531,7 +3531,23 @@ class cppfront
emit(*x.op);
}
printer.print_cpp2(" ", n.position());
- emit(*x.expr);
+
+ // When assigning a single expression-list, we can
+ // take over direct control of emitting it without needing to
+ // go through the whole grammar, and surround it with braces
+ if (
+ x.op->type() == lexeme::Assignment
+ && x.expr->is_expression_list()
+ )
+ {
+ printer.print_cpp2( "{ ", n.position() );
+ emit(*x.expr->get_expression_list(), false);
+ printer.print_cpp2( " }", n.position() );
+ }
+ // Otherwise, just emit the general expression as usual
+ else {
+ emit(*x.expr);
+ }
}
}
}
|
bit
|
https://github.com/teambit/bit
|
a6f109984bcaa4231d508db98e4c57cf8d6be034
|
David First
|
2023-01-18 01:43:39
|
fix(lane-create): use the version from .bitmap when creating a lane from lane (#6929)
|
Currently it's using the version from the lane, which can be ahead of the .bitmap and result in unexpected history on the new lane.
|
fix(lane-create): use the version from .bitmap when creating a lane from lane (#6929)
Currently it's using the version from the lane, which can be ahead of the .bitmap and result in unexpected history on the new lane.
|
diff --git a/e2e/harmony/lanes/lane-from-lane.e2e.ts b/e2e/harmony/lanes/lane-from-lane.e2e.ts
new file mode 100644
index 000000000000..25bff2351381
--- /dev/null
+++ b/e2e/harmony/lanes/lane-from-lane.e2e.ts
@@ -0,0 +1,149 @@
+import chai, { expect } from 'chai';
+import Helper from '../../../src/e2e-helper/e2e-helper';
+import * as fixtures from '../../../src/fixtures/fixtures';
+import { removeChalkCharacters } from '../../../src/utils';
+
+chai.use(require('chai-fs'));
+
+describe('bit lane command', function () {
+ this.timeout(0);
+ let helper: Helper;
+ before(() => {
+ helper = new Helper();
+ });
+ after(() => {
+ helper.scopeHelper.destroy();
+ });
+ describe('main => lane-a => lane-b, so laneB branched from laneA', () => {
+ let beforeSwitchingBack;
+ before(() => {
+ helper.scopeHelper.setNewLocalAndRemoteScopes();
+ // main
+ helper.fs.outputFile('utils/is-type/is-type.js', fixtures.isType);
+ helper.command.addComponent('utils/is-type', { i: 'utils/is-type' });
+ helper.command.snapAllComponentsWithoutBuild();
+
+ // laneA
+ helper.command.createLane('lane-a');
+ helper.fs.outputFile(
+ 'utils/is-string/is-string.js',
+ "const isType = require('../is-type/is-type.js'); module.exports = function isString() { return isType() + ' and got is-string'; };"
+ );
+ helper.command.addComponent('utils/is-string', { i: 'utils/is-string' });
+ helper.command.linkAndRewire();
+ helper.command.compile();
+ helper.command.snapAllComponentsWithoutBuild();
+
+ // laneB
+ helper.command.createLane('lane-b');
+ helper.fixtures.createComponentBarFoo();
+ helper.fixtures.addComponentBarFooAsDir();
+ helper.command.snapAllComponentsWithoutBuild();
+
+ beforeSwitchingBack = helper.scopeHelper.cloneLocalScope();
+ });
+ it('lane-a should not contain components from main', () => {
+ const lane = helper.command.showOneLaneParsed('lane-a');
+ expect(lane.components).to.have.lengthOf(1);
+ });
+ it('laneB object should include components from laneA, but not from main', () => {
+ const lane = helper.command.showOneLaneParsed('lane-b');
+ expect(lane.components).to.have.lengthOf(2);
+ });
+ it('bit list should show all components available to lane-b', () => {
+ const list = helper.command.listLocalScopeParsed();
+ expect(list).to.have.lengthOf(3);
+ });
+ describe('checking out to lane-a', () => {
+ let switchOutput;
+ before(() => {
+ switchOutput = helper.command.switchLocalLane('lane-a');
+ });
+ it('should indicate that it switched to the new lane', () => {
+ expect(switchOutput).to.have.string(
+ removeChalkCharacters('successfully set "lane-a" as the active lane') as string
+ );
+ });
+ // main components belong to lane-a only if they are snapped on lane-a, so utils/is-type
+ // doesn't belong to lane-a and should not appear as staged when on lane-a.
+ it('bit status should not show neither lane-b nor main components as staged', () => {
+ const staged = helper.command.getStagedIdsFromStatus();
+ expect(staged).to.deep.equal(['utils/is-string']);
+ const status = helper.command.status();
+ expect(status).to.not.have.string('bar/foo');
+ });
+ it('bit list should not show lane-b components', () => {
+ const list = helper.command.listParsed();
+ expect(list).to.have.lengthOf(2);
+ });
+ // @todo: test each one of the commands on bar/foo
+ });
+ describe('checking out from lane-b to main', () => {
+ before(() => {
+ helper.scopeHelper.getClonedLocalScope(beforeSwitchingBack);
+ helper.command.switchLocalLane('main');
+ });
+ it('bit list should only show main components', () => {
+ const list = helper.command.listParsed();
+ expect(list).to.have.lengthOf(1);
+ });
+ it('bit status should show only main components as staged', () => {
+ const staged = helper.command.getStagedIdsFromStatus();
+ expect(staged).to.deep.equal(['utils/is-type']);
+ const status = helper.command.status();
+ expect(status).to.not.have.string('bar/foo');
+ expect(status).to.not.have.string('utils/is-string');
+ });
+ });
+ describe('switching to lane-a then to main', () => {
+ before(() => {
+ helper.scopeHelper.getClonedLocalScope(beforeSwitchingBack);
+ helper.command.switchLocalLane('lane-a');
+ helper.command.switchLocalLane('main');
+ });
+ it('bit list should only show main components', () => {
+ const list = helper.command.listParsed();
+ expect(list).to.have.lengthOf(1);
+ });
+ it('bit status should show only main components as staged', () => {
+ const staged = helper.command.getStagedIdsFromStatus();
+ expect(staged).to.deep.equal(['utils/is-type']);
+ const status = helper.command.status();
+ expect(status).to.not.have.string('bar/foo');
+ expect(status).to.not.have.string('utils/is-string');
+ });
+ });
+ });
+ describe('creating lane-b from lane-a when lane-a is out-of-date', () => {
+ let outOfDateState: string;
+ let firstSnap: string;
+ let secondSnap: string;
+ before(() => {
+ helper.scopeHelper.setNewLocalAndRemoteScopes();
+ helper.command.createLane('lane-a');
+ helper.fixtures.populateComponents(1, false);
+ helper.command.snapAllComponentsWithoutBuild();
+ firstSnap = helper.command.getHeadOfLane('lane-a', 'comp1');
+ helper.command.export();
+ outOfDateState = helper.scopeHelper.cloneLocalScope();
+
+ helper.fixtures.populateComponents(1, false, 'v2');
+ helper.command.snapAllComponentsWithoutBuild();
+ secondSnap = helper.command.getHeadOfLane('lane-a', 'comp1');
+ helper.command.export();
+
+ helper.scopeHelper.getClonedLocalScope(outOfDateState);
+ helper.command.import();
+ // intermediate step to make sure the lane is out-of-date
+ const status = helper.command.statusJson();
+ expect(status.outdatedComponents).to.have.lengthOf(1);
+
+ helper.command.createLane('lane-b');
+ });
+ it('should add the component from the current/first snap (from .bitmap) and not from the head (lane-a object)', () => {
+ const headOnLaneB = helper.command.getHeadOfLane('lane-b', 'comp1');
+ expect(headOnLaneB).to.equal(firstSnap);
+ expect(headOnLaneB).to.not.equal(secondSnap);
+ });
+ });
+});
diff --git a/e2e/harmony/lanes/lanes.e2e.ts b/e2e/harmony/lanes/lanes.e2e.ts
index e9265a78d789..6f181c7a44ac 100644
--- a/e2e/harmony/lanes/lanes.e2e.ts
+++ b/e2e/harmony/lanes/lanes.e2e.ts
@@ -305,106 +305,7 @@ describe('bit lane command', function () {
);
});
});
- describe('main => lane-a => lane-b, so laneB branched from laneA', () => {
- let beforeSwitchingBack;
- before(() => {
- helper.scopeHelper.setNewLocalAndRemoteScopes();
- // main
- helper.fs.outputFile('utils/is-type/is-type.js', fixtures.isType);
- helper.command.addComponent('utils/is-type', { i: 'utils/is-type' });
- helper.command.snapAllComponentsWithoutBuild();
-
- // laneA
- helper.command.createLane('lane-a');
- helper.fs.outputFile(
- 'utils/is-string/is-string.js',
- "const isType = require('../is-type/is-type.js'); module.exports = function isString() { return isType() + ' and got is-string'; };"
- );
- helper.command.addComponent('utils/is-string', { i: 'utils/is-string' });
- helper.command.linkAndRewire();
- helper.command.compile();
- helper.command.snapAllComponentsWithoutBuild();
-
- // laneB
- helper.command.createLane('lane-b');
- helper.fixtures.createComponentBarFoo();
- helper.fixtures.addComponentBarFooAsDir();
- helper.command.snapAllComponentsWithoutBuild();
- beforeSwitchingBack = helper.scopeHelper.cloneLocalScope();
- });
- it('lane-a should not contain components from main', () => {
- const lane = helper.command.showOneLaneParsed('lane-a');
- expect(lane.components).to.have.lengthOf(1);
- });
- it('laneB object should include components from laneA, but not from main', () => {
- const lane = helper.command.showOneLaneParsed('lane-b');
- expect(lane.components).to.have.lengthOf(2);
- });
- it('bit list should show all components available to lane-b', () => {
- const list = helper.command.listLocalScopeParsed();
- expect(list).to.have.lengthOf(3);
- });
- describe('checking out to lane-a', () => {
- let switchOutput;
- before(() => {
- switchOutput = helper.command.switchLocalLane('lane-a');
- });
- it('should indicate that it switched to the new lane', () => {
- expect(switchOutput).to.have.string(
- removeChalkCharacters('successfully set "lane-a" as the active lane') as string
- );
- });
- // main components belong to lane-a only if they are snapped on lane-a, so utils/is-type
- // doesn't belong to lane-a and should not appear as staged when on lane-a.
- it('bit status should not show neither lane-b nor main components as staged', () => {
- const staged = helper.command.getStagedIdsFromStatus();
- expect(staged).to.deep.equal(['utils/is-string']);
- const status = helper.command.status();
- expect(status).to.not.have.string('bar/foo');
- });
- it('bit list should not show lane-b components', () => {
- const list = helper.command.listParsed();
- expect(list).to.have.lengthOf(2);
- });
- // @todo: test each one of the commands on bar/foo
- });
- describe('checking out from lane-b to main', () => {
- before(() => {
- helper.scopeHelper.getClonedLocalScope(beforeSwitchingBack);
- helper.command.switchLocalLane('main');
- });
- it('bit list should only show main components', () => {
- const list = helper.command.listParsed();
- expect(list).to.have.lengthOf(1);
- });
- it('bit status should show only main components as staged', () => {
- const staged = helper.command.getStagedIdsFromStatus();
- expect(staged).to.deep.equal(['utils/is-type']);
- const status = helper.command.status();
- expect(status).to.not.have.string('bar/foo');
- expect(status).to.not.have.string('utils/is-string');
- });
- });
- describe('switching to lane-a then to main', () => {
- before(() => {
- helper.scopeHelper.getClonedLocalScope(beforeSwitchingBack);
- helper.command.switchLocalLane('lane-a');
- helper.command.switchLocalLane('main');
- });
- it('bit list should only show main components', () => {
- const list = helper.command.listParsed();
- expect(list).to.have.lengthOf(1);
- });
- it('bit status should show only main components as staged', () => {
- const staged = helper.command.getStagedIdsFromStatus();
- expect(staged).to.deep.equal(['utils/is-type']);
- const status = helper.command.status();
- expect(status).to.not.have.string('bar/foo');
- expect(status).to.not.have.string('utils/is-string');
- });
- });
- });
describe('main => lane => main => lane', () => {
before(() => {
helper.scopeHelper.setNewLocalAndRemoteScopes();
diff --git a/scopes/lanes/lanes/create-lane.ts b/scopes/lanes/lanes/create-lane.ts
index 5a9bc0bfa86f..4e9adea21ffe 100644
--- a/scopes/lanes/lanes/create-lane.ts
+++ b/scopes/lanes/lanes/create-lane.ts
@@ -4,6 +4,8 @@ import { Consumer } from '@teambit/legacy/dist/consumer';
import { ScopeMain } from '@teambit/scope';
// import { BitIds } from '@teambit/legacy/dist/bit-id';
import Lane, { LaneComponent } from '@teambit/legacy/dist/scope/models/lane';
+import { isHash } from '@teambit/component-version';
+import { Ref } from '@teambit/legacy/dist/scope/objects';
export async function createLane(
consumer: Consumer,
@@ -21,7 +23,17 @@ export async function createLane(
// when branching from one lane to another, copy components from the origin lane
// when branching from main, no need to copy anything
const currentLaneObject = await consumer.getCurrentLaneObject();
- return currentLaneObject ? currentLaneObject.components : [];
+ if (!currentLaneObject) return [];
+ const laneComponents = currentLaneObject.components;
+ const workspaceIds = consumer.bitMap.getAllBitIds();
+ const laneComponentWithBitmapHead = laneComponents.map(({ id, head }) => {
+ const bitmapHead = workspaceIds.searchWithoutVersion(id);
+ if (bitmapHead && isHash(bitmapHead.version)) {
+ return { id, head: Ref.from(bitmapHead.version as string) };
+ }
+ return { id, head };
+ });
+ return laneComponentWithBitmapHead;
};
const forkedFrom = await getLaneOrigin(consumer);
|
vuls
|
https://github.com/future-architect/vuls
|
1100c133ba5d1870d54a3de792717789da9de2ba
|
Kota Kanbe
|
2021-01-21 02:52:25
|
feat(config): Default values for WordPress scanning to be set in config.toml (#1140)
|
* chore: update go mod
* fix(wordpress): set default if defined in config.toml
|
feat(config): Default values for WordPress scanning to be set in config.toml (#1140)
* chore: update go mod
* fix(wordpress): set default if defined in config.toml
|
diff --git a/config/tomlloader.go b/config/tomlloader.go
index c38a983e4c..44b7f62d86 100644
--- a/config/tomlloader.go
+++ b/config/tomlloader.go
@@ -201,11 +201,12 @@ func setDefaultIfEmpty(server *ServerInfo, d ServerInfo) error {
server.Memo = Conf.Default.Memo
}
- // TODO set default WordPress
if server.WordPress == nil {
- server.WordPress = &WordPressConf{}
+ server.WordPress = Conf.Default.WordPress
+ if server.WordPress == nil {
+ server.WordPress = &WordPressConf{}
+ }
}
- //TODO set nil in config re-generate in saas subcmd
if len(server.IgnoredJSONKeys) == 0 {
server.IgnoredJSONKeys = Conf.Default.IgnoredJSONKeys
diff --git a/go.mod b/go.mod
index 804f683172..42b0d9e4e9 100644
--- a/go.mod
+++ b/go.mod
@@ -8,23 +8,23 @@ replace (
)
require (
- github.com/Azure/azure-sdk-for-go v50.0.0+incompatible
- github.com/Azure/go-autorest/autorest v0.11.16 // indirect
+ github.com/Azure/azure-sdk-for-go v50.1.0+incompatible
+ github.com/Azure/go-autorest/autorest v0.11.17 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.10 // indirect
github.com/BurntSushi/toml v0.3.1
- github.com/aquasecurity/fanal v0.0.0-20210111044704-9cb28297c870
+ github.com/aquasecurity/fanal v0.0.0-20210119051230-28c249da7cfd
github.com/aquasecurity/go-dep-parser v0.0.0-20210113052454-251388ce94e5 // indirect
github.com/aquasecurity/trivy v0.15.0
github.com/aquasecurity/trivy-db v0.0.0-20210111152553-7d4d1aa5f0d4
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
- github.com/aws/aws-sdk-go v1.36.26
+ github.com/aws/aws-sdk-go v1.36.29
github.com/boltdb/bolt v1.3.1
github.com/caarlos0/env/v6 v6.4.0 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/d4l3k/messagediff v1.2.2-0.20190829033028-7e0a312ae40b
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
github.com/emersion/go-smtp v0.14.0
- github.com/go-redis/redis/v8 v8.4.8 // indirect
+ github.com/go-redis/redis/v8 v8.4.9 // indirect
github.com/goccy/go-yaml v1.8.4 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/google/subcommands v1.2.0
@@ -41,9 +41,9 @@ require (
github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d
github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936
github.com/knqyf263/gost v0.1.7
- github.com/kotakanbe/go-cve-dictionary v0.5.6
+ github.com/kotakanbe/go-cve-dictionary v0.5.7
github.com/kotakanbe/go-pingscanner v0.1.0
- github.com/kotakanbe/goval-dictionary v0.3.0
+ github.com/kotakanbe/goval-dictionary v0.3.1
github.com/kotakanbe/logrus-prefixed-formatter v0.0.0-20180123152602-928f7356cb96
github.com/magiconair/properties v1.8.4 // indirect
github.com/mattn/go-runewidth v0.0.10 // indirect
@@ -52,7 +52,7 @@ require (
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mozqnet/go-exploitdb v0.1.2
github.com/nlopes/slack v0.6.0
- github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00 // indirect
+ github.com/nsf/termbox-go v0.0.0-20210114135735-d04385b850e8 // indirect
github.com/olekukonko/tablewriter v0.0.4
github.com/parnurzeal/gorequest v0.2.16
github.com/pelletier/go-toml v1.8.1 // indirect
@@ -70,11 +70,10 @@ require (
go.uber.org/zap v1.16.0 // indirect
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
- golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
+ golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
golang.org/x/oauth2 v0.0.0-20210113205817-d3ed898aa8a3
- golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 // indirect
+ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
- golang.org/x/text v0.3.5 // indirect
golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
google.golang.org/appengine v1.6.7 // indirect
diff --git a/go.sum b/go.sum
index e0f775a46b..d8dc24b29d 100644
--- a/go.sum
+++ b/go.sum
@@ -35,16 +35,16 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v50.0.0+incompatible h1:kFIPXbg+knN0rsmsj3jIuoxOYCsevOwvwUgwICmrIwA=
-github.com/Azure/azure-sdk-for-go v50.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v50.1.0+incompatible h1:SUR6Y194mjyNkNbEzDHyYX8Butfa+Om9fcGSIy0ffhk=
+github.com/Azure/azure-sdk-for-go v50.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
github.com/Azure/go-autorest/autorest v0.9.3 h1:OZEIaBbMdUE/Js+BQKlpO81XlISgipr6yDJ+PSwsgi4=
github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0=
-github.com/Azure/go-autorest/autorest v0.11.16 h1:3jkFG3SL0fFXmvmPF9Kc8LscIbeXUhmt3yuzUSqv3pI=
-github.com/Azure/go-autorest/autorest v0.11.16/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
+github.com/Azure/go-autorest/autorest v0.11.17 h1:2zCdHwNgRH+St1J+ZMf66xI8aLr/5KMy+wWLH97zwYM=
+github.com/Azure/go-autorest/autorest v0.11.17/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
github.com/Azure/go-autorest/autorest/adal v0.8.1 h1:pZdL8o72rK+avFWl+p9nE8RWi1JInZrWJYlnpfXJwHk=
@@ -116,8 +116,8 @@ github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986/go.mod
github.com/aquasecurity/fanal v0.0.0-20190819081512-f04452b627c6/go.mod h1:enEz4FFetw4XAbkffaYgyCVq1556R9Ry+noqT4rq9BE=
github.com/aquasecurity/fanal v0.0.0-20201218050947-981a0510f9cb h1:T48y/j2wvl/xPX2IyV0ogFq+GeCLY+3548awySrUaJU=
github.com/aquasecurity/fanal v0.0.0-20201218050947-981a0510f9cb/go.mod h1:arUN1lJnuAWLL0PUQ/UYrkAomU/Mby+gCXJMU90GHlA=
-github.com/aquasecurity/fanal v0.0.0-20210111044704-9cb28297c870 h1:cnrqKqeCl+Y4UemFqxpsSwrpbRyDjQB/WoJyptzlBmo=
-github.com/aquasecurity/fanal v0.0.0-20210111044704-9cb28297c870/go.mod h1:AAgPw/VIfjojPCRjOg+hWeVzpRaplsZTpv5gPBNWLrM=
+github.com/aquasecurity/fanal v0.0.0-20210119051230-28c249da7cfd h1:meqa2AA+7K1r/nfNB19K2AP/v8+nemuWeQoTSqZ2R9s=
+github.com/aquasecurity/fanal v0.0.0-20210119051230-28c249da7cfd/go.mod h1:kur6SaohYhsjQLzijAdtn+X8rkTtwxawE51WyVCXLKk=
github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b h1:55Ulc/gvfWm4ylhVaR7MxOwujRjA6et7KhmUbSgUFf4=
github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b/go.mod h1:BpNTD9vHfrejKsED9rx04ldM1WIbeyXGYxUrqTVwxVQ=
github.com/aquasecurity/go-dep-parser v0.0.0-20201028043324-889d4a92b8e0 h1:cLH3SebzhbJ+jU1GIad8A1N8p7m7OjHhtY6JePISiVc=
@@ -132,7 +132,7 @@ github.com/aquasecurity/go-version v0.0.0-20201107203531-5e48ac5d022a/go.mod h1:
github.com/aquasecurity/go-version v0.0.0-20201115065329-578079e4ab05 h1:q0ZpFBjwzDk1ofey7gJ2kfA6ZNi2PeBWxNzmRPrfetA=
github.com/aquasecurity/go-version v0.0.0-20201115065329-578079e4ab05/go.mod h1:9Beu8XsUNNfzml7WBf3QmyPToP1wm1Gj/Vc5UJKqTzU=
github.com/aquasecurity/testdocker v0.0.0-20200426142840-5f05bce6f12a/go.mod h1:psfu0MVaiTDLpNxCoNsTeILSKY2EICBwv345f3M+Ffs=
-github.com/aquasecurity/testdocker v0.0.0-20201220111429-5278b43e3eba/go.mod h1:psfu0MVaiTDLpNxCoNsTeILSKY2EICBwv345f3M+Ffs=
+github.com/aquasecurity/testdocker v0.0.0-20210106133225-0b17fe083674/go.mod h1:psfu0MVaiTDLpNxCoNsTeILSKY2EICBwv345f3M+Ffs=
github.com/aquasecurity/trivy v0.1.6/go.mod h1:5hobyhxLzDtxruHzPxpND2PUKOssvGUdE9BocpJUwo4=
github.com/aquasecurity/trivy v0.15.0 h1:C70Sx3vEX17GLlpwE7hXAJM3Et8zgSRVJSbes+zj2So=
github.com/aquasecurity/trivy v0.15.0/go.mod h1:JPgyECgbdod5QI8pQ1aEwAS53h6KGZ5hpBuCotBJYiE=
@@ -154,8 +154,8 @@ github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
github.com/aws/aws-sdk-go v1.19.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.27.1 h1:MXnqY6SlWySaZAqNnXThOvjRFdiiOuKtC6i7baFdNdU=
github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.36.26 h1:710u7Q1xpbzpigh/RPPUXwr/5X/VwCxTXSeam8icgos=
-github.com/aws/aws-sdk-go v1.36.26/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.36.29 h1:lM1G3AF1+7vzFm0n7hfH8r2+750BTo+6Lo6FtPB7kzk=
+github.com/aws/aws-sdk-go v1.36.29/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
@@ -349,8 +349,8 @@ github.com/go-redis/redis/v8 v8.4.0 h1:J5NCReIgh3QgUJu398hUncxDExN4gMOHI11NVbVic
github.com/go-redis/redis/v8 v8.4.0/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hbQN45Jdy0M=
github.com/go-redis/redis/v8 v8.4.4 h1:fGqgxCTR1sydaKI00oQf3OmkU/DIe/I/fYXvGklCIuc=
github.com/go-redis/redis/v8 v8.4.4/go.mod h1:nA0bQuF0i5JFx4Ta9RZxGKXFrQ8cRWntra97f0196iY=
-github.com/go-redis/redis/v8 v8.4.8 h1:sEG4g6Jq4hvQzbrNsVDNTDdxFCUnFC0jxuOp6tgALlA=
-github.com/go-redis/redis/v8 v8.4.8/go.mod h1:/cTZsrSn1DPqRuOnSDuyH2OSvd9iX0iUGT0s7hYGIAg=
+github.com/go-redis/redis/v8 v8.4.9 h1:ixEQSxNnzo6zh/dmoZIHl9DmyX3mHV5a2p6OasPR93k=
+github.com/go-redis/redis/v8 v8.4.9/go.mod h1:d5yY/TlkQyYBSBHnXUmnf1OrHbyQere5JV4dLKwvXmo=
github.com/go-restruct/restruct v0.0.0-20191227155143-5734170a48a1/go.mod h1:KqrpKpn4M8OLznErihXTGLlsXFGeLxHUrLRRI/1YjGk=
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
@@ -583,12 +583,12 @@ github.com/knqyf263/gost v0.1.7/go.mod h1:rlf9JZR6qMyXtnz0bqyMIexDoYhFt+on0FK+OL
github.com/knqyf263/nested v0.0.1/go.mod h1:zwhsIhMkBg90DTOJQvxPkKIypEHPYkgWHs4gybdlUmk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kotakanbe/go-cve-dictionary v0.5.6 h1:xTq6AcWYkmdqHCwL5DiqH+/C0Ga4IHlZdQDWVLJeelo=
-github.com/kotakanbe/go-cve-dictionary v0.5.6/go.mod h1:CtZPPDJUrU/+3TvUcD1xFHVWWlM9SSEZYRZ11pblmDQ=
+github.com/kotakanbe/go-cve-dictionary v0.5.7 h1:HLJBp4fJ2tecJRSv/4eDmjXHKXshZ7AhSCxM1qqayPM=
+github.com/kotakanbe/go-cve-dictionary v0.5.7/go.mod h1:CtZPPDJUrU/+3TvUcD1xFHVWWlM9SSEZYRZ11pblmDQ=
github.com/kotakanbe/go-pingscanner v0.1.0 h1:VG4/9l0i8WeToXclj7bIGoAZAu7a07Z3qmQiIfU0gT0=
github.com/kotakanbe/go-pingscanner v0.1.0/go.mod h1:/761QZzuZFcfN8h/1QuawUA+pKukp3qcNj5mxJCOiAk=
-github.com/kotakanbe/goval-dictionary v0.3.0 h1:f8itkjyrcrHaEWQcqquldifQYRndErxFHyjtMi+rbHc=
-github.com/kotakanbe/goval-dictionary v0.3.0/go.mod h1:NFnlcNWtD4dXkovJqGG+IFNba4q3qXYBbq56O9fHL0o=
+github.com/kotakanbe/goval-dictionary v0.3.1 h1:79gv75CqViYlzDAkmlPGS2tbEwJJICwKSn1sARtL6xY=
+github.com/kotakanbe/goval-dictionary v0.3.1/go.mod h1:1FcXF2+KKTN+IwLbU+iUsufgUrlpurk8nFJUThksEiQ=
github.com/kotakanbe/logrus-prefixed-formatter v0.0.0-20180123152602-928f7356cb96 h1:xNVK0mQJdQjw+QYeaMM4G6fvucWr8rTGGIhlPakx1wU=
github.com/kotakanbe/logrus-prefixed-formatter v0.0.0-20180123152602-928f7356cb96/go.mod h1:ljq48H1V+0Vh0u7ucA3LjR4AfkAeCpxrf7LaaCk8Vmo=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
@@ -701,8 +701,8 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nlopes/slack v0.6.0 h1:jt0jxVQGhssx1Ib7naAOZEZcGdtIhTzkP0nopK0AsRA=
github.com/nlopes/slack v0.6.0/go.mod h1:JzQ9m3PMAqcpeCam7UaHSuBuupz7CmpjehYMayT6YOk=
-github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00 h1:Rl8NelBe+n7SuLbJyw13ho7CGWUt2BjGGKIoreCWQ/c=
-github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
+github.com/nsf/termbox-go v0.0.0-20210114135735-d04385b850e8 h1:3vzIuru1svOK2sXlg4XcrO3KkGRneIejmfQfR+ptSW8=
+github.com/nsf/termbox-go v0.0.0-20210114135735-d04385b850e8/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -941,6 +941,8 @@ go.opentelemetry.io/otel v0.14.0 h1:YFBEfjCk9MTjaytCNSUkp9Q8lF7QJezA06T71FbQxLQ=
go.opentelemetry.io/otel v0.14.0/go.mod h1:vH5xEuwy7Rts0GNtsCW3HYQoZDY+OmBJ6t1bFGGlxgw=
go.opentelemetry.io/otel v0.15.0 h1:CZFy2lPhxd4HlhZnYK8gRyDotksO3Ip9rBweY1vVYJw=
go.opentelemetry.io/otel v0.15.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA=
+go.opentelemetry.io/otel v0.16.0 h1:uIWEbdeb4vpKPGITLsRVUS44L5oDbDUCZxn8lkxhmgw=
+go.opentelemetry.io/otel v0.16.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
@@ -1081,6 +1083,8 @@ golang.org/x/net v0.0.0-20201216054612-986b41b23924 h1:QsnDpLLOKwHBBDa8nDws4DYNc
golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1168,6 +1172,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78 h1:nVuTkr9L6Bq62qpUqKo/RnZCFfzDBL0bYo6w9OJUqZY=
golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
ttyd
|
https://github.com/tsl0922/ttyd
|
162e3bf168b8ae3762a449114c56f2b337417872
|
dependabot-preview[bot]
|
2021-01-09 00:56:39
|
build(deps-dev): bump husky from 4.3.6 to 4.3.7 in /html (#576)
|
Bumps [husky](https://github.com/typicode/husky) from 4.3.6 to 4.3.7.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v4.3.6...v4.3.7)
|
build(deps-dev): bump husky from 4.3.6 to 4.3.7 in /html (#576)
Bumps [husky](https://github.com/typicode/husky) from 4.3.6 to 4.3.7.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v4.3.6...v4.3.7)
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
|
diff --git a/html/package.json b/html/package.json
index 8dc3b431..dfc8eb32 100644
--- a/html/package.json
+++ b/html/package.json
@@ -42,7 +42,7 @@
"gulp-inline-source": "^4.0.0",
"gulp-rename": "^2.0.0",
"html-webpack-plugin": "^4.5.1",
- "husky": "^4.3.6",
+ "husky": "^4.3.7",
"lint-staged": "^10.5.3",
"mini-css-extract-plugin": "^1.3.3",
"node-sass": "^5.0.0",
diff --git a/html/yarn.lock b/html/yarn.lock
index fa3278bf..caaee565 100644
--- a/html/yarn.lock
+++ b/html/yarn.lock
@@ -2987,12 +2987,20 @@ find-up@^4.0.0:
locate-path "^5.0.0"
path-exists "^4.0.0"
-find-versions@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e"
- integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==
+find-up@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+ integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+ dependencies:
+ locate-path "^6.0.0"
+ path-exists "^4.0.0"
+
+find-versions@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965"
+ integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==
dependencies:
- semver-regex "^2.0.0"
+ semver-regex "^3.1.2"
findup-sync@^2.0.0:
version "2.0.0"
@@ -3795,18 +3803,18 @@ human-signals@^2.1.0:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-husky@^4.3.6:
- version "4.3.6"
- resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.6.tgz#ebd9dd8b9324aa851f1587318db4cccb7665a13c"
- integrity sha512-o6UjVI8xtlWRL5395iWq9LKDyp/9TE7XMOTvIpEVzW638UcGxTmV5cfel6fsk/jbZSTlvfGVJf2svFtybcIZag==
+husky@^4.3.7:
+ version "4.3.7"
+ resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.7.tgz#ca47bbe6213c1aa8b16bbd504530d9600de91e88"
+ integrity sha512-0fQlcCDq/xypoyYSJvEuzbDPHFf8ZF9IXKJxlrnvxABTSzK1VPT2RKYQKrcgJ+YD39swgoB6sbzywUqFxUiqjw==
dependencies:
chalk "^4.0.0"
ci-info "^2.0.0"
compare-versions "^3.6.0"
cosmiconfig "^7.0.0"
- find-versions "^3.2.0"
+ find-versions "^4.0.0"
opencollective-postinstall "^2.0.2"
- pkg-dir "^4.2.0"
+ pkg-dir "^5.0.0"
please-upgrade-node "^3.2.0"
slash "^3.0.0"
which-pm-runs "^1.0.0"
@@ -4714,6 +4722,13 @@ locate-path@^5.0.0:
dependencies:
p-locate "^4.1.0"
+locate-path@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+ integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+ dependencies:
+ p-locate "^5.0.0"
+
lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -5652,6 +5667,13 @@ p-locate@^4.1.0:
dependencies:
p-limit "^2.2.0"
+p-locate@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+ integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+ dependencies:
+ p-limit "^3.0.2"
+
p-map@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
@@ -5945,6 +5967,13 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
dependencies:
find-up "^4.0.0"
+pkg-dir@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+ integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+ dependencies:
+ find-up "^5.0.0"
+
please-upgrade-node@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
@@ -7033,10 +7062,10 @@ semver-greatest-satisfied-range@^1.1.0:
dependencies:
sver-compat "^1.5.0"
-semver-regex@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
- integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
+semver-regex@^3.1.2:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
+ integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
version "5.7.1"
|
syncthing
|
https://github.com/syncthing/syncthing
|
d5141c6d5188608a4bfa37a1b0996e9e326ada00
|
dependabot[bot]
|
2021-04-30 01:27:22
|
build: Bump github.com/prometheus/client_golang from 1.8.0 to 1.10.0 (#7612)
|
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.8.0 to 1.10.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.8.0...v1.10.0)
|
build: Bump github.com/prometheus/client_golang from 1.8.0 to 1.10.0 (#7612)
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.8.0 to 1.10.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.8.0...v1.10.0)
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
diff --git a/go.mod b/go.mod
index 2925423e698..9f885c28d5c 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,6 @@ require (
github.com/gobwas/glob v0.2.3
github.com/gogo/protobuf v1.3.1
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
- github.com/golang/protobuf v1.4.3
github.com/greatroar/blobloom v0.5.0
github.com/hashicorp/golang-lru v0.5.1
github.com/jackpal/gateway v1.0.6
@@ -28,7 +27,6 @@ require (
github.com/lucas-clemente/quic-go v0.19.3
github.com/maruel/panicparse v1.5.1
github.com/mattn/go-isatty v0.0.12
- github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0 // indirect
github.com/minio/sha256-simd v0.1.1
github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
@@ -36,7 +34,7 @@ require (
github.com/oschwald/geoip2-golang v1.4.0
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pkg/errors v0.9.1
- github.com/prometheus/client_golang v1.8.0
+ github.com/prometheus/client_golang v1.10.0
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
github.com/sasha-s/go-deadlock v0.2.0
github.com/shirou/gopsutil/v3 v3.20.11
@@ -47,11 +45,10 @@ require (
github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
- golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4
+ golang.org/x/sys v0.0.0-20210309074719-68d13333faf2
golang.org/x/text v0.3.4
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
- golang.org/x/tools v0.1.0 // indirect
- google.golang.org/protobuf v1.23.0 // indirect
+ google.golang.org/protobuf v1.23.0
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
)
diff --git a/go.sum b/go.sum
index 16751f07b60..eda1b1816fa 100644
--- a/go.sum
+++ b/go.sum
@@ -50,8 +50,6 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
github.com/calmh/xdr v1.1.0 h1:U/Dd4CXNLoo8EiQ4ulJUXkgO1/EyQLgDKLgpY1SOoJE=
github.com/calmh/xdr v1.1.0/go.mod h1:E8sz2ByAdXC8MbANf1LCRYzedSnnc+/sXXJs/PVqoeg=
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/ccding/go-stun v0.1.2 h1:1CZhjVwfyO/jGxk06a+0OSOGBWZu588kuZQQO4nihsw=
-github.com/ccding/go-stun v0.1.2/go.mod h1:3FK1bMar37f7jqVY7q/63k3OMX1c47pGCufzt3X0sYE=
github.com/ccding/go-stun v0.1.3 h1:uEAFsxqPBuo4tvILfloEHUBO3b4BlEAMnx2PZdh54jE=
github.com/ccding/go-stun v0.1.3/go.mod h1:cCZjJ1J3WFSJV6Wj8Y9Di8JMTsEXh6uv2eNmLzKaUeM=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
@@ -160,8 +158,9 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -263,8 +262,6 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0 h1:8E6DrFvII6QR4eJ3PkFvV+lc03P+2qwqTPLm1ax7694=
-github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0/go.mod h1:fcEyUyXZXoV4Abw8DX0t7wyL8mCDxXyU4iAFZfT3IHw=
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -347,8 +344,8 @@ github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.8.0 h1:zvJNkoCFAnYFNC24FV8nW4JdRJ3GIFcLbg65lL/JDcw=
-github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM=
+github.com/prometheus/client_golang v1.10.0 h1:/o0BDeWzLWXNZ+4q5gXltUvaMpJqckTa+jTNoB+z4cg=
+github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -361,16 +358,16 @@ github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.14.0 h1:RHRyE8UocrbjU+6UvRzwi6HjiDfxrrBU91TtbKzkGp4=
-github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
+github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y=
+github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4=
-github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ=
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
@@ -384,7 +381,6 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y=
github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
-github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/shirou/gopsutil/v3 v3.20.11 h1:NeVf1K0cgxsWz+N3671ojRptdgzvp7BXL3KV21R0JnA=
@@ -451,7 +447,6 @@ github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMI
github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0 h1:okhMind4q9H1OxF44gNegWkiP4H/gsTFLalHFa4OOUI=
github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod h1:TTbGUfE+cXXceWtbTHq6lqcTvYPBKLNejBEbnUsQJtU=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
@@ -489,8 +484,6 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -515,8 +508,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201026091529-146b70c837a4/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -530,7 +521,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -562,10 +553,10 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
+golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -593,11 +584,7 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
open-im-server
|
https://github.com/openimsdk/open-im-server
|
1eef4013e2f7561f2a8bd63816e4257638370deb
|
OpenIM-Gordon
|
2024-05-27 09:26:46
|
fix: main bug fix notification unread (#2266)
|
* fix: notification has counted unread counts bug fix.
* fix: notification has counted unread counts bug fix.
|
fix: main bug fix notification unread (#2266)
* fix: notification has counted unread counts bug fix.
* fix: notification has counted unread counts bug fix.
|
diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go
index df2660804d..551e3fe911 100644
--- a/internal/msgtransfer/online_history_msg_handler.go
+++ b/internal/msgtransfer/online_history_msg_handler.go
@@ -176,20 +176,15 @@ func (och *OnlineHistoryRedisConsumerHandler) getPushStorageMsgList(
if v.message.Options != nil {
msg.Options = msgprocessor.NewMsgOptions()
}
- if options.IsOfflinePush() {
- v.message.Options = msgprocessor.WithOptions(
- v.message.Options,
- msgprocessor.WithOfflinePush(false),
- )
- msg.Options = msgprocessor.WithOptions(msg.Options, msgprocessor.WithOfflinePush(true))
- }
- if options.IsUnreadCount() {
- v.message.Options = msgprocessor.WithOptions(
- v.message.Options,
- msgprocessor.WithUnreadCount(false),
- )
- msg.Options = msgprocessor.WithOptions(msg.Options, msgprocessor.WithUnreadCount(true))
- }
+ msg.Options = msgprocessor.WithOptions(msg.Options,
+ msgprocessor.WithOfflinePush(options.IsOfflinePush()),
+ msgprocessor.WithUnreadCount(options.IsUnreadCount()),
+ )
+ v.message.Options = msgprocessor.WithOptions(
+ v.message.Options,
+ msgprocessor.WithOfflinePush(false),
+ msgprocessor.WithUnreadCount(false),
+ )
storageMsgList = append(storageMsgList, msg)
}
if isStorage(v.message) {
|
verdaccio
|
https://github.com/verdaccio/verdaccio
|
69f2e66b924fd6d112532cb1b8fc9c54ad4e40c1
|
Marc Bernard
|
2025-01-28 04:18:30
|
fix(ui): sort versions (#5049)
|
* fix(ui): sort versions
* Add test
|
fix(ui): sort versions (#5049)
* fix(ui): sort versions
* Add test
|
diff --git a/.changeset/bright-bobcats-ring.md b/.changeset/bright-bobcats-ring.md
new file mode 100644
index 000000000000..7f86afa55cb4
--- /dev/null
+++ b/.changeset/bright-bobcats-ring.md
@@ -0,0 +1,5 @@
+---
+'@verdaccio/ui-components': patch
+---
+
+fix(ui): sort versions
diff --git a/packages/ui-components/src/components/Versions/HistoryList.tsx b/packages/ui-components/src/components/Versions/HistoryList.tsx
index 83b06c3f039a..0389b0dcb287 100644
--- a/packages/ui-components/src/components/Versions/HistoryList.tsx
+++ b/packages/ui-components/src/components/Versions/HistoryList.tsx
@@ -39,7 +39,11 @@ const VersionsHistoryList: React.FC<Props> = ({ versions, packageName, time }) =
return (
<List dense={true}>
{Object.keys(listVersions)
- .reverse()
+ .sort((a, b) => {
+ const timeA = time[a] ? new Date(time[a]).getTime() : 0;
+ const timeB = time[b] ? new Date(time[b]).getTime() : 0;
+ return timeB - timeA;
+ })
.map((version) => (
<ListItem
className="version-item"
@@ -48,7 +52,11 @@ const VersionsHistoryList: React.FC<Props> = ({ versions, packageName, time }) =
sx={{ pr: 0 }}
>
<Link to={`${Route.DETAIL}${packageName}/v/${version}`} variant="outline">
- <ListItemText disableTypography={false} primary={version}></ListItemText>
+ <ListItemText
+ data-testid={`version-list-link`}
+ disableTypography={false}
+ primary={version}
+ />
</Link>
{typeof versions[version]?.deprecated === 'string' ? (
<Chip
diff --git a/packages/ui-components/src/components/Versions/Versions.test.tsx b/packages/ui-components/src/components/Versions/Versions.test.tsx
index a29c3de3ff85..7f7656774baf 100644
--- a/packages/ui-components/src/components/Versions/Versions.test.tsx
+++ b/packages/ui-components/src/components/Versions/Versions.test.tsx
@@ -7,6 +7,7 @@ import { fireEvent, render, screen } from '../../test/test-react-testing-library
import Versions, { Props } from './Versions';
import data from './__partials__/data.json';
import dataDeprecated from './__partials__/deprecated-versions.json';
+import dataUnsorted from './__partials__/unsorted-versions.json';
const VersionsComponent: React.FC<Props> = (props) => (
<MemoryRouter>
@@ -68,5 +69,15 @@ describe('<Version /> component', () => {
expect(screen.getByText('0.0.1')).toBeInTheDocument();
});
+ test('should render versions sorted by timestamp in descending order', () => {
+ render(<VersionsComponent packageMeta={dataUnsorted} packageName={'dummy'} />);
+
+ const versionElements = screen.getAllByTestId('version-list-link');
+ const versions = versionElements.map((el) => el.textContent);
+
+ // Expected order based on timestamps in unsorted-versions.json:
+ expect(versions).toEqual(['1.0.1', '1.0.0', '0.1.1', '0.1.0']);
+ });
+
test.todo('should click on version link');
});
diff --git a/packages/ui-components/src/components/Versions/__partials__/unsorted-versions.json b/packages/ui-components/src/components/Versions/__partials__/unsorted-versions.json
new file mode 100644
index 000000000000..4094ab0e44a7
--- /dev/null
+++ b/packages/ui-components/src/components/Versions/__partials__/unsorted-versions.json
@@ -0,0 +1,37 @@
+{
+ "versions": {
+ "1.0.0": {
+ "name": "dummy",
+ "version": "1.0.0"
+ },
+ "0.1.0": {
+ "name": "dummy",
+ "version": "0.1.0"
+ },
+ "0.1.1": {
+ "name": "dummy",
+ "version": "0.1.1"
+ },
+ "1.0.1": {
+ "name": "dummy",
+ "version": "1.0.1"
+ }
+ },
+ "time": {
+ "created": "2012-02-19T21:35:53.514Z",
+ "modified": "2024-11-21T06:32:43.761Z",
+ "1.0.0": "2025-01-10T14:55:23.763Z",
+ "0.1.0": "2012-02-19T21:35:54.455Z",
+ "0.1.1": "2012-02-20T06:12:03.403Z",
+ "1.0.1": "2025-01-10T15:11:36.318Z"
+ },
+ "users": {},
+ "dist-tags": {
+ "latest": "1.0.1"
+ },
+ "_id": "dummy",
+ "latest": {
+ "name": "dummy",
+ "version": "1.0.1"
+ }
+}
|
rspack
|
https://github.com/web-infra-dev/rspack
|
065ffbf2e8833c451811eaae5d7518f39f8d5cb0
|
IWANABETHATGUY
|
2024-01-09 09:14:14
|
fix: new tree shaking with hmr (#5053)
|
* chore: 🤖 fix new tree shaking with hmr
* chore: 🤖 recover
* chore: 🤖 recover
* chore: 🤖 clean
* chore: 🤖 add some comments
|
fix: new tree shaking with hmr (#5053)
* chore: 🤖 fix new tree shaking with hmr
* chore: 🤖 recover
* chore: 🤖 recover
* chore: 🤖 clean
* chore: 🤖 add some comments
|
diff --git a/crates/rspack_core/src/compiler/compilation.rs b/crates/rspack_core/src/compiler/compilation.rs
index 6fdcdf1421c8..49b9fa896daf 100644
--- a/crates/rspack_core/src/compiler/compilation.rs
+++ b/crates/rspack_core/src/compiler/compilation.rs
@@ -1048,7 +1048,13 @@ impl Compilation {
})
};
- // dbg!(&self.module_graph.module_identifier_to_module_graph_module);
+ // Avoid to introduce too much overhead,
+ // until we find a better way to align with webpack hmr behavior
+ if self.options.is_new_tree_shaking() {
+ let start = logger.time("finish compilation");
+ self.finish(self.plugin_driver.clone()).await?;
+ logger.time_end(start);
+ }
// add context module and context element module to bailout_module_identifiers
if self.options.builtins.tree_shaking.enable() {
|
angular
|
https://github.com/angular/angular
|
894c1c5f100a62866cc7ed3e23d025c8e505c60d
|
Joey Perrott
|
2024-04-03 02:12:04
|
refactor: apply prettier formatting to integration (#54653)
|
Apply prettier formatting to integration directories
PR Close #54653
|
refactor: apply prettier formatting to integration (#54653)
Apply prettier formatting to integration directories
PR Close #54653
|
diff --git a/.ng-dev/format.mts b/.ng-dev/format.mts
index febcd823f2dd2..a4e9755837dab 100644
--- a/.ng-dev/format.mts
+++ b/.ng-dev/format.mts
@@ -9,6 +9,7 @@ export const format: FormatConfig = {
'**/*.{yaml,yml}',
'adev/**/*.{js,ts}',
'devtools/**/*.{js,ts}',
+ 'integration/**/*.{js,ts}',
'tools/**/*.{js,ts}',
'modules/**/*.{js,ts}',
'scripts/**/*.{js,ts}',
diff --git a/integration/animations-async/karma.conf.js b/integration/animations-async/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/animations-async/karma.conf.js
+++ b/integration/animations-async/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/animations-async/src/app/app.component.ts b/integration/animations-async/src/app/app.component.ts
index 516c873b55f66..433c8f3ebc6fb 100644
--- a/integration/animations-async/src/app/app.component.ts
+++ b/integration/animations-async/src/app/app.component.ts
@@ -6,5 +6,4 @@ import {RouterModule} from '@angular/router';
imports: [RouterModule],
standalone: true,
})
-export class AppComponent {
-}
+export class AppComponent {}
diff --git a/integration/animations-async/src/app/open-close.component.ts b/integration/animations-async/src/app/open-close.component.ts
index 39f2ff200a9a3..04343dcee6e82 100644
--- a/integration/animations-async/src/app/open-close.component.ts
+++ b/integration/animations-async/src/app/open-close.component.ts
@@ -3,19 +3,13 @@ import {Component} from '@angular/core';
@Component({
selector: 'app-open-close',
animations: [
- trigger(
- 'openClose',
- [
- // ...
- state(
- 'open',
- style({height: '200px', opacity: 1, backgroundColor: 'yellow'})),
- state(
- 'closed',
- style({height: '100px', opacity: 0.8, backgroundColor: 'blue'})),
- transition('open => closed', [animate('1s')]),
- transition('closed => open', [animate('0.5s')]),
- ]),
+ trigger('openClose', [
+ // ...
+ state('open', style({height: '200px', opacity: 1, backgroundColor: 'yellow'})),
+ state('closed', style({height: '100px', opacity: 0.8, backgroundColor: 'blue'})),
+ transition('open => closed', [animate('1s')]),
+ transition('closed => open', [animate('0.5s')]),
+ ]),
],
template: `<nav>
<button type="button" (click)="toggle()">Toggle Open/Close</button>
@@ -24,7 +18,8 @@ import {Component} from '@angular/core';
<div [@openClose]="isOpen ? 'open' : 'closed'" class="open-close-container">
<p>The box is now {{ isOpen ? 'Open' : 'Closed' }}!</p>
</div>`,
- styles: [`:host {
+ styles: [
+ `:host {
display: block;
margin-top: 1rem;
}
@@ -36,7 +31,8 @@ import {Component} from '@angular/core';
color: #000000;
font-weight: bold;
font-size: 20px;
- }`],
+ }`,
+ ],
standalone: true,
})
export class OpenCloseComponent {
@@ -45,4 +41,4 @@ export class OpenCloseComponent {
toggle() {
this.isOpen = !this.isOpen;
}
-}
\ No newline at end of file
+}
diff --git a/integration/animations/karma.conf.js b/integration/animations/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/animations/karma.conf.js
+++ b/integration/animations/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/animations/src/app/app.component.ts b/integration/animations/src/app/app.component.ts
index 516c873b55f66..433c8f3ebc6fb 100644
--- a/integration/animations/src/app/app.component.ts
+++ b/integration/animations/src/app/app.component.ts
@@ -6,5 +6,4 @@ import {RouterModule} from '@angular/router';
imports: [RouterModule],
standalone: true,
})
-export class AppComponent {
-}
+export class AppComponent {}
diff --git a/integration/animations/src/app/open-close.component.ts b/integration/animations/src/app/open-close.component.ts
index 39f2ff200a9a3..04343dcee6e82 100644
--- a/integration/animations/src/app/open-close.component.ts
+++ b/integration/animations/src/app/open-close.component.ts
@@ -3,19 +3,13 @@ import {Component} from '@angular/core';
@Component({
selector: 'app-open-close',
animations: [
- trigger(
- 'openClose',
- [
- // ...
- state(
- 'open',
- style({height: '200px', opacity: 1, backgroundColor: 'yellow'})),
- state(
- 'closed',
- style({height: '100px', opacity: 0.8, backgroundColor: 'blue'})),
- transition('open => closed', [animate('1s')]),
- transition('closed => open', [animate('0.5s')]),
- ]),
+ trigger('openClose', [
+ // ...
+ state('open', style({height: '200px', opacity: 1, backgroundColor: 'yellow'})),
+ state('closed', style({height: '100px', opacity: 0.8, backgroundColor: 'blue'})),
+ transition('open => closed', [animate('1s')]),
+ transition('closed => open', [animate('0.5s')]),
+ ]),
],
template: `<nav>
<button type="button" (click)="toggle()">Toggle Open/Close</button>
@@ -24,7 +18,8 @@ import {Component} from '@angular/core';
<div [@openClose]="isOpen ? 'open' : 'closed'" class="open-close-container">
<p>The box is now {{ isOpen ? 'Open' : 'Closed' }}!</p>
</div>`,
- styles: [`:host {
+ styles: [
+ `:host {
display: block;
margin-top: 1rem;
}
@@ -36,7 +31,8 @@ import {Component} from '@angular/core';
color: #000000;
font-weight: bold;
font-size: 20px;
- }`],
+ }`,
+ ],
standalone: true,
})
export class OpenCloseComponent {
@@ -45,4 +41,4 @@ export class OpenCloseComponent {
toggle() {
this.isOpen = !this.isOpen;
}
-}
\ No newline at end of file
+}
diff --git a/integration/check-dependencies.js b/integration/check-dependencies.js
index 269243171a590..4375c22e7a736 100755
--- a/integration/check-dependencies.js
+++ b/integration/check-dependencies.js
@@ -55,25 +55,29 @@ const nonExactDeps = deps.filter(([, version]) => !/^\d+\.\d+\.\d+(?:-\w+\.\d+)?
if (nonExactDeps.length) {
throw new Error(
- `The following dependencies in '${projectDir}' are not pinned to exact versions (of the ` +
+ `The following dependencies in '${projectDir}' are not pinned to exact versions (of the ` +
'format X.Y.Z[-<pre-release-identifier>]):' +
- nonExactDeps.map(([name, version]) => `\n ${name}: ${version}`));
+ nonExactDeps.map(([name, version]) => `\n ${name}: ${version}`),
+ );
}
// Check for dependencies that are not in-sync between `package.json` and the lockfile.
const {object: parsedLockfile} = parseLockfile(readFileSync(lockfilePath, 'utf8'));
const outOfSyncDeps = deps
- .map(([depName, pkgJsonVersion]) => [
- depName,
- pkgJsonVersion,
- (parsedLockfile[`${depName}@${pkgJsonVersion}`] || {}).version,
- ])
- .filter(([, pkgJsonVersion, lockfileVersion]) => pkgJsonVersion !== lockfileVersion);
+ .map(([depName, pkgJsonVersion]) => [
+ depName,
+ pkgJsonVersion,
+ (parsedLockfile[`${depName}@${pkgJsonVersion}`] || {}).version,
+ ])
+ .filter(([, pkgJsonVersion, lockfileVersion]) => pkgJsonVersion !== lockfileVersion);
if (outOfSyncDeps.length) {
throw new Error(
- `The following dependencies in '${projectDir}' are out-of-sync between 'package.json' and ` +
+ `The following dependencies in '${projectDir}' are out-of-sync between 'package.json' and ` +
'the lockfile:' +
- outOfSyncDeps.map(([name, pkgJsonVersion, lockfileVersion]) =>
- `\n ${name}: ${pkgJsonVersion} vs ${lockfileVersion}`));
+ outOfSyncDeps.map(
+ ([name, pkgJsonVersion, lockfileVersion]) =>
+ `\n ${name}: ${pkgJsonVersion} vs ${lockfileVersion}`,
+ ),
+ );
}
diff --git a/integration/cli-elements-universal/e2e/protractor.conf.js b/integration/cli-elements-universal/e2e/protractor.conf.js
index 0fe4fb83ceaec..6fc6112b435e7 100644
--- a/integration/cli-elements-universal/e2e/protractor.conf.js
+++ b/integration/cli-elements-universal/e2e/protractor.conf.js
@@ -2,23 +2,28 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
+const {SpecReporter, StacktraceOption} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -28,16 +33,18 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({
- spec: {
- displayStacktrace: StacktraceOption.PRETTY
- }
- }));
- }
+ jasmine.getEnv().addReporter(
+ new SpecReporter({
+ spec: {
+ displayStacktrace: StacktraceOption.PRETTY,
+ },
+ }),
+ );
+ },
};
diff --git a/integration/cli-elements-universal/e2e/src/app.e2e-spec.ts b/integration/cli-elements-universal/e2e/src/app.e2e-spec.ts
index a399ba87315d9..a9e93e8cf8ba9 100644
--- a/integration/cli-elements-universal/e2e/src/app.e2e-spec.ts
+++ b/integration/cli-elements-universal/e2e/src/app.e2e-spec.ts
@@ -1,5 +1,5 @@
-import { AppPage } from './app.po';
-import { browser, logging } from 'protractor';
+import {AppPage} from './app.po';
+import {browser, logging} from 'protractor';
describe('workspace-project App', () => {
let page: AppPage;
diff --git a/integration/cli-elements-universal/e2e/src/app.po.ts b/integration/cli-elements-universal/e2e/src/app.po.ts
index 602087cca38fd..4283e44f73aa8 100644
--- a/integration/cli-elements-universal/e2e/src/app.po.ts
+++ b/integration/cli-elements-universal/e2e/src/app.po.ts
@@ -1,4 +1,4 @@
-import { browser, by, element } from 'protractor';
+import {browser, by, element} from 'protractor';
export class AppPage {
async navigateTo(): Promise<unknown> {
diff --git a/integration/cli-elements-universal/karma.conf.js b/integration/cli-elements-universal/karma.conf.js
index d52436900e102..c79f8f900e019 100644
--- a/integration/cli-elements-universal/karma.conf.js
+++ b/integration/cli-elements-universal/karma.conf.js
@@ -10,18 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageReporter: {
dir: require('path').join(__dirname, './coverage/cli-elements-universal'),
subdir: '.',
- reporters: [
- { type: 'html' },
- { type: 'text-summary' }
- ],
+ reporters: [{type: 'html'}, {type: 'text-summary'}],
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -32,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/cli-elements-universal/src/app/app.component.spec.ts b/integration/cli-elements-universal/src/app/app.component.spec.ts
index 3122eb39e5b4f..b3ce4ffd7dffe 100644
--- a/integration/cli-elements-universal/src/app/app.component.spec.ts
+++ b/integration/cli-elements-universal/src/app/app.component.spec.ts
@@ -1,19 +1,14 @@
-import { Component, Input } from '@angular/core';
-import { TestBed } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-import { RouterModule } from '@angular/router';
-import { AppComponent } from './app.component';
+import {Component, Input} from '@angular/core';
+import {TestBed} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
+import {RouterModule} from '@angular/router';
+import {AppComponent} from './app.component';
describe('AppComponent', () => {
beforeEach(async () => {
TestBed.configureTestingModule({
- declarations: [
- AppComponent,
- TestTitleComponent,
- ],
- imports: [
- RouterModule.forRoot([]),
- ],
+ declarations: [AppComponent, TestTitleComponent],
+ imports: [RouterModule.forRoot([])],
});
await TestBed.compileComponents();
});
diff --git a/integration/cli-elements-universal/src/app/app.component.ts b/integration/cli-elements-universal/src/app/app.component.ts
index 50055d14c6561..6a2d21bfd2c00 100644
--- a/integration/cli-elements-universal/src/app/app.component.ts
+++ b/integration/cli-elements-universal/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'app-root',
diff --git a/integration/cli-elements-universal/src/app/app.module.ts b/integration/cli-elements-universal/src/app/app.module.ts
index 6cda804e30c0e..f28fbfa55057e 100644
--- a/integration/cli-elements-universal/src/app/app.module.ts
+++ b/integration/cli-elements-universal/src/app/app.module.ts
@@ -1,27 +1,17 @@
-import { isPlatformBrowser } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, Inject, Injector, NgModule, PLATFORM_ID } from '@angular/core';
-import { createCustomElement } from '@angular/elements';
-import { BrowserModule } from '@angular/platform-browser';
-import { RouterModule } from '@angular/router';
+import {isPlatformBrowser} from '@angular/common';
+import {CUSTOM_ELEMENTS_SCHEMA, Inject, Injector, NgModule, PLATFORM_ID} from '@angular/core';
+import {createCustomElement} from '@angular/elements';
+import {BrowserModule} from '@angular/platform-browser';
+import {RouterModule} from '@angular/router';
-import { AppComponent } from './app.component';
-import { TitleComponent } from './title.component';
+import {AppComponent} from './app.component';
+import {TitleComponent} from './title.component';
@NgModule({
- bootstrap: [
- AppComponent,
- ],
- declarations: [
- AppComponent,
- TitleComponent,
- ],
- imports: [
- BrowserModule,
- RouterModule.forRoot([]),
- ],
- schemas: [
- CUSTOM_ELEMENTS_SCHEMA,
- ],
+ bootstrap: [AppComponent],
+ declarations: [AppComponent, TitleComponent],
+ imports: [BrowserModule, RouterModule.forRoot([])],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA],
})
export class AppModule {
constructor(injector: Injector, @Inject(PLATFORM_ID) platformId: object) {
diff --git a/integration/cli-elements-universal/src/app/app.server.module.ts b/integration/cli-elements-universal/src/app/app.server.module.ts
index 9a6fbfb342846..c4b69c3b3c9f2 100644
--- a/integration/cli-elements-universal/src/app/app.server.module.ts
+++ b/integration/cli-elements-universal/src/app/app.server.module.ts
@@ -1,18 +1,12 @@
-import { NgModule } from '@angular/core';
-import { ServerModule } from '@angular/platform-server';
-import { RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {ServerModule} from '@angular/platform-server';
+import {RouterModule} from '@angular/router';
-import { AppModule } from './app.module';
-import { AppComponent } from './app.component';
+import {AppModule} from './app.module';
+import {AppComponent} from './app.component';
@NgModule({
- bootstrap: [
- AppComponent,
- ],
- imports: [
- AppModule,
- RouterModule.forRoot([]),
- ServerModule,
- ],
+ bootstrap: [AppComponent],
+ imports: [AppModule, RouterModule.forRoot([]), ServerModule],
})
export class AppServerModule {}
diff --git a/integration/cli-elements-universal/src/app/title.component.spec.ts b/integration/cli-elements-universal/src/app/title.component.spec.ts
index 8dd2fc8541513..b952be7ccf977 100644
--- a/integration/cli-elements-universal/src/app/title.component.spec.ts
+++ b/integration/cli-elements-universal/src/app/title.component.spec.ts
@@ -1,5 +1,5 @@
-import { TestBed } from '@angular/core/testing';
-import { TitleComponent } from './title.component';
+import {TestBed} from '@angular/core/testing';
+import {TitleComponent} from './title.component';
describe('TitleComponent', () => {
beforeEach(async () => {
diff --git a/integration/cli-elements-universal/src/app/title.component.ts b/integration/cli-elements-universal/src/app/title.component.ts
index 1e47dea3333c6..ab0eb80ebde9f 100644
--- a/integration/cli-elements-universal/src/app/title.component.ts
+++ b/integration/cli-elements-universal/src/app/title.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import {Component, Input} from '@angular/core';
@Component({
selector: 'app-title',
diff --git a/integration/cli-elements-universal/src/main.server.ts b/integration/cli-elements-universal/src/main.server.ts
index 081f0d6c00ca2..c3d795d08348d 100644
--- a/integration/cli-elements-universal/src/main.server.ts
+++ b/integration/cli-elements-universal/src/main.server.ts
@@ -1,3 +1,3 @@
import '@angular/platform-server/init';
-export { AppServerModule } from './app/app.server.module';
+export {AppServerModule} from './app/app.server.module';
diff --git a/integration/cli-elements-universal/src/main.ts b/integration/cli-elements-universal/src/main.ts
index 36d42623eb72c..c75655a66607d 100644
--- a/integration/cli-elements-universal/src/main.ts
+++ b/integration/cli-elements-universal/src/main.ts
@@ -1,8 +1,9 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
document.addEventListener('DOMContentLoaded', () => {
- platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+ platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
});
diff --git a/integration/cli-hello-world-ivy-i18n/e2e/app.po.ts b/integration/cli-hello-world-ivy-i18n/e2e/app.po.ts
index d7375c9072a57..e4b365cb89144 100644
--- a/integration/cli-hello-world-ivy-i18n/e2e/app.po.ts
+++ b/integration/cli-hello-world-ivy-i18n/e2e/app.po.ts
@@ -1,9 +1,15 @@
import {browser, by, element} from 'protractor';
export class AppPage {
- navigateTo() { return browser.get('/'); }
+ navigateTo() {
+ return browser.get('/');
+ }
- getHeading() { return element(by.css('app-root h1')).getText(); }
+ getHeading() {
+ return element(by.css('app-root h1')).getText();
+ }
- getParagraph(name: string) { return element(by.css('app-root p#' + name)).getText(); }
+ getParagraph(name: string) {
+ return element(by.css('app-root p#' + name)).getText();
+ }
}
diff --git a/integration/cli-hello-world-ivy-i18n/e2e/de/app.e2e-spec.ts b/integration/cli-hello-world-ivy-i18n/e2e/de/app.e2e-spec.ts
index c5c57bf5bf42d..4a84b2f2f4aaf 100644
--- a/integration/cli-hello-world-ivy-i18n/e2e/de/app.e2e-spec.ts
+++ b/integration/cli-hello-world-ivy-i18n/e2e/de/app.e2e-spec.ts
@@ -12,7 +12,9 @@ describe('cli-hello-world-ivy App', () => {
expect(page.getHeading()).toEqual('Hallo cli-hello-world-ivy-i18n!');
});
- it('should display the locale', () => { expect(page.getParagraph('locale')).toEqual('de'); });
+ it('should display the locale', () => {
+ expect(page.getParagraph('locale')).toEqual('de');
+ });
it('the date pipe should show the localized month', () => {
page.navigateTo();
@@ -22,8 +24,10 @@ describe('cli-hello-world-ivy App', () => {
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/cli-hello-world-ivy-i18n/e2e/en/app.e2e-spec.ts b/integration/cli-hello-world-ivy-i18n/e2e/en/app.e2e-spec.ts
index 84799f8aa2abc..1abe93e2af1fe 100644
--- a/integration/cli-hello-world-ivy-i18n/e2e/en/app.e2e-spec.ts
+++ b/integration/cli-hello-world-ivy-i18n/e2e/en/app.e2e-spec.ts
@@ -8,10 +8,13 @@ describe('cli-hello-world-ivy App', () => {
page.navigateTo();
});
- it('should display title',
- () => { expect(page.getHeading()).toEqual('Hello cli-hello-world-ivy-i18n!'); });
+ it('should display title', () => {
+ expect(page.getHeading()).toEqual('Hello cli-hello-world-ivy-i18n!');
+ });
- it('should display the locale', () => { expect(page.getParagraph('locale')).toEqual('en-US'); });
+ it('should display the locale', () => {
+ expect(page.getParagraph('locale')).toEqual('en-US');
+ });
it('the date pipe should show the localized month', () => {
page.navigateTo();
@@ -21,8 +24,10 @@ describe('cli-hello-world-ivy App', () => {
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/cli-hello-world-ivy-i18n/e2e/fr/app.e2e-spec.ts b/integration/cli-hello-world-ivy-i18n/e2e/fr/app.e2e-spec.ts
index 29c91848adf42..6f24e222a92b1 100644
--- a/integration/cli-hello-world-ivy-i18n/e2e/fr/app.e2e-spec.ts
+++ b/integration/cli-hello-world-ivy-i18n/e2e/fr/app.e2e-spec.ts
@@ -8,10 +8,13 @@ describe('cli-hello-world-ivy App', () => {
page.navigateTo();
});
- it('should display title',
- () => { expect(page.getHeading()).toEqual('Bonjour cli-hello-world-ivy-i18n!'); });
+ it('should display title', () => {
+ expect(page.getHeading()).toEqual('Bonjour cli-hello-world-ivy-i18n!');
+ });
- it('should display the locale', () => { expect(page.getParagraph('locale')).toEqual('fr'); });
+ it('should display the locale', () => {
+ expect(page.getParagraph('locale')).toEqual('fr');
+ });
it('the date pipe should show the localized month', () => {
page.navigateTo();
@@ -21,8 +24,10 @@ describe('cli-hello-world-ivy App', () => {
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/cli-hello-world-ivy-i18n/e2e/protractor.conf.js b/integration/cli-hello-world-ivy-i18n/e2e/protractor.conf.js
index 79b4510703727..3a7bff8ad2c61 100644
--- a/integration/cli-hello-world-ivy-i18n/e2e/protractor.conf.js
+++ b/integration/cli-hello-world-ivy-i18n/e2e/protractor.conf.js
@@ -1,24 +1,29 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/cli-hello-world-ivy-i18n/karma.conf.js b/integration/cli-hello-world-ivy-i18n/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/cli-hello-world-ivy-i18n/karma.conf.js
+++ b/integration/cli-hello-world-ivy-i18n/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/cli-hello-world-ivy-i18n/src/app/app.component.spec.ts b/integration/cli-hello-world-ivy-i18n/src/app/app.component.spec.ts
index 610da0d2f3e48..3c627dd16980f 100644
--- a/integration/cli-hello-world-ivy-i18n/src/app/app.component.spec.ts
+++ b/integration/cli-hello-world-ivy-i18n/src/app/app.component.spec.ts
@@ -3,11 +3,9 @@ import {AppComponent} from './app.component';
describe('AppComponent', () => {
beforeEach(async(() => {
- TestBed
- .configureTestingModule({
- declarations: [AppComponent],
- })
- .compileComponents();
+ TestBed.configureTestingModule({
+ declarations: [AppComponent],
+ }).compileComponents();
}));
it('should create the app', () => {
@@ -26,7 +24,6 @@ describe('AppComponent', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
- expect(compiled.querySelector('h1').textContent)
- .toContain('Hello cli-hello-world-ivy-i18n!');
+ expect(compiled.querySelector('h1').textContent).toContain('Hello cli-hello-world-ivy-i18n!');
});
});
diff --git a/integration/cli-hello-world-ivy-i18n/src/app/app.component.ts b/integration/cli-hello-world-ivy-i18n/src/app/app.component.ts
index 7470aa099e709..e1f091d019b1d 100644
--- a/integration/cli-hello-world-ivy-i18n/src/app/app.component.ts
+++ b/integration/cli-hello-world-ivy-i18n/src/app/app.component.ts
@@ -1,11 +1,11 @@
-import { Component, Inject, LOCALE_ID } from '@angular/core';
+import {Component, Inject, LOCALE_ID} from '@angular/core';
@Component({
selector: 'app-root',
- templateUrl: './app.component.html'
+ templateUrl: './app.component.html',
})
export class AppComponent {
- constructor(@Inject(LOCALE_ID) public locale: string) { }
+ constructor(@Inject(LOCALE_ID) public locale: string) {}
title = `cli-hello-world-ivy-i18n`;
jan = new Date(2000, 0, 1);
}
diff --git a/integration/cli-hello-world-ivy-i18n/src/app/app.module.ts b/integration/cli-hello-world-ivy-i18n/src/app/app.module.ts
index 0de438443f099..ea42d1cf096d7 100644
--- a/integration/cli-hello-world-ivy-i18n/src/app/app.module.ts
+++ b/integration/cli-hello-world-ivy-i18n/src/app/app.module.ts
@@ -9,5 +9,4 @@ import {AppComponent} from './app.component';
registerLocaleData(localeFr);
@NgModule({declarations: [AppComponent], imports: [BrowserModule], bootstrap: [AppComponent]})
-export class AppModule {
-}
+export class AppModule {}
diff --git a/integration/cli-hello-world-ivy-i18n/src/environments/environment.prod.ts b/integration/cli-hello-world-ivy-i18n/src/environments/environment.prod.ts
index 3612073bc31cd..c9669790be176 100644
--- a/integration/cli-hello-world-ivy-i18n/src/environments/environment.prod.ts
+++ b/integration/cli-hello-world-ivy-i18n/src/environments/environment.prod.ts
@@ -1,3 +1,3 @@
export const environment = {
- production: true
+ production: true,
};
diff --git a/integration/cli-hello-world-ivy-i18n/src/environments/environment.ts b/integration/cli-hello-world-ivy-i18n/src/environments/environment.ts
index 30d7bccb19894..31cb7855f1447 100644
--- a/integration/cli-hello-world-ivy-i18n/src/environments/environment.ts
+++ b/integration/cli-hello-world-ivy-i18n/src/environments/environment.ts
@@ -3,7 +3,7 @@
// The list of file replacements can be found in `angular.json`.
export const environment = {
- production: false
+ production: false,
};
/*
diff --git a/integration/cli-hello-world-ivy-i18n/src/main.ts b/integration/cli-hello-world-ivy-i18n/src/main.ts
index 0a621147e305c..6f00233886b74 100644
--- a/integration/cli-hello-world-ivy-i18n/src/main.ts
+++ b/integration/cli-hello-world-ivy-i18n/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
diff --git a/integration/cli-hello-world-lazy/check-output-for-ngdevmode.js b/integration/cli-hello-world-lazy/check-output-for-ngdevmode.js
index 2ad80703691ec..1289ea3c1b3af 100644
--- a/integration/cli-hello-world-lazy/check-output-for-ngdevmode.js
+++ b/integration/cli-hello-world-lazy/check-output-for-ngdevmode.js
@@ -4,12 +4,15 @@ const path = require('path');
const distPath = './dist/';
const ngDevModeVariable = 'ngDevMode';
-const filesWithNgDevMode = fs.readdirSync(distPath)
- .filter(p => p.endsWith('.js'))
- .filter(p => fs.readFileSync(path.join(distPath, p), 'utf-8').includes(ngDevModeVariable));
+const filesWithNgDevMode = fs
+ .readdirSync(distPath)
+ .filter((p) => p.endsWith('.js'))
+ .filter((p) => fs.readFileSync(path.join(distPath, p), 'utf-8').includes(ngDevModeVariable));
if (filesWithNgDevMode.length > 0) {
- throw new Error(`Found '${ngDevModeVariable}' referenced in ${filesWithNgDevMode}. These references should be tree-shaken away!`);
+ throw new Error(
+ `Found '${ngDevModeVariable}' referenced in ${filesWithNgDevMode}. These references should be tree-shaken away!`,
+ );
} else {
- console.log(`No '${ngDevModeVariable}' references found in ${distPath}`)
+ console.log(`No '${ngDevModeVariable}' references found in ${distPath}`);
}
diff --git a/integration/cli-hello-world-lazy/e2e/protractor.conf.js b/integration/cli-hello-world-lazy/e2e/protractor.conf.js
index f86a6f96b1daf..3a7bff8ad2c61 100644
--- a/integration/cli-hello-world-lazy/e2e/protractor.conf.js
+++ b/integration/cli-hello-world-lazy/e2e/protractor.conf.js
@@ -1,23 +1,28 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/cli-hello-world-lazy/e2e/src/app.e2e-spec.ts b/integration/cli-hello-world-lazy/e2e/src/app.e2e-spec.ts
index 34631df219296..8eb16a3bc5570 100644
--- a/integration/cli-hello-world-lazy/e2e/src/app.e2e-spec.ts
+++ b/integration/cli-hello-world-lazy/e2e/src/app.e2e-spec.ts
@@ -1,5 +1,5 @@
-import { AppPage } from './app.po';
-import { browser, logging, element, by } from 'protractor';
+import {AppPage} from './app.po';
+import {browser, logging, element, by} from 'protractor';
describe('cli-hello-world-lazy App', () => {
let page: AppPage;
@@ -21,8 +21,10 @@ describe('cli-hello-world-lazy App', () => {
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/cli-hello-world-lazy/e2e/src/app.po.ts b/integration/cli-hello-world-lazy/e2e/src/app.po.ts
index b8498c26f24ea..e6f4140472778 100644
--- a/integration/cli-hello-world-lazy/e2e/src/app.po.ts
+++ b/integration/cli-hello-world-lazy/e2e/src/app.po.ts
@@ -1,4 +1,4 @@
-import { browser, by, element } from 'protractor';
+import {browser, by, element} from 'protractor';
export class AppPage {
navigateTo() {
diff --git a/integration/cli-hello-world-lazy/karma.conf.js b/integration/cli-hello-world-lazy/karma.conf.js
index e362168a3e108..cf2d53bfa7f2e 100644
--- a/integration/cli-hello-world-lazy/karma.conf.js
+++ b/integration/cli-hello-world-lazy/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/cli-hello-world-lazy'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/cli-hello-world-lazy/src/app/app.component.spec.ts b/integration/cli-hello-world-lazy/src/app/app.component.spec.ts
index 1224f92f52553..f5d913a308c38 100644
--- a/integration/cli-hello-world-lazy/src/app/app.component.spec.ts
+++ b/integration/cli-hello-world-lazy/src/app/app.component.spec.ts
@@ -3,11 +3,9 @@ import {AppComponent} from './app.component';
describe('AppComponent', () => {
beforeEach(waitForAsync(() => {
- TestBed
- .configureTestingModule({
- imports: [AppComponent],
- })
- .compileComponents();
+ TestBed.configureTestingModule({
+ imports: [AppComponent],
+ }).compileComponents();
}));
it('should create the app', () => {
@@ -26,7 +24,8 @@ describe('AppComponent', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
- expect(compiled.querySelector('.content span').textContent)
- .toContain('cli-hello-world-lazy app is running!');
+ expect(compiled.querySelector('.content span').textContent).toContain(
+ 'cli-hello-world-lazy app is running!',
+ );
});
});
diff --git a/integration/cli-hello-world-lazy/src/app/app.routes.ts b/integration/cli-hello-world-lazy/src/app/app.routes.ts
index 437d3233c0cbe..123f528ab4ea8 100644
--- a/integration/cli-hello-world-lazy/src/app/app.routes.ts
+++ b/integration/cli-hello-world-lazy/src/app/app.routes.ts
@@ -1,7 +1,8 @@
import {Routes} from '@angular/router';
-
-export const appRoutes: Routes = [{
- path: 'lazy',
- loadChildren: () => import('./lazy/lazy.routes').then(routes => routes.lazyRoutes),
-}];
+export const appRoutes: Routes = [
+ {
+ path: 'lazy',
+ loadChildren: () => import('./lazy/lazy.routes').then((routes) => routes.lazyRoutes),
+ },
+];
diff --git a/integration/cli-hello-world-lazy/src/app/lazy/lazy.component.spec.ts b/integration/cli-hello-world-lazy/src/app/lazy/lazy.component.spec.ts
index 790efa286624b..3d2bc524552df 100644
--- a/integration/cli-hello-world-lazy/src/app/lazy/lazy.component.spec.ts
+++ b/integration/cli-hello-world-lazy/src/app/lazy/lazy.component.spec.ts
@@ -1,6 +1,6 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import { LazyComponent } from './lazy.component';
+import {LazyComponent} from './lazy.component';
describe('LazyComponent', () => {
let component: LazyComponent;
@@ -8,9 +8,8 @@ describe('LazyComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ LazyComponent ]
- })
- .compileComponents();
+ declarations: [LazyComponent],
+ }).compileComponents();
}));
beforeEach(() => {
diff --git a/integration/cli-hello-world-lazy/src/app/lazy/lazy.component.ts b/integration/cli-hello-world-lazy/src/app/lazy/lazy.component.ts
index 346a73da1c34c..8152fb523f3cb 100644
--- a/integration/cli-hello-world-lazy/src/app/lazy/lazy.component.ts
+++ b/integration/cli-hello-world-lazy/src/app/lazy/lazy.component.ts
@@ -5,5 +5,4 @@ import {Component} from '@angular/core';
selector: 'app-lazy',
template: '<p>lazy works!</p>',
})
-export class LazyComponent {
-}
+export class LazyComponent {}
diff --git a/integration/cli-hello-world-lazy/src/main.ts b/integration/cli-hello-world-lazy/src/main.ts
index 5904ebfd75882..852d9f10b9c63 100644
--- a/integration/cli-hello-world-lazy/src/main.ts
+++ b/integration/cli-hello-world-lazy/src/main.ts
@@ -5,8 +5,5 @@ import {AppComponent} from './app/app.component';
import {appRoutes} from './app/app.routes';
bootstrapApplication(AppComponent, {
- providers: [
- provideRouter(appRoutes),
- provideProtractorTestingSupport(),
- ]
+ providers: [provideRouter(appRoutes), provideProtractorTestingSupport()],
}).catch(console.error);
diff --git a/integration/cli-hello-world-mocha/e2e/protractor.conf.js b/integration/cli-hello-world-mocha/e2e/protractor.conf.js
index f86a6f96b1daf..3a7bff8ad2c61 100644
--- a/integration/cli-hello-world-mocha/e2e/protractor.conf.js
+++ b/integration/cli-hello-world-mocha/e2e/protractor.conf.js
@@ -1,23 +1,28 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/cli-hello-world-mocha/e2e/src/app.e2e-spec.ts b/integration/cli-hello-world-mocha/e2e/src/app.e2e-spec.ts
index 32ecb470497a6..d1e65baa7c61f 100644
--- a/integration/cli-hello-world-mocha/e2e/src/app.e2e-spec.ts
+++ b/integration/cli-hello-world-mocha/e2e/src/app.e2e-spec.ts
@@ -1,5 +1,5 @@
-import { AppPage } from './app.po';
-import { browser, logging } from 'protractor';
+import {AppPage} from './app.po';
+import {browser, logging} from 'protractor';
describe('cli-hello-world App', () => {
let page: AppPage;
@@ -16,8 +16,10 @@ describe('cli-hello-world App', () => {
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/cli-hello-world-mocha/e2e/src/app.po.ts b/integration/cli-hello-world-mocha/e2e/src/app.po.ts
index b8498c26f24ea..e6f4140472778 100644
--- a/integration/cli-hello-world-mocha/e2e/src/app.po.ts
+++ b/integration/cli-hello-world-mocha/e2e/src/app.po.ts
@@ -1,4 +1,4 @@
-import { browser, by, element } from 'protractor';
+import {browser, by, element} from 'protractor';
export class AppPage {
navigateTo() {
diff --git a/integration/cli-hello-world-mocha/src/app/app.component.spec.ts b/integration/cli-hello-world-mocha/src/app/app.component.spec.ts
index fb29c9ec1a387..1427bcf442c19 100644
--- a/integration/cli-hello-world-mocha/src/app/app.component.spec.ts
+++ b/integration/cli-hello-world-mocha/src/app/app.component.spec.ts
@@ -5,11 +5,9 @@ import {AppComponent} from './app.component';
describe('AppComponent', () => {
beforeEach(waitForAsync(() => {
- TestBed
- .configureTestingModule({
- declarations: [AppComponent],
- })
- .compileComponents();
+ TestBed.configureTestingModule({
+ declarations: [AppComponent],
+ }).compileComponents();
}));
it('should create the app', () => {
@@ -28,7 +26,8 @@ describe('AppComponent', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
- expect(compiled.querySelector('.content span').textContent)
- .to.include('cli-hello-world app is running!');
+ expect(compiled.querySelector('.content span').textContent).to.include(
+ 'cli-hello-world app is running!',
+ );
});
});
diff --git a/integration/cli-hello-world-mocha/src/app/app.component.ts b/integration/cli-hello-world-mocha/src/app/app.component.ts
index 05ce1affac152..2aa776389f27e 100644
--- a/integration/cli-hello-world-mocha/src/app/app.component.ts
+++ b/integration/cli-hello-world-mocha/src/app/app.component.ts
@@ -1,9 +1,9 @@
-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
- styleUrls: ['./app.component.css']
+ styleUrls: ['./app.component.css'],
})
export class AppComponent {
title = 'cli-hello-world';
diff --git a/integration/cli-hello-world-mocha/src/app/app.module.ts b/integration/cli-hello-world-mocha/src/app/app.module.ts
index 314179fcf7661..3d195c97197de 100644
--- a/integration/cli-hello-world-mocha/src/app/app.module.ts
+++ b/integration/cli-hello-world-mocha/src/app/app.module.ts
@@ -1,21 +1,17 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { LOCALE_ID, NgModule } from '@angular/core';
-import { registerLocaleData } from '@angular/common';
+import {BrowserModule} from '@angular/platform-browser';
+import {LOCALE_ID, NgModule} from '@angular/core';
+import {registerLocaleData} from '@angular/common';
import localeFr from '@angular/common/locales/fr';
-import { AppComponent } from './app.component';
+import {AppComponent} from './app.component';
// adding this code to detect issues like https://github.com/angular/angular-cli/issues/10322
registerLocaleData(localeFr);
@NgModule({
- declarations: [
- AppComponent
- ],
- imports: [
- BrowserModule
- ],
- providers: [{ provide: LOCALE_ID, useValue: 'fr' }],
- bootstrap: [AppComponent]
+ declarations: [AppComponent],
+ imports: [BrowserModule],
+ providers: [{provide: LOCALE_ID, useValue: 'fr'}],
+ bootstrap: [AppComponent],
})
-export class AppModule { }
+export class AppModule {}
diff --git a/integration/cli-hello-world-mocha/src/main.ts b/integration/cli-hello-world-mocha/src/main.ts
index 0a621147e305c..6f00233886b74 100644
--- a/integration/cli-hello-world-mocha/src/main.ts
+++ b/integration/cli-hello-world-mocha/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
diff --git a/integration/cli-hello-world/e2e/protractor.conf.js b/integration/cli-hello-world/e2e/protractor.conf.js
index f86a6f96b1daf..3a7bff8ad2c61 100644
--- a/integration/cli-hello-world/e2e/protractor.conf.js
+++ b/integration/cli-hello-world/e2e/protractor.conf.js
@@ -1,23 +1,28 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/cli-hello-world/e2e/src/app.e2e-spec.ts b/integration/cli-hello-world/e2e/src/app.e2e-spec.ts
index 32ecb470497a6..d1e65baa7c61f 100644
--- a/integration/cli-hello-world/e2e/src/app.e2e-spec.ts
+++ b/integration/cli-hello-world/e2e/src/app.e2e-spec.ts
@@ -1,5 +1,5 @@
-import { AppPage } from './app.po';
-import { browser, logging } from 'protractor';
+import {AppPage} from './app.po';
+import {browser, logging} from 'protractor';
describe('cli-hello-world App', () => {
let page: AppPage;
@@ -16,8 +16,10 @@ describe('cli-hello-world App', () => {
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/cli-hello-world/e2e/src/app.po.ts b/integration/cli-hello-world/e2e/src/app.po.ts
index b8498c26f24ea..e6f4140472778 100644
--- a/integration/cli-hello-world/e2e/src/app.po.ts
+++ b/integration/cli-hello-world/e2e/src/app.po.ts
@@ -1,4 +1,4 @@
-import { browser, by, element } from 'protractor';
+import {browser, by, element} from 'protractor';
export class AppPage {
navigateTo() {
diff --git a/integration/cli-hello-world/karma.conf.js b/integration/cli-hello-world/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/cli-hello-world/karma.conf.js
+++ b/integration/cli-hello-world/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/cli-hello-world/src/app/app.component.spec.ts b/integration/cli-hello-world/src/app/app.component.spec.ts
index 103a5b5c5b7fd..192f3f4048ee7 100644
--- a/integration/cli-hello-world/src/app/app.component.spec.ts
+++ b/integration/cli-hello-world/src/app/app.component.spec.ts
@@ -3,11 +3,9 @@ import {AppComponent} from './app.component';
describe('AppComponent', () => {
beforeEach(waitForAsync(() => {
- TestBed
- .configureTestingModule({
- declarations: [AppComponent],
- })
- .compileComponents();
+ TestBed.configureTestingModule({
+ declarations: [AppComponent],
+ }).compileComponents();
}));
it('should create the app', () => {
@@ -26,7 +24,8 @@ describe('AppComponent', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
- expect(compiled.querySelector('.content span').textContent)
- .toContain('cli-hello-world app is running!');
+ expect(compiled.querySelector('.content span').textContent).toContain(
+ 'cli-hello-world app is running!',
+ );
});
});
diff --git a/integration/cli-hello-world/src/app/app.component.ts b/integration/cli-hello-world/src/app/app.component.ts
index d30d3888b9a81..2aa776389f27e 100644
--- a/integration/cli-hello-world/src/app/app.component.ts
+++ b/integration/cli-hello-world/src/app/app.component.ts
@@ -1,7 +1,10 @@
import {Component} from '@angular/core';
-@Component(
- {selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.css']})
+@Component({
+ selector: 'app-root',
+ templateUrl: './app.component.html',
+ styleUrls: ['./app.component.css'],
+})
export class AppComponent {
title = 'cli-hello-world';
}
diff --git a/integration/cli-hello-world/src/app/app.module.ts b/integration/cli-hello-world/src/app/app.module.ts
index 314179fcf7661..3d195c97197de 100644
--- a/integration/cli-hello-world/src/app/app.module.ts
+++ b/integration/cli-hello-world/src/app/app.module.ts
@@ -1,21 +1,17 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { LOCALE_ID, NgModule } from '@angular/core';
-import { registerLocaleData } from '@angular/common';
+import {BrowserModule} from '@angular/platform-browser';
+import {LOCALE_ID, NgModule} from '@angular/core';
+import {registerLocaleData} from '@angular/common';
import localeFr from '@angular/common/locales/fr';
-import { AppComponent } from './app.component';
+import {AppComponent} from './app.component';
// adding this code to detect issues like https://github.com/angular/angular-cli/issues/10322
registerLocaleData(localeFr);
@NgModule({
- declarations: [
- AppComponent
- ],
- imports: [
- BrowserModule
- ],
- providers: [{ provide: LOCALE_ID, useValue: 'fr' }],
- bootstrap: [AppComponent]
+ declarations: [AppComponent],
+ imports: [BrowserModule],
+ providers: [{provide: LOCALE_ID, useValue: 'fr'}],
+ bootstrap: [AppComponent],
})
-export class AppModule { }
+export class AppModule {}
diff --git a/integration/cli-hello-world/src/main.ts b/integration/cli-hello-world/src/main.ts
index 0a621147e305c..6f00233886b74 100644
--- a/integration/cli-hello-world/src/main.ts
+++ b/integration/cli-hello-world/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
diff --git a/integration/cli-signal-inputs/e2e/protractor.conf.js b/integration/cli-signal-inputs/e2e/protractor.conf.js
index f86a6f96b1daf..3a7bff8ad2c61 100644
--- a/integration/cli-signal-inputs/e2e/protractor.conf.js
+++ b/integration/cli-signal-inputs/e2e/protractor.conf.js
@@ -1,23 +1,28 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/cli-signal-inputs/e2e/src/app.e2e-spec.ts b/integration/cli-signal-inputs/e2e/src/app.e2e-spec.ts
index 60e7c8fd0bc31..23d0393afd5dd 100644
--- a/integration/cli-signal-inputs/e2e/src/app.e2e-spec.ts
+++ b/integration/cli-signal-inputs/e2e/src/app.e2e-spec.ts
@@ -32,8 +32,10 @@ describe('cli-signal-inputs App', () => {
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/cli-signal-inputs/karma.conf.js b/integration/cli-signal-inputs/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/cli-signal-inputs/karma.conf.js
+++ b/integration/cli-signal-inputs/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/cli-signal-inputs/src/app/app.component.ts b/integration/cli-signal-inputs/src/app/app.component.ts
index e8653a8f98e2c..b73c45b8ecee9 100644
--- a/integration/cli-signal-inputs/src/app/app.component.ts
+++ b/integration/cli-signal-inputs/src/app/app.component.ts
@@ -22,7 +22,7 @@ import {GreetComponent} from './greet.component';
})
export class AppComponent {
firstName = 'John';
- lastName: string|undefined = undefined;
+ lastName: string | undefined = undefined;
greets = viewChildren(GreetComponent);
}
diff --git a/integration/cli-signal-inputs/src/app/greet.component.ts b/integration/cli-signal-inputs/src/app/greet.component.ts
index 2adeb50fa849b..90d7990a32af2 100644
--- a/integration/cli-signal-inputs/src/app/greet.component.ts
+++ b/integration/cli-signal-inputs/src/app/greet.component.ts
@@ -15,7 +15,7 @@ import {Subject} from 'rxjs';
export class GreetComponent {
firstName = input.required<string>();
lastName = input(undefined, {
- transform: (v?: string) => v === undefined ? 'transformed-fallback' : `ng-${v}`,
+ transform: (v?: string) => (v === undefined ? 'transformed-fallback' : `ng-${v}`),
});
@Input() decoratorInput = 0;
diff --git a/integration/defer/e2e/protractor.conf.js b/integration/defer/e2e/protractor.conf.js
index f86a6f96b1daf..3a7bff8ad2c61 100644
--- a/integration/defer/e2e/protractor.conf.js
+++ b/integration/defer/e2e/protractor.conf.js
@@ -1,23 +1,28 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/defer/karma.conf.js b/integration/defer/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/defer/karma.conf.js
+++ b/integration/defer/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/defer/src/app/defer.component.ts b/integration/defer/src/app/defer.component.ts
index 6ef003041144b..cf91ceb03e148 100644
--- a/integration/defer/src/app/defer.component.ts
+++ b/integration/defer/src/app/defer.component.ts
@@ -7,5 +7,4 @@ import {Component} from '@angular/core';
<h2>Defer-loaded component</h2>
`,
})
-export class DeferComponent {
-}
+export class DeferComponent {}
diff --git a/integration/defer/src/main.ts b/integration/defer/src/main.ts
index ccc1cf713dbe1..44497618a29df 100644
--- a/integration/defer/src/main.ts
+++ b/integration/defer/src/main.ts
@@ -2,4 +2,4 @@ import {bootstrapApplication} from '@angular/platform-browser';
import {AppComponent} from './app/app.component';
-bootstrapApplication(AppComponent);
\ No newline at end of file
+bootstrapApplication(AppComponent);
diff --git a/integration/dynamic-compiler/e2e/app.e2e-spec.ts b/integration/dynamic-compiler/e2e/app.e2e-spec.ts
index 654e76298f184..1622bc734d216 100644
--- a/integration/dynamic-compiler/e2e/app.e2e-spec.ts
+++ b/integration/dynamic-compiler/e2e/app.e2e-spec.ts
@@ -1,4 +1,4 @@
-import { AppPage } from './app.po';
+import {AppPage} from './app.po';
describe('dynamic-compiler App', () => {
let page: AppPage;
diff --git a/integration/dynamic-compiler/e2e/app.po.ts b/integration/dynamic-compiler/e2e/app.po.ts
index af43732cc6f24..819744e116466 100644
--- a/integration/dynamic-compiler/e2e/app.po.ts
+++ b/integration/dynamic-compiler/e2e/app.po.ts
@@ -11,6 +11,9 @@ export class AppPage {
getLazyLoadedText() {
const el = element(by.css('app-root lazy-component'));
- return browser.wait(protractor.ExpectedConditions.presenceOf(el)).then(() => el.getText(), err => el.getText());
+ return browser.wait(protractor.ExpectedConditions.presenceOf(el)).then(
+ () => el.getText(),
+ (err) => el.getText(),
+ );
}
}
diff --git a/integration/dynamic-compiler/e2e/protractor.config.js b/integration/dynamic-compiler/e2e/protractor.config.js
index ac95bb2b50cb2..6cfedc172cfda 100644
--- a/integration/dynamic-compiler/e2e/protractor.config.js
+++ b/integration/dynamic-compiler/e2e/protractor.config.js
@@ -1,21 +1,26 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
exports.config = {
- specs: [
- '../dist/e2e/*.e2e-spec.js'
- ],
+ specs: ['../dist/e2e/*.e2e-spec.js'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
directConnect: true,
// Port comes from lite-server config `/e2e/browser.config.json` `"port": 4201`
baseUrl: 'http://localhost:4201/',
framework: 'jasmine',
- useAllAngular2AppRoots: true
+ useAllAngular2AppRoots: true,
};
diff --git a/integration/dynamic-compiler/src/app.component.ts b/integration/dynamic-compiler/src/app.component.ts
index 999019c02a900..294b0da541de9 100644
--- a/integration/dynamic-compiler/src/app.component.ts
+++ b/integration/dynamic-compiler/src/app.component.ts
@@ -13,7 +13,7 @@ export class AppComponent implements AfterViewInit {
constructor(private compiler: Compiler) {}
ngAfterViewInit() {
- import('./lazy.module').then(module => {
+ import('./lazy.module').then((module) => {
this.compiler.compileModuleAndAllComponentsAsync(module.LazyModule).then((compiled) => {
const factory = compiled.componentFactories[0];
this.container.createComponent(factory);
diff --git a/integration/dynamic-compiler/src/app.module.ts b/integration/dynamic-compiler/src/app.module.ts
index 0963654c9522c..2b3fa6723853b 100644
--- a/integration/dynamic-compiler/src/app.module.ts
+++ b/integration/dynamic-compiler/src/app.module.ts
@@ -1,8 +1,8 @@
import {Compiler, COMPILER_OPTIONS, CompilerFactory, NgModule} from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
+import {BrowserModule} from '@angular/platform-browser';
import {JitCompilerFactory} from '@angular/platform-browser-dynamic';
-import { AppComponent } from './app.component';
+import {AppComponent} from './app.component';
export function createCompiler(compilerFactory: CompilerFactory) {
return compilerFactory.createCompiler();
@@ -15,8 +15,7 @@ export function createCompiler(compilerFactory: CompilerFactory) {
providers: [
{provide: COMPILER_OPTIONS, useValue: {}, multi: true},
{provide: CompilerFactory, useClass: JitCompilerFactory, deps: [COMPILER_OPTIONS]},
- {provide: Compiler, useFactory: createCompiler, deps: [CompilerFactory]}
- ]
+ {provide: Compiler, useFactory: createCompiler, deps: [CompilerFactory]},
+ ],
})
export class AppModule {}
-
diff --git a/integration/dynamic-compiler/src/lazy.module.ts b/integration/dynamic-compiler/src/lazy.module.ts
index 9539c144e97e4..42346ec196c5e 100644
--- a/integration/dynamic-compiler/src/lazy.module.ts
+++ b/integration/dynamic-compiler/src/lazy.module.ts
@@ -3,15 +3,12 @@ import {NgModule, Component} from '@angular/core';
@Component({
selector: 'lazy-component',
template: 'Lazy-loaded component!',
- jit: true
+ jit: true,
})
-export class LazyComponent {
-
-}
+export class LazyComponent {}
@NgModule({
declarations: [LazyComponent],
jit: true,
})
-export class LazyModule {
-}
+export class LazyModule {}
diff --git a/integration/dynamic-compiler/src/main.ts b/integration/dynamic-compiler/src/main.ts
index b7ec6e6737205..47feed00d977c 100644
--- a/integration/dynamic-compiler/src/main.ts
+++ b/integration/dynamic-compiler/src/main.ts
@@ -1,7 +1,7 @@
-import { enableProdMode } from '@angular/core';
-import { platformBrowser } from '@angular/platform-browser';
+import {enableProdMode} from '@angular/core';
+import {platformBrowser} from '@angular/platform-browser';
-import { AppModule } from './app.module';
+import {AppModule} from './app.module';
enableProdMode();
diff --git a/integration/forms/e2e/protractor.conf.js b/integration/forms/e2e/protractor.conf.js
index f86a6f96b1daf..3a7bff8ad2c61 100644
--- a/integration/forms/e2e/protractor.conf.js
+++ b/integration/forms/e2e/protractor.conf.js
@@ -1,23 +1,28 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/forms/e2e/src/app.e2e-spec.ts b/integration/forms/e2e/src/app.e2e-spec.ts
index 4201c9f585482..ad7f28faa205b 100644
--- a/integration/forms/e2e/src/app.e2e-spec.ts
+++ b/integration/forms/e2e/src/app.e2e-spec.ts
@@ -17,8 +17,10 @@ describe('forms app', () => {
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/forms/karma.conf.js b/integration/forms/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/forms/karma.conf.js
+++ b/integration/forms/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/forms/src/app/app.component.spec.ts b/integration/forms/src/app/app.component.spec.ts
index 0a36afb0fecb1..f8902fb18345b 100644
--- a/integration/forms/src/app/app.component.spec.ts
+++ b/integration/forms/src/app/app.component.spec.ts
@@ -6,7 +6,7 @@ describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [AppComponent, TemplateFormsComponent, ReactiveFormsComponent],
- imports: [FormsModule, ReactiveFormsModule]
+ imports: [FormsModule, ReactiveFormsModule],
}).compileComponents();
});
diff --git a/integration/forms/src/app/app.component.ts b/integration/forms/src/app/app.component.ts
index fd4fc58f27cf4..be46689e6d60d 100644
--- a/integration/forms/src/app/app.component.ts
+++ b/integration/forms/src/app/app.component.ts
@@ -38,7 +38,7 @@ export class TemplateFormsComponent {
}
addCity() {
- this.addresses.push(({city: ''}));
+ this.addresses.push({city: ''});
}
}
@@ -110,5 +110,4 @@ export class ReactiveFormsComponent {
selector: 'app-root',
templateUrl: './app.component.html',
})
-export class AppComponent {
-}
\ No newline at end of file
+export class AppComponent {}
diff --git a/integration/forms/src/app/app.module.ts b/integration/forms/src/app/app.module.ts
index 5119e131e87d1..7d3f943ea91ef 100644
--- a/integration/forms/src/app/app.module.ts
+++ b/integration/forms/src/app/app.module.ts
@@ -6,18 +6,8 @@ import {BrowserModule} from '@angular/platform-browser';
import {AppComponent, ReactiveFormsComponent, TemplateFormsComponent} from './app.component';
@NgModule({
- declarations: [
- AppComponent,
- TemplateFormsComponent,
- ReactiveFormsComponent,
- ],
- imports: [
- BrowserModule,
- CommonModule,
- FormsModule,
- ReactiveFormsModule,
- ],
- bootstrap: [AppComponent]
+ declarations: [AppComponent, TemplateFormsComponent, ReactiveFormsComponent],
+ imports: [BrowserModule, CommonModule, FormsModule, ReactiveFormsModule],
+ bootstrap: [AppComponent],
})
-export class AppModule {
-}
+export class AppModule {}
diff --git a/integration/forms/src/main.ts b/integration/forms/src/main.ts
index 0a621147e305c..6f00233886b74 100644
--- a/integration/forms/src/main.ts
+++ b/integration/forms/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
diff --git a/integration/injectable-def/src/app.ts b/integration/injectable-def/src/app.ts
index 89c6c662c4ca1..a5005b43bac60 100644
--- a/integration/injectable-def/src/app.ts
+++ b/integration/injectable-def/src/app.ts
@@ -12,10 +12,6 @@ export class TestApp {}
@NgModule({
declarations: [TestApp],
bootstrap: [TestApp],
- imports: [
- Lib2Module,
- BrowserModule,
- ServerModule,
- ],
+ imports: [Lib2Module, BrowserModule, ServerModule],
})
export class AppModule {}
diff --git a/integration/injectable-def/src/main.ts b/integration/injectable-def/src/main.ts
index e853f555cad62..c075158b84cea 100644
--- a/integration/injectable-def/src/main.ts
+++ b/integration/injectable-def/src/main.ts
@@ -13,14 +13,16 @@ enableProdMode();
renderModule(AppModule, {
document: '<test-app></test-app>',
url: '/',
-}).then(html => {
- if (/>0:0</.test(html)) {
- process.exit(0);
- } else {
- console.error('html was', html);
- process.exit(1);
- }
-}).catch(err => {
- console.error(err);
- process.exit(2);
})
+ .then((html) => {
+ if (/>0:0</.test(html)) {
+ process.exit(0);
+ } else {
+ console.error('html was', html);
+ process.exit(1);
+ }
+ })
+ .catch((err) => {
+ console.error(err);
+ process.exit(2);
+ });
diff --git a/integration/ivy-i18n/e2e/app.po.ts b/integration/ivy-i18n/e2e/app.po.ts
index d7375c9072a57..e4b365cb89144 100644
--- a/integration/ivy-i18n/e2e/app.po.ts
+++ b/integration/ivy-i18n/e2e/app.po.ts
@@ -1,9 +1,15 @@
import {browser, by, element} from 'protractor';
export class AppPage {
- navigateTo() { return browser.get('/'); }
+ navigateTo() {
+ return browser.get('/');
+ }
- getHeading() { return element(by.css('app-root h1')).getText(); }
+ getHeading() {
+ return element(by.css('app-root h1')).getText();
+ }
- getParagraph(name: string) { return element(by.css('app-root p#' + name)).getText(); }
+ getParagraph(name: string) {
+ return element(by.css('app-root p#' + name)).getText();
+ }
}
diff --git a/integration/ivy-i18n/e2e/fr/app.e2e-spec.ts b/integration/ivy-i18n/e2e/fr/app.e2e-spec.ts
index 93876089bba6a..65a1e49172307 100644
--- a/integration/ivy-i18n/e2e/fr/app.e2e-spec.ts
+++ b/integration/ivy-i18n/e2e/fr/app.e2e-spec.ts
@@ -12,7 +12,7 @@ describe('cli-hello-world-ivy App', () => {
});
it('should display welcome message', () => {
- expect(page.getParagraph('message')).toEqual('Bienvenue sur l\'application i18n. (inline)');
+ expect(page.getParagraph('message')).toEqual("Bienvenue sur l'application i18n. (inline)");
});
it('should display extra message', () => {
diff --git a/integration/ivy-i18n/e2e/legacy/app.e2e-spec.ts b/integration/ivy-i18n/e2e/legacy/app.e2e-spec.ts
index 04cb3ccf0c18f..cebb6633961fb 100644
--- a/integration/ivy-i18n/e2e/legacy/app.e2e-spec.ts
+++ b/integration/ivy-i18n/e2e/legacy/app.e2e-spec.ts
@@ -7,8 +7,9 @@ describe('cli-hello-world-ivy App', () => {
page.navigateTo();
});
- it('should display translated title',
- () => { expect(page.getHeading()).toEqual('Bonjour cli-hello-world-ivy-compat!'); });
+ it('should display translated title', () => {
+ expect(page.getHeading()).toEqual('Bonjour cli-hello-world-ivy-compat!');
+ });
it('should display untranslated welcome message', () => {
// This message does not get translated because we did not provide a translation for it
@@ -16,5 +17,7 @@ describe('cli-hello-world-ivy App', () => {
expect(page.getParagraph('message')).toEqual('Welcome to the i18n app.');
});
- it('should display the locale', () => { expect(page.getParagraph('locale')).toEqual('legacy'); });
+ it('should display the locale', () => {
+ expect(page.getParagraph('locale')).toEqual('legacy');
+ });
});
diff --git a/integration/ivy-i18n/e2e/protractor.conf.js b/integration/ivy-i18n/e2e/protractor.conf.js
index 79b4510703727..3a7bff8ad2c61 100644
--- a/integration/ivy-i18n/e2e/protractor.conf.js
+++ b/integration/ivy-i18n/e2e/protractor.conf.js
@@ -1,24 +1,29 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/ivy-i18n/e2e/runtime/app.e2e-spec.ts b/integration/ivy-i18n/e2e/runtime/app.e2e-spec.ts
index 9ba4217c404e5..d8520f0fd5619 100644
--- a/integration/ivy-i18n/e2e/runtime/app.e2e-spec.ts
+++ b/integration/ivy-i18n/e2e/runtime/app.e2e-spec.ts
@@ -3,7 +3,9 @@ import {AppPage} from '../app.po';
describe('cli-hello-world-ivy App', () => {
let page: AppPage;
- beforeEach(() => { page = new AppPage(); });
+ beforeEach(() => {
+ page = new AppPage();
+ });
it('should display title', () => {
page.navigateTo();
@@ -12,7 +14,7 @@ describe('cli-hello-world-ivy App', () => {
it('should display welcome message', () => {
page.navigateTo();
- expect(page.getParagraph('message')).toEqual('Bienvenue sur l\'application i18n.');
+ expect(page.getParagraph('message')).toEqual("Bienvenue sur l'application i18n.");
});
it('the percent pipe should work', () => {
@@ -20,7 +22,9 @@ describe('cli-hello-world-ivy App', () => {
expect(page.getParagraph('pipe')).toEqual('100 % awesome');
});
- it('should display the locale', () => { expect(page.getParagraph('locale')).toEqual('fr'); });
+ it('should display the locale', () => {
+ expect(page.getParagraph('locale')).toEqual('fr');
+ });
it('the date pipe should show the localized month', () => {
page.navigateTo();
diff --git a/integration/ivy-i18n/karma.conf.js b/integration/ivy-i18n/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/ivy-i18n/karma.conf.js
+++ b/integration/ivy-i18n/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/ivy-i18n/scripts/update-xlf-translation-file.js b/integration/ivy-i18n/scripts/update-xlf-translation-file.js
index 79a0001a3b4bb..c925f908f3874 100644
--- a/integration/ivy-i18n/scripts/update-xlf-translation-file.js
+++ b/integration/ivy-i18n/scripts/update-xlf-translation-file.js
@@ -13,8 +13,8 @@ const contents = fs.readFileSync(filePath, 'utf8');
fs.writeFileSync(filePath + '.bak', contents, 'utf8');
// Write translated file
-const updated =
- contents.replace(/source>/g, 'target>')
- .replace(/Hello/g, 'Bonjour')
- .replace(/source-language="([^"]+)"/g, 'source-language="$1" target-language="legacy"');
+const updated = contents
+ .replace(/source>/g, 'target>')
+ .replace(/Hello/g, 'Bonjour')
+ .replace(/source-language="([^"]+)"/g, 'source-language="$1" target-language="legacy"');
fs.writeFileSync(filePath, updated, 'utf8');
diff --git a/integration/ivy-i18n/scripts/update-xmb-translation-file.js b/integration/ivy-i18n/scripts/update-xmb-translation-file.js
index 98f5da8be7ce2..6b72cb6bcffcf 100644
--- a/integration/ivy-i18n/scripts/update-xmb-translation-file.js
+++ b/integration/ivy-i18n/scripts/update-xmb-translation-file.js
@@ -11,9 +11,10 @@ const contents = fs.readFileSync(filePath, 'utf8');
// Write translated file
const updatedFilePath = filePath.replace(/\.xmb$/, '.xtb');
-const updatedContents = contents.replace(/messagebundle/g, 'translationbundle>')
- .replace(/<translationbundle>/g, '<translationbundle lang="legacy">')
- .replace(/\bmsg\b/g, 'translation')
- .replace(/Hello/g, 'Bonjour')
- .replace(/<source>.*<\/source>/g, '');
+const updatedContents = contents
+ .replace(/messagebundle/g, 'translationbundle>')
+ .replace(/<translationbundle>/g, '<translationbundle lang="legacy">')
+ .replace(/\bmsg\b/g, 'translation')
+ .replace(/Hello/g, 'Bonjour')
+ .replace(/<source>.*<\/source>/g, '');
fs.writeFileSync(updatedFilePath, updatedContents, 'utf8');
diff --git a/integration/ivy-i18n/src/app/app.component.spec.ts b/integration/ivy-i18n/src/app/app.component.spec.ts
index edfb11fc547a3..73b25845ace59 100644
--- a/integration/ivy-i18n/src/app/app.component.spec.ts
+++ b/integration/ivy-i18n/src/app/app.component.spec.ts
@@ -24,7 +24,6 @@ describe('AppComponent', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
- expect(compiled.querySelector('h1').textContent)
- .toContain('Hello cli-hello-world-ivy-compat!');
+ expect(compiled.querySelector('h1').textContent).toContain('Hello cli-hello-world-ivy-compat!');
});
});
diff --git a/integration/ivy-i18n/src/app/app.component.ts b/integration/ivy-i18n/src/app/app.component.ts
index ddf6cb97d0117..f1b6804a69a3a 100644
--- a/integration/ivy-i18n/src/app/app.component.ts
+++ b/integration/ivy-i18n/src/app/app.component.ts
@@ -1,7 +1,10 @@
import {Component, Inject, LOCALE_ID} from '@angular/core';
-@Component(
- {selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.css']})
+@Component({
+ selector: 'app-root',
+ templateUrl: './app.component.html',
+ styleUrls: ['./app.component.css'],
+})
export class AppComponent {
constructor(@Inject(LOCALE_ID) public locale: string) {}
title = `cli-hello-world-ivy-compat`;
diff --git a/integration/ivy-i18n/src/app/app.module.ts b/integration/ivy-i18n/src/app/app.module.ts
index 0de438443f099..ea42d1cf096d7 100644
--- a/integration/ivy-i18n/src/app/app.module.ts
+++ b/integration/ivy-i18n/src/app/app.module.ts
@@ -9,5 +9,4 @@ import {AppComponent} from './app.component';
registerLocaleData(localeFr);
@NgModule({declarations: [AppComponent], imports: [BrowserModule], bootstrap: [AppComponent]})
-export class AppModule {
-}
+export class AppModule {}
diff --git a/integration/ivy-i18n/src/main.ts b/integration/ivy-i18n/src/main.ts
index 0a621147e305c..6f00233886b74 100644
--- a/integration/ivy-i18n/src/main.ts
+++ b/integration/ivy-i18n/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
diff --git a/integration/ivy-i18n/src/polyfills-runtime.ts b/integration/ivy-i18n/src/polyfills-runtime.ts
index 7883c5d1eee8c..0cbc9c770f62e 100644
--- a/integration/ivy-i18n/src/polyfills-runtime.ts
+++ b/integration/ivy-i18n/src/polyfills-runtime.ts
@@ -69,7 +69,7 @@ import {loadTranslations} from '@angular/localize';
// Load some runtime translations!
loadTranslations({
[computeMsgId(' Hello {$INTERPOLATION}! ')]: 'Bonjour {$INTERPOLATION}!',
- [computeMsgId('Welcome to the i18n app.')]: 'Bienvenue sur l\'application i18n.',
+ [computeMsgId('Welcome to the i18n app.')]: "Bienvenue sur l'application i18n.",
});
// Set up the locale for the runtime inlining (EXPERIMENTAL)
diff --git a/integration/ivy-i18n/src/polyfills.ts b/integration/ivy-i18n/src/polyfills.ts
index bc374317fac0a..eafbb96b59760 100644
--- a/integration/ivy-i18n/src/polyfills.ts
+++ b/integration/ivy-i18n/src/polyfills.ts
@@ -59,7 +59,6 @@ import 'zone.js'; // Included with Angular CLI.
*/
import '@angular/localize/init';
-
/***************************************************************************************************
* APPLICATION IMPORTS
*/
diff --git a/integration/ng-add-localize/src/app/app.component.ts b/integration/ng-add-localize/src/app/app.component.ts
index 4f7c6300210cf..9a2dac41ab836 100644
--- a/integration/ng-add-localize/src/app/app.component.ts
+++ b/integration/ng-add-localize/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'app-root',
@@ -25,7 +25,7 @@ import { Component } from '@angular/core';
</ul>
`,
- styles: []
+ styles: [],
})
export class AppComponent {
title = $localize`ng-add-localize`;
diff --git a/integration/ng-add-localize/src/app/app.module.ts b/integration/ng-add-localize/src/app/app.module.ts
index 8dfc1d68272a4..5ca28b08e0978 100644
--- a/integration/ng-add-localize/src/app/app.module.ts
+++ b/integration/ng-add-localize/src/app/app.module.ts
@@ -1,16 +1,12 @@
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
-import { AppComponent } from './app.component';
+import {AppComponent} from './app.component';
@NgModule({
- declarations: [
- AppComponent
- ],
- imports: [
- BrowserModule
- ],
+ declarations: [AppComponent],
+ imports: [BrowserModule],
providers: [],
- bootstrap: [AppComponent]
+ bootstrap: [AppComponent],
})
-export class AppModule { }
+export class AppModule {}
diff --git a/integration/ng-add-localize/src/main.ts b/integration/ng-add-localize/src/main.ts
index 0a621147e305c..6f00233886b74 100644
--- a/integration/ng-add-localize/src/main.ts
+++ b/integration/ng-add-localize/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
diff --git a/integration/ng_elements/e2e/app.e2e-spec.ts b/integration/ng_elements/e2e/app.e2e-spec.ts
index 0d7e65ffbcef7..50f970e3e285d 100644
--- a/integration/ng_elements/e2e/app.e2e-spec.ts
+++ b/integration/ng_elements/e2e/app.e2e-spec.ts
@@ -51,7 +51,10 @@ describe('Element E2E Tests', function () {
input.sendKeys('Foo');
// Make tests less flaky on CI by waiting up to 5s for the element text to be updated.
- browser.wait(async () => await getShadowDomText(helloWorldShadowEl) === 'Hello Foo!', 5000);
+ browser.wait(
+ async () => (await getShadowDomText(helloWorldShadowEl)) === 'Hello Foo!',
+ 5000,
+ );
});
});
});
diff --git a/integration/ng_elements/e2e/protractor.config.js b/integration/ng_elements/e2e/protractor.config.js
index ae652011dba3d..1cf969432634f 100644
--- a/integration/ng_elements/e2e/protractor.config.js
+++ b/integration/ng_elements/e2e/protractor.config.js
@@ -1,21 +1,26 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
exports.config = {
- specs: [
- '../built/e2e/*.e2e-spec.js'
- ],
+ specs: ['../built/e2e/*.e2e-spec.js'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
directConnect: true,
// Port comes from lite-server config `/e2e/browser.config.json` `"port": 4205`
baseUrl: 'http://localhost:4205/',
framework: 'jasmine',
- useAllAngular2AppRoots: true
+ useAllAngular2AppRoots: true,
};
diff --git a/integration/ng_elements/src/app.ts b/integration/ng_elements/src/app.ts
index f1c351d1ea978..6363bacc37a1c 100644
--- a/integration/ng_elements/src/app.ts
+++ b/integration/ng_elements/src/app.ts
@@ -2,8 +2,12 @@ import {Injector, NgModule} from '@angular/core';
import {createCustomElement} from '@angular/elements';
import {BrowserModule} from '@angular/platform-browser';
-import {HelloWorldComponent, HelloWorldOnpushComponent, HelloWorldShadowComponent, TestCardComponent} from './elements';
-
+import {
+ HelloWorldComponent,
+ HelloWorldOnpushComponent,
+ HelloWorldShadowComponent,
+ TestCardComponent,
+} from './elements';
@NgModule({
declarations: [
@@ -18,9 +22,13 @@ export class AppModule {
constructor(injector: Injector) {
customElements.define('hello-world-el', createCustomElement(HelloWorldComponent, {injector}));
customElements.define(
- 'hello-world-onpush-el', createCustomElement(HelloWorldOnpushComponent, {injector}));
+ 'hello-world-onpush-el',
+ createCustomElement(HelloWorldOnpushComponent, {injector}),
+ );
customElements.define(
- 'hello-world-shadow-el', createCustomElement(HelloWorldShadowComponent, {injector}));
+ 'hello-world-shadow-el',
+ createCustomElement(HelloWorldShadowComponent, {injector}),
+ );
customElements.define('test-card', createCustomElement(TestCardComponent, {injector}));
}
ngDoBootstrap() {}
diff --git a/integration/ng_elements/src/elements.ts b/integration/ng_elements/src/elements.ts
index e3252e7761c69..28879505fc029 100644
--- a/integration/ng_elements/src/elements.ts
+++ b/integration/ng_elements/src/elements.ts
@@ -38,5 +38,4 @@ export class HelloWorldShadowComponent {
</footer>`,
encapsulation: ViewEncapsulation.ShadowDom,
})
-export class TestCardComponent {
-}
+export class TestCardComponent {}
diff --git a/integration/ng_update/check.js b/integration/ng_update/check.js
index 9b1898a23bc57..2632e475418a8 100644
--- a/integration/ng_update/check.js
+++ b/integration/ng_update/check.js
@@ -2,13 +2,18 @@ const fs = require('fs');
const path = require('path');
const angularRoot = path.resolve('./node_modules/@angular');
-const angularModules = fs.readdirSync(angularRoot).map(function (name) {
- const content = fs.readFileSync(path.join(angularRoot, name, 'package.json'), 'utf-8').toString();
- return JSON.parse(content);
-}).reduce(function (acc, packageJson) {
- acc[packageJson.name] = packageJson;
- return acc;
-}, Object.create(null));
+const angularModules = fs
+ .readdirSync(angularRoot)
+ .map(function (name) {
+ const content = fs
+ .readFileSync(path.join(angularRoot, name, 'package.json'), 'utf-8')
+ .toString();
+ return JSON.parse(content);
+ })
+ .reduce(function (acc, packageJson) {
+ acc[packageJson.name] = packageJson;
+ return acc;
+ }, Object.create(null));
var error = false;
Object.keys(angularModules).forEach(function (name) {
@@ -31,8 +36,13 @@ Object.keys(angularModules).forEach(function (name) {
// Verify that every packageGroup is represented in the list of modules.
Object.keys(angularModules).forEach(function (groupEntry) {
if (packageGroup.indexOf(groupEntry) == -1) {
- console.error('Package ' + JSON.stringify(name) + ' is missing ' + JSON.stringify(groupEntry)
- + ' as a packageGroup entry.');
+ console.error(
+ 'Package ' +
+ JSON.stringify(name) +
+ ' is missing ' +
+ JSON.stringify(groupEntry) +
+ ' as a packageGroup entry.',
+ );
error = true;
return;
}
diff --git a/integration/ng_update_migrations/src/app/app.component.spec.ts b/integration/ng_update_migrations/src/app/app.component.spec.ts
index 1d9ff930df5a7..8c15700c2fcab 100644
--- a/integration/ng_update_migrations/src/app/app.component.spec.ts
+++ b/integration/ng_update_migrations/src/app/app.component.spec.ts
@@ -3,11 +3,9 @@ import {AppComponent} from './app.component';
describe('AppComponent', () => {
beforeEach(waitForAsync(() => {
- TestBed
- .configureTestingModule({
- declarations: [AppComponent],
- })
- .compileComponents();
+ TestBed.configureTestingModule({
+ declarations: [AppComponent],
+ }).compileComponents();
}));
it('should create the app', () => {
diff --git a/integration/ng_update_migrations/src/app/app.component.ts b/integration/ng_update_migrations/src/app/app.component.ts
index 06ad8d132fa38..dd325a7812ee1 100644
--- a/integration/ng_update_migrations/src/app/app.component.ts
+++ b/integration/ng_update_migrations/src/app/app.component.ts
@@ -1,9 +1,9 @@
-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
- styleUrls: ['./app.component.less']
+ styleUrls: ['./app.component.less'],
})
export class AppComponent {
title = 'ng-update-migrations';
diff --git a/integration/ng_update_migrations/src/app/app.module.ts b/integration/ng_update_migrations/src/app/app.module.ts
index f65716351aa59..e59b43254b796 100644
--- a/integration/ng_update_migrations/src/app/app.module.ts
+++ b/integration/ng_update_migrations/src/app/app.module.ts
@@ -1,16 +1,12 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
-import { AppComponent } from './app.component';
+import {AppComponent} from './app.component';
@NgModule({
- declarations: [
- AppComponent
- ],
- imports: [
- BrowserModule
- ],
+ declarations: [AppComponent],
+ imports: [BrowserModule],
providers: [],
- bootstrap: [AppComponent]
+ bootstrap: [AppComponent],
})
-export class AppModule { }
+export class AppModule {}
diff --git a/integration/ng_update_migrations/src/main.ts b/integration/ng_update_migrations/src/main.ts
index 0a621147e305c..6f00233886b74 100644
--- a/integration/ng_update_migrations/src/main.ts
+++ b/integration/ng_update_migrations/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
diff --git a/integration/ng_update_migrations/src/test.ts b/integration/ng_update_migrations/src/test.ts
index 6b03dbe8b6dee..36f11553df6c7 100644
--- a/integration/ng_update_migrations/src/test.ts
+++ b/integration/ng_update_migrations/src/test.ts
@@ -1,21 +1,18 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/testing';
-import { getTestBed } from '@angular/core/testing';
+import {getTestBed} from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
- platformBrowserDynamicTesting
+ platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
declare const require: any;
// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
- BrowserDynamicTestingModule,
- platformBrowserDynamicTesting(), {
- teardown: { destroyAfterEach: false }
-}
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+ teardown: {destroyAfterEach: false},
+});
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
diff --git a/integration/ng_update_migrations/src/test_expected.ts b/integration/ng_update_migrations/src/test_expected.ts
index 6b03dbe8b6dee..36f11553df6c7 100644
--- a/integration/ng_update_migrations/src/test_expected.ts
+++ b/integration/ng_update_migrations/src/test_expected.ts
@@ -1,21 +1,18 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/testing';
-import { getTestBed } from '@angular/core/testing';
+import {getTestBed} from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
- platformBrowserDynamicTesting
+ platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
declare const require: any;
// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
- BrowserDynamicTestingModule,
- platformBrowserDynamicTesting(), {
- teardown: { destroyAfterEach: false }
-}
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+ teardown: {destroyAfterEach: false},
+});
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
diff --git a/integration/ng_update_migrations/test.js b/integration/ng_update_migrations/test.js
index b2ed7af9e02ce..c8be2e0d1a806 100644
--- a/integration/ng_update_migrations/test.js
+++ b/integration/ng_update_migrations/test.js
@@ -22,15 +22,25 @@ const fromVersion = '12.0.0';
const toVersion = '13.0.0';
// Note that we need to specify "--allow-dirty" as the repository will become dirty
// if dependencies for the integration test are installed (i.e. modified lock files)
-const updateCommandArgs = ['@angular/core', '--migrate-only', '--from', fromVersion,
- '--to', toVersion, '--allow-dirty'];
+const updateCommandArgs = [
+ '@angular/core',
+ '--migrate-only',
+ '--from',
+ fromVersion,
+ '--to',
+ toVersion,
+ '--allow-dirty',
+];
// Print out the command that is used to run the migrations for easier debugging.
console.error(`Running "ng update ${updateCommandArgs.join(' ')}":`);
console.error(chalk.yellow(`------------------------------------------`));
const updateProcess = child_process.spawnSync(
- 'node', [cliBinPath, 'update', ...updateCommandArgs], {stdio: 'inherit', cwd: projectDir});
+ 'node',
+ [cliBinPath, 'update', ...updateCommandArgs],
+ {stdio: 'inherit', cwd: projectDir},
+);
console.error(chalk.yellow(`------------------------------------------\n`));
@@ -42,7 +52,7 @@ if (updateProcess.status !== 0) {
let testsPassing = true;
// Check if each expectation file matches the actual file in the CLI project.
-expectationFiles.forEach(relativeFilePath => {
+expectationFiles.forEach((relativeFilePath) => {
const actualFilePath = relativeFilePath.replace(/_expected.(ts)$/, '.$1');
const expectedContent = fs.readFileSync(path.join(projectDir, relativeFilePath), 'utf8');
const actualContent = fs.readFileSync(path.join(projectDir, actualFilePath), 'utf8');
@@ -62,10 +72,15 @@ process.exit(testsPassing ? 0 : 1);
/** Compares the two strings and prints out a colored diff to stdout. */
function printColoredPatch(actualFilePath, actualContent, expectedContent) {
- const patchLines =
- diff.createPatch(
- actualFilePath, expectedContent, actualContent, 'Expected content', 'Actual content')
- .split(/\r?\n/);
+ const patchLines = diff
+ .createPatch(
+ actualFilePath,
+ expectedContent,
+ actualContent,
+ 'Expected content',
+ 'Actual content',
+ )
+ .split(/\r?\n/);
// Walk through each line of the patch and print it. We omit the first two lines
// as these are the patch header and not relevant to the test.
for (let line of patchLines.slice(2)) {
diff --git a/integration/nodenext_resolution/include-all.ts b/integration/nodenext_resolution/include-all.ts
index c48b53c439ed7..367051450949f 100644
--- a/integration/nodenext_resolution/include-all.ts
+++ b/integration/nodenext_resolution/include-all.ts
@@ -6,8 +6,6 @@
* found in the LICENSE file at https://angular.io/license
*/
-
-
import * as animations from '@angular/animations';
import * as animationsBrowser from '@angular/animations/browser';
import * as animationsBrowserTesting from '@angular/animations/browser/testing';
diff --git a/integration/platform-server/e2e/protractor.conf.js b/integration/platform-server/e2e/protractor.conf.js
index 369767f212e09..b7b164a747145 100644
--- a/integration/platform-server/e2e/protractor.conf.js
+++ b/integration/platform-server/e2e/protractor.conf.js
@@ -1,16 +1,14 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*-spec.ts'
- ],
+ specs: ['./src/**/*-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
SELENIUM_PROMISE_MANAGER: false,
capabilities: {
@@ -18,7 +16,14 @@ exports.config = {
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -27,12 +32,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/platform-server/projects/ngmodule/src/app/app-routing.module.ts b/integration/platform-server/projects/ngmodule/src/app/app-routing.module.ts
index 0ed8c070fea51..a9004326381b6 100644
--- a/integration/platform-server/projects/ngmodule/src/app/app-routing.module.ts
+++ b/integration/platform-server/projects/ngmodule/src/app/app-routing.module.ts
@@ -16,14 +16,14 @@ const routes: Routes = [
path: 'http-transferstate-lazy',
loadChildren: () =>
import('./http-transferstate-lazy/http-transfer-state.module').then(
- (m) => m.HttpTransferStateModule
+ (m) => m.HttpTransferStateModule,
),
},
{
path: 'http-transferstate-lazy-on-init',
loadChildren: () =>
import('./http-transferstate-lazy-on-init/http-transferstate-lazy-on-init.module').then(
- (m) => m.HttpTransferStateOnInitModule
+ (m) => m.HttpTransferStateOnInitModule,
),
},
{
diff --git a/integration/platform-server/projects/ngmodule/src/app/app.component.ts b/integration/platform-server/projects/ngmodule/src/app/app.component.ts
index 40c0ecf54ecaf..894c1a636d7dc 100644
--- a/integration/platform-server/projects/ngmodule/src/app/app.component.ts
+++ b/integration/platform-server/projects/ngmodule/src/app/app.component.ts
@@ -1,8 +1,7 @@
-import { Component } from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'app-root',
template: '<router-outlet></router-outlet>',
})
-export class AppComponent {
-}
+export class AppComponent {}
diff --git a/integration/platform-server/projects/ngmodule/src/app/app.server.module.ts b/integration/platform-server/projects/ngmodule/src/app/app.server.module.ts
index 795380cd22946..ccc3d3fd34dbc 100644
--- a/integration/platform-server/projects/ngmodule/src/app/app.server.module.ts
+++ b/integration/platform-server/projects/ngmodule/src/app/app.server.module.ts
@@ -1,14 +1,11 @@
-import { NgModule } from '@angular/core';
-import { ServerModule } from '@angular/platform-server';
+import {NgModule} from '@angular/core';
+import {ServerModule} from '@angular/platform-server';
-import { AppModule } from './app.module';
-import { AppComponent } from './app.component';
+import {AppModule} from './app.module';
+import {AppComponent} from './app.component';
@NgModule({
- imports: [
- AppModule,
- ServerModule,
- ],
+ imports: [AppModule, ServerModule],
bootstrap: [AppComponent],
})
export class AppServerModule {}
diff --git a/integration/platform-server/projects/ngmodule/src/app/helloworld/hello-world.component.ts b/integration/platform-server/projects/ngmodule/src/app/helloworld/hello-world.component.ts
index aa0a40c4d9f51..9190fa48493b1 100644
--- a/integration/platform-server/projects/ngmodule/src/app/helloworld/hello-world.component.ts
+++ b/integration/platform-server/projects/ngmodule/src/app/helloworld/hello-world.component.ts
@@ -13,11 +13,13 @@ import {Component} from '@angular/core';
template: `
<div>Hello {{ name }}!</div>
`,
- styles: [`
+ styles: [
+ `
div {
font-weight: bold;
}
- `]
+ `,
+ ],
})
export class HelloWorldComponent {
name: string = 'world';
diff --git a/integration/platform-server/projects/ngmodule/src/app/transferstate/transfer-state.component.ts b/integration/platform-server/projects/ngmodule/src/app/transferstate/transfer-state.component.ts
index 07bfcfa60cf71..c4a1a546f8bc6 100644
--- a/integration/platform-server/projects/ngmodule/src/app/transferstate/transfer-state.component.ts
+++ b/integration/platform-server/projects/ngmodule/src/app/transferstate/transfer-state.component.ts
@@ -18,7 +18,10 @@ const COUNTER_KEY = makeStateKey<number>('counter');
export class TransferStateComponent {
counter = 0;
- constructor(@Inject(PLATFORM_ID) private platformId: {}, private transferState: TransferState) {}
+ constructor(
+ @Inject(PLATFORM_ID) private platformId: {},
+ private transferState: TransferState,
+ ) {}
ngOnInit() {
if (isPlatformServer(this.platformId)) {
diff --git a/integration/platform-server/projects/ngmodule/src/main.server.ts b/integration/platform-server/projects/ngmodule/src/main.server.ts
index cdb649e15de7c..ac4cea71cd80b 100644
--- a/integration/platform-server/projects/ngmodule/src/main.server.ts
+++ b/integration/platform-server/projects/ngmodule/src/main.server.ts
@@ -1,2 +1 @@
-
-export { AppServerModule } from './app/app.server.module';
+export {AppServerModule} from './app/app.server.module';
diff --git a/integration/platform-server/projects/ngmodule/src/main.ts b/integration/platform-server/projects/ngmodule/src/main.ts
index 595b729d6343a..cb04960747e51 100644
--- a/integration/platform-server/projects/ngmodule/src/main.ts
+++ b/integration/platform-server/projects/ngmodule/src/main.ts
@@ -1,6 +1,6 @@
-import { platformBrowser } from '@angular/platform-browser';
+import {platformBrowser} from '@angular/platform-browser';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
(window as any)['doBootstrap'] = () => {
platformBrowser().bootstrapModule(AppModule);
diff --git a/integration/platform-server/projects/standalone/server.ts b/integration/platform-server/projects/standalone/server.ts
index 4c791442679ac..14940c0999e53 100644
--- a/integration/platform-server/projects/standalone/server.ts
+++ b/integration/platform-server/projects/standalone/server.ts
@@ -10,8 +10,8 @@ import {APP_BASE_HREF} from '@angular/common';
import {renderApplication} from '@angular/platform-server';
import express from 'express';
import bootstrap from './src/main.server';
-import { fileURLToPath } from 'node:url';
-import { dirname, join, resolve } from 'node:path';
+import {fileURLToPath} from 'node:url';
+import {dirname, join, resolve} from 'node:path';
import {readFileSync} from 'node:fs';
import './prerender';
@@ -25,7 +25,7 @@ app.get(
'*.*',
express.static(browserDistFolder, {
maxAge: '1y',
- })
+ }),
);
// Mock API
@@ -39,7 +39,7 @@ app.get('/api-2', (req, res) => {
// All regular routes use the Universal engine
app.get('*', (req, res) => {
- const { protocol, originalUrl, baseUrl, headers } = req;
+ const {protocol, originalUrl, baseUrl, headers} = req;
renderApplication(bootstrap, {
document: indexHtml,
@@ -50,7 +50,6 @@ app.get('*', (req, res) => {
});
});
-
app.listen(4206, () => {
console.log('Server listening on port 4206!');
});
diff --git a/integration/platform-server/projects/standalone/src/app/app.component.ts b/integration/platform-server/projects/standalone/src/app/app.component.ts
index 7891c524dac18..2ddaf81aaaa56 100644
--- a/integration/platform-server/projects/standalone/src/app/app.component.ts
+++ b/integration/platform-server/projects/standalone/src/app/app.component.ts
@@ -1,13 +1,11 @@
-import { Component } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { RouterOutlet } from '@angular/router';
+import {Component} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {RouterOutlet} from '@angular/router';
@Component({
selector: 'app-root',
standalone: true,
imports: [CommonModule, RouterOutlet],
template: '<router-outlet></router-outlet>',
-
})
-export class AppComponent {
-}
+export class AppComponent {}
diff --git a/integration/platform-server/projects/standalone/src/app/app.config.server.ts b/integration/platform-server/projects/standalone/src/app/app.config.server.ts
index b4d57c94235f8..c217a73668a04 100644
--- a/integration/platform-server/projects/standalone/src/app/app.config.server.ts
+++ b/integration/platform-server/projects/standalone/src/app/app.config.server.ts
@@ -1,11 +1,9 @@
-import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
-import { provideServerRendering } from '@angular/platform-server';
-import { appConfig } from './app.config';
+import {mergeApplicationConfig, ApplicationConfig} from '@angular/core';
+import {provideServerRendering} from '@angular/platform-server';
+import {appConfig} from './app.config';
const serverConfig: ApplicationConfig = {
- providers: [
- provideServerRendering()
- ]
+ providers: [provideServerRendering()],
};
export const config = mergeApplicationConfig(appConfig, serverConfig);
diff --git a/integration/platform-server/projects/standalone/src/app/app.config.ts b/integration/platform-server/projects/standalone/src/app/app.config.ts
index c53d3ecdefc96..4089ff36edb51 100644
--- a/integration/platform-server/projects/standalone/src/app/app.config.ts
+++ b/integration/platform-server/projects/standalone/src/app/app.config.ts
@@ -6,9 +6,5 @@ import {provideRouter} from '@angular/router';
import {routes} from './app.routes';
export const appConfig: ApplicationConfig = {
- providers: [
- provideRouter(routes),
- provideClientHydration(),
- provideHttpClient(),
- ],
+ providers: [provideRouter(routes), provideClientHydration(), provideHttpClient()],
};
diff --git a/integration/platform-server/projects/standalone/src/app/app.routes.ts b/integration/platform-server/projects/standalone/src/app/app.routes.ts
index 0113034fd44b2..9f71d1f48528b 100644
--- a/integration/platform-server/projects/standalone/src/app/app.routes.ts
+++ b/integration/platform-server/projects/standalone/src/app/app.routes.ts
@@ -15,14 +15,14 @@ export const routes: Routes = [
path: 'http-transferstate-lazy',
loadComponent: () =>
import('./http-transferstate-lazy/http-transfer-state.component').then(
- (c) => c.TransferStateComponent
+ (c) => c.TransferStateComponent,
),
},
{
path: 'http-transferstate-lazy-on-init',
loadComponent: () =>
import('./http-transferstate-lazy-on-init/http-transfer-state-on-init.component').then(
- (c) => c.TransferStateOnInitComponent
+ (c) => c.TransferStateOnInitComponent,
),
},
{
diff --git a/integration/platform-server/projects/standalone/src/app/helloworld/hello-world.component.ts b/integration/platform-server/projects/standalone/src/app/helloworld/hello-world.component.ts
index 9fd9199cab513..2503f1bd42de8 100644
--- a/integration/platform-server/projects/standalone/src/app/helloworld/hello-world.component.ts
+++ b/integration/platform-server/projects/standalone/src/app/helloworld/hello-world.component.ts
@@ -14,11 +14,13 @@ import {Component} from '@angular/core';
template: `
<div>Hello {{ name }}!</div>
`,
- styles: [`
+ styles: [
+ `
div {
font-weight: bold;
}
- `]
+ `,
+ ],
})
export class HelloWorldComponent {
name: string = 'world';
diff --git a/integration/platform-server/projects/standalone/src/app/http-transferstate-lazy/http-transfer-state.component.ts b/integration/platform-server/projects/standalone/src/app/http-transferstate-lazy/http-transfer-state.component.ts
index eda820d63ccc9..295cdc2d67a1c 100644
--- a/integration/platform-server/projects/standalone/src/app/http-transferstate-lazy/http-transfer-state.component.ts
+++ b/integration/platform-server/projects/standalone/src/app/http-transferstate-lazy/http-transfer-state.component.ts
@@ -16,7 +16,7 @@ import {Component, OnInit} from '@angular/core';
<div class="one">{{ responseOne }}</div>
<div class="two">{{ responseTwo }}</div>
`,
- providers: [HttpClient]
+ providers: [HttpClient],
})
export class TransferStateComponent implements OnInit {
responseOne: string = '';
diff --git a/integration/platform-server/projects/standalone/src/app/transferstate/transfer-state.component.ts b/integration/platform-server/projects/standalone/src/app/transferstate/transfer-state.component.ts
index 57a7946ad15c9..c1b4c4c51be18 100644
--- a/integration/platform-server/projects/standalone/src/app/transferstate/transfer-state.component.ts
+++ b/integration/platform-server/projects/standalone/src/app/transferstate/transfer-state.component.ts
@@ -16,12 +16,15 @@ const COUNTER_KEY = makeStateKey<number>('counter');
selector: 'transfer-state',
standalone: true,
template: ` <div>{{ counter }}</div> `,
- providers: [HttpClient]
+ providers: [HttpClient],
})
export class TransferStateComponent {
counter = 0;
- constructor(@Inject(PLATFORM_ID) private platformId: {}, private transferState: TransferState) {}
+ constructor(
+ @Inject(PLATFORM_ID) private platformId: {},
+ private transferState: TransferState,
+ ) {}
ngOnInit() {
if (isPlatformServer(this.platformId)) {
diff --git a/integration/platform-server/projects/standalone/src/main.server.ts b/integration/platform-server/projects/standalone/src/main.server.ts
index 4b9d4d1545c1a..e83e990a42ce7 100644
--- a/integration/platform-server/projects/standalone/src/main.server.ts
+++ b/integration/platform-server/projects/standalone/src/main.server.ts
@@ -1,6 +1,6 @@
-import { bootstrapApplication } from '@angular/platform-browser';
-import { AppComponent } from './app/app.component';
-import { config } from './app/app.config.server';
+import {bootstrapApplication} from '@angular/platform-browser';
+import {AppComponent} from './app/app.component';
+import {config} from './app/app.config.server';
const bootstrap = () => bootstrapApplication(AppComponent, config);
diff --git a/integration/side-effects/snapshots/animations-browser/esm2022.js b/integration/side-effects/snapshots/animations-browser/esm2022.js
index a23be397a1edf..bb47737e08e92 100644
--- a/integration/side-effects/snapshots/animations-browser/esm2022.js
+++ b/integration/side-effects/snapshots/animations-browser/esm2022.js
@@ -1,3 +1,3 @@
-import "@angular/animations";
+import '@angular/animations';
-import "@angular/core";
+import '@angular/core';
diff --git a/integration/side-effects/snapshots/animations/esm2022.js b/integration/side-effects/snapshots/animations/esm2022.js
index 8b137891791fe..e69de29bb2d1d 100644
--- a/integration/side-effects/snapshots/animations/esm2022.js
+++ b/integration/side-effects/snapshots/animations/esm2022.js
@@ -1 +0,0 @@
-
diff --git a/integration/side-effects/snapshots/common/esm2022.js b/integration/side-effects/snapshots/common/esm2022.js
index 595d8ae0af2ae..35529f9f0826d 100644
--- a/integration/side-effects/snapshots/common/esm2022.js
+++ b/integration/side-effects/snapshots/common/esm2022.js
@@ -1 +1 @@
-import "@angular/core";
+import '@angular/core';
diff --git a/integration/side-effects/snapshots/core/esm2022.js b/integration/side-effects/snapshots/core/esm2022.js
index dbc3b5fd64782..caf376e1232c7 100644
--- a/integration/side-effects/snapshots/core/esm2022.js
+++ b/integration/side-effects/snapshots/core/esm2022.js
@@ -1,9 +1,18 @@
-import "rxjs";
+import 'rxjs';
-import "rxjs/operators";
+import 'rxjs/operators';
const _global = globalThis;
-if ("undefined" !== typeof ngDevMode && ngDevMode) _global.$localize = _global.$localize || function() {
- throw new Error("It looks like your application or one of its dependencies is using i18n.\n" + "Angular 9 introduced a global `$localize()` function that needs to be loaded.\n" + "Please run `ng add @angular/localize` from the Angular CLI.\n" + "(For non-CLI projects, add `import '@angular/localize/init';` to your `polyfills.ts` file.\n" + "For server-side rendering applications add the import to your `main.server.ts` file.)");
-};
+if ('undefined' !== typeof ngDevMode && ngDevMode)
+ _global.$localize =
+ _global.$localize ||
+ function () {
+ throw new Error(
+ 'It looks like your application or one of its dependencies is using i18n.\n' +
+ 'Angular 9 introduced a global `$localize()` function that needs to be loaded.\n' +
+ 'Please run `ng add @angular/localize` from the Angular CLI.\n' +
+ "(For non-CLI projects, add `import '@angular/localize/init';` to your `polyfills.ts` file.\n" +
+ 'For server-side rendering applications add the import to your `main.server.ts` file.)',
+ );
+ };
diff --git a/integration/side-effects/snapshots/elements/esm2022.js b/integration/side-effects/snapshots/elements/esm2022.js
index 38f33e40ed9f2..e40fc92371d36 100644
--- a/integration/side-effects/snapshots/elements/esm2022.js
+++ b/integration/side-effects/snapshots/elements/esm2022.js
@@ -1,5 +1,5 @@
-import "@angular/core";
+import '@angular/core';
-import "rxjs";
+import 'rxjs';
-import "rxjs/operators";
+import 'rxjs/operators';
diff --git a/integration/side-effects/snapshots/forms/esm2022.js b/integration/side-effects/snapshots/forms/esm2022.js
index fe5d46d469a35..c6e40221a4bda 100644
--- a/integration/side-effects/snapshots/forms/esm2022.js
+++ b/integration/side-effects/snapshots/forms/esm2022.js
@@ -1,7 +1,7 @@
-import "@angular/core";
+import '@angular/core';
-import "@angular/common";
+import '@angular/common';
-import "rxjs";
+import 'rxjs';
-import "rxjs/operators";
+import 'rxjs/operators';
diff --git a/integration/side-effects/snapshots/platform-browser/esm2022.js b/integration/side-effects/snapshots/platform-browser/esm2022.js
index aa3513a1903ce..702c2c5ceb10f 100644
--- a/integration/side-effects/snapshots/platform-browser/esm2022.js
+++ b/integration/side-effects/snapshots/platform-browser/esm2022.js
@@ -1,3 +1,3 @@
-import "@angular/common";
+import '@angular/common';
-import "@angular/core";
+import '@angular/core';
diff --git a/integration/side-effects/snapshots/router/esm2022.js b/integration/side-effects/snapshots/router/esm2022.js
index 829a5bdc8cf9d..269631461a657 100644
--- a/integration/side-effects/snapshots/router/esm2022.js
+++ b/integration/side-effects/snapshots/router/esm2022.js
@@ -1,7 +1,7 @@
-import "@angular/common";
+import '@angular/common';
-import "@angular/core";
+import '@angular/core';
-import "rxjs";
+import 'rxjs';
-import "rxjs/operators";
+import 'rxjs/operators';
diff --git a/integration/standalone-bootstrap/e2e/protractor.conf.js b/integration/standalone-bootstrap/e2e/protractor.conf.js
index f86a6f96b1daf..3a7bff8ad2c61 100644
--- a/integration/standalone-bootstrap/e2e/protractor.conf.js
+++ b/integration/standalone-bootstrap/e2e/protractor.conf.js
@@ -1,23 +1,28 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter } = require('jasmine-spec-reporter');
+const {SpecReporter} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -26,12 +31,12 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
- }
+ jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
+ },
};
diff --git a/integration/standalone-bootstrap/karma.conf.js b/integration/standalone-bootstrap/karma.conf.js
index 4a43e961fd50b..de6f6a9799e41 100644
--- a/integration/standalone-bootstrap/karma.conf.js
+++ b/integration/standalone-bootstrap/karma.conf.js
@@ -10,15 +10,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, './coverage/latest-app'),
reports: ['html', 'lcovonly', 'text-summary'],
- fixWebpackSourcePaths: true
+ fixWebpackSourcePaths: true,
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
- flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
+ flags: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/standalone-bootstrap/src/app/app.component.ts b/integration/standalone-bootstrap/src/app/app.component.ts
index de34f3015970d..e1a77a0822dac 100644
--- a/integration/standalone-bootstrap/src/app/app.component.ts
+++ b/integration/standalone-bootstrap/src/app/app.component.ts
@@ -8,5 +8,4 @@ import {Component} from '@angular/core';
Hello Bootstrapped Standalone Component!
`,
})
-export class AppComponent {
-}
\ No newline at end of file
+export class AppComponent {}
diff --git a/integration/standalone-bootstrap/src/main.ts b/integration/standalone-bootstrap/src/main.ts
index ccc1cf713dbe1..44497618a29df 100644
--- a/integration/standalone-bootstrap/src/main.ts
+++ b/integration/standalone-bootstrap/src/main.ts
@@ -2,4 +2,4 @@ import {bootstrapApplication} from '@angular/platform-browser';
import {AppComponent} from './app/app.component';
-bootstrapApplication(AppComponent);
\ No newline at end of file
+bootstrapApplication(AppComponent);
diff --git a/integration/terser/test.js b/integration/terser/test.js
index 782afb4334ed6..c46b16ea31cf1 100644
--- a/integration/terser/test.js
+++ b/integration/terser/test.js
@@ -3,7 +3,6 @@ const writeFileSync = require('fs').writeFileSync;
const resolve = require('path').resolve;
const Terser = require('terser');
-
async function test() {
const outputPath = resolve(__dirname, './core.min.js');
const pathToCoreFesm2020 = resolve(__dirname, './node_modules/@angular/core/fesm2022/core.mjs');
@@ -15,23 +14,25 @@ async function test() {
const terserOpts = {
compress: {
module: true,
- global_defs: GLOBAL_DEFS_FOR_TERSER
- }
+ global_defs: GLOBAL_DEFS_FOR_TERSER,
+ },
};
const result = await Terser.minify(coreFesm2022Content, terserOpts);
writeFileSync(outputPath, result.code);
for (const def of Object.keys(GLOBAL_DEFS_FOR_TERSER)) {
if (result.code.includes(def)) {
- throw `'${def}' should have been removed from core bundle, but was still there.\n` +
- `See output at ${outputPath}.`;
+ throw (
+ `'${def}' should have been removed from core bundle, but was still there.\n` +
+ `See output at ${outputPath}.`
+ );
}
}
- console.info('Output looks good.')
+ console.info('Output looks good.');
}
-test().catch(e => {
+test().catch((e) => {
console.error(e);
process.exitCode = 1;
});
diff --git a/integration/trusted-types/e2e/protractor.conf.js b/integration/trusted-types/e2e/protractor.conf.js
index 0fe4fb83ceaec..6fc6112b435e7 100644
--- a/integration/trusted-types/e2e/protractor.conf.js
+++ b/integration/trusted-types/e2e/protractor.conf.js
@@ -2,23 +2,28 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
-const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
+const {SpecReporter, StacktraceOption} = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
chromeDriver: process.env.CHROMEDRIVER_BIN,
capabilities: {
browserName: 'chrome',
chromeOptions: {
binary: process.env.CHROME_BIN,
// See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
+ args: [
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
},
},
directConnect: true,
@@ -28,16 +33,18 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
- print: function() {}
+ print: function () {},
},
onPrepare() {
require('ts-node').register({
- project: require('path').join(__dirname, './tsconfig.json')
+ project: require('path').join(__dirname, './tsconfig.json'),
});
- jasmine.getEnv().addReporter(new SpecReporter({
- spec: {
- displayStacktrace: StacktraceOption.PRETTY
- }
- }));
- }
+ jasmine.getEnv().addReporter(
+ new SpecReporter({
+ spec: {
+ displayStacktrace: StacktraceOption.PRETTY,
+ },
+ }),
+ );
+ },
};
diff --git a/integration/trusted-types/e2e/src/app.e2e-spec.ts b/integration/trusted-types/e2e/src/app.e2e-spec.ts
index 9e51f5c673042..1c8970fbc67b8 100644
--- a/integration/trusted-types/e2e/src/app.e2e-spec.ts
+++ b/integration/trusted-types/e2e/src/app.e2e-spec.ts
@@ -58,8 +58,10 @@ describe('workspace-project App', () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
- expect(logs).not.toContain(jasmine.objectContaining({
- level: logging.Level.SEVERE,
- } as logging.Entry));
+ expect(logs).not.toContain(
+ jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry),
+ );
});
});
diff --git a/integration/trusted-types/e2e/src/app.po.ts b/integration/trusted-types/e2e/src/app.po.ts
index d85d7f246b0fa..43121fd9beb7d 100644
--- a/integration/trusted-types/e2e/src/app.po.ts
+++ b/integration/trusted-types/e2e/src/app.po.ts
@@ -1,4 +1,4 @@
-import { browser, by, element } from 'protractor';
+import {browser, by, element} from 'protractor';
export class AppPage {
async navigateTo(): Promise<unknown> {
diff --git a/integration/trusted-types/karma.conf.js b/integration/trusted-types/karma.conf.js
index 7584892504d15..37d99c28640fd 100644
--- a/integration/trusted-types/karma.conf.js
+++ b/integration/trusted-types/karma.conf.js
@@ -1,7 +1,7 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html
-module.exports = function(config) {
+module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
@@ -10,18 +10,15 @@ module.exports = function(config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
- require('@angular-devkit/build-angular/plugins/karma')
+ require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
- clearContext: false // leave Jasmine Spec Runner output visible in browser
+ clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
coverageReporter: {
dir: require('path').join(__dirname, './coverage/trusted-types'),
subdir: '.',
- reporters: [
- { type: 'html' },
- { type: 'text-summary' }
- ],
+ reporters: [{type: 'html'}, {type: 'text-summary'}],
},
reporters: ['progress', 'kjhtml'],
port: 9876,
@@ -33,13 +30,17 @@ module.exports = function(config) {
base: 'ChromeHeadless',
// See /integration/README.md#browser-tests for more info on these args
flags: [
- '--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage',
- '--hide-scrollbars', '--mute-audio'
- ]
- }
+ '--no-sandbox',
+ '--headless',
+ '--disable-gpu',
+ '--disable-dev-shm-usage',
+ '--hide-scrollbars',
+ '--mute-audio',
+ ],
+ },
},
browsers: ['ChromeHeadlessNoSandbox'],
singleRun: false,
- restartOnFileChange: true
+ restartOnFileChange: true,
});
};
diff --git a/integration/trusted-types/src/app/app-routing.module.ts b/integration/trusted-types/src/app/app-routing.module.ts
index d425c6f56b578..c21fa460e4350 100644
--- a/integration/trusted-types/src/app/app-routing.module.ts
+++ b/integration/trusted-types/src/app/app-routing.module.ts
@@ -1,10 +1,10 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {Routes, RouterModule} from '@angular/router';
const routes: Routes = [];
@NgModule({
imports: [RouterModule.forRoot(routes)],
- exports: [RouterModule]
+ exports: [RouterModule],
})
-export class AppRoutingModule { }
+export class AppRoutingModule {}
diff --git a/integration/trusted-types/src/app/app.component.spec.ts b/integration/trusted-types/src/app/app.component.spec.ts
index 0f4cc0b42e84d..4d08fbb920bef 100644
--- a/integration/trusted-types/src/app/app.component.spec.ts
+++ b/integration/trusted-types/src/app/app.component.spec.ts
@@ -1,16 +1,12 @@
-import { TestBed } from '@angular/core/testing';
-import { RouterModule } from '@angular/router';
-import { AppComponent } from './app.component';
+import {TestBed} from '@angular/core/testing';
+import {RouterModule} from '@angular/router';
+import {AppComponent} from './app.component';
describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [
- RouterModule.forRoot([])
- ],
- declarations: [
- AppComponent
- ],
+ imports: [RouterModule.forRoot([])],
+ declarations: [AppComponent],
}).compileComponents();
});
@@ -30,6 +26,8 @@ describe('AppComponent', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.nativeElement;
- expect(compiled.querySelector('.content span').textContent).toContain('trusted-types app is running!');
+ expect(compiled.querySelector('.content span').textContent).toContain(
+ 'trusted-types app is running!',
+ );
});
});
diff --git a/integration/trusted-types/src/app/app.component.ts b/integration/trusted-types/src/app/app.component.ts
index 6828cda15efea..c16b215e0a961 100644
--- a/integration/trusted-types/src/app/app.component.ts
+++ b/integration/trusted-types/src/app/app.component.ts
@@ -4,7 +4,7 @@ import {DomSanitizer, SafeHtml, SafeResourceUrl} from '@angular/platform-browser
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
- styleUrls: ['./app.component.css']
+ styleUrls: ['./app.component.css'],
})
export class AppComponent {
title = 'trusted-types';
@@ -16,8 +16,10 @@ export class AppComponent {
constructor(sanitizer: DomSanitizer) {
this.safeHtml = sanitizer.bypassSecurityTrustHtml(
- `<span>Hello from bound SafeHtml</span><iframe id="bound-safehtml-iframe"></iframe>`);
+ `<span>Hello from bound SafeHtml</span><iframe id="bound-safehtml-iframe"></iframe>`,
+ );
this.safeResourceUrl = sanitizer.bypassSecurityTrustResourceUrl(
- `data:text/html,<body><h1>Hello from object</h1></body>`);
+ `data:text/html,<body><h1>Hello from object</h1></body>`,
+ );
}
}
diff --git a/integration/trusted-types/src/app/app.module.ts b/integration/trusted-types/src/app/app.module.ts
index 2c3ba2995c851..5357ceea72746 100644
--- a/integration/trusted-types/src/app/app.module.ts
+++ b/integration/trusted-types/src/app/app.module.ts
@@ -1,18 +1,13 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
+import {AppRoutingModule} from './app-routing.module';
+import {AppComponent} from './app.component';
@NgModule({
- declarations: [
- AppComponent
- ],
- imports: [
- BrowserModule,
- AppRoutingModule
- ],
+ declarations: [AppComponent],
+ imports: [BrowserModule, AppRoutingModule],
providers: [],
- bootstrap: [AppComponent]
+ bootstrap: [AppComponent],
})
-export class AppModule { }
+export class AppModule {}
diff --git a/integration/trusted-types/src/main.ts b/integration/trusted-types/src/main.ts
index 0a621147e305c..6f00233886b74 100644
--- a/integration/trusted-types/src/main.ts
+++ b/integration/trusted-types/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import {AppModule} from './app/app.module';
-platformBrowserDynamic().bootstrapModule(AppModule)
- .catch(err => console.error(err));
+platformBrowserDynamic()
+ .bootstrapModule(AppModule)
+ .catch((err) => console.error(err));
diff --git a/integration/typings_test_rxjs7/include-all.ts b/integration/typings_test_rxjs7/include-all.ts
index e95c8266e51d1..87e15f48675d5 100644
--- a/integration/typings_test_rxjs7/include-all.ts
+++ b/integration/typings_test_rxjs7/include-all.ts
@@ -6,8 +6,6 @@
* found in the LICENSE file at https://angular.io/license
*/
-
-
import * as animations from '@angular/animations';
import * as animationsBrowser from '@angular/animations/browser';
import * as animationsBrowserTesting from '@angular/animations/browser/testing';
diff --git a/integration/typings_test_ts54/include-all.ts b/integration/typings_test_ts54/include-all.ts
index 196ed86c52012..96c1a80cf41ae 100644
--- a/integration/typings_test_ts54/include-all.ts
+++ b/integration/typings_test_ts54/include-all.ts
@@ -6,8 +6,6 @@
* found in the LICENSE file at https://angular.io/license
*/
-
-
import * as animations from '@angular/animations';
import * as animationsBrowser from '@angular/animations/browser';
import * as animationsBrowserTesting from '@angular/animations/browser/testing';
|
angular
|
https://github.com/angular/angular
|
b9a997c467c54b8f99bad7ada24bd40dbca59e23
|
Tom Wilkinson
|
2024-05-02 00:25:31
|
refactor(core): Remove STOP_PROPAGATION define. (#55582)
|
This define has been removed at head, and now legacy stop propagation
behavior can be opted into at the LegacyDispatcher level, if necessary.
PR Close #55582
|
refactor(core): Remove STOP_PROPAGATION define. (#55582)
This define has been removed at head, and now legacy stop propagation
behavior can be opted into at the LegacyDispatcher level, if necessary.
PR Close #55582
|
diff --git a/goldens/public-api/core/primitives/event-dispatch/index.md b/goldens/public-api/core/primitives/event-dispatch/index.md
index 8cb03c021279c..f92bd2e664782 100644
--- a/goldens/public-api/core/primitives/event-dispatch/index.md
+++ b/goldens/public-api/core/primitives/event-dispatch/index.md
@@ -46,8 +46,6 @@ export class EventContract implements UnrenamedEventContract {
static MOUSE_SPECIAL_SUPPORT: boolean;
registerDispatcher(dispatcher: Dispatcher_2, restriction: Restriction): void;
replayEarlyEvents(): void;
- // (undocumented)
- static STOP_PROPAGATION: boolean;
}
// @public
diff --git a/packages/core/primitives/event-dispatch/src/event_contract_defines.ts b/packages/core/primitives/event-dispatch/src/event_contract_defines.ts
index f93b37684f552..cec01990d7690 100644
--- a/packages/core/primitives/event-dispatch/src/event_contract_defines.ts
+++ b/packages/core/primitives/event-dispatch/src/event_contract_defines.ts
@@ -24,15 +24,6 @@ export const A11Y_CLICK_SUPPORT = false;
*/
export const MOUSE_SPECIAL_SUPPORT = false;
-/**
- * @define Call stopPropagation on handled events. When integrating with
- * non-jsaction event handler based code, you will likely want to turn this flag
- * off. While most event handlers will continue to work, jsaction binds focus
- * and blur events in the capture phase and thus with stopPropagation, none of
- * your non-jsaction-handlers will ever see it.
- */
-export const STOP_PROPAGATION = true;
-
/**
* @define Support for custom events, which are type EventType.CUSTOM. These are
* native DOM events with an additional type field and an optional payload.
diff --git a/packages/core/primitives/event-dispatch/src/eventcontract.ts b/packages/core/primitives/event-dispatch/src/eventcontract.ts
index ca8b65c794d01..08920d504d89f 100644
--- a/packages/core/primitives/event-dispatch/src/eventcontract.ts
+++ b/packages/core/primitives/event-dispatch/src/eventcontract.ts
@@ -40,7 +40,6 @@ import {
CUSTOM_EVENT_SUPPORT,
JSNAMESPACE_SUPPORT,
MOUSE_SPECIAL_SUPPORT,
- STOP_PROPAGATION,
} from './event_contract_defines';
import * as eventInfoLib from './event_info';
import {EventType} from './event_type';
@@ -90,7 +89,6 @@ type EventHandler = (eventType: string, event: Event, container: Element) => voi
*/
export class EventContract implements UnrenamedEventContract {
static CUSTOM_EVENT_SUPPORT = CUSTOM_EVENT_SUPPORT;
- static STOP_PROPAGATION = STOP_PROPAGATION;
static A11Y_CLICK_SUPPORT = A11Y_CLICK_SUPPORT;
static MOUSE_SPECIAL_SUPPORT = MOUSE_SPECIAL_SUPPORT;
static JSNAMESPACE_SUPPORT = JSNAMESPACE_SUPPORT;
|
terraform-provider-aws
|
https://github.com/hashicorp/terraform-provider-aws
|
753a12c7ae12f714b9be64858325d7d0d9ada7b4
|
dependabot[bot]
|
2022-09-28 03:43:58
|
build(deps): bump github.com/aws/aws-sdk-go-v2/feature/ec2/imds
|
Bumps [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://github.com/aws/aws-sdk-go-v2) from 1.12.15 to 1.12.17.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.12.15...credentials/v1.12.17)
---
|
build(deps): bump github.com/aws/aws-sdk-go-v2/feature/ec2/imds
Bumps [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://github.com/aws/aws-sdk-go-v2) from 1.12.15 to 1.12.17.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.12.15...credentials/v1.12.17)
---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/feature/ec2/imds
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
|
diff --git a/go.mod b/go.mod
index 133d0e7459f..0351ad3f60f 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
github.com/aws/aws-sdk-go v1.44.104
github.com/aws/aws-sdk-go-v2 v1.16.16
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.15
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17
github.com/aws/aws-sdk-go-v2/service/comprehend v1.18.10
github.com/aws/aws-sdk-go-v2/service/fis v1.12.15
github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.2
diff --git a/go.sum b/go.sum
index 9f70a5c3f1d..b4ffe843438 100644
--- a/go.sum
+++ b/go.sum
@@ -31,8 +31,8 @@ github.com/aws/aws-sdk-go-v2/config v1.15.4/go.mod h1:ZijHHh0xd/A+ZY53az0qzC5tT4
github.com/aws/aws-sdk-go-v2/credentials v1.12.0 h1:4R/NqlcRFSkR0wxOhgHi+agGpbEr5qMCjn7VqUIJY+E=
github.com/aws/aws-sdk-go-v2/credentials v1.12.0/go.mod h1:9YWk7VW+eyKsoIL6/CljkTrNVWBSK9pkqOPUuijid4A=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.4/go.mod h1:u/s5/Z+ohUQOPXl00m2yJVyioWDECsbpXTQlaqSlufc=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.15 h1:nkQ+aI0OCeYfzrBipL6ja/6VEbUnHQoZHBHtoK+Nzxw=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.15/go.mod h1:Oz2/qWINxIgSmoZT9adpxJy2UhpcOAI3TIyWgYMVSz0=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17 h1:r08j4sbZu/RVi+BNxkBJwPMUYY3P8mgSDuKkZ/ZN1lE=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17/go.mod h1:yIkQcCDYNsZfXpd5UX2Cy+sWA1jPgIhGTw9cOBzfVnQ=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.10/go.mod h1:F+EZtuIwjlv35kRJPyBGcsA4f7bnSoz15zOQ2lJq1Z4=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21/go.mod h1:XsmHMV9c512xgsW01q7H0ut+UQQQpWX8QsFbdLHDwaU=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23 h1:s4g/wnzMf+qepSNgTvaQQHNxyMLKSawNhKCPNy++2xY=
|
DPlayer
|
https://github.com/DIYgod/DPlayer
|
eb266daa9872094b135f2a81dfa9b156f6971bbf
|
dependabot-preview[bot]
|
2020-08-10 21:23:18
|
chore(deps-dev): bump mini-css-extract-plugin from 0.9.0 to 0.10.0
|
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.9.0 to 0.10.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.9.0...v0.10.0)
|
chore(deps-dev): bump mini-css-extract-plugin from 0.9.0 to 0.10.0
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.9.0 to 0.10.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.9.0...v0.10.0)
Signed-off-by: dependabot-preview[bot] <[email protected]>
|
diff --git a/package.json b/package.json
index 9688e0657..e76ccd173 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
"exports-loader": "^1.0.0",
"file-loader": "^6.0.0",
"git-revision-webpack-plugin": "^3.0.3",
- "mini-css-extract-plugin": "0.9.0",
+ "mini-css-extract-plugin": "0.10.0",
"node-sass": "^4.12.0",
"postcss-loader": "^3.0.0",
"prettier": "^2.0.4",
diff --git a/yarn.lock b/yarn.lock
index 7ef9b7f98..daddafa54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5829,23 +5829,23 @@ min-document@^2.19.0:
dependencies:
dom-walk "^0.1.0"
[email protected]:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
- integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
[email protected]:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.0.tgz#a0e6bfcad22a9c73f6c882a3c7557a98e2d3d27d"
+ integrity sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==
dependencies:
loader-utils "^1.1.0"
- normalize-url "^2.0.1"
+ normalize-url "1.9.1"
schema-utils "^1.0.0"
webpack-sources "^1.1.0"
[email protected]:
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
- integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==
[email protected]:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+ integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
dependencies:
loader-utils "^1.1.0"
- normalize-url "1.9.1"
+ normalize-url "^2.0.1"
schema-utils "^1.0.0"
webpack-sources "^1.1.0"
|
ruffle
|
https://github.com/ruffle-rs/ruffle
|
663182cd49b4b6ba050a8da5923a5cc6ff9ad13a
|
dependabot[bot]
|
2022-11-02 12:46:05
|
build(deps-dev): bump @wdio/static-server-service in /web
|
Bumps [@wdio/static-server-service](https://github.com/webdriverio/webdriverio) from 7.25.1 to 7.25.4.
- [Release notes](https://github.com/webdriverio/webdriverio/releases)
- [Changelog](https://github.com/webdriverio/webdriverio/blob/v7.25.4/CHANGELOG.md)
- [Commits](https://github.com/webdriverio/webdriverio/compare/v7.25.1...v7.25.4)
---
|
build(deps-dev): bump @wdio/static-server-service in /web
Bumps [@wdio/static-server-service](https://github.com/webdriverio/webdriverio) from 7.25.1 to 7.25.4.
- [Release notes](https://github.com/webdriverio/webdriverio/releases)
- [Changelog](https://github.com/webdriverio/webdriverio/blob/v7.25.4/CHANGELOG.md)
- [Commits](https://github.com/webdriverio/webdriverio/compare/v7.25.1...v7.25.4)
---
updated-dependencies:
- dependency-name: "@wdio/static-server-service"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
|
diff --git a/web/package-lock.json b/web/package-lock.json
index c2051300d6f78..2f20a51ef24e5 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -18,7 +18,7 @@
"@wdio/local-runner": "^7.24.0",
"@wdio/mocha-framework": "^7.20.7",
"@wdio/spec-reporter": "^7.20.8",
- "@wdio/static-server-service": "^7.25.1",
+ "@wdio/static-server-service": "^7.25.4",
"chai": "^4.3.6",
"chai-html": "^2.1.0",
"chromedriver": "^106.0.1",
@@ -1759,16 +1759,16 @@
}
},
"node_modules/@wdio/static-server-service": {
- "version": "7.25.1",
- "resolved": "https://registry.npmjs.org/@wdio/static-server-service/-/static-server-service-7.25.1.tgz",
- "integrity": "sha512-Diei/yR5ICbAsGaR4So+6rSgWhw94u40Oe25QEwxzNHwtYvpM0PuXjwG9hBN12/yqpEXcoEeg808fURYqipDvQ==",
+ "version": "7.25.4",
+ "resolved": "https://registry.npmjs.org/@wdio/static-server-service/-/static-server-service-7.25.4.tgz",
+ "integrity": "sha512-h24iMX3gsXp0uvr6SmgUXzwu7e8Ghe1gICwdAtOb1TfQ8fhP12rgUC4gYY1VSf51qDTsX3JNCBXwUsRP8q1dfA==",
"dev": true,
"dependencies": {
"@types/express": "^4.17.8",
"@types/fs-extra": "^9.0.1",
"@types/morgan": "^1.9.1",
"@wdio/logger": "7.19.0",
- "@wdio/types": "7.25.1",
+ "@wdio/types": "7.25.4",
"express": "^4.14.0",
"fs-extra": "^10.0.0",
"morgan": "^1.7.0"
@@ -1778,9 +1778,9 @@
}
},
"node_modules/@wdio/static-server-service/node_modules/@wdio/types": {
- "version": "7.25.1",
- "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.1.tgz",
- "integrity": "sha512-9Xt2U0YXYxRW4UvMFwjt+44UkfhwrI1gPhW+y56SubpyKaUfdNGberteboQoR/7Os1SVtJry4FohEZNmFzPK6g==",
+ "version": "7.25.4",
+ "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+ "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
"dev": true,
"dependencies": {
"@types/node": "^18.0.0",
@@ -12586,25 +12586,25 @@
}
},
"@wdio/static-server-service": {
- "version": "7.25.1",
- "resolved": "https://registry.npmjs.org/@wdio/static-server-service/-/static-server-service-7.25.1.tgz",
- "integrity": "sha512-Diei/yR5ICbAsGaR4So+6rSgWhw94u40Oe25QEwxzNHwtYvpM0PuXjwG9hBN12/yqpEXcoEeg808fURYqipDvQ==",
+ "version": "7.25.4",
+ "resolved": "https://registry.npmjs.org/@wdio/static-server-service/-/static-server-service-7.25.4.tgz",
+ "integrity": "sha512-h24iMX3gsXp0uvr6SmgUXzwu7e8Ghe1gICwdAtOb1TfQ8fhP12rgUC4gYY1VSf51qDTsX3JNCBXwUsRP8q1dfA==",
"dev": true,
"requires": {
"@types/express": "^4.17.8",
"@types/fs-extra": "^9.0.1",
"@types/morgan": "^1.9.1",
"@wdio/logger": "7.19.0",
- "@wdio/types": "7.25.1",
+ "@wdio/types": "7.25.4",
"express": "^4.14.0",
"fs-extra": "^10.0.0",
"morgan": "^1.7.0"
},
"dependencies": {
"@wdio/types": {
- "version": "7.25.1",
- "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.1.tgz",
- "integrity": "sha512-9Xt2U0YXYxRW4UvMFwjt+44UkfhwrI1gPhW+y56SubpyKaUfdNGberteboQoR/7Os1SVtJry4FohEZNmFzPK6g==",
+ "version": "7.25.4",
+ "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+ "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
"dev": true,
"requires": {
"@types/node": "^18.0.0",
diff --git a/web/package.json b/web/package.json
index 7026fc5aeda49..e6df4f7372777 100644
--- a/web/package.json
+++ b/web/package.json
@@ -17,7 +17,7 @@
"@wdio/local-runner": "^7.24.0",
"@wdio/mocha-framework": "^7.20.7",
"@wdio/spec-reporter": "^7.20.8",
- "@wdio/static-server-service": "^7.25.1",
+ "@wdio/static-server-service": "^7.25.4",
"chai": "^4.3.6",
"chai-html": "^2.1.0",
"chromedriver": "^106.0.1",
|
superset
|
https://github.com/apache/superset
|
fadf0d61a2d5fed99b6ef3290392c9f2fc39059a
|
dependabot-preview[bot]
|
2021-11-26 09:16:20
|
build(deps): bump @airbnb/nimbus from 3.1.3 to 3.1.4 (#523)
|
Bumps [@airbnb/nimbus](https://github.com/airbnb/nimbus) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/airbnb/nimbus/releases)
- [Changelog](https://github.com/airbnb/nimbus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/nimbus/compare/@airbnb/[email protected]...@airbnb/[email protected])
|
build(deps): bump @airbnb/nimbus from 3.1.3 to 3.1.4 (#523)
Bumps [@airbnb/nimbus](https://github.com/airbnb/nimbus) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/airbnb/nimbus/releases)
- [Changelog](https://github.com/airbnb/nimbus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/nimbus/compare/@airbnb/[email protected]...@airbnb/[email protected])
Signed-off-by: dependabot-preview[bot] <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
|
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock b/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock
index e5bb7e42c8529..12c50f63d76d8 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock
+++ b/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock
@@ -91,9 +91,9 @@
fast-glob "^3.2.2"
"@airbnb/nimbus@^3.1.2":
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/@airbnb/nimbus/-/nimbus-3.1.3.tgz#cb9feb0f7b48af3d90a79638f2b239aebc07c7c5"
- integrity sha512-pCgieJ93G0BULt/B8SSaBRpLDfISRI7e2Vy2C2VOq4P2Po+GvJH5H11LhqsFMeH4pPi+yz3bT4zfl8LR7dhLyw==
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/@airbnb/nimbus/-/nimbus-3.1.4.tgz#1ff29814e8d5f17be3b9db5ed675ca4f4191311e"
+ integrity sha512-DYoaBtkxjLRu9GfSMLPNgJ1Z+t9teUy3ELzVQPRpl6iu0AqojSdmmzDLSYXrFeg3fku4HDSo/5MGytuWqRwaTA==
dependencies:
"@airbnb/nimbus-common" "^3.0.1"
"@beemo/cli" "^1.0.10"
|
rook
|
https://github.com/rook/rook
|
ecdcc16104fadc05432403afc2540998e83fe537
|
subhamkrai
|
2022-10-17 19:59:31
|
ci: daily job is failing due to k8s communication
|
installing minikube and kubectl to see if that
works.
|
ci: daily job is failing due to k8s communication
installing minikube and kubectl to see if that
works.
Signed-off-by: subhamkrai <[email protected]>
|
diff --git a/.github/workflows/daily-nightly-jobs.yml b/.github/workflows/daily-nightly-jobs.yml
index 22b83995fe72..ac444eeb4cdf 100644
--- a/.github/workflows/daily-nightly-jobs.yml
+++ b/.github/workflows/daily-nightly-jobs.yml
@@ -26,20 +26,14 @@ jobs:
with:
go-version: 1.18
- - name: teardown minikube and docker
- run: |
- uptime
- minikube delete
- docker system prune -a
-
- name: setup minikube
run: |
- # sudo apt-get install build-essential -y
- # curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-arm64
- # sudo install minikube-linux-arm64 /usr/local/bin/minikube
- # sudo rm -f minikube-linux-arm64
- # curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/arm64/kubectl"
- # sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+ sudo apt-get install build-essential -y
+ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-arm64
+ sudo install minikube-linux-arm64 /usr/local/bin/minikube
+ sudo rm -f minikube-linux-arm64
+ curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/arm64/kubectl"
+ sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
minikube start --memory 28g --cpus=12 --driver=docker
- name: install yq
@@ -76,12 +70,17 @@ jobs:
- name: wait for ceph to be ready
run: tests/scripts/github-action-helper.sh wait_for_ceph_to_be_ready "mon,mgr,osd,mds,rgw,rbd_mirror,fs_mirror" 1
- - name: teardown minikube and docker
+ - name: teardown minikube, docker and kubectl
+ if: always()
run: |
+ uptime
minikube delete
- docker system prune -a
+ docker system prune --all --force
+ sudo rm -rf /usr/local/bin/minikube
+ sudo rm -rf /usr/local/bin/kubectl
- name: remove /usr/bin/yq
+ if: always()
run: sudo rm -rf /usr/bin/yq
- name: collect common logs
|
zulip
|
https://github.com/zulip/zulip
|
7910b9e739c19594d73ffeb54cf8631a6d757d5d
|
Tim Abbott
|
2019-02-21 06:07:11
|
docs: Recommend yarn install over yarn upgrade.
|
For most updates to our dependencies, we want the more conservative
yarn install.
|
docs: Recommend yarn install over yarn upgrade.
For most updates to our dependencies, we want the more conservative
yarn install.
|
diff --git a/docs/subsystems/dependencies.md b/docs/subsystems/dependencies.md
index c1c4816948ce7..d315c6c6e837f 100644
--- a/docs/subsystems/dependencies.md
+++ b/docs/subsystems/dependencies.md
@@ -251,7 +251,7 @@ reasoning here.
repository. We use the standard `package.json` file to declare our
direct dependencies, with sections for development and
production. Yarn takes care of pinning the versions of indirect
- dependencies in the `yarn.lock` file; `yarn upgrade` updates the
+ dependencies in the `yarn.lock` file; `yarn install` updates the
`yarn.lock` files.
* `tools/update-prod-static`. This process is discussed in detail in
the [static asset pipeline](../subsystems/front-end-build-process.html) article,
|
sentry-dart
|
https://github.com/getsentry/sentry-dart
|
7370cb88ba60479bcebae64e056811be2bbff29e
|
Jonas Uekötter
|
2021-04-26 18:14:31
|
Fix: Improve Sentry Integration tests (#421)
|
* Fix: Improve Tests
* Remove unused method
* Further improve tests
* Use Test Fixtures
* Further improve tests
* Improve setting of automatic breadcrumbs
* Revert "Improve setting of automatic breadcrumbs"
This reverts commit df2a62a46a4fd58988775b14625ad5eb2d742912.
* Remove not needed late keywords
|
Fix: Improve Sentry Integration tests (#421)
* Fix: Improve Tests
* Remove unused method
* Further improve tests
* Use Test Fixtures
* Further improve tests
* Improve setting of automatic breadcrumbs
* Revert "Improve setting of automatic breadcrumbs"
This reverts commit df2a62a46a4fd58988775b14625ad5eb2d742912.
* Remove not needed late keywords
|
diff --git a/flutter/test/load_android_image_list_test.dart b/flutter/test/load_android_image_list_test.dart
index 36cf5c8292..9fa7f69b2d 100644
--- a/flutter/test/load_android_image_list_test.dart
+++ b/flutter/test/load_android_image_list_test.dart
@@ -7,11 +7,8 @@ import 'package:sentry_flutter/src/sentry_flutter_options.dart';
import 'mocks.dart';
void main() {
- const _channel = MethodChannel('sentry_flutter');
-
TestWidgetsFlutterBinding.ensureInitialized();
-
- var called = false;
+ late Fixture fixture;
final imageList = [
{
@@ -26,49 +23,76 @@ void main() {
];
setUp(() {
- _channel.setMockMethodCallHandler((MethodCall methodCall) async {
- called = true;
+ fixture = Fixture();
+ fixture.channel.setMockMethodCallHandler((MethodCall methodCall) async {
return imageList;
});
});
tearDown(() {
- _channel.setMockMethodCallHandler(null);
- called = false;
+ fixture.channel.setMockMethodCallHandler(null);
+ });
+
+ test('$LoadAndroidImageListIntegration adds itself to sdk.integrations',
+ () async {
+ final sut = fixture.getSut();
+
+ sut.call(fixture.hub, fixture.options);
+
+ expect(
+ fixture.options.sdk.integrations
+ .contains('loadAndroidImageListIntegration'),
+ true,
+ );
});
test('Native layer is not called as the event is symbolicated', () async {
- final options = SentryFlutterOptions()..dsn = fakeDsn;
- final hub = Hub(options);
+ var called = false;
- LoadAndroidImageListIntegration(_channel)(hub, options);
+ final sut = fixture.getSut();
+ fixture.channel.setMockMethodCallHandler((MethodCall methodCall) async {
+ called = true;
+ return imageList;
+ });
- expect(options.eventProcessors.length, 1);
+ sut.call(fixture.hub, fixture.options);
- await hub.captureException(StateError('error'),
- stackTrace: StackTrace.current);
+ expect(fixture.options.eventProcessors.length, 1);
+
+ await fixture.hub
+ .captureException(StateError('error'), stackTrace: StackTrace.current);
expect(called, false);
});
test('Native layer is not called as the event has no stack traces', () async {
- final options = SentryFlutterOptions()..dsn = fakeDsn;
- final hub = Hub(options);
+ var called = false;
- LoadAndroidImageListIntegration(_channel)(hub, options);
+ final sut = fixture.getSut();
+ fixture.channel.setMockMethodCallHandler((MethodCall methodCall) async {
+ called = true;
+ return imageList;
+ });
+
+ sut.call(fixture.hub, fixture.options);
- await hub.captureException(StateError('error'));
+ await fixture.hub.captureException(StateError('error'));
expect(called, false);
});
test('Native layer is called as stack traces are not symbolicated', () async {
- final options = SentryFlutterOptions()..dsn = fakeDsn;
- final hub = Hub(options);
+ var called = false;
+
+ final sut = fixture.getSut();
+ fixture.channel.setMockMethodCallHandler((MethodCall methodCall) async {
+ called = true;
+ return imageList;
+ });
- LoadAndroidImageListIntegration(_channel)(hub, options);
+ sut.call(fixture.hub, fixture.options);
- await hub.captureException(StateError('error'), stackTrace: '''
+ await fixture.hub.captureException(StateError('error'), stackTrace: '''
warning: This VM has been configured to produce stack traces that violate the Dart standard.
*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
unparsed pid: 30930, tid: 30990, name 1.ui
@@ -83,11 +107,11 @@ void main() {
});
test('Event processor adds image list to the event', () async {
- final options = SentryFlutterOptions()..dsn = fakeDsn;
- final hub = Hub(options);
+ final sut = fixture.getSut();
- LoadAndroidImageListIntegration(_channel)(hub, options);
- final ep = options.eventProcessors.first;
+ sut.call(fixture.hub, fixture.options);
+
+ final ep = fixture.options.eventProcessors.first;
SentryEvent? event = getEvent();
event = await ep(event);
@@ -95,11 +119,10 @@ void main() {
});
test('Event processor asserts image list', () async {
- final options = SentryFlutterOptions()..dsn = fakeDsn;
- final hub = Hub(options);
+ final sut = fixture.getSut();
- LoadAndroidImageListIntegration(_channel)(hub, options);
- final ep = options.eventProcessors.first;
+ sut.call(fixture.hub, fixture.options);
+ final ep = fixture.options.eventProcessors.first;
SentryEvent? event = getEvent();
event = await ep(event);
@@ -125,3 +148,18 @@ SentryEvent getEvent({bool symbolicated = false}) {
);
return SentryEvent(exception: ex);
}
+
+class Fixture {
+ Fixture() {
+ hub = Hub(options);
+ }
+
+ final channel = MethodChannel('sentry_flutter');
+ final options = SentryFlutterOptions(dsn: fakeDsn);
+
+ late final Hub hub;
+
+ LoadAndroidImageListIntegration getSut() {
+ return LoadAndroidImageListIntegration(channel);
+ }
+}
diff --git a/flutter/test/load_contexts_integrations_test.dart b/flutter/test/load_contexts_integrations_test.dart
index 442549897f..2f084edd03 100644
--- a/flutter/test/load_contexts_integrations_test.dart
+++ b/flutter/test/load_contexts_integrations_test.dart
@@ -57,6 +57,16 @@ void main() {
);
}
+ test('$LoadContextsIntegration adds itself to sdk.integrations', () async {
+ final integration = fixture.getSut();
+ integration(fixture.hub, fixture.options);
+
+ expect(
+ fixture.options.sdk.integrations.contains('loadContextsIntegration'),
+ true,
+ );
+ });
+
test('should apply the loadContextsIntegration eventProcessor', () async {
final integration = fixture.getSut();
integration(fixture.hub, fixture.options);
diff --git a/flutter/test/mocks.dart b/flutter/test/mocks.dart
index 499f31eb91..e28c7a216e 100644
--- a/flutter/test/mocks.dart
+++ b/flutter/test/mocks.dart
@@ -16,6 +16,26 @@ class MockPlatform implements Platform {
operatingSystemVersion = osVersion ?? '',
localHostname = hostname ?? '';
+ factory MockPlatform.android() {
+ return MockPlatform(os: 'android');
+ }
+
+ factory MockPlatform.iOs() {
+ return MockPlatform(os: 'ios');
+ }
+
+ factory MockPlatform.macOs() {
+ return MockPlatform(os: 'macos');
+ }
+
+ factory MockPlatform.windows() {
+ return MockPlatform(os: 'windows');
+ }
+
+ factory MockPlatform.linux() {
+ return MockPlatform(os: 'linux');
+ }
+
@override
String operatingSystem;
diff --git a/flutter/test/sentry_flutter_test.dart b/flutter/test/sentry_flutter_test.dart
index 0fe719fa9e..be139ea6f3 100644
--- a/flutter/test/sentry_flutter_test.dart
+++ b/flutter/test/sentry_flutter_test.dart
@@ -1,128 +1,171 @@
-import 'package:flutter/services.dart';
+import 'package:flutter/foundation.dart';
import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/mockito.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:sentry/sentry.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:sentry/src/platform_checker.dart';
-
+import 'package:sentry_flutter/src/version.dart';
import 'mocks.dart';
-import 'mocks.mocks.dart';
import 'sentry_flutter_util.dart';
-void main() {
- TestWidgetsFlutterBinding.ensureInitialized();
+/// These are the integrations which should be added on every platform.
+/// They don't depend on the underlying platform.
+final platformAgnosticIntegrations = [
+ FlutterErrorIntegration,
+ LoadReleaseIntegration,
+];
- group('Flutter init for mobile', () {
- const _channel = MethodChannel('sentry_flutter');
+// These should only be added to Android
+final androidIntegrations = [
+ LoadAndroidImageListIntegration,
+];
- setUp(() {
- _channel.setMockMethodCallHandler((MethodCall methodCall) async {});
- });
+// These should be added to iOS and macOS
+final iOsAndMacOsIntegrations = [
+ LoadContextsIntegration,
+];
+
+// These should be added to every platform which has a native integration.
+final nativeIntegrations = [
+ NativeSdkIntegration,
+];
+void main() {
+ TestWidgetsFlutterBinding.ensureInitialized();
+
+ group('Test platform integrations', () {
tearDown(() async {
await Sentry.close();
});
- test('Will run default configurations on Android', () async {
+ test('Android', () async {
await SentryFlutter.init(
- getConfigurationTester(isAndroid: true),
+ getConfigurationTester(
+ hasFileSystemTransport: true,
+ shouldHaveIntegrations: [
+ ...androidIntegrations,
+ ...nativeIntegrations,
+ ...platformAgnosticIntegrations,
+ ],
+ shouldNotHaveIntegrations: iOsAndMacOsIntegrations,
+ ),
appRunner: appRunner,
packageLoader: loadTestPackage,
- channel: _channel,
- platformChecker: getPlatformChecker(isAndroid: true),
+ platformChecker: getPlatformChecker(platform: MockPlatform.android()),
);
});
- test('Will run default configurations on ios', () async {
+ test('iOS', () async {
await SentryFlutter.init(
- getConfigurationTester(isIOS: true),
+ getConfigurationTester(
+ hasFileSystemTransport: true,
+ shouldHaveIntegrations: [
+ ...iOsAndMacOsIntegrations,
+ ...nativeIntegrations,
+ ...platformAgnosticIntegrations,
+ ],
+ shouldNotHaveIntegrations: androidIntegrations,
+ ),
appRunner: appRunner,
packageLoader: loadTestPackage,
- channel: _channel,
- platformChecker: getPlatformChecker(isIOS: true),
+ platformChecker: getPlatformChecker(platform: MockPlatform.iOs()),
);
});
- });
- group('platform based loadContextsIntegration', () {
- const _channel = MethodChannel('sentry_flutter');
- final transport = MockTransport();
-
- setUp(() {
- _channel.setMockMethodCallHandler(
- (MethodCall methodCall) async => <String, dynamic>{},
+ test('macOS', () async {
+ await SentryFlutter.init(
+ getConfigurationTester(
+ hasFileSystemTransport: true,
+ shouldHaveIntegrations: [
+ ...iOsAndMacOsIntegrations,
+ ...nativeIntegrations,
+ ...platformAgnosticIntegrations,
+ ],
+ shouldNotHaveIntegrations: androidIntegrations,
+ ),
+ appRunner: appRunner,
+ packageLoader: loadTestPackage,
+ platformChecker: getPlatformChecker(platform: MockPlatform.macOs()),
);
- when(transport.send(any))
- .thenAnswer((realInvocation) => Future.value(SentryId.newId()));
});
- tearDown(() async {
- _channel.setMockMethodCallHandler(null);
- await Sentry.close();
- });
-
- test('should add loadContextsIntegration on ios', () async {
+ test('Windows', () async {
await SentryFlutter.init(
- (options) => options
- ..dsn = fakeDsn
- ..transport = transport,
+ getConfigurationTester(
+ hasFileSystemTransport: false,
+ shouldHaveIntegrations: platformAgnosticIntegrations,
+ shouldNotHaveIntegrations: [
+ ...androidIntegrations,
+ ...iOsAndMacOsIntegrations,
+ ...nativeIntegrations,
+ ],
+ ),
+ appRunner: appRunner,
packageLoader: loadTestPackage,
- channel: _channel,
- platformChecker: getPlatformChecker(isIOS: true),
+ platformChecker: getPlatformChecker(platform: MockPlatform.windows()),
);
-
- await Sentry.captureMessage('a message');
-
- final event =
- verify(transport.send(captureAny)).captured.first as SentryEvent;
-
- expect(event.sdk!.integrations.length, 7);
- expect(event.sdk!.integrations.contains('loadContextsIntegration'), true);
});
- test('should not add loadContextsIntegration if not ios', () async {
+ test('Linux', () async {
await SentryFlutter.init(
- (options) => options
- ..dsn = fakeDsn
- ..transport = transport,
+ getConfigurationTester(
+ hasFileSystemTransport: false,
+ shouldHaveIntegrations: platformAgnosticIntegrations,
+ shouldNotHaveIntegrations: [
+ ...androidIntegrations,
+ ...iOsAndMacOsIntegrations,
+ ...nativeIntegrations,
+ ],
+ ),
+ appRunner: appRunner,
packageLoader: loadTestPackage,
- platformChecker: getPlatformChecker(isAndroid: true),
- channel: _channel,
- );
-
- await Sentry.captureMessage('a message');
-
- final event =
- verify(transport.send(captureAny)).captured.first as SentryEvent;
-
- expect(event.sdk!.integrations.length, 7);
- expect(
- event.sdk!.integrations.contains('loadContextsIntegration'),
- false,
+ platformChecker: getPlatformChecker(platform: MockPlatform.linux()),
);
});
- test('should not add loadAndroidImageListIntegration if not Android',
- () async {
+ test('Web', () async {
await SentryFlutter.init(
- (options) => options
- ..dsn = fakeDsn
- ..transport = transport,
+ getConfigurationTester(
+ hasFileSystemTransport: false,
+ shouldHaveIntegrations: platformAgnosticIntegrations,
+ shouldNotHaveIntegrations: [
+ ...androidIntegrations,
+ ...iOsAndMacOsIntegrations,
+ ...nativeIntegrations,
+ ],
+ ),
+ appRunner: appRunner,
packageLoader: loadTestPackage,
- platformChecker: getPlatformChecker(isIOS: true),
- channel: _channel,
+ platformChecker: getPlatformChecker(
+ isWeb: true,
+ platform: MockPlatform.linux(),
+ ),
);
+ });
+ });
- await Sentry.captureMessage('a message');
-
- final event =
- verify(transport.send(captureAny)).captured.first as SentryEvent;
+ group('initial values', () {
+ tearDown(() async {
+ await Sentry.close();
+ });
- expect(event.sdk!.integrations.length, 7);
- expect(
- event.sdk!.integrations.contains('loadAndroidImageListIntegration'),
- false,
+ test('test that initial values are set correctly', () async {
+ await SentryFlutter.init(
+ (options) {
+ options.dsn = fakeDsn;
+
+ expect(kDebugMode, options.debug);
+ expect('debug', options.environment);
+ expect(sdkName, options.sdk.name);
+ expect(sdkVersion, options.sdk.version);
+ expect('pub:sentry_flutter', options.sdk.packages.last.name);
+ expect(sdkVersion, options.sdk.packages.last.version);
+ },
+ appRunner: appRunner,
+ packageLoader: loadTestPackage,
+ platformChecker: getPlatformChecker(
+ platform: MockPlatform.android(),
+ ),
);
});
});
@@ -140,22 +183,12 @@ Future<PackageInfo> loadTestPackage() async {
}
PlatformChecker getPlatformChecker({
- bool isIOS = false,
+ required MockPlatform platform,
bool isWeb = false,
- bool isAndroid = false,
}) {
- var osName = '';
- if (isIOS) {
- osName = 'ios';
- }
- if (isAndroid) {
- osName = 'android';
- }
final platformChecker = PlatformChecker(
isWeb: isWeb,
- platform: MockPlatform(
- os: osName,
- ),
+ platform: platform,
);
return platformChecker;
}
diff --git a/flutter/test/sentry_flutter_util.dart b/flutter/test/sentry_flutter_util.dart
index eb85481211..b8c3bcd1ae 100644
--- a/flutter/test/sentry_flutter_util.dart
+++ b/flutter/test/sentry_flutter_util.dart
@@ -1,68 +1,37 @@
import 'dart:async';
-import 'package:flutter/foundation.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:sentry_flutter/src/file_system_transport.dart';
import 'package:sentry_flutter/src/sentry_flutter_options.dart';
-import 'package:sentry_flutter/src/version.dart';
import 'mocks.dart';
-FutureOr<void> Function(SentryOptions) getConfigurationTester({
- bool isIOS = false,
- bool isWeb = false,
- bool isAndroid = false,
+FutureOr<void> Function(SentryFlutterOptions) getConfigurationTester({
+ required List<Type> shouldHaveIntegrations,
+ required List<Type> shouldNotHaveIntegrations,
+ required bool hasFileSystemTransport,
}) =>
(options) async {
- assert(options is SentryFlutterOptions);
-
options.dsn = fakeDsn;
- expect(kDebugMode, options.debug);
- expect('debug', options.environment);
-
- expect(options.platformChecker.hasNativeIntegration,
- options.transport is FileSystemTransport);
-
expect(
- options.integrations.whereType<FlutterErrorIntegration>().length,
- 1,
+ options.transport is FileSystemTransport,
+ hasFileSystemTransport,
+ reason: '$FileSystemTransport was wrongly set',
);
- if (options.platformChecker.hasNativeIntegration) {
- expect(
- options.integrations.whereType<NativeSdkIntegration>().length,
- 1,
- );
- }
-
- if (isIOS) {
- expect(
- options.integrations.whereType<LoadContextsIntegration>().length,
- 1,
- );
+ for (final type in shouldHaveIntegrations) {
+ final integrations = options.integrations
+ .where((element) => element.runtimeType == type)
+ .toList();
+ expect(integrations.length, 1);
}
- if (isAndroid) {
- expect(
- options.integrations
- .whereType<LoadAndroidImageListIntegration>()
- .length,
- 1,
- );
+ for (final type in shouldNotHaveIntegrations) {
+ final integrations = options.integrations
+ .where((element) => element.runtimeType == type)
+ .toList();
+ expect(integrations.isEmpty, true);
}
-
- expect(
- options.integrations.whereType<LoadReleaseIntegration>().length,
- 1,
- );
-
- expect(sdkName, options.sdk.name);
- expect(sdkVersion, options.sdk.version);
- expect('pub:sentry_flutter', options.sdk.packages.last.name);
- expect(sdkVersion, options.sdk.packages.last.version);
-
- // expect('packageName@version+buildNumber', options.release);
- // expect('buildNumber', options.dist);
};
|
noodle
|
https://github.com/noodle-run/noodle
|
aca5ec3cdd1614ae64c7de024a965b19e8109017
|
Ahmed Elsakaan
|
2022-12-17 00:33:14
|
feat(ui): splits modal into molecule & brings back 100% coverage
|
This commit brings the following changes:
- Let's the auth page handle errors and show an authentication denied
modal
- Makes the modal a reusable component.
- Adds tests to ui library to gain back 100% test coverage.
|
feat(ui): splits modal into molecule & brings back 100% coverage
This commit brings the following changes:
- Let's the auth page handle errors and show an authentication denied
modal
- Makes the modal a reusable component.
- Adds tests to ui library to gain back 100% test coverage.
|
diff --git a/apps/client/pages/signin.tsx b/apps/client/pages/signin.tsx
index 532f2862..57d9d447 100644
--- a/apps/client/pages/signin.tsx
+++ b/apps/client/pages/signin.tsx
@@ -3,14 +3,25 @@ import { Auth } from '@noodle/ui';
import { GetServerSideProps, NextPage } from 'next';
import { unstable_getServerSession } from 'next-auth';
import { signIn } from 'next-auth/react';
+import { useRouter } from 'next/router';
-const SignIn: NextPage = () => (
- <Auth
- onMagicLinkLogin={(email) => signIn('email', { email })}
- onGithubLogin={() => signIn('github')}
- onGoogleLogin={() => signIn('google')}
- />
-);
+type QueryType = {
+ error?: string;
+};
+
+const SignIn: NextPage = () => {
+ const router = useRouter();
+ const queries = router.query as QueryType;
+
+ return (
+ <Auth
+ onMagicLinkLogin={(email) => signIn('email', { email })}
+ onGithubLogin={() => signIn('github')}
+ onGoogleLogin={() => signIn('google')}
+ error={queries.error}
+ />
+ );
+};
export const getServerSideProps: GetServerSideProps = async ({ req, res }) => {
const session = await unstable_getServerSession(req, res, authOptions);
diff --git a/apps/client/public/auth-denied.svg b/apps/client/public/auth-denied.svg
new file mode 100644
index 00000000..5ef645ed
--- /dev/null
+++ b/apps/client/public/auth-denied.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" data-name="Layer 1" width="1100.02" height="811.41" viewBox="0 0 1100.02 811.41"><defs><linearGradient id="785c60ff-874e-47fc-85e9-4f7317d8d736-34" x1="942.13" y1="802.28" x2="942.13" y2="308.24" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="gray" stop-opacity="0.25"/><stop offset="0.54" stop-color="gray" stop-opacity="0.12"/><stop offset="1" stop-color="gray" stop-opacity="0.1"/></linearGradient></defs><title>feeling blue</title><path d="M61.83,433.31C79.2,500.44,115.94,558.47,174,586.6c120.7,58.46,392.91,28.31,596.07-6.3C875.16,562.4,967.53,513,1034.63,443.48Z" transform="translate(-49.99 -44.29)" fill="#6c63ff" opacity="0.1"/><path d="M1127.19,117.32H1015.72c-5.29,0-9.63-3.92-9.63-8.71s4.34-8.72,9.63-8.72H1035c-5.3,0-9.63-3.92-9.63-8.72s4.33-8.71,9.63-8.71h-13.76c-5.3,0-9.64-3.92-9.64-8.72s4.34-8.71,9.64-8.71h58.18c-12.91-5.43-28-9.29-45.39-11.32C875.38,35.28,818.74,47.47,798.76,60a234.52,234.52,0,0,1-81.54,32.34c-97.88,18.27-280.93,40.25-446.84-7C187.92,61.81,126.63,101.52,89.9,167.9H1146.55c-1.38-19.29-5.51-37.11-13.09-52.7A10.17,10.17,0,0,1,1127.19,117.32Z" transform="translate(-49.99 -44.29)" fill="#6c63ff" opacity="0.1"/><path d="M52.38,293.19A402.53,402.53,0,0,0,56.7,410.31l978.68,32.39a415.21,415.21,0,0,0,68-93.82Zm387.08,83.55H420.19c5.3,0,9.64,3.93,9.64,8.72s-4.34,8.71-9.64,8.71H308.72c-5.29,0-9.63-3.92-9.63-8.71s4.34-8.72,9.63-8.72H328c-5.3,0-9.63-3.92-9.63-8.71s4.33-8.72,9.63-8.72H314.23c-5.3,0-9.64-3.92-9.64-8.71s4.34-8.72,9.64-8.72H425.7c5.3,0,9.63,3.92,9.63,8.72s-4.33,8.71-9.63,8.71h13.76c5.3,0,9.63,3.92,9.63,8.72S444.76,376.74,439.46,376.74Z" transform="translate(-49.99 -44.29)" fill="#6c63ff" opacity="0.1"/><path d="M1146.59,168.5,78.11,192c-13,30.23-21.62,64.41-25.59,99.83H1127.87a379.29,379.29,0,0,0,15.52-63.63C1146.6,207.39,1147.88,187.26,1146.59,168.5ZM269.46,245.55H250.19c5.3,0,9.64,3.93,9.64,8.72s-4.34,8.72-9.64,8.72H138.72c-5.29,0-9.63-3.93-9.63-8.72s4.34-8.72,9.63-8.72H158c-5.3,0-9.63-3.92-9.63-8.71s4.33-8.72,9.63-8.72H144.23c-5.3,0-9.64-3.92-9.64-8.71s4.34-8.72,9.64-8.72H255.7c5.3,0,9.63,3.92,9.63,8.72s-4.33,8.71-9.63,8.71h13.76c5.3,0,9.63,3.93,9.63,8.72S274.76,245.55,269.46,245.55Z" transform="translate(-49.99 -44.29)" fill="#6c63ff" opacity="0.1"/><ellipse cx="545.08" cy="739.96" rx="446.98" ry="41.12" fill="#6c63ff" opacity="0.1"/><path d="M1050.63,444.61a1.48,1.48,0,0,1,0-.21c0-.11,0-.21,0-.31h0a8.54,8.54,0,0,0-1.27-3.21,25.29,25.29,0,0,0-9.26-8.76c-6.6-3.62-15.67-5.17-18.31-12.08-.81-2.14-.83-4.47-1.23-6.71a20.29,20.29,0,0,0-13.39-15.23c-3.14-1.05-6.53-1.34-9.58-2.64-6.82-2.9-10.42-10.05-13.47-16.66q-5.92-12.8-11.84-25.61c-3,1.51-6.88.8-9.69-1.09a20.1,20.1,0,0,1-6.27-7.75c-4.07-7.9-5.82-16.85-10.6-24.37s-14.33-13.46-22.77-10.19a38.86,38.86,0,0,1-5.1,2.11c-7.23,1.69-15.23-6.57-21.42-2.56A7,7,0,0,0,894,312a1.2,1.2,0,0,1,0-.2,12.79,12.79,0,0,0-1.32,5.22v0c0,.37,0,.73,0,1.08,0,.06,0,.12,0,.18,0,1.44.09,2.9.11,4.36a19.43,19.43,0,0,1-.28,3.66l0-.1a12.32,12.32,0,0,1-.52,2c-1.61,4.32-6.07,7.15-8.16,11.21l0-.2a10.56,10.56,0,0,0-.61,1.37,10.2,10.2,0,0,0-.57,3.31c-.18,7.63,7.91,14.81,8.85,23,.67,5.8,2,7.66,6.93,10.94l1.08.72c-.43,0-.87.06-1.36.07a3.32,3.32,0,0,0-.57.06,6.1,6.1,0,0,0-5.14.9c-3.78,3-12.72.69-16.69,0s-17.57,1.17-19.47,8.71-5.16,23.1-5.16,23.1,0,9.87-1.21,11.71a.59.59,0,0,0,0,.4c0,2.77.1,19.42-2.58,23.71-.66,1-.61,3.21-.12,5.93-2.82,3.63-5.47,7.87-5,10.65.86,5.69,12.4,23.58,28.94,14,0,0,9.41-17.21-2.43-26.36l.51-2c3.58,4.4,6.23,7.56,6.23,7.56s.14.37.36,1h-.36a47,47,0,0,1,2.78,13.08,16,16,0,0,1-.88,4.81h.31c-.09.34-.19.68-.31,1a8.72,8.72,0,0,1-3.11,4.21c-8.27,5.86-17.74,47.71-17.74,47.71S837.75,596.45,834,600.3c-3.1,3.16,16.38,12.06,31,11a23.86,23.86,0,0,0,6-1.14c.09,1,.19,2,.29,2.91.31,3,.63,5.78.83,6.65.52,2.18,1.55,24.44,1.55,24.44s-2.11,14.46-1.6,24.52c0,.69.09,1.35.15,2l-1.82.28c-2.76,6.2,8.61,57.93,10.16,62.28a41.42,41.42,0,0,1,1.72,10.55s-1,3.68-.17,5.69a13.84,13.84,0,0,1,1,3.85s-.68,3.34.35,5.52-.17,6-.17,6-.34,15.07-3.44,23.27A13.4,13.4,0,0,0,882,801.4a8.21,8.21,0,0,0,.7.81s17.1.14,20.11,0l.39,0c1.21-.17,4.31-13.73,1.55-20.26s-.34-14.57-.34-14.57V755.5s3.1-2.86,0-9-2.59-8-2.59-8,3.45-9.88-.17-13.06.69-15.24.69-15.24L903.56,670a15.81,15.81,0,0,0-1.95-.5c-.07-.66-.14-1.34-.21-2.06-.71-7.28-1.32-17.18.26-20S904,620,904.25,602.89l15.76.6c.33,8,.68,15.3.9,16.23.52,2.18,1.56,24.44,1.56,24.44s-2.12,14.46-1.61,24.52c0,.69.09,1.35.15,2l-1.82.28c-2.76,6.2,8.61,57.93,10.16,62.28a41.65,41.65,0,0,1,1.73,10.55s-1,3.68-.18,5.69a13.84,13.84,0,0,1,1,3.85s-.68,3.34.35,5.52-.17,6-.17,6-.34,15.07-3.44,23.27a13.4,13.4,0,0,0,2.22,13.26,8.21,8.21,0,0,0,.7.81s17.1.14,20.11,0l.39,0c1.21-.17,4.31-13.73,1.55-20.26s-.34-14.57-.34-14.57V755.5s3.1-2.86,0-9-2.59-8-2.59-8,3.45-9.88-.17-13.06.69-15.24.69-15.24L952.44,670a15.36,15.36,0,0,0-2-.5c-.07-.66-.14-1.34-.21-2.06-.71-7.28-1.32-17.18.26-20,1.27-2.31,2-17.19,2.33-31.72,0-1,0-2,.08-3a155.09,155.09,0,0,0,21.58-2.42s-8.43-29.81-5.85-34.66c1.11-2.09-.49-13.22-2.68-25.21a17.52,17.52,0,0,0,10.78,3.9c3.77,7.25,15.24,23.93,21.7,26.5,7.58,3,1.89-23.6-1.72-27.45a32.39,32.39,0,0,1-4.28-6.87c.1-.12.21-.22.31-.33s.18-28.3-1.55-27.79-3.79-4.19-3.79-4.19l-5.34-46.87-2.24-19.62,0,0c1.87,1.38,4.09,2.26,6,3.63,5.2,3.81,6.9,10.5,9.18,16.42,1.88,4.87,4.52,9.7,8.85,12.76s10.68,3.87,15,.77c4-2.91,5.18-8.16,6.06-12.95,7.26,2.55,16.07-4.27,15.13-11.72-.23-1.84-.91-3.85.05-5.46,1.92-3.18,8-1.33,10-4.47a3.34,3.34,0,0,0,.5-1.81C1050.62,444.74,1050.63,444.68,1050.63,444.61Zm-97.11,25.78c-.11,1.79,2.35,16.17,4.35,27.55-1.64-7.09-4.93-14.66-11.41-19.85,0,0,0-.36-.08-1h.08s-.27-2.86-.31-6.93a76.34,76.34,0,0,1,.8-10.78v-.09h-.13c0-.3.08-.61.13-.91a32.5,32.5,0,0,1,2.43-8.74,24.23,24.23,0,0,1,1.85-3.14C952.3,456.17,953.62,468.58,953.52,470.39Zm5.38,33.32c.88,4.91,1.51,8.36,1.51,8.36l5.31,36.46v.17c-2.86-15.39-6.51-31.61-6.51-31.61A63,63,0,0,0,958.9,503.71Z" transform="translate(-49.99 -44.29)" fill="url(#785c60ff-874e-47fc-85e9-4f7317d8d736-34)"/><path d="M893.82,368.89c-1-9.24-11-17.21-8-26,1.63-4.79,6.73-7.72,8.45-12.48,1.14-3.14.63-6.59.64-9.93s.79-7.07,3.57-8.92c6-4,13.72,4.23,20.72,2.55a36.67,36.67,0,0,0,4.93-2.1c8.17-3.25,17.41,2.67,22,10.15s6.31,16.4,10.25,24.26a19.9,19.9,0,0,0,6.06,7.71c2.72,1.88,6.44,2.59,9.38,1.09l11.45,25.5c3,6.57,6.44,13.69,13,16.58,2.94,1.29,6.22,1.58,9.26,2.63a20,20,0,0,1,13,15.15c.39,2.24.4,4.56,1.19,6.69,2.55,6.88,11.32,8.42,17.71,12a24.77,24.77,0,0,1,9,8.71c1,1.73,1.86,4,.79,5.7-1.93,3.12-7.8,1.28-9.66,4.45-.94,1.6-.28,3.6,0,5.44.91,7.41-7.62,14.2-14.64,11.66-.85,4.77-2,10-5.86,12.89-4.15,3.1-10.3,2.28-14.49-.76s-6.73-7.85-8.55-12.7c-2.21-5.9-3.86-12.56-8.89-16.35-1.82-1.36-4-2.24-5.78-3.61-4-3.06-6-8.11-7.43-13-1.85-6.1-3.32-12.37-6-18.13s-6.92-11.12-12.73-13.75c-5.45-2.45-11.73-2.29-17.36-4.28-9.69-3.42-16.86-11.57-26.5-15.41a42.89,42.89,0,0,1-8.7-4.92C895.78,376.52,894.46,374.67,893.82,368.89Z" transform="translate(-49.99 -44.29)" fill="#3f3d56"/><g opacity="0.1"><path d="M894.72,328.45a10.12,10.12,0,0,0,.54-1.21c1.13-3.14.63-6.59.64-9.93a17.84,17.84,0,0,1,.31-3.32,14,14,0,0,0-1.31,6.32C894.89,323,895.21,325.82,894.72,328.45Z" transform="translate(-49.99 -44.29)"/><path d="M1018,479.48c-4.15,3.09-10.3,2.28-14.49-.77S996.77,470.87,995,466c-2.21-5.9-3.85-12.56-8.89-16.35-1.81-1.36-4-2.25-5.77-3.61-4-3.06-6-8.11-7.44-12.95-1.85-6.1-3.31-12.37-6-18.13s-6.91-11.12-12.73-13.75c-5.44-2.45-11.72-2.29-17.35-4.28-9.7-3.42-16.87-11.57-26.5-15.41a43.45,43.45,0,0,1-8.71-4.92c-4.74-3.27-6-5.12-6.7-10.89-1-8.66-9.8-16.21-8.43-24.37a12.68,12.68,0,0,0-.59,1.36c-3,8.8,7,16.77,8,26,.65,5.77,2,7.62,6.7,10.89a43.45,43.45,0,0,0,8.71,4.92c9.63,3.84,16.8,12,26.5,15.41,5.63,2,11.91,1.83,17.35,4.28,5.82,2.63,10,8,12.73,13.75s4.19,12,6,18.13c1.47,4.84,3.4,9.89,7.44,12.95,1.81,1.36,4,2.25,5.77,3.61,5,3.79,6.68,10.45,8.89,16.35,1.82,4.85,4.37,9.65,8.56,12.69s10.34,3.86,14.49.77c2.65-2,4-5.05,4.89-8.32A12.28,12.28,0,0,1,1018,479.48Z" transform="translate(-49.99 -44.29)"/><path d="M1038.55,449.49a4.21,4.21,0,0,0-.48,2.34c2.26-2.23,7.36-.92,9.14-3.79a3.65,3.65,0,0,0,.46-2.35C1045.35,447.89,1040.25,446.58,1038.55,449.49Z" transform="translate(-49.99 -44.29)"/><path d="M1023.86,466.59c-.19,1-.38,2.07-.62,3.11,6.12,1.91,13.19-3,14.19-9.2C1035,465.27,1029,468.46,1023.86,466.59Z" transform="translate(-49.99 -44.29)"/></g><path d="M906.74,373.7s3.33,6.72-6.5,6.86,6.33,43.64,6.33,43.64L922.91,445l20.33-11,1.17-30.34,1.5-18.33s-19-6.17-15.5-14.33S906.74,373.7,906.74,373.7Z" transform="translate(-49.99 -44.29)" fill="#fbbebe"/><path d="M965.75,551.06s12,11.81,26-3.86L981,535.79H967.4Z" transform="translate(-49.99 -44.29)" fill="#575a89"/><path d="M967.05,535.79l-1.65,15.27s12,11.81,26-3.86" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M987.24,537.87s4.83,12.67,8.33,16.5,9,30.33,1.67,27.33-21.33-25.33-22.17-29.16-1.16-14.67-1.16-14.67Z" transform="translate(-49.99 -44.29)" fill="#fbbebe"/><polygon points="832.42 558.58 897.08 561.08 889.58 533.74 857.01 533.08 832.42 558.58" fill="#575a89"/><polygon points="841.41 558.58 906.08 561.08 898.58 533.74 866 533.08 841.41 558.58" opacity="0.1"/><path d="M903.57,648c-1.53,2.85-.94,12.71-.25,20,.44,4.64.92,8.21.92,8.21s-24.17,7.5-27.83,1c-.93-1.65-1.39-4.54-1.55-7.93-.5-10,1.55-24.41,1.55-24.41s-1-22.16-1.5-24.33c-.2-.87-.51-3.63-.81-6.62-.44-4.44-.86-9.38-.86-9.38l33-17.5s0,3.28-.06,8.33C906,611.23,905.47,644.5,903.57,648Z" transform="translate(-49.99 -44.29)" fill="#fbbebe"/><path d="M904.24,676.21s-24.17,7.5-27.83,1c-.93-1.65-1.39-4.54-1.55-7.93,5-.76,20.22-2.86,28.46-1.28C903.76,672.64,904.24,676.21,904.24,676.21Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M905.07,802.21l-.38,0c-2.91.11-19.45,0-19.45,0a9,9,0,0,1-.68-.8,13.64,13.64,0,0,1-2.15-13.2c3-8.17,3.33-23.17,3.33-23.17s1.17-3.83.17-6-.34-5.5-.34-5.5a14.25,14.25,0,0,0-1-3.83c-.83-2,.17-5.67.17-5.67a42.45,42.45,0,0,0-1.67-10.5c-1.5-4.33-12.5-55.83-9.83-62,0,0,23.33-4,32.17-1l-1.17,40s-4.17,12-.67,15.17.17,13,.17,13-.5,1.83,2.5,8,0,9,0,9v11.83s-2.33,8,.33,14.5S906.24,802,905.07,802.21Z" transform="translate(-49.99 -44.29)" fill="#3f3d56"/><path d="M950.86,648c-1.53,2.85-.94,12.71-.25,20,.44,4.64.92,8.21.92,8.21s-24.17,7.5-27.83,1c-.93-1.65-1.39-4.54-1.55-7.93-.5-10,1.55-24.41,1.55-24.41s-1-22.16-1.5-24.33c-.27-1.17-.74-12.33-1.11-22.34-.31-8.54-.56-16.26-.56-16.26l33,5.1s0,14.51-.41,29.42C952.76,630.92,952.09,645.74,950.86,648Z" transform="translate(-49.99 -44.29)" fill="#fbbebe"/><path d="M951.53,676.21s-24.17,7.5-27.83,1c-.93-1.65-1.39-4.54-1.55-7.93,5-.76,20.22-2.86,28.46-1.28C951.05,672.64,951.53,676.21,951.53,676.21Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M952.36,802.21l-.38,0c-2.91.11-19.45,0-19.45,0a9,9,0,0,1-.68-.8,13.64,13.64,0,0,1-2.15-13.2C932.7,780,933,765,933,765s1.17-3.83.17-6-.34-5.5-.34-5.5a14.25,14.25,0,0,0-1-3.83c-.83-2,.17-5.67.17-5.67a42.45,42.45,0,0,0-1.67-10.5c-1.5-4.33-12.5-55.83-9.83-62,0,0,23.33-4,32.17-1l-1.17,40s-4.17,12-.67,15.17.17,13,.17,13-.5,1.83,2.5,8,0,9,0,9v11.83s-2.33,8,.33,14.5S953.53,802,952.36,802.21Z" transform="translate(-49.99 -44.29)" fill="#3f3d56"/><circle cx="869.75" cy="313.77" r="23.5" opacity="0.1"/><circle cx="869.75" cy="312.77" r="23.5" fill="#fbbebe"/><path d="M873.24,604.54l33-17.5s0,3.28-.06,8.33c-4.82,2.88-12.09,7.21-19.08,11.3-3.8,2.23-7.51,4.39-10.69,6.2a14.2,14.2,0,0,1-2.31,1C873.66,609.48,873.24,604.54,873.24,604.54Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M953.53,587s0,14.51-.41,29.42H953a55.48,55.48,0,0,1-7.39-.23c-4.31-.46-7.76-1.6-9-3.86-2.51-4.4-9.54-10-15.48-14.17-.31-8.54-.56-16.26-.56-16.26Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M947.39,459.91a95.17,95.17,0,0,0-.48,19.63c15.16,12.5,12.33,38.83,12.33,38.83s11.67,53.34,9.17,58.17,5.66,34.5,5.66,34.5A145.51,145.51,0,0,1,953,613.46a55.48,55.48,0,0,1-7.39-.23c-4.31-.46-7.76-1.6-9-3.86-4.66-8.16-24.83-20.33-24.83-20.33S899,596.7,887.1,603.67c-3.8,2.23-7.51,4.39-10.69,6.2a19.84,19.84,0,0,1-8.35,2.29c-14.15,1.05-33-7.81-30-10.95,3.67-3.84,21.84-71.17,21.84-71.17s9.16-41.67,17.16-47.5a8.65,8.65,0,0,0,3-4.19c2.74-7.61-1.84-19.81-1.84-19.81s-25.83-31.83-24.67-33.67,1.17-11.66,1.17-11.66,3.17-15.5,5-23,15-9.34,18.83-8.67,12.49,3,16.15,0,9.84,1.17,9.84,1.17l15.18,4.18,13.65-8s13.68.7,14.85,2.53,19.17,5.34,19.17,5.34c9.16,6.16,8.83,35.5,8.83,35.5s-22,19.16-26.5,29A33.06,33.06,0,0,0,947.39,459.91Z" transform="translate(-49.99 -44.29)" fill="#575a89"/><path d="M971.24,418.2l5,4,5.17,46.5,5.16,46.67s2,4.67,3.67,4.17,1.5,27.66,1.5,27.66-19.14-11.77-26,3.86l-5.34-37.69s-6.84-38.5-6.67-41.5-3.5-35.5-3.5-35.5Z" transform="translate(-49.99 -44.29)" fill="#575a89"/><path d="M857.24,420.37l-3.67,4.5s.34,19.33-2.5,24,7.84,32,11.84,30.33,13-44.33,13-44.83S857.24,420.37,857.24,420.37Z" transform="translate(-49.99 -44.29)" fill="#575a89"/><path d="M856.91,447.87s-11.67,11.83-10.84,17.5,12,23.48,28,13.91C874.07,479.28,888.91,451.37,856.91,447.87Z" transform="translate(-49.99 -44.29)" fill="#575a89"/><path d="M904.69,802.24c-2.91.11-19.45,0-19.45,0a9,9,0,0,1-.68-.8C888.79,800,897.93,797.84,904.69,802.24Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M952,802.24c-2.91.11-19.45,0-19.45,0a9,9,0,0,1-.68-.8C936.08,800,945.22,797.84,952,802.24Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M888.28,509.11c-2.55,24.46-1.71,73-1.18,94.56-3.8,2.23-7.51,4.39-10.69,6.2a19.84,19.84,0,0,1-8.35,2.29C867,605.64,881.68,538.67,888.28,509.11Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M891.4,495.23c-.07.35-1.28,5.67-3.12,13.88C889,502.1,890,497.07,891.4,495.23Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M932,492.59s14.17,89-27.79,100C904.2,592.55,933.24,588.14,932,492.59Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M953,613.46a55.48,55.48,0,0,1-7.39-.23L934.29,491.54C941.51,496.26,950.15,582.62,953,613.46Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M902.24,343.24a6.19,6.19,0,0,1,2.23.23,9.73,9.73,0,0,1,2.82,2.12,10.05,10.05,0,0,0,9.54,1.85,12.58,12.58,0,0,1,3.59-1c1.91,0,3.56,1.4,4.55,3s1.5,3.5,2.35,5.21,2.21,3.33,4.08,3.75A7.14,7.14,0,0,1,934,359a3.68,3.68,0,0,1,1.12,1.55c1.56,3.37,2.8,7.35,6.13,9a9.17,9.17,0,0,0,3.91.85,8.17,8.17,0,0,0,4-.72,7.66,7.66,0,0,0,2.94-2.93c2.08-3.44,2.32-7.7,1.83-11.69A32.16,32.16,0,0,0,948.7,341a29.35,29.35,0,0,0-26.85-12.39,37.42,37.42,0,0,0-5.35,1c-6.36,1.7-12.6,4.88-16.46,10.21a34.64,34.64,0,0,1-3.07,3.78C898.72,343.43,900.48,343.28,902.24,343.24Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M902.24,342.24a6.19,6.19,0,0,1,2.23.23,9.73,9.73,0,0,1,2.82,2.12,10.05,10.05,0,0,0,9.54,1.85,12.58,12.58,0,0,1,3.59-1c1.91,0,3.56,1.4,4.55,3s1.5,3.5,2.35,5.21,2.21,3.33,4.08,3.75A7.14,7.14,0,0,1,934,358a3.68,3.68,0,0,1,1.12,1.55c1.56,3.37,2.8,7.35,6.13,9a9.17,9.17,0,0,0,3.91.85,8.17,8.17,0,0,0,4-.72,7.66,7.66,0,0,0,2.94-2.93c2.08-3.44,2.32-7.7,1.83-11.69A32.16,32.16,0,0,0,948.7,340a29.35,29.35,0,0,0-26.85-12.39,37.42,37.42,0,0,0-5.35,1c-6.36,1.7-12.6,4.88-16.46,10.21a34.64,34.64,0,0,1-3.07,3.78C898.72,342.43,900.48,342.28,902.24,342.24Z" transform="translate(-49.99 -44.29)" fill="#3f3d56"/><path d="M876.74,398.2s1.17,9.34-2.83,11.67S876.74,398.2,876.74,398.2Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M961.57,470.54s9.5-14,10.84-10S961.57,470.54,961.57,470.54Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M962.24,475.2s9.37-11.5,10.27-7S962.24,475.2,962.24,475.2Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M934.72,461.51a15.21,15.21,0,0,1-9.42-3.1l-.82,0a14.8,14.8,0,0,1-10.29,3.87A14.6,14.6,0,0,1,903.52,458l-1.09,0a15.71,15.71,0,0,1-20.28-.37l-3.91-.07s4.58,12.2,1.84,19.81l66.83,1.19a95.17,95.17,0,0,1,.48-19.63v-.09l-3.67-.07A15.38,15.38,0,0,1,934.72,461.51Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M934.72,463.51a15.21,15.21,0,0,1-9.42-3.1l-.82,0a14.8,14.8,0,0,1-10.29,3.87A14.6,14.6,0,0,1,903.52,460l-1.09,0a15.71,15.71,0,0,1-20.28-.37l-3.91-.07s4.58,12.2,1.84,19.81l66.83,1.19a95.17,95.17,0,0,1,.48-19.63v-.09l-3.67-.07A15.38,15.38,0,0,1,934.72,463.51Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M934.72,462.51a15.21,15.21,0,0,1-9.42-3.1l-.82,0a14.8,14.8,0,0,1-10.29,3.87A14.6,14.6,0,0,1,903.52,459l-1.09,0a15.71,15.71,0,0,1-20.28-.37l-3.91-.07s4.58,12.2,1.84,19.81l66.83,1.19a95.17,95.17,0,0,1,.48-19.63v-.09l-3.67-.07A15.38,15.38,0,0,1,934.72,462.51Z" transform="translate(-49.99 -44.29)" fill="#3f3d56"/><path d="M931.75,395.83s14.07.9,14.16,2.9S931.75,395.83,931.75,395.83Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M897.57,387.3s-14.07.9-14.16,2.9S897.57,387.3,897.57,387.3Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M951.34,428.19c-.14-.1-.28-.18-.42-.27,3.6,3.24,3,10.32-1.42,16.16s-11.13,8.27-15.21,5.65c.13.11.24.23.38.34,4,3.06,11,.66,15.62-5.38S955.36,431.26,951.34,428.19Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M874.05,443.33c-3.56-6.42-3.1-13.51.93-16.2-.15.07-.31.13-.46.21-4.42,2.46-5,9.83-1.34,16.47s10.26,10,14.68,7.58a3.83,3.83,0,0,0,.42-.28C883.87,453.11,877.61,449.75,874.05,443.33Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M878.81,389.19h0l-1.29,2-3.29-1.75,1.73-2.66A7.25,7.25,0,0,1,878.81,389.19Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M857.91,463.2s2.93-13.78-1-18.16-2.67-27.34,3.33-26.84,15,18.66,13.5,22.5-7.17,23.5-7.17,23.5Z" transform="translate(-49.99 -44.29)" fill="#fbbebe"/><path d="M952,363.78a7.66,7.66,0,0,1-2.94,2.93,8.17,8.17,0,0,1-4,.72,9.17,9.17,0,0,1-3.91-.85c-3.33-1.66-4.57-5.64-6.13-9A3.68,3.68,0,0,0,934,356a7.14,7.14,0,0,0-2.57-.63c-1.87-.42-3.22-2.05-4.08-3.75s-1.37-3.58-2.35-5.21-2.64-3.06-4.55-3a12.29,12.29,0,0,0-3.59,1.05,10.08,10.08,0,0,1-9.54-1.86,9.73,9.73,0,0,0-2.82-2.12,6.19,6.19,0,0,0-2.23-.23c-1.15,0-2.29.11-3.44.2a25.14,25.14,0,0,1-1.83,2.14c1.75-.15,3.51-.3,5.27-.34a6.19,6.19,0,0,1,2.23.23,9.73,9.73,0,0,1,2.82,2.12,10.08,10.08,0,0,0,9.54,1.86,12.29,12.29,0,0,1,3.59-1.05c1.91,0,3.56,1.4,4.55,3s1.5,3.5,2.35,5.21,2.21,3.33,4.08,3.75A7.14,7.14,0,0,1,934,358a3.68,3.68,0,0,1,1.12,1.55c1.56,3.37,2.8,7.35,6.13,9a9.17,9.17,0,0,0,3.91.85,8.17,8.17,0,0,0,4-.72,7.66,7.66,0,0,0,2.94-2.93,16.59,16.59,0,0,0,2-9.26A15.28,15.28,0,0,1,952,363.78Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><ellipse cx="812.35" cy="423.74" rx="9" ry="6.1" fill="#575a89"/><circle cx="518.99" cy="454.79" r="308.5" fill="#6c63ff"/><path d="M730.85,654.11c0,48.7-76.56,4.16-158.64,4.16s-165.1,42.7-165.1-6c0-27.77,26.46-66.39,64.42-94.44h0c28.6-21.14,63.72-36.28,99-36.28,36.28,0,71.82,16.39,100.17,38.89C706.48,588.81,730.85,626.93,730.85,654.11Z" transform="translate(-49.99 -44.29)" fill="#444053"/><path d="M670.69,560.42c-43.63-6.57-122.54-14.58-199.16-2.61,28.6-21.14,63.72-36.28,99-36.28C606.8,521.53,642.34,537.92,670.69,560.42Z" transform="translate(-49.99 -44.29)" fill="#f6f8fb"/><path d="M407.11,281.31s-92.93,59.41-92.17,152.34S407.11,281.31,407.11,281.31Z" transform="translate(-49.99 -44.29)" opacity="0.05"/><path d="M877.36,113.52s-84.2-5.07-74.27,53.93c0,0-2,10.42,7.48,15.16,0,0,.15-4.37,8.63-2.89a39,39,0,0,0,9.15.44,19,19,0,0,0,11.18-4.62h0s23.67-9.77,32.88-48.46c0,0,6.81-8.44,6.54-10.6l-14.21,6.06s4.85,10.25,1,18.77c0,0-.46-18.39-3.19-18-.55.09-7.38,3.55-7.38,3.55s8.35,17.86,2,30.83c0,0,2.39-22-4.66-29.54l-10,5.84s9.76,18.44,3.14,33.49c0,0,1.7-23.08-5.24-32.07l-9.07,7.07s9.17,18.18,3.58,30.66c0,0-.73-26.87-5.54-28.9,0,0-7.93,7-9.14,9.87,0,0,6.28,13.19,2.39,20.15,0,0-2.39-17.9-4.35-18,0,0-7.9,11.86-8.73,20,0,0,.35-12.1,6.81-21.13,0,0-7.64,1.31-12.09,6.27,0,0,1.23-8.39,14-9.12,0,0,6.53-9,8.28-9.54,0,0-12.75-1.07-20.48,2.36,0,0,6.8-7.91,22.81-4.32l9-7.3s-16.78-2.3-23.9.24c0,0,8.19-7,26.31-1.9l9.75-5.83s-14.31-3.08-22.84-2c0,0,9-4.85,25.69.41l7-3.13s-10.49-2.06-13.56-2.38-3.23-1.18-3.23-1.18A36.35,36.35,0,0,1,862.83,120S877.61,114.45,877.36,113.52Z" transform="translate(-49.99 -44.29)" fill="#6c63ff"/><path d="M791,87.29s-38-2.3-33.56,24.36c0,0-.89,4.71,3.38,6.85,0,0,.06-2,3.9-1.3a18.06,18.06,0,0,0,4.13.2,8.69,8.69,0,0,0,5.06-2.09h0s10.69-4.42,14.85-21.9c0,0,3.08-3.81,3-4.79l-6.42,2.74s2.2,4.63.47,8.48c0,0-.21-8.31-1.44-8.11-.25,0-3.34,1.6-3.34,1.6s3.78,8.07.93,13.93c0,0,1.08-9.94-2.1-13.35l-4.52,2.64s4.41,8.34,1.42,15.14c0,0,.76-10.43-2.37-14.49l-4.1,3.19s4.14,8.21,1.62,13.85c0,0-.33-12.14-2.51-13.06,0,0-3.58,3.16-4.13,4.46,0,0,2.84,6,1.08,9.11,0,0-1.08-8.09-2-8.12,0,0-3.57,5.35-3.94,9a19.48,19.48,0,0,1,3.07-9.55,10.71,10.71,0,0,0-5.46,2.83s.55-3.79,6.34-4.12c0,0,2.95-4.06,3.74-4.31,0,0-5.76-.48-9.25,1.07,0,0,3.07-3.58,10.31-2l4-3.29s-7.58-1-10.8.1c0,0,3.7-3.16,11.89-.85l4.4-2.64s-6.46-1.39-10.32-.89c0,0,4.07-2.19,11.61.19l3.15-1.42s-4.74-.93-6.12-1.07-1.47-.53-1.47-.53a16.39,16.39,0,0,1,8.9,1S791.11,87.71,791,87.29Z" transform="translate(-49.99 -44.29)" fill="#6c63ff"/><ellipse cx="1073.09" cy="725.46" rx="26.93" ry="4.55" fill="#6c63ff" opacity="0.1"/><ellipse cx="46.77" cy="801.15" rx="26.93" ry="4.55" fill="#6c63ff" opacity="0.1"/><ellipse cx="203.1" cy="806.86" rx="26.93" ry="4.55" fill="#6c63ff" opacity="0.1"/><ellipse cx="1014.15" cy="774.22" rx="40.21" ry="6.8" fill="#6c63ff"/><path d="M1080.76,807.4a11.73,11.73,0,0,0,3.84-5.79c.49-2.29-.49-5.05-2.68-5.89-2.46-.94-5.09.77-7.08,2.49s-4.28,3.68-6.89,3.32a10.47,10.47,0,0,0,3.24-9.81,4.12,4.12,0,0,0-.9-2c-1.37-1.46-3.84-.84-5.48.31-5.2,3.66-6.65,10.72-6.68,17.08-.52-2.29-.08-4.68-.09-7s-.66-5-2.64-6.23a8,8,0,0,0-4-.94c-2.34-.09-4.94.14-6.54,1.85-2,2.13-1.47,5.69.26,8s4.35,3.81,6.76,5.42a15,15,0,0,1,4.84,4.61,4.83,4.83,0,0,1,.36.83h14.65A40.77,40.77,0,0,0,1080.76,807.4Z" transform="translate(-49.99 -44.29)" fill="#6c63ff"/><path d="M109.33,723.55s5.49,7.18-2.54,18-14.65,20-12,26.76c0,0,12.11-20.14,22-20.43S120.17,735.66,109.33,723.55Z" transform="translate(-49.99 -44.29)" fill="#6c63ff"/><path d="M109.33,723.55a9,9,0,0,1,1.12,2.25c9.62,11.3,14.74,21.85,5.5,22.11-8.62.25-19,15.65-21.43,19.54a9.3,9.3,0,0,0,.3.89s12.11-20.14,22-20.43S120.17,735.66,109.33,723.55Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M119.54,732.7c0,2.53-.29,4.58-.64,4.58s-.63-2-.63-4.58.35-1.34.71-1.34S119.54,730.17,119.54,732.7Z" transform="translate(-49.99 -44.29)" fill="#ffd037"/><path d="M123,735.72c-2.22,1.21-4.15,1.94-4.32,1.63s1.5-1.53,3.72-2.74,1.34-.33,1.51,0S125.26,734.51,123,735.72Z" transform="translate(-49.99 -44.29)" fill="#ffd037"/><path d="M80.31,723.55s-5.49,7.18,2.53,18,14.65,20,12,26.76c0,0-12.12-20.14-22-20.43S69.46,735.66,80.31,723.55Z" transform="translate(-49.99 -44.29)" fill="#6c63ff"/><path d="M80.31,723.55a8.63,8.63,0,0,0-1.12,2.25c-9.62,11.3-14.75,21.85-5.5,22.11,8.61.25,19,15.65,21.42,19.54a9.24,9.24,0,0,1-.29.89s-12.12-20.14-22-20.43S69.46,735.66,80.31,723.55Z" transform="translate(-49.99 -44.29)" opacity="0.1"/><path d="M70.1,732.7c0,2.53.28,4.58.63,4.58s.63-2,.63-4.58-.35-1.34-.7-1.34S70.1,730.17,70.1,732.7Z" transform="translate(-49.99 -44.29)" fill="#ffd037"/><path d="M66.59,735.72c2.22,1.21,4.16,1.94,4.33,1.63s-1.5-1.53-3.72-2.74-1.35-.33-1.51,0S64.37,734.51,66.59,735.72Z" transform="translate(-49.99 -44.29)" fill="#ffd037"/><path d="M71.85,767.4s15.36-.47,20-3.77,23.63-7.23,24.78-2,23.08,26.3,5.74,26.44-40.29-2.71-44.91-5.52S71.85,767.4,71.85,767.4Z" transform="translate(-49.99 -44.29)" fill="#a8a8a8"/><path d="M122.66,786.28c-17.34.14-40.29-2.71-44.91-5.52-3.52-2.14-4.92-9.83-5.39-13.38l-.51,0s1,12.39,5.59,15.2,27.57,5.66,44.91,5.52c5,0,6.73-1.83,6.64-4.46C128.29,785.25,126.39,786.25,122.66,786.28Z" transform="translate(-49.99 -44.29)" opacity="0.2"/><path d="M459.3,458.63c5.87-.33,33.5-2.41,51.05-12.42a19.89,19.89,0,0,1,9.27-2.73c5.58-.16,12,2.17,7.89,15.21-6.66,21.33-45.33,45.33-69.33,44-23.08-1.28-50.46-10.58-68.54-43.28a20,20,0,0,1-2.47-10.29c.21-6.6,2.61-14.87,15-5.65,16.74,12.45,48.5,14.81,54.87,15.16A21.11,21.11,0,0,0,459.3,458.63Z" transform="translate(-49.99 -44.29)" fill="#444053"/><path d="M681.3,458.63c5.87-.33,33.5-2.41,51.05-12.42a19.89,19.89,0,0,1,9.27-2.73c5.58-.16,12,2.17,7.89,15.21-6.66,21.33-45.33,45.33-69.33,44-23.08-1.28-50.46-10.58-68.54-43.28a20,20,0,0,1-2.47-10.29c.21-6.6,2.61-14.87,15-5.65,16.74,12.45,48.5,14.81,54.87,15.16A21.11,21.11,0,0,0,681.3,458.63Z" transform="translate(-49.99 -44.29)" fill="#444053"/></svg>
\ No newline at end of file
diff --git a/libs/server/src/utils/authOptions.ts b/libs/server/src/utils/authOptions.ts
index 5e0fdb6d..ca5103e8 100644
--- a/libs/server/src/utils/authOptions.ts
+++ b/libs/server/src/utils/authOptions.ts
@@ -59,6 +59,9 @@ export const authOptions: NextAuthOptions = {
}
},
},
+ pages: {
+ error: '/signin',
+ },
callbacks: {
session({ session, user }) {
if (session.user) {
diff --git a/libs/ui/src/molecules/Greeting/Greeting.spec.tsx b/libs/ui/src/molecules/Greeting/Greeting.spec.tsx
index c55a57d8..5106c279 100644
--- a/libs/ui/src/molecules/Greeting/Greeting.spec.tsx
+++ b/libs/ui/src/molecules/Greeting/Greeting.spec.tsx
@@ -39,4 +39,10 @@ describe('Greeting molecules', () => {
expect(screen.getByRole('status')).toBeInTheDocument();
});
+
+ it("doesn't render anything when no loading and no greeting", () => {
+ render(<Greeting isLoading={false} />);
+
+ expect(screen.queryByText('Good morning')).not.toBeInTheDocument();
+ });
});
diff --git a/libs/ui/src/molecules/Modal/Modal.spec.tsx b/libs/ui/src/molecules/Modal/Modal.spec.tsx
new file mode 100644
index 00000000..3bae6676
--- /dev/null
+++ b/libs/ui/src/molecules/Modal/Modal.spec.tsx
@@ -0,0 +1,54 @@
+import { render, screen } from '@testing-library/react';
+import { Modal } from './Modal';
+
+describe('Modal molecule', () => {
+ beforeEach(() => {
+ // IntersectionObserver isn't available in test environment
+ const mockIntersectionObserver = jest.fn();
+ mockIntersectionObserver.mockReturnValue({
+ observe: () => null,
+ unobserve: () => null,
+ disconnect: () => null,
+ });
+ window.IntersectionObserver = mockIntersectionObserver;
+ });
+
+ it("doesn't render title when closed", () => {
+ render(
+ <Modal title="Title" description="Description" onClose={() => {}} />,
+ );
+
+ expect(screen.queryByText('Title')).not.toBeInTheDocument();
+ });
+
+ it('renders the title when open', () => {
+ render(
+ <Modal title="Title" description="Description" open onClose={() => {}} />,
+ );
+
+ expect(screen.getByText('Title')).toBeInTheDocument();
+ });
+
+ it('renders the description when open', () => {
+ render(
+ <Modal title="Title" description="Description" open onClose={() => {}} />,
+ );
+
+ expect(screen.getByText('Description')).toBeInTheDocument();
+ });
+
+ it('renders the image when open', () => {
+ render(
+ <Modal
+ title="Title"
+ description="Description"
+ image="/image.png"
+ alt="illustration"
+ open
+ onClose={() => {}}
+ />,
+ );
+
+ expect(screen.getByAltText('illustration')).toBeInTheDocument();
+ });
+});
diff --git a/libs/ui/src/molecules/Modal/Modal.stories.tsx b/libs/ui/src/molecules/Modal/Modal.stories.tsx
new file mode 100644
index 00000000..1ac53c32
--- /dev/null
+++ b/libs/ui/src/molecules/Modal/Modal.stories.tsx
@@ -0,0 +1,30 @@
+import { Meta, Story } from '@storybook/react';
+import { ComponentProps } from 'react';
+import { Modal } from './Modal';
+
+const args: ComponentProps<typeof Modal> = {
+ open: true,
+ onClose: () => {},
+ title: 'Modal title',
+ description: 'Modal description',
+ image: '/waitlist-illustration.svg',
+ alt: 'illustration',
+};
+
+const config: Meta<typeof args> = {
+ title: 'Molecules / Modal',
+ component: Modal,
+ args,
+};
+
+export default config;
+
+const Template: Story<typeof args> = (props) => <Modal {...props} />;
+
+export const Default = Template.bind({});
+
+export const NoImage = Template.bind({});
+NoImage.args = {
+ image: undefined,
+ alt: undefined,
+};
diff --git a/libs/ui/src/molecules/Modal/Modal.tsx b/libs/ui/src/molecules/Modal/Modal.tsx
new file mode 100644
index 00000000..aedccd13
--- /dev/null
+++ b/libs/ui/src/molecules/Modal/Modal.tsx
@@ -0,0 +1,93 @@
+import { Dialog, Transition } from '@headlessui/react';
+import Image from 'next/image';
+import { FC, Fragment, ReactNode } from 'react';
+import { FiX } from 'react-icons/fi';
+
+type ImageProps =
+ | {
+ image: string;
+ alt: string;
+ }
+ | {
+ image?: undefined;
+ alt?: undefined;
+ };
+
+type ModalProps = ImageProps & {
+ open?: boolean;
+ onClose: () => void;
+ title: ReactNode;
+ description: ReactNode;
+};
+
+export const Modal: FC<ModalProps> = ({
+ title,
+ description,
+ image,
+ alt,
+ open = false,
+ onClose,
+}) => {
+ return (
+ <Transition appear show={open} as={Fragment}>
+ <Dialog
+ as="div"
+ className="relative z-10 font-[sans_serif]"
+ onClose={onClose}
+ >
+ <Transition.Child
+ as={Fragment}
+ enter="ease-out duration-300"
+ enterFrom="opacity-0"
+ enterTo="opacity-100"
+ leave="ease-in duration-200"
+ leaveFrom="opacity-100"
+ leaveTo="opacity-0"
+ >
+ <div className="fixed inset-0 bg-black bg-opacity-75" />
+ </Transition.Child>
+
+ <div className="fixed inset-0 overflow-y-auto">
+ <div className="flex min-h-full items-center justify-center p-4 text-center">
+ <Transition.Child
+ as={Fragment}
+ enter="ease-out duration-300"
+ enterFrom="opacity-0 scale-95"
+ enterTo="opacity-100 scale-100"
+ leave="ease-in duration-200"
+ leaveFrom="opacity-100 scale-100"
+ leaveTo="opacity-0 scale-95"
+ >
+ <Dialog.Panel className="w-full max-w-md transform overflow-hidden rounded-2xl bg-zinc-100 dark:bg-zinc-900 p-6 text-left align-middle shadow-xl transition-all">
+ <div className="flex justify-end">
+ <button
+ type="button"
+ onClick={onClose}
+ className="dark:text-zinc-300 text-zinc-700"
+ data-testid="close-modal"
+ >
+ <FiX size={24} />
+ </button>
+ </div>
+ {image && alt && (
+ <div className="flex justify-center mb-6">
+ <Image src={image} alt={alt} width={150} height={130.58} />
+ </div>
+ )}
+ <Dialog.Title
+ as="h3"
+ className="text-2xl text-black dark:text-white font-bold text-center leading-6"
+ >
+ {title}
+ </Dialog.Title>
+ <Dialog.Description className="text-sm dark:text-zinc-400 text-zinc-600 text-center mt-3 mb-6">
+ {description}
+ </Dialog.Description>
+ </Dialog.Panel>
+ </Transition.Child>
+ </div>
+ </div>
+ </Dialog>
+ </Transition>
+ );
+};
diff --git a/libs/ui/src/molecules/Modal/index.ts b/libs/ui/src/molecules/Modal/index.ts
new file mode 100644
index 00000000..8deb0a3d
--- /dev/null
+++ b/libs/ui/src/molecules/Modal/index.ts
@@ -0,0 +1 @@
+export { Modal } from './Modal';
diff --git a/libs/ui/src/pages/Auth/Auth.spec.tsx b/libs/ui/src/pages/Auth/Auth.spec.tsx
index d46682ba..9fc2083a 100644
--- a/libs/ui/src/pages/Auth/Auth.spec.tsx
+++ b/libs/ui/src/pages/Auth/Auth.spec.tsx
@@ -3,6 +3,17 @@ import userEvent from '@testing-library/user-event';
import { Auth } from './Auth';
describe('Auth page', () => {
+ beforeEach(() => {
+ // IntersectionObserver isn't available in test environment
+ const mockIntersectionObserver = jest.fn();
+ mockIntersectionObserver.mockReturnValue({
+ observe: () => null,
+ unobserve: () => null,
+ disconnect: () => null,
+ });
+ window.IntersectionObserver = mockIntersectionObserver;
+ });
+
it('should render welcome message', () => {
render(
<Auth
@@ -81,4 +92,36 @@ describe('Auth page', () => {
expect(onMagicLinkLogin).toHaveBeenCalledWith(email);
});
+
+ it('should render authentication denied on error', () => {
+ render(
+ <Auth
+ onGithubLogin={jest.fn()}
+ onGoogleLogin={jest.fn()}
+ onMagicLinkLogin={jest.fn()}
+ error="Not approved"
+ />,
+ );
+
+ expect(screen.getByText('Authentication denied')).toBeInTheDocument();
+ });
+
+ it('closes the modal when clicking on the close button', async () => {
+ render(
+ <Auth
+ onGithubLogin={jest.fn()}
+ onGoogleLogin={jest.fn()}
+ onMagicLinkLogin={jest.fn()}
+ error="Not approved"
+ />,
+ );
+
+ const closeButton = screen.getByTestId('close-modal');
+
+ await act(async () => {
+ await userEvent.click(closeButton);
+ });
+
+ expect(screen.queryByText('Authentication denied')).not.toBeInTheDocument();
+ });
});
diff --git a/libs/ui/src/pages/Auth/Auth.tsx b/libs/ui/src/pages/Auth/Auth.tsx
index 4307e123..f7f327f5 100644
--- a/libs/ui/src/pages/Auth/Auth.tsx
+++ b/libs/ui/src/pages/Auth/Auth.tsx
@@ -6,18 +6,22 @@ import { z } from 'zod';
import { Brand } from '../../atoms/Brand';
import { Button } from '../../atoms/Button';
import { Input } from '../../atoms/Input';
+import { Modal } from '../../molecules/Modal';
type AuthProps = {
onMagicLinkLogin: (email: string) => void;
onGithubLogin: () => void;
onGoogleLogin: () => void;
+ error?: string;
};
export const Auth: FC<AuthProps> = ({
onGithubLogin,
onGoogleLogin,
onMagicLinkLogin,
+ error,
}) => {
+ const [isErrorModalOpen, setErrorModalOpen] = useState(!!error);
const [email, setEmail] = useState('');
const isEmail = z.string().email();
@@ -77,6 +81,16 @@ export const Auth: FC<AuthProps> = ({
Continue with Google
</Button>
</div>
+ {error === 'Not approved' && (
+ <Modal
+ title="Authentication denied"
+ description="You have not been approved for early access just yet, we will let you know when you can sign in 🙌"
+ image="/auth-denied.svg"
+ alt="sad illustration"
+ open={isErrorModalOpen}
+ onClose={() => setErrorModalOpen(false)}
+ />
+ )}
</div>
</main>
);
diff --git a/libs/ui/src/pages/Landing/Landing.spec.tsx b/libs/ui/src/pages/Landing/Landing.spec.tsx
index 6b5351a0..26ad9cf4 100644
--- a/libs/ui/src/pages/Landing/Landing.spec.tsx
+++ b/libs/ui/src/pages/Landing/Landing.spec.tsx
@@ -1,7 +1,19 @@
-import { render, screen } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
import { Landing } from './Landing';
describe('Landing page', () => {
+ beforeEach(() => {
+ // IntersectionObserver isn't available in test environment
+ const mockIntersectionObserver = jest.fn();
+ mockIntersectionObserver.mockReturnValue({
+ observe: () => null,
+ unobserve: () => null,
+ disconnect: () => null,
+ });
+ window.IntersectionObserver = mockIntersectionObserver;
+ });
+
it('renders the heading', () => {
const onWaitListFormSubmit = jest.fn();
render(<Landing onWaitListFormSubmit={onWaitListFormSubmit} />);
@@ -10,4 +22,91 @@ describe('Landing page', () => {
screen.getByText(/rethinking student productivity/i),
).toBeInTheDocument();
});
+
+ it('renders error message when email is not valid', async () => {
+ const onWaitListFormSubmit = jest.fn();
+ render(<Landing onWaitListFormSubmit={onWaitListFormSubmit} />);
+
+ const submitButton = screen.getByRole('button', { name: /join waitlist/i });
+
+ await act(async () => {
+ await userEvent.click(submitButton);
+ });
+
+ expect(
+ screen.getByText(/please enter a valid email address/i),
+ ).toBeInTheDocument();
+ });
+
+ it('shows the modal when the form is submitted', async () => {
+ const onWaitListFormSubmit = jest.fn().mockResolvedValue('');
+ render(<Landing onWaitListFormSubmit={onWaitListFormSubmit} />);
+
+ const submitButton = screen.getByRole('button', { name: /join waitlist/i });
+ const emailInput = screen.getByPlaceholderText(/email address/i);
+
+ await act(async () => {
+ await userEvent.type(emailInput, '[email protected]');
+ });
+
+ await act(async () => {
+ await userEvent.click(submitButton);
+ });
+
+ expect(screen.getByText("You're on the waiting list!")).toBeInTheDocument();
+
+ expect(onWaitListFormSubmit).toHaveBeenCalledWith('[email protected]');
+ });
+
+ it('shows the error message when the form is submitted', async () => {
+ const onWaitListFormSubmit = jest
+ .fn()
+ .mockRejectedValue(new Error('Something went wrong. Please try again.'));
+ render(<Landing onWaitListFormSubmit={onWaitListFormSubmit} />);
+
+ const submitButton = screen.getByRole('button', { name: /join waitlist/i });
+ const emailInput = screen.getByPlaceholderText(/email address/i);
+
+ const email = '[email protected]';
+
+ await act(async () => {
+ await userEvent.type(emailInput, email);
+ });
+
+ await act(async () => {
+ await userEvent.click(submitButton);
+ });
+
+ expect(
+ screen.getByText('Something went wrong. Please try again.'),
+ ).toBeInTheDocument();
+ });
+
+ it('closes the modal when the close button is pressed', async () => {
+ const onWaitListFormSubmit = jest.fn().mockResolvedValue('');
+ render(<Landing onWaitListFormSubmit={onWaitListFormSubmit} />);
+
+ const submitButton = screen.getByRole('button', { name: /join waitlist/i });
+ const emailInput = screen.getByPlaceholderText(/email address/i);
+
+ const email = '[email protected]';
+
+ await act(async () => {
+ await userEvent.type(emailInput, email);
+ });
+
+ await act(async () => {
+ await userEvent.click(submitButton);
+ });
+
+ const closeButton = screen.getByTestId('close-modal');
+
+ await act(async () => {
+ await userEvent.click(closeButton);
+ });
+
+ expect(
+ screen.queryByText("You're on the waiting list!"),
+ ).not.toBeInTheDocument();
+ });
});
diff --git a/libs/ui/src/pages/Landing/Landing.stories.tsx b/libs/ui/src/pages/Landing/Landing.stories.tsx
index 021c5b66..a9e38ec6 100644
--- a/libs/ui/src/pages/Landing/Landing.stories.tsx
+++ b/libs/ui/src/pages/Landing/Landing.stories.tsx
@@ -1,15 +1,21 @@
import { Meta, Story } from '@storybook/react';
+import { ComponentProps } from 'react';
import { Landing } from './Landing';
+const args: ComponentProps<typeof Landing> = {
+ onWaitListFormSubmit: () => Promise.resolve(),
+};
+
const config: Meta = {
title: 'Pages / Landing',
component: Landing,
parameters: {
controls: { hideNoControlsWarning: true },
},
+ args,
};
export default config;
-export const Normal: Story = () => <Landing />;
+export const Normal: Story<typeof args> = (props) => <Landing {...props} />;
Normal.storyName = 'Landing';
diff --git a/libs/ui/src/pages/Landing/Landing.tsx b/libs/ui/src/pages/Landing/Landing.tsx
index 5958a9da..31ed0c82 100644
--- a/libs/ui/src/pages/Landing/Landing.tsx
+++ b/libs/ui/src/pages/Landing/Landing.tsx
@@ -1,9 +1,9 @@
-import { Dialog, Transition } from '@headlessui/react';
import Image from 'next/image';
-import { FC, FormEvent, Fragment, useState } from 'react';
-import { FiAlertTriangle, FiX } from 'react-icons/fi';
+import { FC, FormEvent, useState } from 'react';
+import { FiAlertTriangle } from 'react-icons/fi';
import { twMerge } from 'tailwind-merge';
import { z } from 'zod';
+import { Modal } from '../../molecules/Modal';
import { Navbar } from '../../templates/Navbar';
const isEmail = z.string().email();
@@ -27,8 +27,8 @@ export const Landing: FC<LandingProps> = ({ onWaitListFormSubmit }) => {
setIsOpen(true);
setWaitListFormError(undefined);
})
- .catch((err) => {
- setWaitListFormError((err as { message: string }).message);
+ .catch((err: Error) => {
+ setWaitListFormError(err.message);
setIsOpen(false);
});
}
@@ -76,69 +76,15 @@ export const Landing: FC<LandingProps> = ({ onWaitListFormSubmit }) => {
</p>
)}
</div>
- <Transition appear show={isOpen} as={Fragment}>
- <Dialog
- as="div"
- className="relative z-10 font-[sans_serif]"
- onClose={() => setIsOpen(false)}
- >
- <Transition.Child
- as={Fragment}
- enter="ease-out duration-300"
- enterFrom="opacity-0"
- enterTo="opacity-100"
- leave="ease-in duration-200"
- leaveFrom="opacity-100"
- leaveTo="opacity-0"
- >
- <div className="fixed inset-0 bg-black bg-opacity-75" />
- </Transition.Child>
-
- <div className="fixed inset-0 overflow-y-auto">
- <div className="flex min-h-full items-center justify-center p-4 text-center">
- <Transition.Child
- as={Fragment}
- enter="ease-out duration-300"
- enterFrom="opacity-0 scale-95"
- enterTo="opacity-100 scale-100"
- leave="ease-in duration-200"
- leaveFrom="opacity-100 scale-100"
- leaveTo="opacity-0 scale-95"
- >
- <Dialog.Panel className="w-full max-w-md transform overflow-hidden rounded-2xl bg-zinc-100 dark:bg-zinc-900 p-6 text-left align-middle shadow-xl transition-all">
- <div className="flex justify-end">
- <button
- type="button"
- onClick={() => setIsOpen(false)}
- className="dark:text-zinc-300 text-zinc-700"
- >
- <FiX size={24} />
- </button>
- </div>
- <div className="flex justify-center mb-6">
- <Image
- src="/waitlist-illustration.svg"
- alt="happy illustration"
- width={150}
- height={130.58}
- />
- </div>
- <Dialog.Title
- as="h3"
- className="text-2xl font-bold text-center leading-6"
- >
- You're on the waiting list!
- </Dialog.Title>
- <Dialog.Description className="text-sm dark:text-zinc-400 text-zinc-600 text-center mt-3 mb-6">
- We will send you an email as soon as Noodle is ready.
- Thanks for your interest 🤟
- </Dialog.Description>
- </Dialog.Panel>
- </Transition.Child>
- </div>
- </div>
- </Dialog>
- </Transition>
+ <Modal
+ image="/waitlist-illustration.svg"
+ alt="waitlist illustration"
+ title="You're on the waiting list!"
+ description="We will send you an email as soon as Noodle is ready.
+ Thanks for your interest 🤟"
+ open={isOpen}
+ onClose={() => setIsOpen(false)}
+ />
</div>
</header>
<div className="max-w-5xl mx-auto pt-36 md:pt-64">
|
MaxKB
|
https://github.com/1Panel-dev/MaxKB
|
666d58659ee93afbe7c1a00e14fdc8340340a8e4
|
CaptainB
|
2025-02-25 13:29:52
|
fix: Fix user cannot export public function lib
|
--bug=1052408 --user=刘瑞斌 【函数库】导出非当前用户创建的函数，报错 https://www.tapd.cn/57709429/s/1658696
|
fix: Fix user cannot export public function lib
--bug=1052408 --user=刘瑞斌 【函数库】导出非当前用户创建的函数，报错 https://www.tapd.cn/57709429/s/1658696
|
diff --git a/apps/function_lib/serializers/function_lib_serializer.py b/apps/function_lib/serializers/function_lib_serializer.py
index 7067e699440..6bae40aea6a 100644
--- a/apps/function_lib/serializers/function_lib_serializer.py
+++ b/apps/function_lib/serializers/function_lib_serializer.py
@@ -211,7 +211,7 @@ class Operate(serializers.Serializer):
def is_valid(self, *, raise_exception=False):
super().is_valid(raise_exception=True)
- if not QuerySet(FunctionLib).filter(id=self.data.get('id'), user_id=self.data.get('user_id')).exists():
+ if not QuerySet(FunctionLib).filter(id=self.data.get('id')).exists():
raise AppApiException(500, _('Function does not exist'))
def delete(self, with_valid=True):
|
prometheus
|
https://github.com/prometheus/prometheus
|
2ea7caa1f5221d55cdc04cbf5331030323420b4e
|
dependabot[bot]
|
2025-03-07 20:32:12
|
chore(deps-dev): bump ts-jest from 29.2.5 to 29.2.6 in /web/ui/react-app
|
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.2.5 to 29.2.6.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.5...v29.2.6)
---
|
chore(deps-dev): bump ts-jest from 29.2.5 to 29.2.6 in /web/ui/react-app
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.2.5 to 29.2.6.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.5...v29.2.6)
---
updated-dependencies:
- dependency-name: ts-jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
|
diff --git a/web/ui/react-app/package-lock.json b/web/ui/react-app/package-lock.json
index 33d00f8602e..1198374ba97 100644
--- a/web/ui/react-app/package-lock.json
+++ b/web/ui/react-app/package-lock.json
@@ -73,7 +73,7 @@
"prettier": "^3.5.2",
"react-scripts": "^5.0.1",
"sinon": "^19.0.2",
- "ts-jest": "^29.2.5"
+ "ts-jest": "^29.2.6"
},
"optionalDependencies": {
"fsevents": "^2.3.3"
@@ -21376,9 +21376,9 @@
}
},
"node_modules/semver": {
- "version": "7.6.3",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
- "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+ "version": "7.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+ "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
"dev": true,
"license": "ISC",
"bin": {
@@ -22783,9 +22783,9 @@
"dev": true
},
"node_modules/ts-jest": {
- "version": "29.2.5",
- "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
- "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
+ "version": "29.2.6",
+ "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.6.tgz",
+ "integrity": "sha512-yTNZVZqc8lSixm+QGVFcPe6+yj7+TWZwIesuOWvfcn4B9bz5x4NDzVCQQjOs7Hfouu36aEqfEbo9Qpo+gq8dDg==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -22796,7 +22796,7 @@
"json5": "^2.2.3",
"lodash.memoize": "^4.1.2",
"make-error": "^1.3.6",
- "semver": "^7.6.3",
+ "semver": "^7.7.1",
"yargs-parser": "^21.1.1"
},
"bin": {
diff --git a/web/ui/react-app/package.json b/web/ui/react-app/package.json
index 253fba0bd3f..ead7c995923 100644
--- a/web/ui/react-app/package.json
+++ b/web/ui/react-app/package.json
@@ -90,7 +90,7 @@
"prettier": "^3.5.2",
"react-scripts": "^5.0.1",
"sinon": "^19.0.2",
- "ts-jest": "^29.2.5"
+ "ts-jest": "^29.2.6"
},
"jest": {
"snapshotSerializers": [
|
sarama
|
https://github.com/IBM/sarama
|
9298f406d15519a3e67627427a5970570a8f927c
|
Dominic Evans
|
2022-02-14 04:14:09
|
chore: restrict to 1 parallel test at once (#2146)
|
Seeing some memory issues on the GitHub actions workers so disabling parallel until we can learn more
|
chore: restrict to 1 parallel test at once (#2146)
Seeing some memory issues on the GitHub actions workers so disabling parallel until we can learn more
|
diff --git a/Makefile b/Makefile
index d665cb582..e5ba4f613 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ default: fmt get update test lint
GO := go
GOBUILD := CGO_ENABLED=0 $(GO) build $(BUILD_FLAG)
-GOTEST := $(GO) test -gcflags='-l' -p 1 -race -timeout 10m -coverprofile=profile.out -covermode=atomic
+GOTEST := $(GO) test -gcflags='-l' -p 1 -parallel 1 -race -timeout 10m -coverprofile=profile.out -covermode=atomic
FILES := $(shell find . -name '*.go' -type f -not -name '*.pb.go' -not -name '*_generated.go' -not -name '*_test.go')
TESTS := $(shell find . -name '*.go' -type f -not -name '*.pb.go' -not -name '*_generated.go' -name '*_test.go')
|
beats
|
https://github.com/elastic/beats
|
fe092972a481354a7c84c553ddad07f2ea5bbf34
|
apmmachine
|
2024-03-19 03:32:38
|
chore: Update snapshot.yml (#38372)
|
Made with ❤️️ by updatecli
|
chore: Update snapshot.yml (#38372)
Made with ❤️️ by updatecli
Co-authored-by: apmmachine <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
|
diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
index 693e6d2f7486..5cae69cbdbe3 100644
--- a/testing/environments/snapshot.yml
+++ b/testing/environments/snapshot.yml
@@ -3,7 +3,7 @@
version: '2.3'
services:
elasticsearch:
- image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-a2d5464c-SNAPSHOT
+ image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-09a11c1c-SNAPSHOT
# When extend is used it merges healthcheck.tests, see:
# https://github.com/docker/compose/issues/8962
# healthcheck:
@@ -31,7 +31,7 @@ services:
- "./docker/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles"
logstash:
- image: docker.elastic.co/logstash/logstash:8.14.0-a2d5464c-SNAPSHOT
+ image: docker.elastic.co/logstash/logstash:8.14.0-09a11c1c-SNAPSHOT
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
retries: 600
@@ -44,7 +44,7 @@ services:
- 5055:5055
kibana:
- image: docker.elastic.co/kibana/kibana:8.14.0-a2d5464c-SNAPSHOT
+ image: docker.elastic.co/kibana/kibana:8.14.0-09a11c1c-SNAPSHOT
environment:
- "ELASTICSEARCH_USERNAME=kibana_system_user"
- "ELASTICSEARCH_PASSWORD=testing"
|
primeng
|
https://github.com/primefaces/primeng
|
954e8c1351c57f26c7eef8928601507809fc58cc
|
Mike Ambrozaitis
|
2024-11-18 19:32:27
|
fix(docs): typo in theming#component (#16643)
|
Changes "our" to "your" in the sentence "Overriding components tokens is not the recommended approach if you are building our own style, building your own preset should be preferred instead."
|
fix(docs): typo in theming#component (#16643)
Changes "our" to "your" in the sentence "Overriding components tokens is not the recommended approach if you are building our own style, building your own preset should be preferred instead."
|
diff --git a/apps/showcase/doc/theming/componentdoc.ts b/apps/showcase/doc/theming/componentdoc.ts
index 60bc1f88b28..314bf002686 100644
--- a/apps/showcase/doc/theming/componentdoc.ts
+++ b/apps/showcase/doc/theming/componentdoc.ts
@@ -5,12 +5,14 @@ import { Component } from '@angular/core';
template: `
<app-docsectiontext>
<p>
- The design tokens of a specific component is defined at <i>components</i> layer. Overriding components tokens is not the recommended approach if you are building our own style, building your own preset should be preferred instead.
- This configuration is global and applies to all card components, in case you need to customize a particular component on a page locally, view the Scoped CSS section for an example.
+ The design tokens of a specific component is defined at <i>components</i> layer. Overriding components tokens is not the
+ recommended approach if you are building your own style, building your own preset should be preferred instead. This
+ configuration is global and applies to all card components, in case you need to customize a particular component on a page
+ locally, view the Scoped CSS section for an example.
</p>
</app-docsectiontext>
<app-code [code]="code" selector="component-demo" [hideToggleCode]="true"></app-code>
- `
+ `,
})
export class ComponentDoc {
code = {
@@ -39,6 +41,6 @@ export class ComponentDoc {
}
}
}
-});`
+});`,
};
}
|
components
|
https://github.com/angular/components
|
140c95c2e891c1fb5cc6bb49e08a95ada2c0406c
|
Paul Gschwendtner
|
2017-02-11 04:47:56
|
build: increase minimum angular version (#3017)
|
* Currently Angular Material supports Angular v2.2.0, but some components already use methods that are only available in `v2.3.0`.
This means that Material isn't really compatible with v2.2.0 anymore.
* Since Angular `v.2.3.0` includes a lot of good fixes (like proper metadata inheritance) we should upgrade to `v2.3.0`.
See https://github.com/angular/angular/commit/f5c8e0989d85bc064f689fc3595207dfb29413f4
Related to #2394
|
build: increase minimum angular version (#3017)
* Currently Angular Material supports Angular v2.2.0, but some components already use methods that are only available in `v2.3.0`.
This means that Material isn't really compatible with v2.2.0 anymore.
* Since Angular `v.2.3.0` includes a lot of good fixes (like proper metadata inheritance) we should upgrade to `v2.3.0`.
See https://github.com/angular/angular/commit/f5c8e0989d85bc064f689fc3595207dfb29413f4
Related to #2394
|
diff --git a/package.json b/package.json
index 4b60ac2ebd61..e353ae4d65e5 100644
--- a/package.json
+++ b/package.json
@@ -25,22 +25,22 @@
"node": ">= 5.4.1 < 7"
},
"dependencies": {
- "@angular/common": "^2.2.0",
- "@angular/compiler": "^2.2.0",
- "@angular/core": "^2.2.0",
- "@angular/forms": "^2.2.0",
- "@angular/http": "^2.2.0",
- "@angular/platform-browser": "^2.2.0",
+ "@angular/common": "^2.3.0",
+ "@angular/compiler": "^2.3.0",
+ "@angular/core": "^2.3.0",
+ "@angular/forms": "^2.3.0",
+ "@angular/http": "^2.3.0",
+ "@angular/platform-browser": "^2.3.0",
"core-js": "^2.4.1",
- "rxjs": "5.0.0-beta.12",
+ "rxjs": "^5.0.1",
"systemjs": "0.19.43",
- "zone.js": "^0.6.23"
+ "zone.js": "^0.7.2"
},
"devDependencies": {
- "@angular/compiler-cli": "^2.2.0",
- "@angular/platform-browser-dynamic": "^2.2.0",
- "@angular/platform-server": "^2.2.0",
- "@angular/router": "^3.2.0",
+ "@angular/compiler-cli": "^2.3.0",
+ "@angular/platform-browser-dynamic": "^2.3.0",
+ "@angular/platform-server": "^2.3.0",
+ "@angular/router": "^3.3.0",
"@types/glob": "^5.0.30",
"@types/gulp": "^3.8.32",
"@types/hammerjs": "^2.0.34",
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index b19460eb6e7b..29a12d1d3173 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -184,7 +184,6 @@ export class MdButton {
moduleId: module.id,
selector: `a[md-button], a[md-raised-button], a[md-icon-button], a[md-fab], a[md-mini-fab],
a[mat-button], a[mat-raised-button], a[mat-icon-button], a[mat-fab], a[mat-mini-fab]`,
- inputs: ['color', 'disabled', 'disableRipple'],
host: {
'[attr.disabled]': 'disabled',
'[attr.aria-disabled]': '_isAriaDisabled',
diff --git a/src/lib/package.json b/src/lib/package.json
index 271eca9ce7e1..7efe873a2dd6 100644
--- a/src/lib/package.json
+++ b/src/lib/package.json
@@ -21,8 +21,8 @@
},
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
- "@angular/core": "^2.2.0",
- "@angular/common": "^2.2.0",
- "@angular/http": "^2.2.0"
+ "@angular/core": "^2.3.0",
+ "@angular/common": "^2.3.0",
+ "@angular/http": "^2.3.0"
}
}
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index a92ea6bf5fb0..2ebdeb8d3c06 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -291,8 +291,6 @@ export class MdProgressSpinner implements OnDestroy {
'mode': 'indeterminate',
'[class.mat-spinner]': 'true',
},
- // Due to the class extending we need to explicitly say that the input exists.
- inputs: ['color'],
templateUrl: 'progress-spinner.html',
styleUrls: ['progress-spinner.css'],
})
diff --git a/yarn.lock b/yarn.lock
index 804add84fc2c..980e90d50879 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,55 +2,55 @@
# yarn lockfile v1
-"@angular/common@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.3.tgz#78d96bd2f8a1a105f635cd25e362ba5704b47f56"
+"@angular/common@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.7.tgz#9316daf90e353e67187d2e0afec5521c2001bd4b"
-"@angular/compiler-cli@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.3.tgz#8339c2f428d29df3ea0eac17f08d296fc87eb160"
+"@angular/compiler-cli@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.7.tgz#15768141816903636593f430ff9a808d98a2a762"
dependencies:
- "@angular/tsc-wrapped" "0.5.1"
+ "@angular/tsc-wrapped" "0.5.2"
minimist "^1.2.0"
reflect-metadata "^0.1.2"
-"@angular/compiler@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.3.tgz#76a41916f90eda66643107740c4a9ae45cb7a6c1"
+"@angular/compiler@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.7.tgz#008c1f0d1409c46fbba215fe8ab0d886252c7ff0"
-"@angular/core@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.3.tgz#a72a13bb9f01659b8388558cd6e3a570a8434b1c"
+"@angular/core@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.7.tgz#8bed9a2d37e81342bd41d189df88aa3e02393cfb"
-"@angular/forms@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.3.tgz#0b4f59b8074e3d0fe987781e0f2af1ca1eec212b"
+"@angular/forms@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.7.tgz#d34a36110e10f641aa1e1420b5c2df65987fd8bb"
-"@angular/http@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.4.3.tgz#d8afca7362efb010600fde02360e01e848579be6"
+"@angular/http@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/http/-/http-2.4.7.tgz#b024b2b49ae0234258d42309e46f65862a42070d"
-"@angular/platform-browser-dynamic@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.3.tgz#d65cc9bc4487e2a86e2c6f6641c711fccfa90c5a"
+"@angular/platform-browser-dynamic@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.7.tgz#9632586f9ce596186be4c124c3ea0a4a74b27b46"
-"@angular/platform-browser@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.3.tgz#eba8588d2fffc39d0b85a9180c297d9ca2f1f3a4"
+"@angular/platform-browser@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.7.tgz#19f7996a70f07b34ce8d6d0e255544e62cae75f1"
-"@angular/platform-server@^2.2.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.4.3.tgz#207af33919733696976b29bfc03c265a551dd05f"
+"@angular/platform-server@^2.3.0":
+ version "2.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-2.4.7.tgz#e2a9f283b4eb25b967ab085c83350c0a08927617"
dependencies:
parse5 "^2.2.1"
-"@angular/router@^3.2.0":
- version "3.4.3"
- resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.4.3.tgz#19846caa1f87d9b83f005f45a2be15b6744db8fd"
+"@angular/router@^3.3.0":
+ version "3.4.7"
+ resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.4.7.tgz#e9583eed5a1d50cc1628b2526244555444a746b8"
-"@angular/[email protected]":
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.1.tgz#7a69bec999eef41903dddaaccdc862cfcface52c"
+"@angular/[email protected]":
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.2.tgz#2eddf472c467fcb334ea94deddaaa71990c5a482"
dependencies:
tsickle "^0.2"
@@ -2665,6 +2665,21 @@ gulp-connect@^5.0.0:
gulp-util "^3.0.6"
tiny-lr "^0.2.1"
+gulp-flatten@^0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/gulp-flatten/-/gulp-flatten-0.3.1.tgz#51e7fec13a33c404578d18c1589d1b5bc45fe1d6"
+ dependencies:
+ gulp-util "^3.0.7"
+ through2 "^2.0.0"
+
[email protected]:
+ version "0.0.4"
+ resolved "https://registry.yarnpkg.com/gulp-highlight-files/-/gulp-highlight-files-0.0.4.tgz#8cfd64209e53cac52cd7b8f6a8b5d9ea79795172"
+ dependencies:
+ gulp-util "^3.0.8"
+ highlight.js "^9.9.0"
+ through2 "^2.0.3"
+
gulp-htmlmin@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/gulp-htmlmin/-/gulp-htmlmin-3.0.0.tgz#19ea8002d1231d6b1f18a12d20f2a66a77770fb3"
@@ -2698,6 +2713,10 @@ gulp-match@^1.0.3:
dependencies:
minimatch "^3.0.3"
+gulp-rename@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"
+
gulp-sass@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-3.1.0.tgz#53dc4b68a1f5ddfe4424ab4c247655269a8b74b7"
@@ -2731,7 +2750,7 @@ gulp-transform@^1.1.0:
gulp-util "^3.0.7"
lodash "^4.13.1"
-gulp-util@*, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7:
+gulp-util@*, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8:
version "3.0.8"
resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
dependencies:
@@ -5201,9 +5220,9 @@ rx@^2.4.3:
version "2.5.3"
resolved "https://registry.yarnpkg.com/rx/-/rx-2.5.3.tgz#21adc7d80f02002af50dae97fd9dbf248755f566"
[email protected]:
- version "5.0.0-beta.12"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.0-beta.12.tgz#cdfde2d8c4639d20ae7794bff8fddf32da7ad337"
+rxjs@^5.0.1:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.1.0.tgz#0aa9018b7f440b505fa42bd742b6738be550e720"
dependencies:
symbol-observable "^1.0.1"
@@ -5726,9 +5745,9 @@ stylehacks@^2.3.0:
text-table "^0.2.0"
write-file-stdout "0.0.2"
-stylelint@^7.7.1:
- version "7.7.1"
- resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.7.1.tgz#af30b6677e307d38b0ad64b70e719c1752973c67"
+stylelint@^7.8.0:
+ version "7.8.0"
+ resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.8.0.tgz#ac701044ed03c44f7a9f73d4d5dc1bd1eaae12d1"
dependencies:
autoprefixer "^6.0.0"
balanced-match "^0.4.0"
@@ -6443,6 +6462,10 @@ wd@^1.0.0:
underscore.string "3.3.4"
vargs "0.1.0"
+web-animations-js@^2.2.2:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.2.2.tgz#7c3aa5382c5eade70cd206880d56a37869630638"
+
webdriver-js-extender@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
@@ -6714,6 +6737,6 @@ zip-stream@^1.1.0:
lodash "^4.8.0"
readable-stream "^2.0.0"
-zone.js@^0.6.23:
- version "0.6.26"
- resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.6.26.tgz#067c13b8b80223a89b62e9dc82680f09762c4636"
+zone.js@^0.7.2:
+ version "0.7.6"
+ resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
|
ockam
|
https://github.com/build-trust/ockam
|
23291cfb76f046f7a212db438a8c7efee4e9ddaa
|
Daniil Fedotov
|
2022-10-27 20:54:53
|
fix(elixir): take service worker id from address if address is configured
|
This should make it possible to create multiple services of the same type with
different addresses.
|
fix(elixir): take service worker id from address if address is configured
This should make it possible to create multiple services of the same type with
different addresses.
|
diff --git a/implementations/elixir/ockam/ockam_services/lib/services/provider.ex b/implementations/elixir/ockam/ockam_services/lib/services/provider.ex
index 12efb9b338c..0e08e2c504c 100644
--- a/implementations/elixir/ockam/ockam_services/lib/services/provider.ex
+++ b/implementations/elixir/ockam/ockam_services/lib/services/provider.ex
@@ -76,7 +76,15 @@ defmodule Ockam.Services.Provider do
{:ok, [single_spec_map]}
single_spec ->
- {:ok, [Supervisor.child_spec(single_spec, id: service_name)]}
+ ## Temporary measure to allow multiple services of the same type.
+ ## TODO: redo the way address, service name and id are related
+ id =
+ case Keyword.fetch(service_args, :address) do
+ {:ok, address} -> String.to_atom(address)
+ :error -> service_name
+ end
+
+ {:ok, [Supervisor.child_spec(single_spec, id: id)]}
end
rescue
err ->
|
atuin
|
https://github.com/atuinsh/atuin
|
a52568be795b891c96438ec116ce0b29723655e7
|
Patrick Jackson
|
2023-12-05 23:26:47
|
fix: reenable enter_accept for bash (#1408)
|
* fix: reenable enter_accept for bash
* fix: Fix the shellcheck warnings
|
fix: reenable enter_accept for bash (#1408)
* fix: reenable enter_accept for bash
* fix: Fix the shellcheck warnings
|
diff --git a/atuin/src/command/client/search/interactive.rs b/atuin/src/command/client/search/interactive.rs
index 167eb23af15..3373d51bcf8 100644
--- a/atuin/src/command/client/search/interactive.rs
+++ b/atuin/src/command/client/search/interactive.rs
@@ -705,7 +705,7 @@ pub async fn history(
if index < results.len() {
let mut command = results.swap_remove(index).command;
- if accept && (utils::is_zsh() || utils::is_fish()) {
+ if accept && (utils::is_zsh() || utils::is_fish() || utils::is_bash()) {
command = String::from("__atuin_accept__:") + &command;
}
diff --git a/atuin/src/shell/atuin.bash b/atuin/src/shell/atuin.bash
index 3da296bb17e..bd9506e5c08 100644
--- a/atuin/src/shell/atuin.bash
+++ b/atuin/src/shell/atuin.bash
@@ -1,4 +1,5 @@
ATUIN_SESSION=$(atuin uuid)
+ATUIN_STTY=$(stty -g)
export ATUIN_SESSION
__atuin_preexec() {
@@ -53,8 +54,16 @@ __atuin_history() {
# shellcheck disable=SC2154
__bp_set_ret_value "$preexec_ret_value" "$__bp_last_argument_prev_command"
fi
+ # Juggle the terminal settings so that the command can be interacted with
+ local stty_backup
+ stty_backup=$(stty -g)
+ stty "$ATUIN_STTY"
+
eval "$HISTORY"
exit_status=$?
+
+ stty "$stty_backup"
+
# Execute preprompt commands
__atuin_set_ret_value "$exit_status" "$HISTORY"
eval "$PROMPT_COMMAND"
|
AutoGPT
|
https://github.com/Significant-Gravitas/AutoGPT
|
3b53c6953af97ff09af24e0cd09ed1e5184835ba
|
Reinier van der Leer
|
2025-03-05 21:44:59
|
feat(platform): Agent Run "Stop" + "Delete" functionality (#9547)
|
- Resolves #9542
### Changes 🏗️
- feat(platform): Add "Delete run" button on `/library/agents/[id]` w/
confirm dialog
- Add `AgentGraphExecution.isDeleted` column for soft delete
- Add `DELETE /api/executions/{graph_exec_id}` endpoint
- feat(frontend): Add "Stop run" button on `/library/agents/[id]`
Technical improvements:
- refactor(frontend): Generalize `AgentDeleteConfirmDialog` ->
`DeleteConfirmDialog`
- refactor(frontend): Brand `GraphExecution.execution_id` and
`Schedule.id` to prevent mixing
### Checklist 📋
#### For code changes:
- [x] I have clearly listed my changes in the PR description
- [x] I have made a test plan
- [x] I have tested my changes according to the test plan:
- Click "Delete run" under "Run actions" in the right sidebar
- [x] -> Confirmation dialog should show
- Click "Delete"
- [x] -> run should disappear from list
- [x] -> view should switch to "Draft new run" view
- [x] -> refresh page -> run should not be in list
- Click "Delete" in the menu on a run in the list
- [x] -> Confirmation dialog should show
- Click "Delete"
- [x] -> run should disappear from list
- [x] -> refresh page -> run should not be in list
---------
|
feat(platform): Agent Run "Stop" + "Delete" functionality (#9547)
- Resolves #9542
### Changes 🏗️
- feat(platform): Add "Delete run" button on `/library/agents/[id]` w/
confirm dialog
- Add `AgentGraphExecution.isDeleted` column for soft delete
- Add `DELETE /api/executions/{graph_exec_id}` endpoint
- feat(frontend): Add "Stop run" button on `/library/agents/[id]`
Technical improvements:
- refactor(frontend): Generalize `AgentDeleteConfirmDialog` ->
`DeleteConfirmDialog`
- refactor(frontend): Brand `GraphExecution.execution_id` and
`Schedule.id` to prevent mixing
### Checklist 📋
#### For code changes:
- [x] I have clearly listed my changes in the PR description
- [x] I have made a test plan
- [x] I have tested my changes according to the test plan:
- Click "Delete run" under "Run actions" in the right sidebar
- [x] -> Confirmation dialog should show
- Click "Delete"
- [x] -> run should disappear from list
- [x] -> view should switch to "Draft new run" view
- [x] -> refresh page -> run should not be in list
- Click "Delete" in the menu on a run in the list
- [x] -> Confirmation dialog should show
- Click "Delete"
- [x] -> run should disappear from list
- [x] -> refresh page -> run should not be in list
---------
Co-authored-by: Krzysztof Czerwinski <[email protected]>
|
diff --git a/autogpt_platform/backend/backend/data/execution.py b/autogpt_platform/backend/backend/data/execution.py
index ca6926ee1c97..aef43bc9aebf 100644
--- a/autogpt_platform/backend/backend/data/execution.py
+++ b/autogpt_platform/backend/backend/data/execution.py
@@ -1,11 +1,10 @@
from collections import defaultdict
from datetime import datetime, timezone
from multiprocessing import Manager
-from typing import Any, AsyncGenerator, Generator, Generic, Optional, Type, TypeVar
+from typing import Any, AsyncGenerator, Generator, Generic, Type, TypeVar
from prisma import Json
from prisma.enums import AgentExecutionStatus
-from prisma.errors import PrismaError
from prisma.models import (
AgentGraphExecution,
AgentNodeExecution,
@@ -342,28 +341,21 @@ async def update_execution_status(
return ExecutionResult.from_db(res)
-async def get_execution(
- execution_id: str, user_id: str
-) -> Optional[AgentNodeExecution]:
- """
- Get an execution by ID. Returns None if not found.
-
- Args:
- execution_id: The ID of the execution to retrieve
-
- Returns:
- The execution if found, None otherwise
- """
- try:
- execution = await AgentNodeExecution.prisma().find_unique(
- where={
- "id": execution_id,
- "userId": user_id,
- }
+async def delete_execution(
+ graph_exec_id: str, user_id: str, soft_delete: bool = True
+) -> None:
+ if soft_delete:
+ deleted_count = await AgentGraphExecution.prisma().update_many(
+ where={"id": graph_exec_id, "userId": user_id}, data={"isDeleted": True}
+ )
+ else:
+ deleted_count = await AgentGraphExecution.prisma().delete_many(
+ where={"id": graph_exec_id, "userId": user_id}
+ )
+ if deleted_count < 1:
+ raise DatabaseError(
+ f"Could not delete graph execution #{graph_exec_id}: not found"
)
- return execution
- except PrismaError:
- return None
async def get_execution_results(graph_exec_id: str) -> list[ExecutionResult]:
@@ -385,15 +377,12 @@ async def get_executions_in_timerange(
try:
executions = await AgentGraphExecution.prisma().find_many(
where={
- "AND": [
- {
- "startedAt": {
- "gte": datetime.fromisoformat(start_time),
- "lte": datetime.fromisoformat(end_time),
- }
- },
- {"userId": user_id},
- ]
+ "startedAt": {
+ "gte": datetime.fromisoformat(start_time),
+ "lte": datetime.fromisoformat(end_time),
+ },
+ "userId": user_id,
+ "isDeleted": False,
},
include=GRAPH_EXECUTION_INCLUDE,
)
diff --git a/autogpt_platform/backend/backend/data/graph.py b/autogpt_platform/backend/backend/data/graph.py
index 1857c5fd51ee..a6a04b0cebb4 100644
--- a/autogpt_platform/backend/backend/data/graph.py
+++ b/autogpt_platform/backend/backend/data/graph.py
@@ -597,9 +597,10 @@ async def get_graphs(
return graph_models
+# TODO: move execution stuff to .execution
async def get_graphs_executions(user_id: str) -> list[GraphExecutionMeta]:
executions = await AgentGraphExecution.prisma().find_many(
- where={"userId": user_id},
+ where={"isDeleted": False, "userId": user_id},
order={"createdAt": "desc"},
)
return [GraphExecutionMeta.from_db(execution) for execution in executions]
@@ -607,7 +608,7 @@ async def get_graphs_executions(user_id: str) -> list[GraphExecutionMeta]:
async def get_graph_executions(graph_id: str, user_id: str) -> list[GraphExecutionMeta]:
executions = await AgentGraphExecution.prisma().find_many(
- where={"agentGraphId": graph_id, "userId": user_id},
+ where={"agentGraphId": graph_id, "isDeleted": False, "userId": user_id},
order={"createdAt": "desc"},
)
return [GraphExecutionMeta.from_db(execution) for execution in executions]
@@ -617,14 +618,14 @@ async def get_execution_meta(
user_id: str, execution_id: str
) -> GraphExecutionMeta | None:
execution = await AgentGraphExecution.prisma().find_first(
- where={"id": execution_id, "userId": user_id}
+ where={"id": execution_id, "isDeleted": False, "userId": user_id}
)
return GraphExecutionMeta.from_db(execution) if execution else None
async def get_execution(user_id: str, execution_id: str) -> GraphExecution | None:
execution = await AgentGraphExecution.prisma().find_first(
- where={"id": execution_id, "userId": user_id},
+ where={"id": execution_id, "isDeleted": False, "userId": user_id},
include={
"AgentNodeExecutions": {
"include": {"AgentNode": True, "Input": True, "Output": True},
diff --git a/autogpt_platform/backend/backend/server/routers/v1.py b/autogpt_platform/backend/backend/server/routers/v1.py
index bf0408bcade6..0863e651ba8a 100644
--- a/autogpt_platform/backend/backend/server/routers/v1.py
+++ b/autogpt_platform/backend/backend/server/routers/v1.py
@@ -10,12 +10,14 @@
from autogpt_libs.feature_flag.client import feature_flag
from autogpt_libs.utils.cache import thread_cached
from fastapi import APIRouter, Body, Depends, HTTPException, Request, Response
+from starlette.status import HTTP_204_NO_CONTENT
from typing_extensions import Optional, TypedDict
import backend.data.block
import backend.server.integrations.router
import backend.server.routers.analytics
import backend.server.v2.library.db as library_db
+from backend.data import execution as execution_db
from backend.data import graph as graph_db
from backend.data.api_key import (
APIKeyError,
@@ -621,11 +623,26 @@ async def get_graph_execution(
result = await graph_db.get_execution(execution_id=graph_exec_id, user_id=user_id)
if not result:
- raise HTTPException(status_code=404, detail=f"Graph #{graph_id} not found.")
+ raise HTTPException(
+ status_code=404, detail=f"Graph execution #{graph_exec_id} not found."
+ )
return result
+@v1_router.delete(
+ path="/executions/{graph_exec_id}",
+ tags=["graphs"],
+ dependencies=[Depends(auth_middleware)],
+ status_code=HTTP_204_NO_CONTENT,
+)
+async def delete_graph_execution(
+ graph_exec_id: str,
+ user_id: Annotated[str, Depends(get_user_id)],
+) -> None:
+ await execution_db.delete_execution(graph_exec_id=graph_exec_id, user_id=user_id)
+
+
########################################################
##################### Schedules ########################
########################################################
diff --git a/autogpt_platform/backend/migrations/20250228161607_agent_graph_execution_soft_delete/migration.sql b/autogpt_platform/backend/migrations/20250228161607_agent_graph_execution_soft_delete/migration.sql
new file mode 100644
index 000000000000..ef091b9c80c6
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20250228161607_agent_graph_execution_soft_delete/migration.sql
@@ -0,0 +1,6 @@
+-- Add isDeleted column to AgentGraphExecution
+ALTER TABLE "AgentGraphExecution"
+ADD COLUMN "isDeleted"
+ BOOLEAN
+ NOT NULL
+ DEFAULT false;
diff --git a/autogpt_platform/backend/schema.prisma b/autogpt_platform/backend/schema.prisma
index 0373544e2d2e..12196be67394 100644
--- a/autogpt_platform/backend/schema.prisma
+++ b/autogpt_platform/backend/schema.prisma
@@ -289,6 +289,8 @@ model AgentGraphExecution {
updatedAt DateTime? @updatedAt
startedAt DateTime?
+ isDeleted Boolean @default(false)
+
executionStatus AgentExecutionStatus @default(COMPLETED)
agentGraphId String
diff --git a/autogpt_platform/frontend/src/app/library/agents/[id]/page.tsx b/autogpt_platform/frontend/src/app/library/agents/[id]/page.tsx
index c4f246eda39c..8e242e643342 100644
--- a/autogpt_platform/frontend/src/app/library/agents/[id]/page.tsx
+++ b/autogpt_platform/frontend/src/app/library/agents/[id]/page.tsx
@@ -5,33 +5,37 @@ import { useParams, useRouter } from "next/navigation";
import { useBackendAPI } from "@/lib/autogpt-server-api/context";
import {
GraphExecution,
+ GraphExecutionID,
GraphExecutionMeta,
GraphMeta,
LibraryAgent,
LibraryAgentID,
Schedule,
+ ScheduleID,
} from "@/lib/autogpt-server-api";
import type { ButtonAction } from "@/components/agptui/types";
+import DeleteConfirmDialog from "@/components/agptui/delete-confirm-dialog";
import AgentRunDraftView from "@/components/agents/agent-run-draft-view";
import AgentRunDetailsView from "@/components/agents/agent-run-details-view";
import AgentRunsSelectorList from "@/components/agents/agent-runs-selector-list";
import AgentScheduleDetailsView from "@/components/agents/agent-schedule-details-view";
-import AgentDeleteConfirmDialog from "@/components/agents/agent-delete-confirm-dialog";
export default function AgentRunsPage(): React.ReactElement {
const { id: agentID }: { id: LibraryAgentID } = useParams();
const router = useRouter();
const api = useBackendAPI();
+ // ============================ STATE =============================
+
const [graph, setGraph] = useState<GraphMeta | null>(null);
const [agent, setAgent] = useState<LibraryAgent | null>(null);
const [agentRuns, setAgentRuns] = useState<GraphExecutionMeta[]>([]);
const [schedules, setSchedules] = useState<Schedule[]>([]);
- const [selectedView, selectView] = useState<{
- type: "run" | "schedule";
- id?: string;
- }>({ type: "run" });
+ const [selectedView, selectView] = useState<
+ | { type: "run"; id?: GraphExecutionID }
+ | { type: "schedule"; id: ScheduleID }
+ >({ type: "run" });
const [selectedRun, setSelectedRun] = useState<
GraphExecution | GraphExecutionMeta | null
>(null);
@@ -41,12 +45,14 @@ export default function AgentRunsPage(): React.ReactElement {
const [isFirstLoad, setIsFirstLoad] = useState<boolean>(true);
const [agentDeleteDialogOpen, setAgentDeleteDialogOpen] =
useState<boolean>(false);
+ const [confirmingDeleteAgentRun, setConfirmingDeleteAgentRun] =
+ useState<GraphExecutionMeta | null>(null);
const openRunDraftView = useCallback(() => {
selectView({ type: "run" });
}, []);
- const selectRun = useCallback((id: string) => {
+ const selectRun = useCallback((id: GraphExecutionID) => {
selectView({ type: "run", id });
}, []);
@@ -114,20 +120,40 @@ export default function AgentRunsPage(): React.ReactElement {
fetchSchedules();
}, [fetchSchedules]);
- const removeSchedule = useCallback(
- async (scheduleId: string) => {
- const removedSchedule = await api.deleteSchedule(scheduleId);
- setSchedules(schedules.filter((s) => s.id !== removedSchedule.id));
- },
- [schedules, api],
- );
-
/* TODO: use websockets instead of polling - https://github.com/Significant-Gravitas/AutoGPT/issues/8782 */
useEffect(() => {
const intervalId = setInterval(() => fetchAgents(), 5000);
return () => clearInterval(intervalId);
}, [fetchAgents]);
+ // =========================== ACTIONS ============================
+
+ const deleteRun = useCallback(
+ async (run: GraphExecutionMeta) => {
+ if (run.status == "RUNNING" || run.status == "QUEUED") {
+ await api.stopGraphExecution(run.graph_id, run.execution_id);
+ }
+ await api.deleteGraphExecution(run.execution_id);
+
+ setConfirmingDeleteAgentRun(null);
+ if (selectedView.type == "run" && selectedView.id == run.execution_id) {
+ openRunDraftView();
+ }
+ setAgentRuns(
+ agentRuns.filter((r) => r.execution_id !== run.execution_id),
+ );
+ },
+ [agentRuns, api, selectedView, openRunDraftView],
+ );
+
+ const deleteSchedule = useCallback(
+ async (scheduleID: ScheduleID) => {
+ const removedSchedule = await api.deleteSchedule(scheduleID);
+ setSchedules(schedules.filter((s) => s.id !== removedSchedule.id));
+ },
+ [schedules, api],
+ );
+
const agentActions: ButtonAction[] = useMemo(
() => [
{
@@ -160,7 +186,9 @@ export default function AgentRunsPage(): React.ReactElement {
selectedView={selectedView}
onSelectRun={selectRun}
onSelectSchedule={selectSchedule}
- onDraftNewRun={openRunDraftView}
+ onSelectDraftNewRun={openRunDraftView}
+ onDeleteRun={setConfirmingDeleteAgentRun}
+ onDeleteSchedule={(id) => deleteSchedule(id)}
/>
<div className="flex-1">
@@ -180,6 +208,7 @@ export default function AgentRunsPage(): React.ReactElement {
graph={graph}
run={selectedRun}
agentActions={agentActions}
+ deleteRun={() => setConfirmingDeleteAgentRun(selectedRun)}
/>
)
) : selectedView.type == "run" ? (
@@ -199,7 +228,8 @@ export default function AgentRunsPage(): React.ReactElement {
)
) : null) || <p>Loading...</p>}
- <AgentDeleteConfirmDialog
+ <DeleteConfirmDialog
+ entityType="agent"
open={agentDeleteDialogOpen}
onOpenChange={setAgentDeleteDialogOpen}
onDoDelete={() =>
@@ -209,6 +239,15 @@ export default function AgentRunsPage(): React.ReactElement {
.then(() => router.push("/library"))
}
/>
+
+ <DeleteConfirmDialog
+ entityType="agent run"
+ open={!!confirmingDeleteAgentRun}
+ onOpenChange={(open) => !open && setConfirmingDeleteAgentRun(null)}
+ onDoDelete={() =>
+ confirmingDeleteAgentRun && deleteRun(confirmingDeleteAgentRun)
+ }
+ />
</div>
</div>
);
diff --git a/autogpt_platform/frontend/src/app/monitoring/page.tsx b/autogpt_platform/frontend/src/app/monitoring/page.tsx
index dd1cf2c7c00c..251a194abc7e 100644
--- a/autogpt_platform/frontend/src/app/monitoring/page.tsx
+++ b/autogpt_platform/frontend/src/app/monitoring/page.tsx
@@ -5,6 +5,7 @@ import {
GraphExecutionMeta,
Schedule,
LibraryAgent,
+ ScheduleID,
} from "@/lib/autogpt-server-api";
import { Card } from "@/components/ui/card";
@@ -35,7 +36,7 @@ const Monitor = () => {
}, [api]);
const removeSchedule = useCallback(
- async (scheduleId: string) => {
+ async (scheduleId: ScheduleID) => {
const removedSchedule = await api.deleteSchedule(scheduleId);
setSchedules(schedules.filter((s) => s.id !== removedSchedule.id));
},
diff --git a/autogpt_platform/frontend/src/components/Flow.tsx b/autogpt_platform/frontend/src/components/Flow.tsx
index 7f3cf1415797..9b62ac9507d7 100644
--- a/autogpt_platform/frontend/src/components/Flow.tsx
+++ b/autogpt_platform/frontend/src/components/Flow.tsx
@@ -26,7 +26,12 @@ import {
import "@xyflow/react/dist/style.css";
import { CustomNode } from "./CustomNode";
import "./flow.css";
-import { BlockUIType, formatEdgeID, GraphID } from "@/lib/autogpt-server-api";
+import {
+ BlockUIType,
+ formatEdgeID,
+ GraphExecutionID,
+ GraphID,
+} from "@/lib/autogpt-server-api";
import { getTypeColor, findNewlyAddedBlockCoordinates } from "@/lib/utils";
import { history } from "./history";
import { CustomEdge } from "./CustomEdge";
@@ -86,7 +91,9 @@ const FlowEditor: React.FC<{
const [visualizeBeads, setVisualizeBeads] = useState<
"no" | "static" | "animate"
>("animate");
- const [flowExecutionID, setFlowExecutionID] = useState<string | undefined>();
+ const [flowExecutionID, setFlowExecutionID] = useState<
+ GraphExecutionID | undefined
+ >();
const {
agentName,
setAgentName,
@@ -164,7 +171,9 @@ const FlowEditor: React.FC<{
if (params.get("open_scheduling") === "true") {
setOpenCron(true);
}
- setFlowExecutionID(params.get("flowExecutionID") || undefined);
+ setFlowExecutionID(
+ (params.get("flowExecutionID") as GraphExecutionID) || undefined,
+ );
}, [params]);
useEffect(() => {
diff --git a/autogpt_platform/frontend/src/components/agents/agent-run-details-view.tsx b/autogpt_platform/frontend/src/components/agents/agent-run-details-view.tsx
index c6df19ce9076..ccdef84575b8 100644
--- a/autogpt_platform/frontend/src/components/agents/agent-run-details-view.tsx
+++ b/autogpt_platform/frontend/src/components/agents/agent-run-details-view.tsx
@@ -23,10 +23,12 @@ export default function AgentRunDetailsView({
graph,
run,
agentActions,
+ deleteRun,
}: {
graph: GraphMeta;
run: GraphExecution | GraphExecutionMeta;
agentActions: ButtonAction[];
+ deleteRun: () => void;
}): React.ReactNode {
const api = useBackendAPI();
@@ -86,6 +88,11 @@ export default function AgentRunDetailsView({
[api, graph, agentRunInputs],
);
+ const stopRun = useCallback(
+ () => api.stopGraphExecution(graph.id, run.execution_id),
+ [api, graph.id, run.execution_id],
+ );
+
const agentRunOutputs:
| Record<
string,
@@ -109,9 +116,23 @@ export default function AgentRunDetailsView({
);
}, [graph, run, runStatus]);
- const runActions: { label: string; callback: () => void }[] = useMemo(
- () => [{ label: "Run again", callback: () => runAgain() }],
- [runAgain],
+ const runActions: ButtonAction[] = useMemo(
+ () => [
+ ...(["running", "queued"].includes(runStatus)
+ ? ([
+ {
+ label: "Stop run",
+ variant: "secondary",
+ callback: stopRun,
+ },
+ ] satisfies ButtonAction[])
+ : []),
+ ...(["success", "failed", "stopped"].includes(runStatus)
+ ? [{ label: "Run again", callback: runAgain }]
+ : []),
+ { label: "Delete run", variant: "secondary", callback: deleteRun },
+ ],
+ [runStatus, runAgain, stopRun, deleteRun],
);
return (
@@ -190,7 +211,11 @@ export default function AgentRunDetailsView({
<div className="flex flex-col gap-3">
<h3 className="text-sm font-medium">Run actions</h3>
{runActions.map((action, i) => (
- <Button key={i} variant="outline" onClick={action.callback}>
+ <Button
+ key={i}
+ variant={action.variant ?? "outline"}
+ onClick={action.callback}
+ >
{action.label}
</Button>
))}
diff --git a/autogpt_platform/frontend/src/components/agents/agent-run-draft-view.tsx b/autogpt_platform/frontend/src/components/agents/agent-run-draft-view.tsx
index a4f096780f56..50ba007c9652 100644
--- a/autogpt_platform/frontend/src/components/agents/agent-run-draft-view.tsx
+++ b/autogpt_platform/frontend/src/components/agents/agent-run-draft-view.tsx
@@ -2,7 +2,7 @@
import React, { useCallback, useMemo, useState } from "react";
import { useBackendAPI } from "@/lib/autogpt-server-api/context";
-import { GraphMeta } from "@/lib/autogpt-server-api";
+import { GraphExecutionID, GraphMeta } from "@/lib/autogpt-server-api";
import type { ButtonAction } from "@/components/agptui/types";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
@@ -15,7 +15,7 @@ export default function AgentRunDraftView({
agentActions,
}: {
graph: GraphMeta;
- onRun: (runID: string) => void;
+ onRun: (runID: GraphExecutionID) => void;
agentActions: ButtonAction[];
}): React.ReactNode {
const api = useBackendAPI();
diff --git a/autogpt_platform/frontend/src/components/agents/agent-run-summary-card.tsx b/autogpt_platform/frontend/src/components/agents/agent-run-summary-card.tsx
index 7336835438cb..912569a8cf9e 100644
--- a/autogpt_platform/frontend/src/components/agents/agent-run-summary-card.tsx
+++ b/autogpt_platform/frontend/src/components/agents/agent-run-summary-card.tsx
@@ -18,24 +18,24 @@ import AgentRunStatusChip, {
} from "@/components/agents/agent-run-status-chip";
export type AgentRunSummaryProps = {
- agentID: string;
- agentRunID: string;
status: AgentRunStatus;
title: string;
timestamp: number | Date;
selected?: boolean;
onClick?: () => void;
+ // onRename: () => void;
+ onDelete: () => void;
className?: string;
};
export default function AgentRunSummaryCard({
- agentID,
- agentRunID,
status,
title,
timestamp,
selected = false,
onClick,
+ // onRename,
+ onDelete,
className,
}: AgentRunSummaryProps): React.ReactElement {
return (
@@ -55,32 +55,24 @@ export default function AgentRunSummaryCard({
{title}
</h3>
- {/* <DropdownMenu>
+ <DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" className="h-5 w-5 p-0">
<MoreVertical className="h-5 w-5" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent>
- <DropdownMenuItem
- // TODO: implement
- >
- Pin into a template
+ {/* {onPinAsPreset && (
+ <DropdownMenuItem onClick={onPinAsPreset}>
+ Pin as a preset
</DropdownMenuItem>
+ )} */}
- <DropdownMenuItem
- // TODO: implement
- >
- Rename
- </DropdownMenuItem>
+ {/* <DropdownMenuItem onClick={onRename}>Rename</DropdownMenuItem> */}
- <DropdownMenuItem
- // TODO: implement
- >
- Delete
- </DropdownMenuItem>
+ <DropdownMenuItem onClick={onDelete}>Delete</DropdownMenuItem>
</DropdownMenuContent>
- </DropdownMenu> */}
+ </DropdownMenu>
</div>
<p
diff --git a/autogpt_platform/frontend/src/components/agents/agent-runs-selector-list.tsx b/autogpt_platform/frontend/src/components/agents/agent-runs-selector-list.tsx
index 783a31e94521..11d3909e3e92 100644
--- a/autogpt_platform/frontend/src/components/agents/agent-runs-selector-list.tsx
+++ b/autogpt_platform/frontend/src/components/agents/agent-runs-selector-list.tsx
@@ -4,9 +4,11 @@ import { Plus } from "lucide-react";
import { cn } from "@/lib/utils";
import {
+ GraphExecutionID,
GraphExecutionMeta,
LibraryAgent,
Schedule,
+ ScheduleID,
} from "@/lib/autogpt-server-api";
import { ScrollArea } from "@/components/ui/scroll-area";
@@ -21,9 +23,11 @@ interface AgentRunsSelectorListProps {
agentRuns: GraphExecutionMeta[];
schedules: Schedule[];
selectedView: { type: "run" | "schedule"; id?: string };
- onSelectRun: (id: string) => void;
+ onSelectRun: (id: GraphExecutionID) => void;
onSelectSchedule: (schedule: Schedule) => void;
- onDraftNewRun: () => void;
+ onSelectDraftNewRun: () => void;
+ onDeleteRun: (id: GraphExecutionMeta) => void;
+ onDeleteSchedule: (id: ScheduleID) => void;
className?: string;
}
@@ -34,7 +38,9 @@ export default function AgentRunsSelectorList({
selectedView,
onSelectRun,
onSelectSchedule,
- onDraftNewRun,
+ onSelectDraftNewRun,
+ onDeleteRun,
+ onDeleteSchedule,
className,
}: AgentRunsSelectorListProps): React.ReactElement {
const [activeListTab, setActiveListTab] = useState<"runs" | "scheduled">(
@@ -51,7 +57,7 @@ export default function AgentRunsSelectorList({
? "agpt-card-selected text-accent"
: "")
}
- onClick={onDraftNewRun}
+ onClick={onSelectDraftNewRun}
>
<Plus className="h-6 w-6" />
<span>New run</span>
@@ -91,7 +97,7 @@ export default function AgentRunsSelectorList({
? "agpt-card-selected text-accent"
: "")
}
- onClick={onDraftNewRun}
+ onClick={onSelectDraftNewRun}
>
<Plus className="h-6 w-6" />
<span>New run</span>
@@ -102,13 +108,12 @@ export default function AgentRunsSelectorList({
<AgentRunSummaryCard
className="h-28 w-72 lg:h-32 xl:w-80"
key={i}
- agentID={run.graph_id}
- agentRunID={run.execution_id}
status={agentRunStatusMap[run.status]}
title={agent.name}
timestamp={run.started_at}
selected={selectedView.id === run.execution_id}
onClick={() => onSelectRun(run.execution_id)}
+ onDelete={() => onDeleteRun(run)}
/>
))
: schedules
@@ -117,13 +122,12 @@ export default function AgentRunsSelectorList({
<AgentRunSummaryCard
className="h-28 w-72 lg:h-32 xl:w-80"
key={i}
- agentID={schedule.graph_id}
- agentRunID={schedule.id}
status="scheduled"
title={schedule.name}
timestamp={schedule.next_run_time}
selected={selectedView.id === schedule.id}
onClick={() => onSelectSchedule(schedule)}
+ onDelete={() => onDeleteSchedule(schedule.id)}
/>
))}
</div>
diff --git a/autogpt_platform/frontend/src/components/agents/agent-schedule-details-view.tsx b/autogpt_platform/frontend/src/components/agents/agent-schedule-details-view.tsx
index 2133cea3bf93..520188fad44c 100644
--- a/autogpt_platform/frontend/src/components/agents/agent-schedule-details-view.tsx
+++ b/autogpt_platform/frontend/src/components/agents/agent-schedule-details-view.tsx
@@ -1,7 +1,11 @@
"use client";
import React, { useCallback, useMemo } from "react";
-import { GraphMeta, Schedule } from "@/lib/autogpt-server-api";
+import {
+ GraphExecutionID,
+ GraphMeta,
+ Schedule,
+} from "@/lib/autogpt-server-api";
import { useBackendAPI } from "@/lib/autogpt-server-api/context";
import type { ButtonAction } from "@/components/agptui/types";
@@ -18,7 +22,7 @@ export default function AgentScheduleDetailsView({
}: {
graph: GraphMeta;
schedule: Schedule;
- onForcedRun: (runID: string) => void;
+ onForcedRun: (runID: GraphExecutionID) => void;
agentActions: ButtonAction[];
}): React.ReactNode {
const api = useBackendAPI();
diff --git a/autogpt_platform/frontend/src/components/agents/agent-delete-confirm-dialog.tsx b/autogpt_platform/frontend/src/components/agptui/delete-confirm-dialog.tsx
similarity index 57%
rename from autogpt_platform/frontend/src/components/agents/agent-delete-confirm-dialog.tsx
rename to autogpt_platform/frontend/src/components/agptui/delete-confirm-dialog.tsx
index c8934e06eb0a..7d09502dd257 100644
--- a/autogpt_platform/frontend/src/components/agents/agent-delete-confirm-dialog.tsx
+++ b/autogpt_platform/frontend/src/components/agptui/delete-confirm-dialog.tsx
@@ -8,25 +8,41 @@ import {
DialogTitle,
} from "@/components/ui/dialog";
-export default function AgentDeleteConfirmDialog({
+export default function DeleteConfirmDialog({
+ entityType,
+ entityName,
open,
onOpenChange,
onDoDelete,
+ isIrreversible = true,
className,
}: {
+ entityType: string;
+ entityName?: string;
open: boolean;
onOpenChange: (open: boolean) => void;
onDoDelete: () => void;
+ isIrreversible?: boolean;
className?: string;
}): React.ReactNode {
+ const displayType = entityType
+ .split(" ")
+ .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+ .join(" ");
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className={className}>
<DialogHeader>
- <DialogTitle>Delete Agent</DialogTitle>
+ <DialogTitle>
+ Delete {displayType} {entityName && `"${entityName}"`}
+ </DialogTitle>
<DialogDescription>
- Are you sure you want to delete this agent? <br />
- This action cannot be undone.
+ Are you sure you want to delete this {entityType}?
+ {isIrreversible && (
+ <b>
+ <br /> This action cannot be undone.
+ </b>
+ )}
</DialogDescription>
</DialogHeader>
<DialogFooter>
diff --git a/autogpt_platform/frontend/src/components/monitor/scheduleTable.tsx b/autogpt_platform/frontend/src/components/monitor/scheduleTable.tsx
index e1df96dc2d0f..2c28bdc1ca41 100644
--- a/autogpt_platform/frontend/src/components/monitor/scheduleTable.tsx
+++ b/autogpt_platform/frontend/src/components/monitor/scheduleTable.tsx
@@ -1,4 +1,4 @@
-import { LibraryAgent, Schedule } from "@/lib/autogpt-server-api";
+import { LibraryAgent, Schedule, ScheduleID } from "@/lib/autogpt-server-api";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
import {
@@ -36,7 +36,7 @@ import { Label } from "../ui/label";
interface SchedulesTableProps {
schedules: Schedule[];
agents: LibraryAgent[];
- onRemoveSchedule: (scheduleId: string, enabled: boolean) => void;
+ onRemoveSchedule: (scheduleId: ScheduleID, enabled: boolean) => void;
sortColumn: keyof Schedule;
sortDirection: "asc" | "desc";
onSort: (column: keyof Schedule) => void;
@@ -73,7 +73,7 @@ export const SchedulesTable = ({
return String(bValue).localeCompare(String(aValue));
});
- const handleToggleSchedule = (scheduleId: string, enabled: boolean) => {
+ const handleToggleSchedule = (scheduleId: ScheduleID, enabled: boolean) => {
onRemoveSchedule(scheduleId, enabled);
if (!enabled) {
toast({
diff --git a/autogpt_platform/frontend/src/hooks/useAgentGraph.tsx b/autogpt_platform/frontend/src/hooks/useAgentGraph.tsx
index 41ea1691621f..1ce8aa389fee 100644
--- a/autogpt_platform/frontend/src/hooks/useAgentGraph.tsx
+++ b/autogpt_platform/frontend/src/hooks/useAgentGraph.tsx
@@ -6,6 +6,7 @@ import BackendAPI, {
BlockUIType,
formatEdgeID,
Graph,
+ GraphExecutionID,
GraphID,
NodeExecutionResult,
} from "@/lib/autogpt-server-api";
@@ -29,7 +30,7 @@ const ajv = new Ajv({ strict: false, allErrors: true });
export default function useAgentGraph(
flowID?: GraphID,
flowVersion?: number,
- flowExecutionID?: string,
+ flowExecutionID?: GraphExecutionID,
passDataToBeads?: boolean,
) {
const { toast } = useToast();
@@ -65,7 +66,7 @@ export default function useAgentGraph(
| {
request: "run" | "stop";
state: "running" | "stopping" | "error";
- activeExecutionID?: string;
+ activeExecutionID?: GraphExecutionID;
}
>({
request: "none",
diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
index 32f9f2ebb4e9..f14d28c75760 100644
--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/client.ts
@@ -17,6 +17,7 @@ import {
Graph,
GraphCreatable,
GraphExecution,
+ GraphExecutionID,
GraphExecutionMeta,
GraphID,
GraphMeta,
@@ -35,6 +36,7 @@ import {
RefundRequest,
Schedule,
ScheduleCreatable,
+ ScheduleID,
StoreAgentDetails,
StoreAgentsResponse,
StoreReview,
@@ -211,7 +213,7 @@ export default class BackendAPI {
id: GraphID,
version: number,
inputData: { [key: string]: any } = {},
- ): Promise<{ graph_exec_id: string }> {
+ ): Promise<{ graph_exec_id: GraphExecutionID }> {
return this._request("POST", `/graphs/${id}/execute/${version}`, inputData);
}
@@ -225,7 +227,7 @@ export default class BackendAPI {
async getGraphExecutionInfo(
graphID: GraphID,
- runID: string,
+ runID: GraphExecutionID,
): Promise<GraphExecution> {
const result = await this._get(`/graphs/${graphID}/executions/${runID}`);
result.node_executions = result.node_executions.map(
@@ -236,7 +238,7 @@ export default class BackendAPI {
async stopGraphExecution(
graphID: GraphID,
- runID: string,
+ runID: GraphExecutionID,
): Promise<GraphExecution> {
const result = await this._request(
"POST",
@@ -248,6 +250,10 @@ export default class BackendAPI {
return result;
}
+ async deleteGraphExecution(runID: GraphExecutionID): Promise<void> {
+ await this._request("DELETE", `/executions/${runID}`);
+ }
+
oAuthLogin(
provider: string,
scopes?: string[],
@@ -558,13 +564,9 @@ export default class BackendAPI {
});
}
- ///////////////////////////////////////////
- /////////// INTERNAL FUNCTIONS ////////////
- //////////////////////////////??///////////
-
- private _get(path: string, query?: Record<string, any>) {
- return this._request("GET", path, query);
- }
+ //////////////////////////////////
+ /////////// SCHEDULES ////////////
+ //////////////////////////////////
async createSchedule(schedule: ScheduleCreatable): Promise<Schedule> {
return this._request("POST", `/schedules`, schedule).then(
@@ -572,7 +574,7 @@ export default class BackendAPI {
);
}
- async deleteSchedule(scheduleId: string): Promise<{ id: string }> {
+ async deleteSchedule(scheduleId: ScheduleID): Promise<{ id: string }> {
return this._request("DELETE", `/schedules/${scheduleId}`);
}
@@ -582,6 +584,14 @@ export default class BackendAPI {
);
}
+ ///////////////////////////////////////////
+ /////////// INTERNAL FUNCTIONS ////////////
+ //////////////////////////////??///////////
+
+ private _get(path: string, query?: Record<string, any>) {
+ return this._request("GET", path, query);
+ }
+
private async _uploadFile(path: string, file: File): Promise<string> {
// Get session with retry logic
let token = "no-token-found";
diff --git a/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts b/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
index de0f1da8bad7..1d9bfd5c6153 100644
--- a/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
+++ b/autogpt_platform/frontend/src/lib/autogpt-server-api/types.ts
@@ -218,7 +218,7 @@ export type LinkCreatable = Omit<Link, "id" | "is_static"> & {
/* Mirror of backend/data/graph.py:GraphExecutionMeta */
export type GraphExecutionMeta = {
- execution_id: string;
+ execution_id: GraphExecutionID;
started_at: number;
ended_at: number;
cost?: number;
@@ -230,6 +230,8 @@ export type GraphExecutionMeta = {
preset_id?: string;
};
+export type GraphExecutionID = Brand<string, "GraphExecutionID">;
+
/* Mirror of backend/data/graph.py:GraphExecution */
export type GraphExecution = GraphExecutionMeta & {
inputs: Record<string, any>;
@@ -287,7 +289,7 @@ export type GraphCreatable = Omit<GraphUpdateable, "id"> & { id?: string };
export type NodeExecutionResult = {
graph_id: GraphID;
graph_version: number;
- graph_exec_id: string;
+ graph_exec_id: GraphExecutionID;
node_exec_id: string;
node_id: string;
block_id: string;
@@ -624,7 +626,7 @@ export type ProfileDetails = {
};
export type Schedule = {
- id: string;
+ id: ScheduleID;
name: string;
cron: string;
user_id: string;
@@ -634,6 +636,8 @@ export type Schedule = {
next_run_time: Date;
};
+export type ScheduleID = Brand<string, "ScheduleID">;
+
export type ScheduleCreatable = {
cron: string;
graph_id: GraphID;
@@ -642,7 +646,7 @@ export type ScheduleCreatable = {
};
export type MyAgent = {
- agent_id: string;
+ agent_id: GraphID;
agent_version: number;
agent_name: string;
last_edited: string;
@@ -706,7 +710,7 @@ export interface CreditTransaction {
balance: number;
description: string;
usage_graph_id: GraphID;
- usage_execution_id: string;
+ usage_execution_id: GraphExecutionID;
usage_node_count: number;
usage_starting_time: Date;
}
|
gatsby
|
https://github.com/gatsbyjs/gatsby
|
2f67bceeaffc86f2f162c8bd15bab0e65a537071
|
Paweł Jędrzejczyk
|
2020-01-10 00:13:46
|
feat(gatsby-source-wordpress): add normalizers option to modif… (#18079)
|
* add new `normalizers` option to enable adding/removing normalizers
* update README with new `normalizers` option
|
feat(gatsby-source-wordpress): add normalizers option to modif… (#18079)
* add new `normalizers` option to enable adding/removing normalizers
* update README with new `normalizers` option
Co-authored-by: GatsbyJS Bot <[email protected]>
|
diff --git a/packages/gatsby-source-wordpress/README.md b/packages/gatsby-source-wordpress/README.md
index 83e71ea679554..b35a144c5ff9a 100644
--- a/packages/gatsby-source-wordpress/README.md
+++ b/packages/gatsby-source-wordpress/README.md
@@ -144,6 +144,25 @@ module.exports = {
normalizer: function({ entities }) {
return entities
},
+ // The normalizers option allows you to manipulate the array of internal
+ // normalizers that are applied to entities after they're fetched
+ // from WordPress.
+ // You can add your own normalizers to this array by adding an object
+ // that contains name and normalizer properties.
+ // Name is the name of your normalizer, and normalizer is a function that
+ // should return the array of entities that are passed to it.
+ // This is useful if you need more control over the order of normalizers,
+ // instead of your normalizer being applied after the built in normalizers (as is the case with the normalizer option).
+ normalizers: normalizers => [
+ ...normalizers,
+ {
+ name: "nameOfTheFunction",
+ normalizer: function({ entities }) {
+ // manipulate entities here
+ return entities
+ },
+ },
+ ],
},
},
],
@@ -751,7 +770,7 @@ To learn more about image processing check
## Using a custom normalizer
The plugin uses the concept of normalizers to transform the json data from WordPress into
-GraphQL nodes. You can extend the normalizers by passing a custom function to your `gatsby-config.js`.
+GraphQL nodes. You can extend the normalizers by modifying the normalizers array in plugin options in `gatsby-config.js`.
### Example:
@@ -759,7 +778,9 @@ You have a custom post type `movie` and a related custom taxonomy `genre` in you
`gatsby-source-wordpress` doesn't know about the relation of the two, we can build an additional normalizer function to map the movie GraphQL nodes to the genre nodes:
```javascript
-function mapMoviesToGenres({ entities }) {
+const mapMoviesToGenres = {
+ name: `mapMoviesToGenres`,
+ normalizer: function({ entities }) {
const genres = entities.filter(e => e.__type === `wordpress__wp_genre`)
return entities.map(e => {
@@ -778,7 +799,7 @@ function mapMoviesToGenres({ entities }) {
}
```
-In your `gatsby-config.js` you can then pass the function to the plugin options:
+In your `gatsby-config.js` you can then add the normalizer to the plugin options called normalizers:
```javascript
module.exports = {
@@ -787,7 +808,7 @@ module.exports = {
resolve: "gatsby-source-wordpress",
options: {
// ...
- normalizer: mapMoviesToGenres,
+ normalizers: normalizers => [...normalizers, mapMoviesToGenres],
},
},
],
@@ -797,6 +818,35 @@ module.exports = {
Next to the entities, the object passed to the custom normalizer function also contains other helpful Gatsby functions
and also your `wordpress-source-plugin` options from `gatsby-config.js`. To learn more about the passed object see the [source code](https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-wordpress/src/gatsby-node.js).
+### Example with modyfing gatsby-source-wordpress normalizers
+
+```javascript
+const dropUnusedMediaNormalizer = {
+ name: "dropUnusedMediaNormalizer",
+ normalizer: function({ entities }) {
+ return entities.filter(
+ e => !(e.__type === "wordpress__wp_media" && !e.post)
+ )
+ },
+}
+```
+
+Adding this normalizer on top of other/builtin normalizers, so unused media entities are not further processed.
+
+```javascript
+module.exports = {
+ plugins: [
+ {
+ resolve: "gatsby-source-wordpress",
+ options: {
+ // ...
+ normalizers: normalizers => [dropUnusedMediaNormalizer, ...normalizers],
+ },
+ },
+ ],
+}
+```
+
## Site's `gatsby-node.js` example
```javascript
diff --git a/packages/gatsby-source-wordpress/src/gatsby-node.js b/packages/gatsby-source-wordpress/src/gatsby-node.js
index a27c969f5d754..90b2a4391425d 100644
--- a/packages/gatsby-source-wordpress/src/gatsby-node.js
+++ b/packages/gatsby-source-wordpress/src/gatsby-node.js
@@ -23,6 +23,7 @@ let _concurrentRequests
let _includedRoutes
let _excludedRoutes
let _normalizer
+let _normalizers
let _keepMediaSizes
exports.sourceNodes = async (
@@ -50,6 +51,7 @@ exports.sourceNodes = async (
includedRoutes = [`**`],
excludedRoutes = [],
normalizer,
+ normalizers,
keepMediaSizes = false,
}
) => {
@@ -69,6 +71,7 @@ exports.sourceNodes = async (
_excludedRoutes = excludedRoutes
_keepMediaSizes = keepMediaSizes
_normalizer = normalizer
+ _normalizers = normalizers
let entities = await fetch({
baseUrl,
@@ -88,111 +91,187 @@ exports.sourceNodes = async (
refactoredEntityTypes,
})
- // Normalize data & create nodes
-
- // Create fake wordpressId form element who done have any in the database
- entities = normalize.generateFakeWordpressId(entities)
-
- // Remove ACF key if it's not an object, combine ACF Options
- entities = normalize.normalizeACF(entities)
-
- // Combine ACF Option Data entities into one but split by IDs + options
- entities = normalize.combineACF(entities)
-
- // Creates entities from object collections of entities
- entities = normalize.normalizeEntities(entities)
-
- // Standardizes ids & cleans keys
- entities = normalize.standardizeKeys(entities)
-
- // Converts to use only GMT dates
- entities = normalize.standardizeDates(entities)
-
- // Lifts all "rendered" fields to top-level.
- entities = normalize.liftRenderedField(entities)
-
- // Exclude entities of unknown shape
- entities = normalize.excludeUnknownEntities(entities)
-
- // Creates Gatsby IDs for each entity
- entities = normalize.createGatsbyIds(createNodeId, entities, _siteURL)
-
- // Creates links between authors and user entities
- entities = normalize.mapAuthorsToUsers(entities)
+ let wordpressDataNormalizers = [
+ // Create fake wordpressId form element who done have any in the database
+ {
+ name: `generateFakeWordpressId`,
+ normalizer: ({ entities }) => normalize.generateFakeWordpressId(entities),
+ },
+ // Remove ACF key if it's not an object, combine ACF Options
+ {
+ name: `normalizeACF`,
+ normalizer: ({ entities }) => normalize.normalizeACF(entities),
+ },
+ // Combine ACF Option Data entities into one but split by IDs + options
+ {
+ name: `combineACF`,
+ normalizer: ({ entities }) => normalize.combineACF(entities),
+ },
+ // Creates entities from object collections of entities
+ {
+ name: `normalizeEntities`,
+ normalizer: ({ entities }) => normalize.normalizeEntities(entities),
+ },
+ // Standardizes ids & cleans keys
+ {
+ name: `standardizeKeys`,
+ normalizer: ({ entities }) => normalize.standardizeKeys(entities),
+ },
+ // Converts to use only GMT dates
+ {
+ name: `standardizeDates`,
+ normalizer: ({ entities }) => normalize.standardizeDates(entities),
+ },
+ // Lifts all "rendered" fields to top-level.
+ {
+ name: `liftRenderedField`,
+ normalizer: ({ entities }) => normalize.liftRenderedField(entities),
+ },
+ // Exclude entities of unknown shape
+ {
+ name: `excludeUnknownEntities`,
+ normalizer: ({ entities }) => normalize.excludeUnknownEntities(entities),
+ },
+ // Creates Gatsby IDs for each entity
+ {
+ name: `createGatsbyIds`,
+ normalizer: ({ creteNodeId, entities, _siteURL }) =>
+ normalize.createGatsbyIds(createNodeId, entities, _siteURL),
+ },
+ // Creates links between authors and user entities
+ {
+ name: `mapAuthorsToUsers`,
+ normalizer: ({ entities }) => normalize.mapAuthorsToUsers(entities),
+ },
+ // Creates links between posts and tags/categories.
+ {
+ name: `mapPostsToTagsCategories`,
+ normalizer: ({ entities }) =>
+ normalize.mapPostsToTagsCategories(entities),
+ },
+ // Creates links between tags/categories and taxonomies.
+ {
+ name: `mapTagsCategoriesToTaxonomies`,
+ normalizer: ({ entities }) =>
+ normalize.mapTagsCategoriesToTaxonomies(entities),
+ },
+ // Normalize menu items
+ {
+ name: `normalizeMenuItems`,
+ normalizer: ({ entities }) => normalize.normalizeMenuItems(entities),
+ },
+ // Creates links from entities to media nodes
+ {
+ name: `mapEntitiesToMedia`,
+ normalizer: ({ entities }) => normalize.mapEntitiesToMedia(entities),
+ },
+ // Downloads media files and removes "sizes" data as useless in Gatsby context.
+ {
+ name: `downloadMediaFiles`,
+ normalizer: async ({
+ entities,
+ store,
+ cache,
+ createNode,
+ createNodeId,
+ touchNode,
+ getNode,
+ auth,
+ reporter,
+ keepMediaSizes,
+ }) =>
+ await normalize.downloadMediaFiles({
+ entities,
+ store,
+ cache,
+ createNode,
+ createNodeId,
+ touchNode,
+ getNode,
+ _auth: auth,
+ reporter,
+ keepMediaSizes,
+ }),
+ },
+ // Creates links between elements and parent element.
+ {
+ name: `mapElementsToParent`,
+ normalizer: ({ entities }) => normalize.mapElementsToParent(entities),
+ },
+ // Search and replace Content Urls
+ {
+ name: `searchReplaceContentUrls`,
+ normalizer: ({ entities, searchAndReplaceContentUrls }) =>
+ normalize.searchReplaceContentUrls({
+ entities,
+ searchAndReplaceContentUrls,
+ }),
+ },
+ {
+ name: `mapPolylangTranslations`,
+ normalizer: ({ entities }) => normalize.mapPolylangTranslations(entities),
+ },
+ {
+ name: `createUrlPathsFromLinks`,
+ normalizer: ({ entities }) => normalize.createUrlPathsFromLinks(entities),
+ },
+ ]
- // Creates links between posts and tags/categories.
- entities = normalize.mapPostsToTagsCategories(entities)
-
- // Creates links between tags/categories and taxonomies.
- entities = normalize.mapTagsCategoriesToTaxonomies(entities)
-
- // Normalize menu items
- entities = normalize.normalizeMenuItems(entities)
-
- // Creates links from entities to media nodes
- entities = normalize.mapEntitiesToMedia(entities)
-
- // Downloads media files and removes "sizes" data as useless in Gatsby context.
- entities = await normalize.downloadMediaFiles({
- entities,
+ const normalizerHelpers = {
store,
cache,
createNode,
createNodeId,
+ createContentDigest,
touchNode,
getNode,
- _auth,
- reporter,
- keepMediaSizes,
- })
-
- // Creates links between elements and parent element.
- entities = normalize.mapElementsToParent(entities)
-
- // Search and replace Content Urls
- entities = normalize.searchReplaceContentUrls({
- entities,
+ typePrefix,
+ refactoredEntityTypes,
+ baseUrl,
+ protocol,
+ _siteURL,
+ hostingWPCOM,
+ useACF,
+ acfOptionPageIds,
+ auth,
+ verboseOutput,
+ perPage,
searchAndReplaceContentUrls,
- })
-
- entities = normalize.mapPolylangTranslations(entities)
-
- entities = normalize.createUrlPathsFromLinks(entities)
+ concurrentRequests,
+ excludedRoutes,
+ keepMediaSizes,
+ }
// apply custom normalizer
if (typeof _normalizer === `function`) {
- entities = _normalizer({
- entities,
- store,
- cache,
- createNode,
- createNodeId,
- touchNode,
- getNode,
- typePrefix,
- refactoredEntityTypes,
- baseUrl,
- protocol,
- _siteURL,
- hostingWPCOM,
- useACF,
- acfOptionPageIds,
- auth,
- verboseOutput,
- perPage,
- searchAndReplaceContentUrls,
- concurrentRequests,
- excludedRoutes,
- keepMediaSizes,
+ wordpressDataNormalizers.push({
+ name: `customNormalizer`,
+ normalizer: _normalizer,
})
}
+ if (typeof _normalizers === `function`) {
+ wordpressDataNormalizers = _normalizers([...wordpressDataNormalizers])
+ }
+
// creates nodes for each entry
- normalize.createNodesFromEntities({
- entities,
- createNode,
- createContentDigest,
+ wordpressDataNormalizers.push({
+ name: `createNodesFromEntities`,
+ normalizer: ({ entities, createNode, createContentDigest }) =>
+ normalize.createNodesFromEntities({
+ entities,
+ createNode,
+ createContentDigest,
+ }),
})
+ // Normalize data & create nodes
+ for (const { normalizer } of wordpressDataNormalizers) {
+ entities = await normalizer({
+ entities,
+ ...normalizerHelpers,
+ })
+ }
+
return
}
|
bit
|
https://github.com/teambit/bit
|
7f68e6ed01d907080d9d944fa4ba28581fb4c2d3
|
David First
|
2022-02-02 20:45:17
|
feat: improve "pattern" to accept multiple patterns and negate syntax (#5346)
|
- introduce `idsByPattern` API for the workspace that returns all matching component ids according to the pattern. A pattern may consist multiple patterns separated by a comma. Also, a pattern can exclude ids by the `!` syntax.
- introduce `bit pattern <pattern>` command to list the ids matching the pattern.
|
feat: improve "pattern" to accept multiple patterns and negate syntax (#5346)
- introduce `idsByPattern` API for the workspace that returns all matching component ids according to the pattern. A pattern may consist multiple patterns separated by a comma. Also, a pattern can exclude ids by the `!` syntax.
- introduce `bit pattern <pattern>` command to list the ids matching the pattern.
|
diff --git a/scopes/harmony/aspect/aspect.main.runtime.ts b/scopes/harmony/aspect/aspect.main.runtime.ts
index d71e2741446c..06bd821ab591 100644
--- a/scopes/harmony/aspect/aspect.main.runtime.ts
+++ b/scopes/harmony/aspect/aspect.main.runtime.ts
@@ -32,8 +32,7 @@ export class AspectMain {
async listAspectsOfComponent(pattern?: string): Promise<{ [component: string]: AspectSource[] }> {
const getIds = async () => {
if (!pattern) return this.workspace.listIds();
- const comps = await this.workspace.byPattern(pattern);
- return comps.map((comp) => comp.id);
+ return this.workspace.idsByPattern(pattern);
};
const componentIds = await getIds();
const results = {};
@@ -77,8 +76,7 @@ export class AspectMain {
aspectId: string,
config: Record<string, any> = {}
): Promise<ComponentID[]> {
- const components = await this.workspace.byPattern(pattern);
- const componentIds = components.map((comp) => comp.id);
+ const componentIds = await this.workspace.idsByPattern(pattern);
componentIds.forEach((componentId) => {
this.workspace.bitMap.addComponentConfig(componentId, aspectId, config);
});
@@ -88,8 +86,7 @@ export class AspectMain {
}
async unsetAspectsFromComponents(pattern: string, aspectId: string): Promise<ComponentID[]> {
- const components = await this.workspace.byPattern(pattern);
- const componentIds = components.map((comp) => comp.id);
+ const componentIds = await this.workspace.idsByPattern(pattern);
componentIds.forEach((componentId) => {
this.workspace.bitMap.removeComponentConfig(componentId, aspectId, true);
});
diff --git a/scopes/workspace/workspace/envs-subcommands/envs-set.cmd.ts b/scopes/workspace/workspace/envs-subcommands/envs-set.cmd.ts
index 064fb88d286d..38f8216608c6 100644
--- a/scopes/workspace/workspace/envs-subcommands/envs-set.cmd.ts
+++ b/scopes/workspace/workspace/envs-subcommands/envs-set.cmd.ts
@@ -12,9 +12,10 @@ export class EnvsSetCmd implements Command {
async report([pattern, env]: [string, string]) {
const envId = await this.workspace.resolveComponentId(env);
- const components = await this.workspace.byPattern(pattern);
- await this.workspace.setEnvToComponents(envId, components);
+ const componentIds = await this.workspace.idsByPattern(pattern);
+ if (!componentIds.length) return chalk.yellow(`unable to find any matching for ${chalk.bold(pattern)} pattern`);
+ await this.workspace.setEnvToComponents(envId, componentIds);
return `added ${chalk.bold(envId.toString())} env to the following component(s):
-${components.map((comp) => comp.id.toString()).join('\n')}`;
+${componentIds.map((compId) => compId.toString()).join('\n')}`;
}
}
diff --git a/scopes/workspace/workspace/envs-subcommands/envs-unset.cmd.ts b/scopes/workspace/workspace/envs-subcommands/envs-unset.cmd.ts
index 659c0eec6a7e..77da3ef7cc25 100644
--- a/scopes/workspace/workspace/envs-subcommands/envs-unset.cmd.ts
+++ b/scopes/workspace/workspace/envs-subcommands/envs-unset.cmd.ts
@@ -10,8 +10,8 @@ export class EnvsUnsetCmd implements Command {
constructor(private workspace: Workspace) {}
async report([pattern]: [string]) {
- const components = await this.workspace.byPattern(pattern);
- const { changed } = await this.workspace.unsetEnvFromComponents(components);
+ const componentIds = await this.workspace.idsByPattern(pattern);
+ const { changed } = await this.workspace.unsetEnvFromComponents(componentIds);
return `successfully removed env from the following component(s):
${changed.map((id) => id.toString()).join('\n')}`;
}
diff --git a/scopes/workspace/workspace/pattern.cmd.ts b/scopes/workspace/workspace/pattern.cmd.ts
new file mode 100644
index 000000000000..cdaac9064541
--- /dev/null
+++ b/scopes/workspace/workspace/pattern.cmd.ts
@@ -0,0 +1,24 @@
+import { Command, CommandOptions } from '@teambit/cli';
+import chalk from 'chalk';
+import { Workspace } from './workspace';
+
+export class PatternCommand implements Command {
+ name = 'pattern <pattern>';
+ alias = '';
+ description = 'list the component ids matching the given pattern';
+ group = 'development';
+ private = false;
+ options = [['j', 'json', 'return the output as JSON']] as CommandOptions;
+
+ constructor(private workspace: Workspace) {}
+
+ async report([pattern]: [string]) {
+ const ids = await this.workspace.idsByPattern(pattern);
+ const title = chalk.green(`found ${chalk.bold(ids.length.toString())} components matching the pattern`);
+ return `${title}\n${ids.join('\n')}`;
+ }
+
+ async json([pattern]: [string]) {
+ return this.workspace.idsByPattern(pattern);
+ }
+}
diff --git a/scopes/workspace/workspace/workspace.provider.ts b/scopes/workspace/workspace/workspace.provider.ts
index b9310fa3bc4c..3bd700b85534 100644
--- a/scopes/workspace/workspace/workspace.provider.ts
+++ b/scopes/workspace/workspace/workspace.provider.ts
@@ -36,6 +36,7 @@ import { Tag } from './tag-cmd';
import { CapsuleCmd, CapsuleCreateCmd, CapsuleDeleteCmd, CapsuleListCmd } from './capsule.cmd';
import { EnvsSetCmd } from './envs-subcommands/envs-set.cmd';
import { EnvsUnsetCmd } from './envs-subcommands/envs-unset.cmd';
+import { PatternCommand } from './pattern.cmd';
export type WorkspaceDeps = [
PubsubMain,
@@ -208,6 +209,7 @@ export default async function provideWorkspace(
commands.push(new LinkCommand(workspace, logger));
}
commands.push(new Tag());
+ commands.push(new PatternCommand(workspace));
cli.register(...commands);
component.registerHost(workspace);
diff --git a/scopes/workspace/workspace/workspace.ts b/scopes/workspace/workspace/workspace.ts
index fa8be5ae02f8..b81f452ec645 100644
--- a/scopes/workspace/workspace/workspace.ts
+++ b/scopes/workspace/workspace/workspace.ts
@@ -2,6 +2,7 @@
import chalk from 'chalk';
import memoize from 'memoizee';
import mapSeries from 'p-map-series';
+import multimatch from 'multimatch';
import type { PubsubMain } from '@teambit/pubsub';
import { IssuesList } from '@teambit/component-issues';
import type { AspectLoaderMain, AspectDefinition } from '@teambit/aspect-loader';
@@ -721,6 +722,18 @@ export class Workspace implements ComponentFactory {
return components;
}
+ /**
+ * get component-ids matching the given pattern. a pattern can have multiple patterns separated by a comma.
+ * it supports negate (!) character to exclude ids.
+ */
+ async idsByPattern(pattern: string): Promise<ComponentID[]> {
+ const ids = await this.listIds();
+ const patterns = pattern.split(',').map((p) => p.trim());
+ // check also as legacyId.toString, as it doesn't have the defaultScope
+ const idsToCheck = (id: ComponentID) => [id.toStringWithoutVersion(), id._legacy.toStringWithoutVersion()];
+ return ids.filter((id) => multimatch(idsToCheck(id), patterns).length);
+ }
+
/**
* useful for workspace commands, such as `bit build`, `bit compile`.
* by default, it should be running on new and modified components.
@@ -1943,13 +1956,13 @@ your workspace.jsonc has this component-id set. you might want to remove/change
* configure an environment to the given components in the .bitmap file, this configuration overrides other, such as
* overrides in workspace.jsonc.
*/
- async setEnvToComponents(envId: ComponentID, components: Component[]) {
+ async setEnvToComponents(envId: ComponentID, componentIds: ComponentID[]) {
const envIdStr = envId.toString();
const existsOnWorkspace = await this.hasId(envId);
const envIdStrNoVersion = envId.toStringWithoutVersion();
- components.forEach((component) => {
- this.bitMap.addComponentConfig(component.id, existsOnWorkspace ? envIdStrNoVersion : envIdStr);
- this.bitMap.addComponentConfig(component.id, EnvsAspect.id, { env: envIdStrNoVersion });
+ componentIds.forEach((componentId) => {
+ this.bitMap.addComponentConfig(componentId, existsOnWorkspace ? envIdStrNoVersion : envIdStr);
+ this.bitMap.addComponentConfig(componentId, EnvsAspect.id, { env: envIdStrNoVersion });
});
await this.bitMap.write();
}
@@ -1957,20 +1970,20 @@ your workspace.jsonc has this component-id set. you might want to remove/change
/**
* remove env configuration from the .bitmap file, so then other configuration, such as "variants" will take place
*/
- async unsetEnvFromComponents(components: Component[]): Promise<{ changed: ComponentID[]; unchanged: ComponentID[] }> {
+ async unsetEnvFromComponents(ids: ComponentID[]): Promise<{ changed: ComponentID[]; unchanged: ComponentID[] }> {
const changed: ComponentID[] = [];
const unchanged: ComponentID[] = [];
- components.forEach((comp) => {
- const bitMapEntry = this.bitMap.getBitmapEntry(comp.id);
+ ids.forEach((id) => {
+ const bitMapEntry = this.bitMap.getBitmapEntry(id);
const envsAspect = bitMapEntry.config?.[EnvsAspect.id];
const currentEnv = envsAspect && envsAspect !== REMOVE_EXTENSION_SPECIAL_SIGN ? envsAspect.env : null;
if (!currentEnv) {
- unchanged.push(comp.id);
+ unchanged.push(id);
return;
}
- this.bitMap.removeComponentConfig(comp.id, currentEnv, false);
- this.bitMap.removeComponentConfig(comp.id, EnvsAspect.id, false);
- changed.push(comp.id);
+ this.bitMap.removeComponentConfig(id, currentEnv, false);
+ this.bitMap.removeComponentConfig(id, EnvsAspect.id, false);
+ changed.push(id);
});
await this.bitMap.write();
return { changed, unchanged };
diff --git a/workspace.jsonc b/workspace.jsonc
index cf27063c7da8..347fbb860740 100644
--- a/workspace.jsonc
+++ b/workspace.jsonc
@@ -274,6 +274,7 @@
"mini-css-extract-plugin": "2.2.2",
"minimatch": "3.0.4",
"mousetrap": "1.6.5",
+ "multimatch": "5.0.0",
"nanoid": "3.1.20",
"nerf-dart": "1.0.0",
"p-limit": "3.1.0",
@@ -835,4 +836,4 @@
}
}
}
-}
\ No newline at end of file
+}
|
angular
|
https://github.com/angular/angular
|
6e8bc310f0899c46d8a065ac2743c85272d2b24d
|
Eli Sadoff
|
2018-01-30 01:04:46
|
docs: change ”it's" to "its" as needed in several docs. (#21867)
|
Most of them are in content but one is in common and needs special approval.
PR Close #21867
|
docs: change ”it's" to "its" as needed in several docs. (#21867)
Most of them are in content but one is in common and needs special approval.
PR Close #21867
|
diff --git a/aio/content/guide/ngmodule-faq.md b/aio/content/guide/ngmodule-faq.md
index 651b8875fa965..8c8ea9e806ca5 100644
--- a/aio/content/guide/ngmodule-faq.md
+++ b/aio/content/guide/ngmodule-faq.md
@@ -165,7 +165,7 @@ Such [entry components](guide/ngmodule-faq#q-entry-component-defined) can never
While there's no harm in exporting them, there's also no benefit.
* Pure service modules that don't have public (exported) declarations.
For example, there's no point in re-exporting `HttpClientModule` because it doesn't export anything.
-It's only purpose is to add http service providers to the application as a whole.
+Its only purpose is to add http service providers to the application as a whole.
<hr/>
@@ -190,7 +190,7 @@ An NgModule can export a combination of its own declarations, selected imported
Don't bother re-exporting pure service modules.
Pure service modules don't export [declarable](guide/bootstrapping#the-declarations-array) classes that another NgModule could use.
For example, there's no point in re-exporting `HttpClientModule` because it doesn't export anything.
-It's only purpose is to add http service providers to the application as a whole.
+Its only purpose is to add http service providers to the application as a whole.
<hr/>
diff --git a/aio/content/guide/structural-directives.md b/aio/content/guide/structural-directives.md
index 754bf37158adc..cc186ac568a72 100644
--- a/aio/content/guide/structural-directives.md
+++ b/aio/content/guide/structural-directives.md
@@ -297,7 +297,7 @@ These properties include `index` and `odd` and a special property named `$implic
Angular sets them to the current value of the context's `index` and `odd` properties.
* The context property for `let-hero` wasn't specified.
-It's intended source is implicit.
+Its intended source is implicit.
Angular sets `let-hero` to the value of the context's `$implicit` property
which `NgFor` has initialized with the hero for the current iteration.
diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index 6a1b6c7688759..ed9fecfaefa67 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -588,7 +588,7 @@ and a controller:
You can *upgrade* this component to Angular using the `UpgradeComponent` class.
By creating a new Angular **directive** that extends `UpgradeComponent` and doing a `super` call
-inside it's constructor, you have a fully upgraded AngularJS component to be used inside Angular.
+inside its constructor, you have a fully upgraded AngularJS component to be used inside Angular.
All that is left is to add it to `AppModule`'s `declarations` array.
<code-example path="upgrade-module/src/app/upgrade-static/hero-detail.component.ts" region="hero-detail-upgrade" title="hero-detail.component.ts">
@@ -602,7 +602,7 @@ All that is left is to add it to `AppModule`'s `declarations` array.
Upgraded components are Angular **directives**, instead of **components**, because Angular
is unaware that AngularJS will create elements under it. As far as Angular knows, the upgraded
component is just a directive - a tag - and Angular doesn't have to concern itself with
-it's children.
+its children.
</div>
@@ -784,7 +784,7 @@ compilation can pick it up.
<code-example path="upgrade-module/src/app/ajs-to-a-providers/app.module.ts" region="register" title="app.module.ts">
</code-example>
-You can then inject it in Angular using it's class as a type annotation:
+You can then inject it in Angular using its class as a type annotation:
<code-example path="upgrade-module/src/app/ajs-to-a-providers/hero-detail.component.ts" title="hero-detail.component.ts">
@@ -1260,7 +1260,7 @@ app. Switch to the [ngUpgrade bootstrap](#bootstrapping-hybrid-applications) met
instead.
First, remove the `ng-app` attribute from `index.html`.
-Then import `UpgradeModule` in the `AppModule`, and override it's `ngDoBootstrap` method:
+Then import `UpgradeModule` in the `AppModule`, and override its `ngDoBootstrap` method:
<code-example path="upgrade-phonecat-2-hybrid/app/app.module.ts" region="upgrademodule" title="app/app.module.ts">
</code-example>
@@ -1619,7 +1619,7 @@ instead of the default "push state" strategy.
Now update the `AppModule` to import this `AppRoutingModule` and also the
declare the root `AppComponent` as the bootstrap component.
That tells Angular that it should bootstrap the app with the _root_ `AppComponent` and
-insert it's view into the host web page.
+insert its view into the host web page.
You must also remove the bootstrap of the AngularJS module from `ngDoBootstrap()` in `app.module.ts`
and the `UpgradeModule` import.
@@ -1695,7 +1695,7 @@ module configuration files and not needed in Angular:
The external typings for AngularJS may be uninstalled as well. The only ones
you still need are for Jasmine and Angular polyfills.
-The `@angular/upgrade` package and it's mapping in `systemjs.config.js` can also go.
+The `@angular/upgrade` package and its mapping in `systemjs.config.js` can also go.
<code-example format="">
npm uninstall @angular/upgrade --save
diff --git a/packages/common/src/directives/ng_template_outlet.ts b/packages/common/src/directives/ng_template_outlet.ts
index 860d8dce042be..f653503b62ac9 100644
--- a/packages/common/src/directives/ng_template_outlet.ts
+++ b/packages/common/src/directives/ng_template_outlet.ts
@@ -24,7 +24,7 @@ import {Directive, EmbeddedViewRef, Input, OnChanges, SimpleChange, SimpleChange
* `[ngTemplateOutletContext]` should be an object, the object's keys will be available for binding
* by the local template `let` declarations.
*
- * Note: using the key `$implicit` in the context object will set it's value as default.
+ * Note: using the key `$implicit` in the context object will set its value as default.
*
* ## Example
*
|
OpenTTD
|
https://github.com/OpenTTD/OpenTTD
|
e760c9fbec7ab4f0637662bd299369de6dee3db2
|
Didac Perez Parera
|
2021-04-02 13:45:26
|
Fix: adjust object and rail station selection window padding to be consistent (#8929)
|
consistent
|
Fix: adjust object and rail station selection window padding to be consistent (#8929)
consistent
|
diff --git a/src/object_gui.cpp b/src/object_gui.cpp
index 69857895e71ef..05e9b0092d242 100644
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -660,24 +660,24 @@ static const NWidgetPart _nested_build_object_widgets[] = {
NWidget(WWT_DEFSIZEBOX, COLOUR_DARK_GREEN),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_DARK_GREEN),
- NWidget(NWID_HORIZONTAL), SetPadding(2, 0, 0, 0),
- NWidget(NWID_VERTICAL),
- NWidget(NWID_HORIZONTAL), SetPadding(0, 5, 2, 5),
+ NWidget(NWID_HORIZONTAL), SetPadding(2, 0, 0, 2),
+ NWidget(NWID_VERTICAL), SetPadding(0, 5, 2, 0), SetPIP(0, 2, 0),
+ NWidget(NWID_HORIZONTAL),
NWidget(WWT_TEXT, COLOUR_DARK_GREEN), SetFill(0, 1), SetDataTip(STR_LIST_FILTER_TITLE, STR_NULL),
NWidget(WWT_EDITBOX, COLOUR_GREY, WID_BO_FILTER), SetFill(1, 0), SetResize(1, 0),
SetDataTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP),
EndContainer(),
- NWidget(NWID_HORIZONTAL), SetPadding(0, 5, 2, 5),
+ NWidget(NWID_HORIZONTAL),
NWidget(WWT_MATRIX, COLOUR_GREY, WID_BO_CLASS_LIST), SetFill(1, 0), SetMatrixDataTip(1, 0, STR_OBJECT_BUILD_CLASS_TOOLTIP), SetScrollbar(WID_BO_SCROLLBAR),
NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_BO_SCROLLBAR),
EndContainer(),
- NWidget(NWID_HORIZONTAL), SetPadding(0, 5, 0, 5),
+ NWidget(NWID_HORIZONTAL),
NWidget(NWID_MATRIX, COLOUR_DARK_GREEN, WID_BO_OBJECT_MATRIX), SetPIP(0, 2, 0),
NWidget(WWT_PANEL, COLOUR_GREY, WID_BO_OBJECT_SPRITE), SetDataTip(0x0, STR_OBJECT_BUILD_PREVIEW_TOOLTIP), EndContainer(),
EndContainer(),
EndContainer(),
- NWidget(WWT_TEXT, COLOUR_DARK_GREEN, WID_BO_OBJECT_NAME), SetDataTip(STR_ORANGE_STRING, STR_NULL), SetPadding(2, 5, 2, 5),
- NWidget(WWT_TEXT, COLOUR_DARK_GREEN, WID_BO_OBJECT_SIZE), SetDataTip(STR_OBJECT_BUILD_SIZE, STR_NULL), SetPadding(2, 5, 2, 5),
+ NWidget(WWT_TEXT, COLOUR_DARK_GREEN, WID_BO_OBJECT_NAME), SetDataTip(STR_ORANGE_STRING, STR_NULL),
+ NWidget(WWT_TEXT, COLOUR_DARK_GREEN, WID_BO_OBJECT_SIZE), SetDataTip(STR_OBJECT_BUILD_SIZE, STR_NULL),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetScrollbar(WID_BO_SELECT_SCROLL),
NWidget(NWID_HORIZONTAL),
@@ -691,7 +691,7 @@ static const NWidgetPart _nested_build_object_widgets[] = {
EndContainer(),
EndContainer(),
NWidget(NWID_HORIZONTAL),
- NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BO_INFO), SetPadding(2, 5, 0, 5), SetFill(1, 0), SetResize(1, 0),
+ NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BO_INFO), SetPadding(0, 5, 0, 1), SetFill(1, 0), SetResize(1, 0),
NWidget(NWID_VERTICAL),
NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(0, 1), EndContainer(),
NWidget(WWT_RESIZEBOX, COLOUR_DARK_GREEN),
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 3c4adf2622d0b..6956d0e046f63 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -1554,23 +1554,23 @@ static const NWidgetPart _nested_station_builder_widgets[] = {
EndContainer(),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_DARK_GREEN),
- NWidget(NWID_HORIZONTAL),
+ NWidget(NWID_HORIZONTAL), SetPadding(2, 0, 0, 2),
NWidget(NWID_VERTICAL),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_BRAS_FILTER_CONTAINER),
- NWidget(NWID_HORIZONTAL), SetPadding(2, 2, 0, 5),
+ NWidget(NWID_HORIZONTAL), SetPadding(0, 5, 2, 0),
NWidget(WWT_TEXT, COLOUR_DARK_GREEN), SetFill(0, 1), SetDataTip(STR_LIST_FILTER_TITLE, STR_NULL),
NWidget(WWT_EDITBOX, COLOUR_GREY, WID_BRAS_FILTER_EDITBOX), SetFill(1, 0), SetResize(1, 0),
SetDataTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP),
EndContainer(),
EndContainer(),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_BRAS_SHOW_NEWST_ADDITIONS),
- NWidget(NWID_HORIZONTAL), SetPIP(7, 0, 7), SetPadding(2, 0, 1, 0),
+ NWidget(NWID_HORIZONTAL), SetPadding(0, 5, 2, 0),
NWidget(WWT_MATRIX, COLOUR_GREY, WID_BRAS_NEWST_LIST), SetMinimalSize(122, 71), SetFill(1, 0),
SetMatrixDataTip(1, 0, STR_STATION_BUILD_STATION_CLASS_TOOLTIP), SetScrollbar(WID_BRAS_NEWST_SCROLL),
NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_BRAS_NEWST_SCROLL),
EndContainer(),
EndContainer(),
- NWidget(WWT_LABEL, COLOUR_DARK_GREEN), SetMinimalSize(144, 11), SetDataTip(STR_STATION_BUILD_ORIENTATION, STR_NULL), SetPadding(1, 2, 0, 2),
+ NWidget(WWT_LABEL, COLOUR_DARK_GREEN), SetMinimalSize(144, 11), SetDataTip(STR_STATION_BUILD_ORIENTATION, STR_NULL), SetPadding(1, 2, 0, 0),
NWidget(NWID_HORIZONTAL),
NWidget(NWID_SPACER), SetMinimalSize(7, 0), SetFill(1, 0),
NWidget(WWT_PANEL, COLOUR_GREY, WID_BRAS_PLATFORM_DIR_X), SetMinimalSize(66, 60), SetFill(0, 0), SetDataTip(0x0, STR_STATION_BUILD_RAILROAD_ORIENTATION_TOOLTIP), EndContainer(),
@@ -1609,7 +1609,7 @@ static const NWidgetPart _nested_station_builder_widgets[] = {
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BRAS_PLATFORM_DRAG_N_DROP), SetMinimalSize(75, 12), SetDataTip(STR_STATION_BUILD_DRAG_DROP, STR_STATION_BUILD_DRAG_DROP_TOOLTIP),
NWidget(NWID_SPACER), SetMinimalSize(2, 0), SetFill(1, 0),
EndContainer(),
- NWidget(WWT_LABEL, COLOUR_DARK_GREEN), SetMinimalSize(144, 11), SetDataTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE, STR_NULL), SetPadding(3, 2, 0, 2),
+ NWidget(WWT_LABEL, COLOUR_DARK_GREEN), SetMinimalSize(144, 11), SetDataTip(STR_STATION_BUILD_COVERAGE_AREA_TITLE, STR_NULL), SetPadding(3, 2, 0, 0),
NWidget(NWID_HORIZONTAL),
NWidget(NWID_SPACER), SetMinimalSize(2, 0), SetFill(1, 0),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_BRAS_HIGHLIGHT_OFF), SetMinimalSize(60, 12),
@@ -1623,7 +1623,7 @@ static const NWidgetPart _nested_station_builder_widgets[] = {
/* We need an additional background for the matrix, as the matrix cannot handle the scrollbar due to not being an NWidgetCore. */
NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetScrollbar(WID_BRAS_MATRIX_SCROLL),
NWidget(NWID_HORIZONTAL),
- NWidget(NWID_MATRIX, COLOUR_DARK_GREEN, WID_BRAS_MATRIX), SetScrollbar(WID_BRAS_MATRIX_SCROLL), SetPIP(0, 2, 0), SetPadding(2, 0, 0, 0),
+ NWidget(NWID_MATRIX, COLOUR_DARK_GREEN, WID_BRAS_MATRIX), SetScrollbar(WID_BRAS_MATRIX_SCROLL), SetPIP(0, 2, 0),
NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_BRAS_IMAGE), SetMinimalSize(66, 60),
SetFill(0, 0), SetResize(0, 0), SetDataTip(0x0, STR_STATION_BUILD_STATION_TYPE_TOOLTIP), SetScrollbar(WID_BRAS_MATRIX_SCROLL),
EndContainer(),
@@ -1634,7 +1634,7 @@ static const NWidgetPart _nested_station_builder_widgets[] = {
EndContainer(),
EndContainer(),
NWidget(NWID_HORIZONTAL),
- NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BRAS_COVERAGE_TEXTS), SetFill(1, 1), SetResize(1, 0),
+ NWidget(WWT_EMPTY, INVALID_COLOUR, WID_BRAS_COVERAGE_TEXTS), SetPadding(2, 5, 0, 1), SetFill(1, 1), SetResize(1, 0),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_BRAS_SHOW_NEWST_RESIZE),
NWidget(NWID_VERTICAL),
NWidget(WWT_PANEL, COLOUR_DARK_GREEN), SetFill(0, 1), EndContainer(),
|
iroh
|
https://github.com/n0-computer/iroh
|
38bdaef1bc7053bfdafee5a48b99f3b56acb50b5
|
Floris Bruynooghe
|
2024-05-06 18:35:58
|
refactor(iroh-net)!: Make the interfaces module private (#2266)
|
## Description
This is leaking 3rd party types into our public interface, since this
really only exists for our own use it probably shouldn't be public to
start with. So make it private. As a result cleans up some dead
code.
## Breaking Changes
The `iroh_net::net::interfaces` module has been made private.
## Notes & open questions
There is probably more in `iroh_net::net` that needs to be private.
Maybe even the whole module. I'm not sure if doing this stepwise or
in one large chunk is better. This takes the stepwise approach.
## Change checklist
- [x] Self-review.
- [x] Documentation updates if relevant.
- [x] Tests if relevant.
- [x] All breaking changes documented.
|
refactor(iroh-net)!: Make the interfaces module private (#2266)
## Description
This is leaking 3rd party types into our public interface, since this
really only exists for our own use it probably shouldn't be public to
start with. So make it private. As a result cleans up some dead
code.
## Breaking Changes
The `iroh_net::net::interfaces` module has been made private.
## Notes & open questions
There is probably more in `iroh_net::net` that needs to be private.
Maybe even the whole module. I'm not sure if doing this stepwise or
in one large chunk is better. This takes the stepwise approach.
## Change checklist
- [x] Self-review.
- [x] Documentation updates if relevant.
- [x] Tests if relevant.
- [x] All breaking changes documented.
|
diff --git a/iroh-net/src/net.rs b/iroh-net/src/net.rs
index 87747a695e..ce4578ec8d 100644
--- a/iroh-net/src/net.rs
+++ b/iroh-net/src/net.rs
@@ -1,6 +1,6 @@
//! Networking related utilities
-pub mod interfaces;
+pub(crate) mod interfaces;
pub mod ip;
mod ip_family;
pub mod netmon;
diff --git a/iroh-net/src/net/interfaces.rs b/iroh-net/src/net/interfaces.rs
index 10be7a931a..9595774380 100644
--- a/iroh-net/src/net/interfaces.rs
+++ b/iroh-net/src/net/interfaces.rs
@@ -16,9 +16,9 @@ mod linux;
#[cfg(target_os = "windows")]
mod windows;
-pub use netdev::ip::{Ipv4Net, Ipv6Net};
+pub(crate) use netdev::ip::{Ipv4Net, Ipv6Net};
-use crate::net::ip::{is_loopback, is_private_v6, is_up};
+use crate::net::ip::{is_private_v6, is_up};
#[cfg(any(
target_os = "freebsd",
@@ -35,7 +35,7 @@ use self::windows::default_route;
/// Represents a network interface.
#[derive(Debug)]
-pub struct Interface {
+pub(crate) struct Interface {
iface: netdev::interface::Interface,
}
@@ -62,23 +62,18 @@ impl PartialEq for Interface {
impl Eq for Interface {}
impl Interface {
- /// Does this represent the loopback interface?
- pub fn is_loopback(&self) -> bool {
- is_loopback(&self.iface)
- }
-
/// Is this interface up?
- pub fn is_up(&self) -> bool {
+ pub(crate) fn is_up(&self) -> bool {
is_up(&self.iface)
}
/// The name of the interface.
- pub fn name(&self) -> &str {
+ pub(crate) fn name(&self) -> &str {
&self.iface.name
}
/// A list of all ip addresses of this interface.
- pub fn addrs(&self) -> impl Iterator<Item = IpNet> + '_ {
+ pub(crate) fn addrs(&self) -> impl Iterator<Item = IpNet> + '_ {
self.iface
.ipv4
.iter()
@@ -133,7 +128,7 @@ impl Interface {
/// Structure of an IP network, either IPv4 or IPv6.
#[derive(Clone, Debug)]
-pub enum IpNet {
+pub(crate) enum IpNet {
/// Structure of IPv4 Network.
V4(Ipv4Net),
/// Structure of IPv6 Network.
@@ -168,33 +163,33 @@ impl IpNet {
/// Intended to store the state of the machine's network interfaces, routing table, and
/// other network configuration. For now it's pretty basic.
#[derive(Debug, PartialEq, Eq)]
-pub struct State {
+pub(crate) struct State {
/// Maps from an interface name interface.
- pub interfaces: HashMap<String, Interface>,
+ pub(crate) interfaces: HashMap<String, Interface>,
/// Whether this machine has an IPv6 Global or Unique Local Address
/// which might provide connectivity.
- pub have_v6: bool,
+ pub(crate) have_v6: bool,
/// Whether the machine has some non-localhost, non-link-local IPv4 address.
- pub have_v4: bool,
+ pub(crate) have_v4: bool,
//// Whether the current network interface is considered "expensive", which currently means LTE/etc
/// instead of Wifi. This field is not populated by `get_state`.
- pub is_expensive: bool,
+ pub(crate) is_expensive: bool,
/// The interface name for the machine's default route.
///
/// It is not yet populated on all OSes.
///
/// When set, its value is the map key into `interface` and `interface_ips`.
- pub default_route_interface: Option<String>,
+ pub(crate) default_route_interface: Option<String>,
/// The HTTP proxy to use, if any.
- pub http_proxy: Option<String>,
+ pub(crate) http_proxy: Option<String>,
/// The URL to the Proxy Autoconfig URL, if applicable.
- pub pac: Option<String>,
+ pub(crate) pac: Option<String>,
}
impl fmt::Display for State {
@@ -283,38 +278,6 @@ impl State {
pac: None,
}
}
-
- /// Is a PAC set?
- pub fn has_pac(&self) -> bool {
- self.pac.is_some()
- }
-
- /// Reports whether any interface has the provided IP address.
- pub fn has_ip(&self, ip: &IpAddr) -> bool {
- for pv in self.interfaces.values() {
- for p in pv.addrs() {
- match (p, ip) {
- (IpNet::V4(a), IpAddr::V4(b)) => {
- if &a.addr == b {
- return true;
- }
- }
- (IpNet::V6(a), IpAddr::V6(b)) => {
- if &a.addr == b {
- return true;
- }
- }
- _ => {}
- }
- }
- }
- false
- }
-
- /// Reports whether any interface seems like it has internet access.
- pub fn any_interface_up(&self) -> bool {
- self.have_v4 || self.have_v6
- }
}
/// Reports whether ip is a usable IPv4 address which should have Internet connectivity.
@@ -386,7 +349,7 @@ pub async fn default_route_interface() -> Option<String> {
/// Likely IPs of the residentla router, and the ip address of the current
/// machine using it.
#[derive(Debug, Clone)]
-pub struct HomeRouter {
+pub(crate) struct HomeRouter {
/// Ip of the router.
pub gateway: IpAddr,
/// Our local Ip if known.
@@ -399,7 +362,7 @@ impl HomeRouter {
/// In addition, it returns the IP address of the current machine on
/// the LAN using that gateway.
/// This is used as the destination for UPnP, NAT-PMP, PCP, etc queries.
- pub fn new() -> Option<Self> {
+ pub(crate) fn new() -> Option<Self> {
let gateway = Self::get_default_gateway()?;
let my_ip = netdev::interface::get_local_ipaddr();
|
metamask-extension
|
https://github.com/MetaMask/metamask-extension
|
ccc5aad513bbe0f32f56fa7331613c7a33852d54
|
Charly Chevalier
|
2024-10-16 22:46:34
|
chore: update @metamask/bitcoin-wallet-snap to 0.7.0 (#27730)
|
## **Description**
Bump the BTC Snap to version 0.7.0.
- This new release uses a new node provider (QuickNode)
[](https://codespaces.new/MetaMask/metamask-extension/pull/26701?quickstart=1)
## **Related issues**
N/A
## **Manual testing steps**
N/A
## **Screenshots/Recordings**
### **Before**
### **After**
## **Pre-merge author checklist**
- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
|
chore: update @metamask/bitcoin-wallet-snap to 0.7.0 (#27730)
## **Description**
Bump the BTC Snap to version 0.7.0.
- This new release uses a new node provider (QuickNode)
[](https://codespaces.new/MetaMask/metamask-extension/pull/26701?quickstart=1)
## **Related issues**
N/A
## **Manual testing steps**
N/A
## **Screenshots/Recordings**
### **Before**
### **After**
## **Pre-merge author checklist**
- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
|
diff --git a/package.json b/package.json
index 9a77bb273995..fe2f43f63c9a 100644
--- a/package.json
+++ b/package.json
@@ -303,7 +303,7 @@
"@metamask/approval-controller": "^7.0.0",
"@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A38.3.0#~/.yarn/patches/@metamask-assets-controllers-npm-38.3.0-57b3d695bb.patch",
"@metamask/base-controller": "^7.0.0",
- "@metamask/bitcoin-wallet-snap": "^0.6.1",
+ "@metamask/bitcoin-wallet-snap": "^0.7.0",
"@metamask/browser-passworder": "^4.3.0",
"@metamask/contract-metadata": "^2.5.0",
"@metamask/controller-utils": "^11.2.0",
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 37a05025382d..41b04a9b5210 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -1,4 +1,5 @@
[
+ "*.btc*.quiknode.pro",
"accounts.api.cx.metamask.io",
"acl.execution.metamask.io",
"api.blockchair.com",
diff --git a/test/e2e/constants.ts b/test/e2e/constants.ts
index 7e92a28cf463..c3957cb6fbbf 100644
--- a/test/e2e/constants.ts
+++ b/test/e2e/constants.ts
@@ -46,3 +46,6 @@ export const DAPP_ONE_URL = 'http://127.0.0.1:8081';
/* Default BTC address created using test SRP */
export const DEFAULT_BTC_ACCOUNT = 'bc1qg6whd6pc0cguh6gpp3ewujm53hv32ta9hdp252';
+
+/* Default (mocked) BTC balance used by the Bitcoin RPC provider */
+export const DEFAULT_BTC_BALANCE = 1; // BTC
diff --git a/test/e2e/flask/btc/btc-account-overview.spec.ts b/test/e2e/flask/btc/btc-account-overview.spec.ts
index 5f0277c191de..24eedb60b6a2 100644
--- a/test/e2e/flask/btc/btc-account-overview.spec.ts
+++ b/test/e2e/flask/btc/btc-account-overview.spec.ts
@@ -1,4 +1,6 @@
+import { strict as assert } from 'assert';
import { Suite } from 'mocha';
+import { DEFAULT_BTC_BALANCE } from '../../constants';
import { withBtcAccountSnap } from './common-btc';
describe('BTC Account - Overview', function (this: Suite) {
@@ -39,4 +41,23 @@ describe('BTC Account - Overview', function (this: Suite) {
},
);
});
+
+ it('has balance', async function () {
+ await withBtcAccountSnap(
+ { title: this.test?.fullTitle() },
+ async (driver) => {
+ // Wait for the balance to load up
+ await driver.delay(2000);
+
+ const balanceElement = await driver.findElement(
+ '.coin-overview__balance',
+ );
+ const balanceText = await balanceElement.getText();
+
+ const [balance, unit] = balanceText.split('\n');
+ assert(Number(balance) === DEFAULT_BTC_BALANCE);
+ assert(unit === 'BTC');
+ },
+ );
+ });
});
diff --git a/test/e2e/flask/btc/common-btc.ts b/test/e2e/flask/btc/common-btc.ts
index a33ab1241a1c..15bf7d49eb0b 100644
--- a/test/e2e/flask/btc/common-btc.ts
+++ b/test/e2e/flask/btc/common-btc.ts
@@ -1,34 +1,36 @@
import { Mockttp } from 'mockttp';
import FixtureBuilder from '../../fixture-builder';
import { withFixtures, unlockWallet } from '../../helpers';
-import { DEFAULT_BTC_ACCOUNT } from '../../constants';
+import { DEFAULT_BTC_ACCOUNT, DEFAULT_BTC_BALANCE } from '../../constants';
import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
import { Driver } from '../../webdriver/driver';
import { createBtcAccount } from '../../accounts/common';
-const GENERATE_MOCK_BTC_BALANCE_CALL = (
- address: string = DEFAULT_BTC_ACCOUNT,
-): { data: { [address: string]: number } } => {
- return {
- data: {
- [address]: 9999,
- },
- };
-};
-
export async function mockBtcBalanceQuote(
mockServer: Mockttp,
address: string = DEFAULT_BTC_ACCOUNT,
) {
return await mockServer
- .forGet(/https:\/\/api\.blockchair\.com\/bitcoin\/addresses\/balances/u)
- .withQuery({
- addresses: address,
+ .forPost(/^https:\/\/.*\.btc.*\.quiknode\.pro(\/|$)/u)
+ .withJsonBodyIncluding({
+ method: 'bb_getaddress',
})
- .thenCallback(() => ({
- statusCode: 200,
- json: GENERATE_MOCK_BTC_BALANCE_CALL(address),
- }));
+ .thenCallback(() => {
+ return {
+ statusCode: 200,
+ json: {
+ result: {
+ address,
+ balance: (DEFAULT_BTC_BALANCE * 1e8).toString(), // Converts from BTC to sats
+ totalReceived: '0',
+ totalSent: '0',
+ unconfirmedBalance: '0',
+ unconfirmedTxs: 0,
+ txs: 0,
+ },
+ },
+ };
+ });
}
export async function mockRampsDynamicFeatureFlag(
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index 1d0783b82624..12d0fb293e15 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -76,6 +76,7 @@ const browserAPIRequestDomains =
*/
const privateHostMatchers = [
// { pattern: RegExp, host: string }
+ { pattern: /^.*\.btc.*\.quiknode.pro$/iu, host: '*.btc*.quiknode.pro' },
];
/**
diff --git a/yarn.lock b/yarn.lock
index 94ecd006df3e..5b2708b2df0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4981,10 +4981,10 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/bitcoin-wallet-snap@npm:^0.6.1":
- version: 0.6.1
- resolution: "@metamask/bitcoin-wallet-snap@npm:0.6.1"
- checksum: 10/9c595e328cd63efe62cdda4194efe44ab3da4a54a89007f485280924aa9e8ee37042bda0a07751f3ce01c2c3e4740b16cd130f07558aa84cd57b20a8d5f1d3a7
+"@metamask/bitcoin-wallet-snap@npm:^0.7.0":
+ version: 0.7.0
+ resolution: "@metamask/bitcoin-wallet-snap@npm:0.7.0"
+ checksum: 10/be4eceef1715c5e6d33d095d5b4aaa974656d945ff0ed0304fdc1244eb8940eb8978f304378367642aa8fd60d6b375eecc2a4653c38ba62ec306c03955c96682
languageName: node
linkType: hard
@@ -26129,7 +26129,7 @@ __metadata:
"@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A38.3.0#~/.yarn/patches/@metamask-assets-controllers-npm-38.3.0-57b3d695bb.patch"
"@metamask/auto-changelog": "npm:^2.1.0"
"@metamask/base-controller": "npm:^7.0.0"
- "@metamask/bitcoin-wallet-snap": "npm:^0.6.1"
+ "@metamask/bitcoin-wallet-snap": "npm:^0.7.0"
"@metamask/browser-passworder": "npm:^4.3.0"
"@metamask/build-utils": "npm:^3.0.0"
"@metamask/contract-metadata": "npm:^2.5.0"
|
fuels-ts
|
https://github.com/FuelLabs/fuels-ts
|
e87b51bb0c7fdd2d30cd165fd2e226de93aae992
|
Dhaiwat
|
2024-08-29 15:23:53
|
feat: add missing connectors to `create fuels` template (#3013)
|
* feat: add missing connectors to `create fuels` template
* sync deps
* Update pnpm-lock.yaml
|
feat: add missing connectors to `create fuels` template (#3013)
* feat: add missing connectors to `create fuels` template
* sync deps
* Update pnpm-lock.yaml
|
diff --git a/.changeset/new-rivers-rescue.md b/.changeset/new-rivers-rescue.md
new file mode 100644
index 00000000000..06a03163274
--- /dev/null
+++ b/.changeset/new-rivers-rescue.md
@@ -0,0 +1,5 @@
+---
+"create-fuels": patch
+---
+
+feat: add missing connectors to `create fuels` template
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 715a5d00785..a014aa374c6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -154,7 +154,7 @@ importers:
version: 0.1.1
tsup:
specifier: ^6.7.0
- version: 6.7.0(@swc/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ version: 6.7.0(@swc/[email protected](@swc/[email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
tsx:
specifier: ^4.17.0
version: 4.17.0
@@ -245,7 +245,7 @@ importers:
version: 8.4.33
tailwindcss:
specifier: ^3.4.10
- version: 3.4.10([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ version: 3.4.10([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))
typescript:
specifier: ~5.4.5
version: 5.4.5
@@ -333,7 +333,7 @@ importers:
version: 18.3.0
eslint-config-react-app:
specifier: ^7.0.1
- version: 7.0.1(@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]))([email protected])
+ version: 7.0.1(@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]))([email protected])
fuels:
specifier: workspace:*
version: link:../../packages/fuels
@@ -345,7 +345,7 @@ importers:
version: 18.3.1([email protected])
react-scripts:
specifier: 5.0.1
- version: 5.0.1(@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))(@swc/[email protected])(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])([email protected])([email protected])
+ version: 5.0.1(@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))(@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])([email protected])([email protected])
typescript:
specifier: ~5.4.5
version: 5.4.5
@@ -466,7 +466,7 @@ importers:
version: 6.0.1([email protected])([email protected])([email protected])([email protected])
tailwindcss:
specifier: ^3.4.10
- version: 3.4.10([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ version: 3.4.10([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))
typescript:
specifier: ~5.4.5
version: 5.4.5
@@ -1255,7 +1255,7 @@ importers:
version: 8.4.24
tailwindcss:
specifier: ^3.4.10
- version: 3.4.10([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ version: 3.4.10([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))
typescript:
specifier: ~5.4.5
version: 5.4.5
@@ -1337,7 +1337,7 @@ importers:
version: 8.4.41
tailwindcss:
specifier: ^3.4.10
- version: 3.4.10([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ version: 3.4.10([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))
typescript:
specifier: ~5.4.5
version: 5.4.5
@@ -19018,7 +19018,7 @@ snapshots:
jest-util: 28.1.3
slash: 3.0.0
- '@jest/[email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])':
+ '@jest/[email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])':
dependencies:
'@jest/console': 27.5.1
'@jest/reporters': 27.5.1
@@ -19032,7 +19032,7 @@ snapshots:
exit: 0.1.2
graceful-fs: 4.2.11
jest-changed-files: 27.5.1
- jest-config: 27.5.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ jest-config: 27.5.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
jest-haste-map: 27.5.1
jest-message-util: 27.5.1
jest-regex-util: 27.5.1
@@ -19855,7 +19855,7 @@ snapshots:
dependencies:
playwright: 1.46.1
- '@pmmmwh/[email protected]([email protected])([email protected])([email protected]([email protected])([email protected])([email protected](@swc/[email protected])([email protected])))([email protected](@swc/[email protected])([email protected]))':
+ '@pmmmwh/[email protected]([email protected])([email protected])([email protected]([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])))([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))':
dependencies:
ansi-html-community: 0.0.8
common-path-prefix: 3.0.0
@@ -19867,10 +19867,10 @@ snapshots:
react-refresh: 0.11.0
schema-utils: 3.3.0
source-map: 0.7.4
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
optionalDependencies:
type-fest: 3.1.0
- webpack-dev-server: 4.15.1([email protected])([email protected])([email protected](@swc/[email protected])([email protected]))
+ webpack-dev-server: 4.15.1([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
'@polka/[email protected]': {}
@@ -21809,6 +21809,17 @@ snapshots:
vite: 5.4.2(@types/[email protected])([email protected])
vue: 3.4.38([email protected])
+ '@vitest/[email protected]([email protected])([email protected])([email protected]([email protected])([email protected]))':
+ dependencies:
+ '@vitest/utils': 1.6.0
+ magic-string: 0.30.5
+ sirv: 2.0.4
+ vitest: 1.6.0(@types/[email protected])(@vitest/[email protected])([email protected]([email protected])([email protected]))([email protected])
+ optionalDependencies:
+ playwright: 1.46.1
+ webdriverio: 8.40.2([email protected])([email protected])
+ optional: true
+
'@vitest/[email protected]([email protected])([email protected])([email protected]([email protected])([email protected]))':
dependencies:
'@vitest/utils': 1.6.0
@@ -23636,14 +23647,14 @@ snapshots:
transitivePeerDependencies:
- supports-color
- [email protected](@babel/[email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected](@babel/[email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
'@babel/core': 7.22.5
find-cache-dir: 3.3.2
loader-utils: 2.0.4
make-dir: 3.1.0
schema-utils: 2.7.1
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected]:
dependencies:
@@ -24727,7 +24738,7 @@ snapshots:
dependencies:
hyphenate-style-name: 1.0.4
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
icss-utils: 5.1.0([email protected])
postcss: 8.4.41
@@ -24737,9 +24748,9 @@ snapshots:
postcss-modules-values: 4.0.0([email protected])
postcss-value-parser: 4.2.0
semver: 7.3.8
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
- [email protected]([email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
cssnano: 5.1.15([email protected])
jest-worker: 27.5.1
@@ -24747,7 +24758,7 @@ snapshots:
schema-utils: 4.2.0
serialize-javascript: 6.0.1
source-map: 0.6.1
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
optionalDependencies:
esbuild: 0.17.19
@@ -25595,7 +25606,7 @@ snapshots:
dependencies:
eslint: 8.57.0
- [email protected](@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]))([email protected]):
+ [email protected](@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]))([email protected]):
dependencies:
'@babel/core': 7.22.5
'@babel/eslint-parser': 7.22.5(@babel/[email protected])([email protected])
@@ -25607,7 +25618,7 @@ snapshots:
eslint: 8.57.0
eslint-plugin-flowtype: 8.0.3(@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))([email protected])
eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
- eslint-plugin-jest: 25.7.0(@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]))([email protected])
+ eslint-plugin-jest: 25.7.0(@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]))([email protected])
eslint-plugin-jsx-a11y: 6.6.1([email protected])
eslint-plugin-react: 7.35.0([email protected])
eslint-plugin-react-hooks: 4.6.0([email protected])
@@ -25732,13 +25743,13 @@ snapshots:
- eslint-import-resolver-webpack
- supports-color
- [email protected](@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]))([email protected]):
+ [email protected](@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]))([email protected]):
dependencies:
'@typescript-eslint/experimental-utils': 5.60.1([email protected])([email protected])
eslint: 8.57.0
optionalDependencies:
'@typescript-eslint/eslint-plugin': 5.59.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
- jest: 27.5.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ jest: 27.5.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
transitivePeerDependencies:
- supports-color
- typescript
@@ -25866,7 +25877,7 @@ snapshots:
[email protected]: {}
- [email protected]([email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
'@types/eslint': 8.40.2
eslint: 8.57.0
@@ -25874,7 +25885,7 @@ snapshots:
micromatch: 4.0.7
normalize-path: 3.0.0
schema-utils: 4.2.0
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected]:
dependencies:
@@ -26234,11 +26245,11 @@ snapshots:
dependencies:
flat-cache: 3.0.4
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
loader-utils: 2.0.4
schema-utils: 3.3.0
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected]: {}
@@ -26358,7 +26369,7 @@ snapshots:
cross-spawn: 7.0.3
signal-exit: 4.1.0
- [email protected]([email protected])([email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
'@babel/code-frame': 7.24.6
'@types/json-schema': 7.0.12
@@ -26374,7 +26385,7 @@ snapshots:
semver: 7.6.3
tapable: 1.1.3
typescript: 5.4.5
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
optionalDependencies:
eslint: 8.57.0
@@ -26862,14 +26873,14 @@ snapshots:
relateurl: 0.2.7
terser: 5.18.2
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
'@types/html-minifier-terser': 6.1.0
html-minifier-terser: 6.1.0
lodash: 4.17.21
pretty-error: 4.0.0
tapable: 2.2.1
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected]:
dependencies:
@@ -27522,16 +27533,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
- [email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]):
dependencies:
- '@jest/core': 27.5.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ '@jest/core': 27.5.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
'@jest/test-result': 27.5.1
'@jest/types': 27.5.1
chalk: 4.1.2
exit: 0.1.2
graceful-fs: 4.2.11
import-local: 3.1.0
- jest-config: 27.5.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ jest-config: 27.5.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
jest-util: 27.5.1
jest-validate: 27.5.1
prompts: 2.4.2
@@ -27543,7 +27554,7 @@ snapshots:
- ts-node
- utf-8-validate
- [email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]):
dependencies:
'@babel/core': 7.24.4
'@jest/test-sequencer': 27.5.1
@@ -27570,7 +27581,7 @@ snapshots:
slash: 3.0.0
strip-json-comments: 3.1.1
optionalDependencies:
- ts-node: 10.9.1(@swc/[email protected])(@types/[email protected])([email protected])
+ ts-node: 10.9.1(@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])
transitivePeerDependencies:
- bufferutil
- canvas
@@ -27930,11 +27941,11 @@ snapshots:
leven: 3.1.0
pretty-format: 29.7.0
- [email protected]([email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])):
+ [email protected]([email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])):
dependencies:
ansi-escapes: 4.3.2
chalk: 4.1.2
- jest: 27.5.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ jest: 27.5.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
jest-regex-util: 28.0.2
jest-watcher: 28.1.3
slash: 4.0.0
@@ -27987,11 +27998,11 @@ snapshots:
merge-stream: 2.0.0
supports-color: 8.1.1
- [email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]):
dependencies:
- '@jest/core': 27.5.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ '@jest/core': 27.5.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
import-local: 3.1.0
- jest-cli: 27.5.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ jest-cli: 27.5.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
transitivePeerDependencies:
- bufferutil
- canvas
@@ -28992,10 +29003,10 @@ snapshots:
[email protected]: {}
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
schema-utils: 4.2.0
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected]: {}
@@ -30009,29 +30020,29 @@ snapshots:
postcss: 8.4.41
postcss-value-parser: 4.2.0
- [email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])):
dependencies:
lilconfig: 2.1.0
yaml: 1.10.2
optionalDependencies:
postcss: 8.4.41
- ts-node: 10.9.1(@swc/[email protected])(@types/[email protected])([email protected])
+ ts-node: 10.9.1(@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])
- [email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])):
dependencies:
lilconfig: 2.1.0
yaml: 2.5.0
optionalDependencies:
postcss: 8.4.41
- ts-node: 10.9.1(@swc/[email protected])(@types/[email protected])([email protected])
+ ts-node: 10.9.1(@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])
- [email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected])):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])):
dependencies:
lilconfig: 2.1.0
yaml: 2.5.0
optionalDependencies:
postcss: 8.4.41
- ts-node: 10.9.1(@swc/[email protected])(@types/[email protected])([email protected])
+ ts-node: 10.9.1(@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])
[email protected]([email protected])([email protected])([email protected])([email protected]):
dependencies:
@@ -30042,13 +30053,13 @@ snapshots:
tsx: 4.17.0
yaml: 2.5.0
- [email protected]([email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
cosmiconfig: 7.1.0
klona: 2.0.6
postcss: 8.4.41
semver: 7.3.8
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected]([email protected]):
dependencies:
@@ -30472,6 +30483,21 @@ snapshots:
[email protected]: {}
+ [email protected]([email protected])([email protected]):
+ dependencies:
+ '@puppeteer/browsers': 1.9.1
+ chromium-bidi: 0.5.8([email protected])
+ cross-fetch: 4.0.0
+ debug: 4.3.4
+ devtools-protocol: 0.0.1232444
+ ws: 8.16.0([email protected])([email protected])
+ transitivePeerDependencies:
+ - bufferutil
+ - encoding
+ - supports-color
+ - utf-8-validate
+ optional: true
+
[email protected]([email protected])([email protected]):
dependencies:
'@puppeteer/browsers': 1.9.1
@@ -30600,7 +30626,7 @@ snapshots:
regenerator-runtime: 0.13.11
whatwg-fetch: 3.6.2
- [email protected]([email protected])([email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
'@babel/code-frame': 7.22.5
address: 1.2.2
@@ -30611,7 +30637,7 @@ snapshots:
escape-string-regexp: 4.0.0
filesize: 8.0.7
find-up: 5.0.0
- fork-ts-checker-webpack-plugin: 6.5.3([email protected])([email protected])([email protected](@swc/[email protected])([email protected]))
+ fork-ts-checker-webpack-plugin: 6.5.3([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
global-modules: 2.0.0
globby: 11.1.0
gzip-size: 6.0.0
@@ -30626,7 +30652,7 @@ snapshots:
shell-quote: 1.8.1
strip-ansi: 6.0.1
text-table: 0.2.0
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
optionalDependencies:
typescript: 5.4.5
transitivePeerDependencies:
@@ -30744,56 +30770,56 @@ snapshots:
optionalDependencies:
'@types/react': 18.3.1
- [email protected](@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))(@swc/[email protected])(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])([email protected])([email protected]):
+ [email protected](@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))(@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])([email protected])([email protected]):
dependencies:
'@babel/core': 7.22.5
- '@pmmmwh/react-refresh-webpack-plugin': 0.5.10([email protected])([email protected])([email protected]([email protected])([email protected])([email protected](@swc/[email protected])([email protected])))([email protected](@swc/[email protected])([email protected]))
+ '@pmmmwh/react-refresh-webpack-plugin': 0.5.10([email protected])([email protected])([email protected]([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])))([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
'@svgr/webpack': 5.5.0
babel-jest: 27.5.1(@babel/[email protected])
- babel-loader: 8.3.0(@babel/[email protected])([email protected](@swc/[email protected])([email protected]))
+ babel-loader: 8.3.0(@babel/[email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
babel-plugin-named-asset-import: 0.3.8(@babel/[email protected])
babel-preset-react-app: 10.0.1
bfj: 7.0.2
browserslist: 4.21.9
camelcase: 6.3.0
case-sensitive-paths-webpack-plugin: 2.4.0
- css-loader: 6.8.1([email protected](@swc/[email protected])([email protected]))
- css-minimizer-webpack-plugin: 3.4.1([email protected])([email protected](@swc/[email protected])([email protected]))
+ css-loader: 6.8.1([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
+ css-minimizer-webpack-plugin: 3.4.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
dotenv: 10.0.0
dotenv-expand: 5.1.0
eslint: 8.57.0
- eslint-config-react-app: 7.0.1(@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]))([email protected])
- eslint-webpack-plugin: 3.2.0([email protected])([email protected](@swc/[email protected])([email protected]))
- file-loader: 6.2.0([email protected](@swc/[email protected])([email protected]))
+ eslint-config-react-app: 7.0.1(@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))([email protected])([email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]))([email protected])
+ eslint-webpack-plugin: 3.2.0([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
+ file-loader: 6.2.0([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
fs-extra: 10.1.0
- html-webpack-plugin: 5.5.3([email protected](@swc/[email protected])([email protected]))
+ html-webpack-plugin: 5.5.3([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
identity-obj-proxy: 3.0.0
- jest: 27.5.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected])
+ jest: 27.5.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected])
jest-resolve: 27.5.1
- jest-watch-typeahead: 1.1.0([email protected]([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]))
- mini-css-extract-plugin: 2.7.6([email protected](@swc/[email protected])([email protected]))
+ jest-watch-typeahead: 1.1.0([email protected]([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]))
+ mini-css-extract-plugin: 2.7.6([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
postcss: 8.4.41
postcss-flexbugs-fixes: 5.0.2([email protected])
- postcss-loader: 6.2.1([email protected])([email protected](@swc/[email protected])([email protected]))
+ postcss-loader: 6.2.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
postcss-normalize: 10.0.1([email protected])([email protected])
postcss-preset-env: 7.8.3([email protected])
prompts: 2.4.2
react: 18.3.1
react-app-polyfill: 3.0.0
- react-dev-utils: 12.0.1([email protected])([email protected])([email protected](@swc/[email protected])([email protected]))
+ react-dev-utils: 12.0.1([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
react-refresh: 0.11.0
resolve: 1.22.2
resolve-url-loader: 4.0.0
- sass-loader: 12.6.0([email protected](@swc/[email protected])([email protected]))
+ sass-loader: 12.6.0([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
semver: 7.3.8
- source-map-loader: 3.0.2([email protected](@swc/[email protected])([email protected]))
- style-loader: 3.3.3([email protected](@swc/[email protected])([email protected]))
- tailwindcss: 3.4.10([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
- terser-webpack-plugin: 5.3.9(@swc/[email protected])([email protected])([email protected](@swc/[email protected])([email protected]))
- webpack: 5.88.0(@swc/[email protected])([email protected])
- webpack-dev-server: 4.15.1([email protected])([email protected])([email protected](@swc/[email protected])([email protected]))
- webpack-manifest-plugin: 4.1.1([email protected](@swc/[email protected])([email protected]))
- workbox-webpack-plugin: 6.6.0(@types/[email protected])([email protected](@swc/[email protected])([email protected]))
+ source-map-loader: 3.0.2([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
+ style-loader: 3.3.3([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
+ tailwindcss: 3.4.10([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))
+ terser-webpack-plugin: 5.3.9(@swc/[email protected](@swc/[email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
+ webpack-dev-server: 4.15.1([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
+ webpack-manifest-plugin: 4.1.1([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
+ workbox-webpack-plugin: 6.6.0(@types/[email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
optionalDependencies:
fsevents: 2.3.3
typescript: 5.4.5
@@ -31273,11 +31299,11 @@ snapshots:
[email protected]: {}
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
klona: 2.0.6
neo-async: 2.6.2
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected]: {}
@@ -31592,12 +31618,12 @@ snapshots:
[email protected]: {}
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
abab: 2.0.6
iconv-lite: 0.6.3
source-map-js: 1.2.0
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected]:
dependencies:
@@ -31910,9 +31936,9 @@ snapshots:
dependencies:
boundary: 2.0.0
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
[email protected](@babel/[email protected])([email protected]):
dependencies:
@@ -32050,7 +32076,7 @@ snapshots:
string-width: 4.2.3
strip-ansi: 6.0.1
- [email protected]([email protected](@swc/[email protected])(@types/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])):
dependencies:
'@alloc/quick-lru': 5.2.0
arg: 5.0.2
@@ -32069,7 +32095,7 @@ snapshots:
postcss: 8.4.41
postcss-import: 15.1.0([email protected])
postcss-js: 4.0.1([email protected])
- postcss-load-config: 4.0.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ postcss-load-config: 4.0.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))
postcss-nested: 6.0.1([email protected])
postcss-selector-parser: 6.0.13
resolve: 1.22.8
@@ -32077,7 +32103,7 @@ snapshots:
transitivePeerDependencies:
- ts-node
- [email protected]([email protected](@swc/[email protected])(@types/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected])):
dependencies:
'@alloc/quick-lru': 5.2.0
arg: 5.0.2
@@ -32096,7 +32122,7 @@ snapshots:
postcss: 8.4.41
postcss-import: 15.1.0([email protected])
postcss-js: 4.0.1([email protected])
- postcss-load-config: 4.0.1([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ postcss-load-config: 4.0.1([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))
postcss-nested: 6.0.1([email protected])
postcss-selector-parser: 6.0.13
resolve: 1.22.8
@@ -32148,14 +32174,14 @@ snapshots:
ansi-escapes: 4.3.2
supports-hyperlinks: 2.3.0
- [email protected](@swc/[email protected])([email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected](@swc/[email protected](@swc/[email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
'@jridgewell/trace-mapping': 0.3.18
jest-worker: 27.5.1
schema-utils: 3.3.0
serialize-javascript: 6.0.1
terser: 5.18.2
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
optionalDependencies:
'@swc/core': 1.7.14(@swc/[email protected])
esbuild: 0.17.19
@@ -32384,7 +32410,7 @@ snapshots:
[email protected]: {}
- [email protected](@swc/[email protected])(@types/[email protected])([email protected]):
+ [email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]):
dependencies:
'@cspotcode/source-map-support': 0.8.1
'@tsconfig/node10': 1.0.11
@@ -32405,7 +32431,7 @@ snapshots:
'@swc/core': 1.7.14(@swc/[email protected])
optional: true
- [email protected](@swc/[email protected])(@types/[email protected])([email protected]):
+ [email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]):
dependencies:
'@cspotcode/source-map-support': 0.8.1
'@tsconfig/node10': 1.0.11
@@ -32454,7 +32480,7 @@ snapshots:
[email protected]: {}
- [email protected](@swc/[email protected])([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))([email protected]):
+ [email protected](@swc/[email protected](@swc/[email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))([email protected]):
dependencies:
bundle-require: 4.0.1([email protected])
cac: 6.7.14
@@ -32464,7 +32490,7 @@ snapshots:
execa: 5.1.1
globby: 11.1.0
joycon: 3.1.1
- postcss-load-config: 3.1.4([email protected])([email protected](@swc/[email protected])(@types/[email protected])([email protected]))
+ postcss-load-config: 3.1.4([email protected])([email protected](@swc/[email protected](@swc/[email protected]))(@types/[email protected])([email protected]))
resolve-from: 5.0.0
rollup: 3.25.3
source-map: 0.8.0-beta.0
@@ -33092,7 +33118,7 @@ snapshots:
why-is-node-running: 2.2.2
optionalDependencies:
'@types/node': 22.2.0
- '@vitest/browser': 1.6.0([email protected])([email protected])([email protected]([email protected])([email protected]))
+ '@vitest/browser': 1.6.0([email protected])([email protected])([email protected]([email protected])([email protected]))
jsdom: 16.7.0([email protected])([email protected])
transitivePeerDependencies:
- less
@@ -33164,7 +33190,7 @@ snapshots:
why-is-node-running: 2.2.2
optionalDependencies:
'@types/node': 22.5.0
- '@vitest/browser': 1.6.0([email protected])([email protected])([email protected]([email protected])([email protected]))
+ '@vitest/browser': 1.6.0([email protected])([email protected])([email protected]([email protected])([email protected]))
jsdom: 16.7.0([email protected])([email protected])
transitivePeerDependencies:
- less
@@ -33280,6 +33306,25 @@ snapshots:
pvtsutils: 1.3.2
tslib: 2.7.0
+ [email protected]([email protected])([email protected]):
+ dependencies:
+ '@types/node': 20.14.15
+ '@types/ws': 8.5.12
+ '@wdio/config': 8.40.2
+ '@wdio/logger': 8.38.0
+ '@wdio/protocols': 8.38.0
+ '@wdio/types': 8.39.0
+ '@wdio/utils': 8.40.2
+ deepmerge-ts: 5.1.0
+ got: 12.6.1
+ ky: 0.33.3
+ ws: 8.18.0([email protected])([email protected])
+ transitivePeerDependencies:
+ - bufferutil
+ - supports-color
+ - utf-8-validate
+ optional: true
+
[email protected]([email protected])([email protected]):
dependencies:
'@types/node': 20.14.15
@@ -33298,6 +33343,40 @@ snapshots:
- supports-color
- utf-8-validate
+ [email protected]([email protected])([email protected]):
+ dependencies:
+ '@types/node': 20.14.15
+ '@wdio/config': 8.40.2
+ '@wdio/logger': 8.38.0
+ '@wdio/protocols': 8.38.0
+ '@wdio/repl': 8.24.12
+ '@wdio/types': 8.39.0
+ '@wdio/utils': 8.40.2
+ archiver: 7.0.1
+ aria-query: 5.3.0
+ css-shorthand-properties: 1.1.1
+ css-value: 0.0.1
+ devtools-protocol: 0.0.1335233
+ grapheme-splitter: 1.0.4
+ import-meta-resolve: 4.1.0
+ is-plain-obj: 4.1.0
+ jszip: 3.10.1
+ lodash.clonedeep: 4.5.0
+ lodash.zip: 4.2.0
+ minimatch: 9.0.5
+ puppeteer-core: 21.11.0([email protected])([email protected])
+ query-selector-shadow-dom: 1.0.1
+ resq: 1.11.0
+ rgb2hex: 0.2.5
+ serialize-error: 11.0.3
+ webdriver: 8.40.2([email protected])([email protected])
+ transitivePeerDependencies:
+ - bufferutil
+ - encoding
+ - supports-color
+ - utf-8-validate
+ optional: true
+
[email protected]([email protected])([email protected]):
dependencies:
'@types/node': 20.14.15
@@ -33341,16 +33420,16 @@ snapshots:
[email protected]: {}
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
colorette: 2.0.20
memfs: 3.5.3
mime-types: 2.1.35
range-parser: 1.2.1
schema-utils: 4.2.0
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
- [email protected]([email protected])([email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected])([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
'@types/bonjour': 3.5.10
'@types/connect-history-api-fallback': 1.5.0
@@ -33380,20 +33459,20 @@ snapshots:
serve-index: 1.9.1
sockjs: 0.3.24
spdy: 4.0.2
- webpack-dev-middleware: 5.3.3([email protected](@swc/[email protected])([email protected]))
+ webpack-dev-middleware: 5.3.3([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
ws: 8.17.1([email protected])([email protected])
optionalDependencies:
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
transitivePeerDependencies:
- bufferutil
- debug
- supports-color
- utf-8-validate
- [email protected]([email protected](@swc/[email protected])([email protected])):
+ [email protected]([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
tapable: 2.2.1
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
webpack-sources: 2.3.1
[email protected]:
@@ -33410,7 +33489,7 @@ snapshots:
[email protected]: {}
- [email protected](@swc/[email protected])([email protected]):
+ [email protected](@swc/[email protected](@swc/[email protected]))([email protected]):
dependencies:
'@types/eslint-scope': 3.7.4
'@types/estree': 1.0.1
@@ -33433,7 +33512,7 @@ snapshots:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
- terser-webpack-plugin: 5.3.9(@swc/[email protected])([email protected])([email protected](@swc/[email protected])([email protected]))
+ terser-webpack-plugin: 5.3.9(@swc/[email protected](@swc/[email protected]))([email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected]))
watchpack: 2.4.0
webpack-sources: 3.2.3
transitivePeerDependencies:
@@ -33648,12 +33727,12 @@ snapshots:
[email protected]: {}
- [email protected](@types/[email protected])([email protected](@swc/[email protected])([email protected])):
+ [email protected](@types/[email protected])([email protected](@swc/[email protected](@swc/[email protected]))([email protected])):
dependencies:
fast-json-stable-stringify: 2.1.0
pretty-bytes: 5.6.0
upath: 1.2.0
- webpack: 5.88.0(@swc/[email protected])([email protected])
+ webpack: 5.88.0(@swc/[email protected](@swc/[email protected]))([email protected])
webpack-sources: 1.4.3
workbox-build: 6.6.0(@types/[email protected])
transitivePeerDependencies:
@@ -33726,6 +33805,12 @@ snapshots:
utf-8-validate: 6.0.4
optional: true
+ [email protected]([email protected])([email protected]):
+ optionalDependencies:
+ bufferutil: 4.0.8
+ utf-8-validate: 5.0.10
+ optional: true
+
[email protected]([email protected])([email protected]):
optionalDependencies:
bufferutil: 4.0.8
diff --git a/templates/nextjs/src/app/layout.tsx b/templates/nextjs/src/app/layout.tsx
index b562be421d1..6ca8ec5891d 100644
--- a/templates/nextjs/src/app/layout.tsx
+++ b/templates/nextjs/src/app/layout.tsx
@@ -13,6 +13,7 @@ import {
FuelWalletDevelopmentConnector,
FueletWalletConnector,
WalletConnectConnector,
+ SolanaConnector,
} from "@fuels/connectors";
import { NODE_URL } from "@/lib";
import { ActiveWalletProvider } from "@/hooks/useActiveWallet";
@@ -70,6 +71,9 @@ export default function RootLayout({ children }: RootLayoutProps) {
new BakoSafeConnector(),
new FueletWalletConnector(),
new FuelWalletDevelopmentConnector(),
+ new SolanaConnector({
+ fuelProvider: providerToUse,
+ }),
],
}}
>
diff --git a/templates/vite/src/routes/__root.tsx b/templates/vite/src/routes/__root.tsx
index da59c371212..b082d9da735 100644
--- a/templates/vite/src/routes/__root.tsx
+++ b/templates/vite/src/routes/__root.tsx
@@ -13,6 +13,7 @@ import {
FuelWalletDevelopmentConnector,
FueletWalletConnector,
WalletConnectConnector,
+ SolanaConnector,
} from "@fuels/connectors";
import { ActiveWalletProvider } from "../hooks/useActiveWallet";
@@ -60,6 +61,9 @@ export const Route = createRootRoute({
new BakoSafeConnector(),
new FueletWalletConnector(),
new FuelWalletDevelopmentConnector(),
+ new SolanaConnector({
+ fuelProvider: providerToUse,
+ }),
],
}}
>
|
core
|
https://github.com/vuejs/core
|
5849f42ae141a7524cc125247bd0c7be05ccb7c6
|
dependabot-preview[bot]
|
2019-09-17 12:52:08
|
build(deps-dev): bump rollup from 1.21.3 to 1.21.4
|
Bumps [rollup](https://github.com/rollup/rollup) from 1.21.3 to 1.21.4.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v1.21.3...v1.21.4)
|
build(deps-dev): bump rollup from 1.21.3 to 1.21.4
Bumps [rollup](https://github.com/rollup/rollup) from 1.21.3 to 1.21.4.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v1.21.3...v1.21.4)
Signed-off-by: dependabot-preview[bot] <[email protected]>
|
diff --git a/yarn.lock b/yarn.lock
index 4964a8fcf8b..94f38888f4e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6185,9 +6185,9 @@ [email protected], rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
estree-walker "^0.6.1"
rollup@^1.19.4:
- version "1.21.3"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.21.3.tgz#2d957e04b230b06a85b8c617bf594f92c37c4d5d"
- integrity sha512-43CgeUtHhfiqBOUd0uJo5NEOg2FuheF3SqGN8BqgvnqB4xM2TbfPdudeSdllDcMKpagHb//qtpaAADBurT4GzA==
+ version "1.21.4"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.21.4.tgz#00a41a30f90095db890301b226cbe2918e4cf54d"
+ integrity sha512-Pl512XVCmVzgcBz5h/3Li4oTaoDcmpuFZ+kdhS/wLreALz//WuDAMfomD3QEYl84NkDu6Z6wV9twlcREb4qQsw==
dependencies:
"@types/estree" "0.0.39"
"@types/node" "^12.7.5"
|
react-native-firebase
|
https://github.com/invertase/react-native-firebase
|
48c7842124f901aeda991da3122016fd3fb42e03
|
Konstantin
|
2022-02-14 01:14:50
|
feat(auth, android): implement disable app verification feature on android (#6069)
|
* feat(auth, android): add android for disable app verification feature
* chore(auth, lint): fixup unused import
|
feat(auth, android): implement disable app verification feature on android (#6069)
* feat(auth, android): add android for disable app verification feature
* chore(auth, lint): fixup unused import
Co-authored-by: Mike Hardy <[email protected]>
|
diff --git a/packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java b/packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java
index d9e75fdf7a..c88af12ed2 100644
--- a/packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java
+++ b/packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java
@@ -243,6 +243,23 @@ public void setAutoRetrievedSmsCodeForPhoneNumber(
promise.resolve(null);
}
+ /**
+ * Disable app verification for the running of tests
+ * @param appName
+ * @param disabled
+ * @param promise
+ */
+ @ReactMethod
+ public void setAppVerificationDisabledForTesting(
+ String appName, boolean disabled, Promise promise) {
+ Log.d(TAG, "setAppVerificationDisabledForTesting");
+ FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
+ FirebaseAuth firebaseAuth = FirebaseAuth.getInstance(firebaseApp);
+ FirebaseAuthSettings firebaseAuthSettings = firebaseAuth.getFirebaseAuthSettings();
+ firebaseAuthSettings.setAppVerificationDisabledForTesting(disabled);
+ promise.resolve(null);
+ }
+
@ReactMethod
public void signOut(String appName, Promise promise) {
FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
diff --git a/packages/auth/lib/Settings.js b/packages/auth/lib/Settings.js
index 47177fc19a..67616872e3 100644
--- a/packages/auth/lib/Settings.js
+++ b/packages/auth/lib/Settings.js
@@ -15,7 +15,7 @@
*
*/
-import { isAndroid, isIOS } from '@react-native-firebase/app/lib/common';
+import { isAndroid } from '@react-native-firebase/app/lib/common';
export default class Settings {
constructor(auth) {
@@ -28,10 +28,8 @@ export default class Settings {
}
set appVerificationDisabledForTesting(disabled) {
- if (isIOS) {
- this._appVerificationDisabledForTesting = disabled;
- this._auth.native.setAppVerificationDisabledForTesting(disabled);
- }
+ this._appVerificationDisabledForTesting = disabled;
+ this._auth.native.setAppVerificationDisabledForTesting(disabled);
}
setAutoRetrievedSmsCodeForPhoneNumber(phoneNumber, smsCode) {
diff --git a/packages/auth/lib/index.d.ts b/packages/auth/lib/index.d.ts
index e08461cd21..1a7df09981 100644
--- a/packages/auth/lib/index.d.ts
+++ b/packages/auth/lib/index.d.ts
@@ -826,11 +826,10 @@ export namespace FirebaseAuthTypes {
*/
export interface AuthSettings {
/**
- * iOS only flag to disable app verification for the purpose of testing phone authentication. For this property to take effect, it needs to be set before rendering a reCAPTCHA app verifier. When this is disabled, a mock reCAPTCHA is rendered instead. This is useful for manual testing during development or for automated integration tests.
+ * Flag to disable app verification for the purpose of testing phone authentication. For this property to take effect, it needs to be set before rendering a reCAPTCHA app verifier. When this is disabled, a mock reCAPTCHA is rendered instead. This is useful for manual testing during development or for automated integration tests.
*
* > In order to use this feature, you will need to [whitelist your phone number](https://firebase.google.com/docs/auth/web/phone-auth#test-with-whitelisted-phone-numbers) via the Firebase Console.
*
- * @ios
* @param disabled Boolean value representing whether app verification should be disabled for testing.
*/
appVerificationDisabledForTesting: boolean;
|
next.js
|
https://github.com/vercel/next.js
|
5dffc45ab4364ec9a61b4f6acc8fe787e43108b7
|
Donny/강동윤
|
2025-03-17 15:22:51
|
build: Update `swc_core` to `v16.6.0` (#77155)
|
### What?
Applies https://github.com/swc-project/swc/pull/10196
### Why?
|
build: Update `swc_core` to `v16.6.0` (#77155)
### What?
Applies https://github.com/swc-project/swc/pull/10196
### Why?
https://github.com/swc-project/swc/pull/10196 makes minification 3%~4% faster
|
diff --git a/Cargo.lock b/Cargo.lock
index eaaa31932ba61..c535e0c349148 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2962,7 +2962,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
- "socket2 0.5.8",
+ "socket2 0.4.9",
"tokio",
"tower-service",
"tracing",
@@ -6909,9 +6909,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "styled_components"
-version = "0.107.0"
+version = "0.107.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98799a352aadd02069c3620ed154f6fdb4323789a64828cf3db32c23d3b30202"
+checksum = "8ad1b067ffaa5fc0844a0e43a39a9a2d68cc6db20d1adb786f33444057f49ccb"
dependencies = [
"Inflector",
"once_cell",
@@ -6928,9 +6928,9 @@ dependencies = [
[[package]]
name = "styled_jsx"
-version = "0.83.0"
+version = "0.83.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7991fd3e939e5093d5d58fca4f70821f5d4bb384a66c41e53f5c8e41c1e7ec89"
+checksum = "2ede6c96525315b1904d309fd66d69fad412e13efbb2801a98e61e92a25e814b"
dependencies = [
"anyhow",
"lightningcss",
@@ -7203,9 +7203,9 @@ dependencies = [
[[package]]
name = "swc_core"
-version = "16.4.0"
+version = "16.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee84d0cb86de8dae582aab106dbf2ea5e0045232656f2f4c149126f561caf57"
+checksum = "c341fee1c09c34a74f55d033895232d1b8858d860f4d9d10232ce083348a372d"
dependencies = [
"binding_macros",
"swc",
@@ -7506,9 +7506,9 @@ dependencies = [
[[package]]
name = "swc_ecma_compat_es2017"
-version = "11.0.0"
+version = "11.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ce9c93d6a0780fa84eab113083259228557bcd7ce3d27e0479e0d8de143012b"
+checksum = "619d010fc6e5c6067f8397fba8887d6395dda21fe55c6f5346f815f4eb028901"
dependencies = [
"serde",
"swc_atoms",
@@ -7686,9 +7686,9 @@ dependencies = [
[[package]]
name = "swc_ecma_minifier"
-version = "12.0.3"
+version = "12.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab1450f85ca7d1bb35cd913227d31f01a744f25cd22026f735a2128c9fa4c61"
+checksum = "89c92ef9459af28b4c3fad45fc5f82213a26f28bda3242895644c7d53e994fb6"
dependencies = [
"arrayvec 0.7.4",
"indexmap 2.7.1",
@@ -7723,9 +7723,9 @@ dependencies = [
[[package]]
name = "swc_ecma_parser"
-version = "10.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e336f2b460882df2c132328b3c29ab3e680e1db681a05ec3e406940d98320a"
+checksum = "9576fd56e613f83990190778878139ab1a8d5ff0b316318ba34204407a0142a2"
dependencies = [
"either",
"new_debug_unreachable",
@@ -7910,9 +7910,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_module"
-version = "12.0.0"
+version = "12.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2911ff76a54c74eaf29518f15861326595f8f9d98a3086edcad30d3d46bea957"
+checksum = "781eae62860d78d45b1e63d836f89249492db6c136f1893d0c8e0ebdbb7f540a"
dependencies = [
"Inflector",
"anyhow",
@@ -7938,9 +7938,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_optimization"
-version = "11.0.0"
+version = "11.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93e98cb0e4e10a839c553d610082b4b920a430019a0150067ac415e6049f12b2"
+checksum = "d8461bd302613e5144a2685a38bd34dad74eb362d99a343d556a497451603605"
dependencies = [
"dashmap 5.5.3",
"indexmap 2.7.1",
@@ -7963,9 +7963,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_proposal"
-version = "11.0.1"
+version = "11.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3072700bb4401fffed5a152248d0d173a41da94584a4267355fa6772538880b"
+checksum = "fbb38fb5fc6af559ff9ae792c03155655b9d2f214b09d5e899f7c0b76ed1ca98"
dependencies = [
"either",
"rustc-hash 2.1.0",
@@ -8056,9 +8056,9 @@ dependencies = [
[[package]]
name = "swc_ecma_usage_analyzer"
-version = "12.0.0"
+version = "12.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed536f224b5dd9c6c9431c3fca48f572324c485a15d865fa84a22a639e6be59"
+checksum = "384c49a5891a06857543370518bd37e1e27727e3174e439dc662b79333d6a652"
dependencies = [
"indexmap 2.7.1",
"rustc-hash 2.1.0",
@@ -8146,14 +8146,17 @@ dependencies = [
[[package]]
name = "swc_error_reporters"
-version = "9.0.0"
+version = "9.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10ad5f4690758cedc202cf0f4c9d2369372c6692307f65bd40031de494662cfa"
+checksum = "897e83aafbb585409572a46e4dd00c56d25af1268309bfb9613644dd181377a6"
dependencies = [
"anyhow",
"miette",
"once_cell",
"parking_lot",
+ "serde",
+ "serde_derive",
+ "serde_json",
"swc_common",
]
@@ -8338,9 +8341,9 @@ dependencies = [
[[package]]
name = "swc_typescript"
-version = "10.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8facec2d8504b0e38195d60de884056d0d2365ffdc78cd2300ee595fcf9c625d"
+checksum = "5702d7aa5e2ec80b8b207291a032aaeb40769ea1e4a614dd1644590ae040edd3"
dependencies = [
"petgraph",
"rustc-hash 2.1.0",
diff --git a/Cargo.toml b/Cargo.toml
index a93894b7edbb4..70e1245aff477 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -296,7 +296,7 @@ turbopack-trace-utils = { path = "turbopack/crates/turbopack-trace-utils" }
turbopack-wasm = { path = "turbopack/crates/turbopack-wasm" }
# SWC crates
-swc_core = { version = "16.4.0", features = [
+swc_core = { version = "16.6.0", features = [
"ecma_loader_lru",
"ecma_loader_parking_lot",
] }
@@ -307,8 +307,8 @@ browserslist-rs = { version = "0.17.0" }
miette = { version = "5.10.0", features = ["fancy"] }
mdxjs = "0.3"
modularize_imports = { version = "0.79.0" }
-styled_components = { version = "0.107.0" }
-styled_jsx = { version = "0.83.0" }
+styled_components = { version = "0.107.1" }
+styled_jsx = { version = "0.83.1" }
swc_emotion = { version = "0.83.0" }
swc_relay = { version = "0.53.0" }
|
sentry
|
https://github.com/getsentry/sentry
|
c54350d6d7935a3591f3b9a3dc2b63bba83464da
|
Michelle Zhang
|
2024-02-23 23:55:15
|
feat(feedback): add crash report callout (#65712)
|
Adds this blue alert callout for all FE/web BE instructions on this
sidebar.
<img width="462" alt="SCR-20240223-jgxh"
src="https://github.com/getsentry/sentry/assets/56095982/2a0a1165-73d8-4e7a-b2df-b0720c99e976">
|
feat(feedback): add crash report callout (#65712)
Adds this blue alert callout for all FE/web BE instructions on this
sidebar.
<img width="462" alt="SCR-20240223-jgxh"
src="https://github.com/getsentry/sentry/assets/56095982/2a0a1165-73d8-4e7a-b2df-b0720c99e976">
|
diff --git a/static/app/components/replaysOnboarding/utils.tsx b/static/app/components/replaysOnboarding/utils.tsx
index 6f20cc910ce4f4..9107e34eecca20 100644
--- a/static/app/components/replaysOnboarding/utils.tsx
+++ b/static/app/components/replaysOnboarding/utils.tsx
@@ -46,3 +46,14 @@ export const tracePropagationMessage = (
)}
</Alert>
);
+
+export const crashReportCallout = ({link}: {link: string}) => (
+ <Alert type="info" showIcon>
+ {tct(
+ `Interested in receiving feedback only when an error happens? [link:Read the docs] to learn how to set up our crash-report modal.`,
+ {
+ link: <ExternalLink href={link} />,
+ }
+ )}
+ </Alert>
+);
diff --git a/static/app/gettingStartedDocs/capacitor/capacitor.tsx b/static/app/gettingStartedDocs/capacitor/capacitor.tsx
index 8c8317df308ed1..0f2f18a1570251 100644
--- a/static/app/gettingStartedDocs/capacitor/capacitor.tsx
+++ b/static/app/gettingStartedDocs/capacitor/capacitor.tsx
@@ -12,7 +12,10 @@ import {
getUploadSourceMapsStep,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {ProductSolution} from 'sentry/components/onboarding/productSelection';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
export enum SiblingOption {
@@ -449,6 +452,9 @@ const feedbackOnboarding: OnboardingConfig<PlatformOptions> = {
showExtraStep: false,
showDescription: false,
}),
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/capacitor/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/electron/electron.tsx b/static/app/gettingStartedDocs/electron/electron.tsx
index dc703b41b746c4..0f95e37c0d591d 100644
--- a/static/app/gettingStartedDocs/electron/electron.tsx
+++ b/static/app/gettingStartedDocs/electron/electron.tsx
@@ -12,7 +12,10 @@ import {
getReplaySDKSetupSnippet,
getUploadSourceMapsStep,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
type Params = DocsParams;
@@ -282,6 +285,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/electron/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/angular.tsx b/static/app/gettingStartedDocs/javascript/angular.tsx
index 794b17b9a56b59..43d913616ebbe4 100644
--- a/static/app/gettingStartedDocs/javascript/angular.tsx
+++ b/static/app/gettingStartedDocs/javascript/angular.tsx
@@ -13,7 +13,10 @@ import {
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
import {ProductSolution} from 'sentry/components/onboarding/productSelection';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
export enum AngularVersion {
@@ -334,6 +337,9 @@ const feedbackOnboarding: OnboardingConfig<PlatformOptions> = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/angular/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/astro.tsx b/static/app/gettingStartedDocs/javascript/astro.tsx
index 87d00ddc6e61d1..c3b5448c98b02e 100644
--- a/static/app/gettingStartedDocs/javascript/astro.tsx
+++ b/static/app/gettingStartedDocs/javascript/astro.tsx
@@ -14,7 +14,10 @@ import {
getReplaySDKSetupSnippet,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
type Params = DocsParams;
@@ -264,6 +267,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/astro/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/ember.tsx b/static/app/gettingStartedDocs/javascript/ember.tsx
index 1087ee18f3bd60..1a93cb2df351c2 100644
--- a/static/app/gettingStartedDocs/javascript/ember.tsx
+++ b/static/app/gettingStartedDocs/javascript/ember.tsx
@@ -11,7 +11,10 @@ import {
getUploadSourceMapsStep,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
type Params = DocsParams;
@@ -224,6 +227,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/ember/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/gatsby.tsx b/static/app/gettingStartedDocs/javascript/gatsby.tsx
index 26238e7855e3be..f744cc4149d47e 100644
--- a/static/app/gettingStartedDocs/javascript/gatsby.tsx
+++ b/static/app/gettingStartedDocs/javascript/gatsby.tsx
@@ -13,7 +13,10 @@ import {
getUploadSourceMapsStep,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
type Params = DocsParams;
@@ -258,6 +261,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/gatsby/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/javascript.tsx b/static/app/gettingStartedDocs/javascript/javascript.tsx
index d5065d7a473e91..f388e65ce9a555 100644
--- a/static/app/gettingStartedDocs/javascript/javascript.tsx
+++ b/static/app/gettingStartedDocs/javascript/javascript.tsx
@@ -11,7 +11,10 @@ import {
getUploadSourceMapsStep,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import replayOnboardingJsLoader from 'sentry/gettingStartedDocs/javascript/jsLoader/jsLoader';
import {t, tct} from 'sentry/locale';
@@ -225,6 +228,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/nextjs.tsx b/static/app/gettingStartedDocs/javascript/nextjs.tsx
index ee6c94f63da9db..37ae7df4bf41c8 100644
--- a/static/app/gettingStartedDocs/javascript/nextjs.tsx
+++ b/static/app/gettingStartedDocs/javascript/nextjs.tsx
@@ -17,7 +17,10 @@ import {
getReplaySDKSetupSnippet,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import TextCopyInput from 'sentry/components/textCopyInput';
import {t, tct} from 'sentry/locale';
import {space} from 'sentry/styles/space';
@@ -220,6 +223,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/nextjs/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/react.tsx b/static/app/gettingStartedDocs/javascript/react.tsx
index f03f9f6f5c2802..eb8d49844118f3 100644
--- a/static/app/gettingStartedDocs/javascript/react.tsx
+++ b/static/app/gettingStartedDocs/javascript/react.tsx
@@ -11,7 +11,10 @@ import {
getUploadSourceMapsStep,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
type Params = DocsParams;
@@ -250,6 +253,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/react/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/remix.tsx b/static/app/gettingStartedDocs/javascript/remix.tsx
index feb5e64cacaba2..3644ebc20ececc 100644
--- a/static/app/gettingStartedDocs/javascript/remix.tsx
+++ b/static/app/gettingStartedDocs/javascript/remix.tsx
@@ -16,7 +16,10 @@ import {
getReplaySDKSetupSnippet,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
type Params = DocsParams;
@@ -208,6 +211,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/remix/user-feedback/#user-feedback-api',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/svelte.tsx b/static/app/gettingStartedDocs/javascript/svelte.tsx
index da631cd166de19..dc94ad9a12e6c1 100644
--- a/static/app/gettingStartedDocs/javascript/svelte.tsx
+++ b/static/app/gettingStartedDocs/javascript/svelte.tsx
@@ -11,7 +11,10 @@ import {
getUploadSourceMapsStep,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
type Params = DocsParams;
@@ -247,6 +250,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/svelte/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/sveltekit.tsx b/static/app/gettingStartedDocs/javascript/sveltekit.tsx
index 64b3bca9dcc291..954907277da0f3 100644
--- a/static/app/gettingStartedDocs/javascript/sveltekit.tsx
+++ b/static/app/gettingStartedDocs/javascript/sveltekit.tsx
@@ -16,7 +16,10 @@ import {
getReplaySDKSetupSnippet,
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
type Params = DocsParams;
@@ -167,6 +170,9 @@ const feedbackOnboarding: OnboardingConfig = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/sveltekit/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
diff --git a/static/app/gettingStartedDocs/javascript/vue.tsx b/static/app/gettingStartedDocs/javascript/vue.tsx
index 437ccbd31b385c..7d95255945998e 100644
--- a/static/app/gettingStartedDocs/javascript/vue.tsx
+++ b/static/app/gettingStartedDocs/javascript/vue.tsx
@@ -14,7 +14,10 @@ import {
} from 'sentry/components/onboarding/gettingStartedDoc/utils';
import {getJSMetricsOnboarding} from 'sentry/components/onboarding/gettingStartedDoc/utils/metricsOnboarding';
import {ProductSolution} from 'sentry/components/onboarding/productSelection';
-import {tracePropagationMessage} from 'sentry/components/replaysOnboarding/utils';
+import {
+ crashReportCallout,
+ tracePropagationMessage,
+} from 'sentry/components/replaysOnboarding/utils';
import {t, tct} from 'sentry/locale';
export enum VueVersion {
@@ -322,6 +325,9 @@ const feedbackOnboarding: OnboardingConfig<PlatformOptions> = {
],
},
],
+ additionalInfo: crashReportCallout({
+ link: 'https://docs.sentry.io/platforms/javascript/guides/vue/user-feedback/#crash-report-modal',
+ }),
},
],
verify: () => [],
|
kopia
|
https://github.com/kopia/kopia
|
bb979d089cd6c7b40e86a4c41e9918821f476acb
|
Jarek Kowalski
|
2022-02-02 12:33:56
|
fix(providers): fixed rclone connection in KopiaUI (#1712) (#1713)
|
v0.10.3 introduced a regression where RClone connections did not
work in KopiaUI but were ok in the CLI.
The root cause was #1691 which caused storage context to be closed
after opening the repository.
Added test that verifies that storage does not rely on the context
remaining open.
|
fix(providers): fixed rclone connection in KopiaUI (#1712) (#1713)
v0.10.3 introduced a regression where RClone connections did not
work in KopiaUI but were ok in the CLI.
The root cause was #1691 which caused storage context to be closed
after opening the repository.
Added test that verifies that storage does not rely on the context
remaining open.
|
diff --git a/repo/blob/azure/azure_storage_test.go b/repo/blob/azure/azure_storage_test.go
index 63547d1095a..4d7f932ffb5 100644
--- a/repo/blob/azure/azure_storage_test.go
+++ b/repo/blob/azure/azure_storage_test.go
@@ -110,12 +110,16 @@ func TestAzureStorage(t *testing.T) {
ctx := testlogging.Context(t)
- st, err := azure.New(ctx, &azure.Options{
+ // use context that gets canceled after opening storage to ensure it's not used beyond New().
+ newctx, cancel := context.WithCancel(ctx)
+ st, err := azure.New(newctx, &azure.Options{
Container: container,
StorageAccount: storageAccount,
StorageKey: storageKey,
Prefix: fmt.Sprintf("test-%v-%x-", clock.Now().Unix(), data),
})
+
+ cancel()
require.NoError(t, err)
defer st.Close(ctx)
@@ -138,13 +142,18 @@ func TestAzureStorageSASToken(t *testing.T) {
ctx := testlogging.Context(t)
- st, err := azure.New(ctx, &azure.Options{
+ // use context that gets canceled after storage is initialize,
+ // to verify we do not depend on the original context past initialization.
+ newctx, cancel := context.WithCancel(ctx)
+ st, err := azure.New(newctx, &azure.Options{
Container: container,
StorageAccount: storageAccount,
SASToken: sasToken,
Prefix: fmt.Sprintf("sastest-%v-%x-", clock.Now().Unix(), data),
})
+
require.NoError(t, err)
+ cancel()
defer st.Close(ctx)
defer blobtesting.CleanupOldData(ctx, t, st, 0)
diff --git a/repo/blob/b2/b2_storage_test.go b/repo/blob/b2/b2_storage_test.go
index 652f552123a..e78caf99f58 100644
--- a/repo/blob/b2/b2_storage_test.go
+++ b/repo/blob/b2/b2_storage_test.go
@@ -73,7 +73,12 @@ func TestB2Storage(t *testing.T) {
}
ctx := testlogging.Context(t)
- st, err := b2.New(ctx, opt)
+
+ // use context that gets canceled after opening storage to ensure it's not used beyond New().
+ newctx, cancel := context.WithCancel(ctx)
+ st, err := b2.New(newctx, opt)
+
+ cancel()
require.NoError(t, err)
defer st.Close(ctx)
diff --git a/repo/blob/filesystem/filesystem_storage_test.go b/repo/blob/filesystem/filesystem_storage_test.go
index 1a8abfd7a5c..efc3aa31df9 100644
--- a/repo/blob/filesystem/filesystem_storage_test.go
+++ b/repo/blob/filesystem/filesystem_storage_test.go
@@ -1,6 +1,7 @@
package filesystem
import (
+ "context"
"path/filepath"
"reflect"
"sort"
@@ -35,13 +36,17 @@ func TestFileStorage(t *testing.T) {
} {
path := testutil.TempDirectory(t)
- r, err := New(ctx, &Options{
+ newctx, cancel := context.WithCancel(ctx)
+
+ // use context that gets canceled after opening storage to ensure it's not used beyond New().
+ r, err := New(newctx, &Options{
Path: path,
Options: sharded.Options{
DirectoryShards: shardSpec,
},
}, true)
+ cancel()
require.NoError(t, err)
require.NotNil(t, r)
diff --git a/repo/blob/gcs/gcs_storage_test.go b/repo/blob/gcs/gcs_storage_test.go
index 9366be8e10a..696574b26e4 100644
--- a/repo/blob/gcs/gcs_storage_test.go
+++ b/repo/blob/gcs/gcs_storage_test.go
@@ -3,6 +3,7 @@ package gcs_test
import (
"bytes"
"compress/gzip"
+ "context"
"encoding/base64"
"io"
"os"
@@ -38,7 +39,11 @@ func TestGCSStorage(t *testing.T) {
ctx := testlogging.Context(t)
- st, err := gcs.New(ctx, mustGetOptionsOrSkip(t, uuid.NewString()))
+ // use context that gets canceled after opening storage to ensure it's not used beyond New().
+ newctx, cancel := context.WithCancel(ctx)
+ st, err := gcs.New(newctx, mustGetOptionsOrSkip(t, uuid.NewString()))
+
+ cancel()
require.NoError(t, err)
defer st.Close(ctx)
diff --git a/repo/blob/rclone/rclone_storage.go b/repo/blob/rclone/rclone_storage.go
index 936c078036f..18bf132a102 100644
--- a/repo/blob/rclone/rclone_storage.go
+++ b/repo/blob/rclone/rclone_storage.go
@@ -269,7 +269,7 @@ func New(ctx context.Context, opt *Options, isCreate bool) (blob.Storage, error)
arguments = append(arguments, "--config", tmpConfigFile)
}
- r.cmd = exec.CommandContext(ctx, rcloneExe, arguments...) //nolint:gosec
+ r.cmd = exec.Command(rcloneExe, arguments...) //nolint:gosec
r.cmd.Env = append(r.cmd.Env, opt.RCloneEnv...)
startupTimeout := rcloneStartupTimeout
diff --git a/repo/blob/rclone/rclone_storage_test.go b/repo/blob/rclone/rclone_storage_test.go
index 68829859e3c..32eeedd6e60 100644
--- a/repo/blob/rclone/rclone_storage_test.go
+++ b/repo/blob/rclone/rclone_storage_test.go
@@ -1,6 +1,7 @@
package rclone_test
import (
+ "context"
"encoding/base64"
"encoding/json"
"os"
@@ -64,11 +65,16 @@ func TestRCloneStorage(t *testing.T) {
rcloneExe := mustGetRcloneExeOrSkip(t)
dataDir := testutil.TempDirectory(t)
- st, err := rclone.New(ctx, &rclone.Options{
+ // use context that gets canceled after opening storage to ensure it's not used beyond New().
+ newctx, cancel := context.WithCancel(ctx)
+ st, err := rclone.New(newctx, &rclone.Options{
// pass local file as remote path.
RemotePath: dataDir,
RCloneExe: rcloneExe,
}, true)
+
+ cancel()
+
if err != nil {
t.Fatalf("unable to connect to rclone backend: %v", err)
}
diff --git a/repo/blob/s3/s3_storage_test.go b/repo/blob/s3/s3_storage_test.go
index e70f4728dbf..2d45a1e6356 100644
--- a/repo/blob/s3/s3_storage_test.go
+++ b/repo/blob/s3/s3_storage_test.go
@@ -1,6 +1,7 @@
package s3
import (
+ "context"
"crypto/tls"
"encoding/json"
"errors"
@@ -407,6 +408,7 @@ func testStorage(t *testing.T, options *Options, runValidationTest bool, opts bl
require.Equal(t, "", options.Prefix)
st0, err := New(ctx, options)
+
require.NoError(t, err)
defer st0.Close(ctx)
@@ -415,7 +417,11 @@ func testStorage(t *testing.T, options *Options, runValidationTest bool, opts bl
options.Prefix = uuid.NewString()
- st, err := New(ctx, options)
+ // use context that gets canceled after opening storage to ensure it's not used beyond New().
+ newctx, cancel := context.WithCancel(ctx)
+ st, err := New(newctx, options)
+
+ cancel()
require.NoError(t, err)
defer st.Close(ctx)
diff --git a/repo/blob/sftp/sftp_storage_test.go b/repo/blob/sftp/sftp_storage_test.go
index ed120b1bac6..2494a6a8b29 100644
--- a/repo/blob/sftp/sftp_storage_test.go
+++ b/repo/blob/sftp/sftp_storage_test.go
@@ -182,7 +182,9 @@ func TestSFTPStorageValid(t *testing.T) {
t.Run(fmt.Sprintf("Embed=%v", embedCreds), func(t *testing.T) {
ctx := testlogging.Context(t)
- st, err := createSFTPStorage(ctx, t, sftp.Options{
+ // use context that gets canceled after opening storage to ensure it's not used beyond New().
+ newctx, cancel := context.WithCancel(ctx)
+ st, err := createSFTPStorage(newctx, t, sftp.Options{
Path: "/upload",
Host: host,
Username: sftpUsernameWithKeyAuth,
@@ -194,6 +196,8 @@ func TestSFTPStorageValid(t *testing.T) {
t.Fatalf("unable to connect to SSH: %v", err)
}
+ cancel()
+
deleteBlobs(ctx, t, st)
blobtesting.VerifyStorage(ctx, t, st, blob.PutOptions{})
diff --git a/repo/blob/webdav/webdav_storage_test.go b/repo/blob/webdav/webdav_storage_test.go
index 40ef6292f16..120c2ab420f 100644
--- a/repo/blob/webdav/webdav_storage_test.go
+++ b/repo/blob/webdav/webdav_storage_test.go
@@ -2,6 +2,7 @@ package webdav
import (
"bytes"
+ "context"
"fmt"
"io"
"net/http"
@@ -148,7 +149,9 @@ func transformMissingPUTs(next http.Handler) http.HandlerFunc {
func verifyWebDAVStorage(t *testing.T, url, username, password string, shardSpec []int) {
ctx := testlogging.Context(t)
- st, err := New(testlogging.Context(t), &Options{
+ // use context that gets canceled after opening storage to ensure it's not used beyond New().
+ newctx, cancel := context.WithCancel(ctx)
+ st, err := New(newctx, &Options{
URL: url,
Options: sharded.Options{
DirectoryShards: shardSpec,
@@ -157,6 +160,8 @@ func verifyWebDAVStorage(t *testing.T, url, username, password string, shardSpec
Password: password,
}, false)
+ cancel()
+
if st == nil || err != nil {
t.Errorf("unexpected result: %v %v", st, err)
}
|
components
|
https://github.com/angular/components
|
f6d0c017bd587dad1c0fd14828959313d921c1ee
|
Kristiyan Kostadinov
|
2018-03-15 22:09:17
|
chore: add bottom sheet examples (#385)
|
Adds the bottom sheet examples to the navigation and includes the bottom sheet module.
|
chore: add bottom sheet examples (#385)
Adds the bottom sheet examples to the navigation and includes the bottom sheet module.
|
diff --git a/material.angular.io/src/app/shared/documentation-items/documentation-items.ts b/material.angular.io/src/app/shared/documentation-items/documentation-items.ts
index aa8e9eb044a2..c30bb88cc22f 100644
--- a/material.angular.io/src/app/shared/documentation-items/documentation-items.ts
+++ b/material.angular.io/src/app/shared/documentation-items/documentation-items.ts
@@ -154,6 +154,7 @@ const DOCS: {[key: string]: DocCategory[]} = {
id: 'modals',
name: 'Popups & Modals',
items: [
+ {id: 'bottom-sheet', name: 'Bottom Sheet', examples: ['bottom-sheet-overview']},
{id: 'dialog', name: 'Dialog', examples: ['dialog-overview']},
{id: 'snack-bar', name: 'Snackbar', examples: ['snack-bar-component']},
{id: 'tooltip', name: 'Tooltip', examples: ['tooltip-position']},
diff --git a/material.angular.io/src/assets/stackblitz/main.ts b/material.angular.io/src/assets/stackblitz/main.ts
index 5ebdee9b07b0..e93e80af2ae0 100644
--- a/material.angular.io/src/assets/stackblitz/main.ts
+++ b/material.angular.io/src/assets/stackblitz/main.ts
@@ -7,6 +7,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {HttpModule} from '@angular/http';
import {
MatAutocompleteModule,
+ MatBottomSheetModule,
MatButtonModule,
MatButtonToggleModule,
MatCardModule,
@@ -48,6 +49,7 @@ import {MaterialDocsExample} from './app/material-docs-example';
exports: [
CdkTableModule,
MatAutocompleteModule,
+ MatBottomSheetModule,
MatButtonModule,
MatButtonToggleModule,
MatCardModule,
|
vector
|
https://github.com/vectordotdev/vector
|
1220402b6e14977886ea85071ea01eb6c1130fc2
|
Luc Perkins
|
2021-03-11 10:06:06
|
fix(remap): Change description of error code 103 (#6705)
|
* Update error 103 description
|
fix(remap): Change description of error code 103 (#6705)
* Update error 103 description
Signed-off-by: Luc Perkins <[email protected]>
* Small rewording
Signed-off-by: Luc Perkins <[email protected]>
* cargo fmt
Signed-off-by: Luc Perkins <[email protected]>
Co-authored-by: Luc Perkins <[email protected]>
|
diff --git a/docs/reference/remap.cue b/docs/reference/remap.cue
index c1ad649d1aad4..2518f6de5cbd2 100644
--- a/docs/reference/remap.cue
+++ b/docs/reference/remap.cue
@@ -219,7 +219,7 @@ remap: #Remap & {
structured = parse_key_value(.message)
"""
raises: compiletime: """
- error[E103]: unhandled fallible assignment
+ error[E103]: unhandled error
┌─ :1:14
│
1 │ structured = parse_key_value(.message)
diff --git a/docs/reference/remap/errors/103_unhandled_assignment_runtime_error.cue b/docs/reference/remap/errors/103_unhandled_assignment_runtime_error.cue
index e9ec7ec2949a5..578e04a342487 100644
--- a/docs/reference/remap/errors/103_unhandled_assignment_runtime_error.cue
+++ b/docs/reference/remap/errors/103_unhandled_assignment_runtime_error.cue
@@ -1,17 +1,17 @@
package metadata
remap: errors: "103": {
- title: "Unhandled assignment runtime error"
+ title: "Unhandled error"
description: """
- The right-hand side of an [assignment expression](\(urls.vrl_expressions)#\(remap.literals.regular_expression.anchor))
- is fallible and can produce a [runtime error](\(urls.vrl_runtime_errors)), but the error isn't being
+ The right-hand side of this [assignment](\(urls.vrl_expressions)#\(remap.literals.regular_expression.anchor))
+ is fallible (that is, it can produce a [runtime error](\(urls.vrl_runtime_errors))), but the error isn't
[handled](\(urls.vrl_error_handling)).
"""
rationale: remap._fail_safe_blurb
resolution: """
- [Handle](\(urls.vrl_error_handling)) the runtime error by [assigning](\(urls.vrl_error_handling_assigning)),
- [coalescing](\(urls.vrl_error_handling_coalescing)), or [raising](\(urls.vrl_error_handling_raising)) the
- error.
+ [Handle](\(urls.vrl_error_handling)) the runtime error by either
+ [assigning](\(urls.vrl_error_handling_assigning)) it, [coalescing](\(urls.vrl_error_handling_coalescing)) it, or
+ [raising](\(urls.vrl_error_handling_raising)) it.
"""
examples: [...{
diff --git a/lib/vrl/compiler/src/expression/assignment.rs b/lib/vrl/compiler/src/expression/assignment.rs
index 39e009c1028ee..ba61ba69a421f 100644
--- a/lib/vrl/compiler/src/expression/assignment.rs
+++ b/lib/vrl/compiler/src/expression/assignment.rs
@@ -30,10 +30,7 @@ impl Assignment {
// Fallible expressions require infallible assignment.
if type_def.is_fallible() {
return Err(Error {
- variant: ErrorVariant::FallibleAssignment(
- target.to_string(),
- expr.to_string(),
- ),
+ variant: ErrorVariant::UnhandledError(target.to_string(), expr.to_string()),
span,
expr_span,
assignment_span,
@@ -428,8 +425,8 @@ pub enum ErrorVariant {
#[error("unnecessary no-op assignment")]
UnnecessaryNoop(Span),
- #[error("unhandled fallible assignment")]
- FallibleAssignment(String, String),
+ #[error("unhandled error")]
+ UnhandledError(String, String),
#[error("unnecessary error assignment")]
InfallibleAssignment(String, String, Span, Span),
@@ -456,7 +453,7 @@ impl DiagnosticError for Error {
match &self.variant {
UnnecessaryNoop(..) => 640,
- FallibleAssignment(..) => 103,
+ UnhandledError(..) => 103,
InfallibleAssignment(..) => 104,
InvalidTarget(..) => 641,
}
@@ -471,7 +468,7 @@ impl DiagnosticError for Error {
Label::context("either assign to a path or variable here", *target_span),
Label::context("or remove the assignment", self.assignment_span),
],
- FallibleAssignment(target, expr) => vec![
+ UnhandledError(target, expr) => vec![
Label::primary("this expression is fallible", self.expr_span),
Label::context("update the expression to be infallible", self.expr_span),
Label::context(
@@ -496,7 +493,7 @@ impl DiagnosticError for Error {
use ErrorVariant::*;
match &self.variant {
- FallibleAssignment(..) | InfallibleAssignment(..) => vec![Note::SeeErrorDocs],
+ UnhandledError(..) | InfallibleAssignment(..) => vec![Note::SeeErrorDocs],
_ => vec![],
}
}
diff --git a/lib/vrl/tests/tests/diagnostics/unhandled_parse_regex_all_type.vrl b/lib/vrl/tests/tests/diagnostics/unhandled_parse_regex_all_type.vrl
index 50120eefa5fc7..e06f803424f65 100644
--- a/lib/vrl/tests/tests/diagnostics/unhandled_parse_regex_all_type.vrl
+++ b/lib/vrl/tests/tests/diagnostics/unhandled_parse_regex_all_type.vrl
@@ -1,7 +1,7 @@
# object: { "message": "bananas and another ant" }
# result:
#
-# error[E103]: unhandled fallible assignment
+# error[E103]: unhandled error
# ┌─ :3:6
# │
# 3 │ .a = sha3(.result[0].an)
diff --git a/lib/vrl/tests/tests/internal/infallible_ok_maybe_null.vrl b/lib/vrl/tests/tests/internal/infallible_ok_maybe_null.vrl
index 01de3f48b2087..0be2ead9553da 100644
--- a/lib/vrl/tests/tests/internal/infallible_ok_maybe_null.vrl
+++ b/lib/vrl/tests/tests/internal/infallible_ok_maybe_null.vrl
@@ -1,7 +1,7 @@
# object: { "foo": "bar" }
# result:
#
-# error[E103]: unhandled fallible assignment
+# error[E103]: unhandled error
# ┌─ :4:8
# │
# 4 │ .foo = upcase(.foo) # string
|
swagger-ui
|
https://github.com/swagger-api/swagger-ui
|
0a807d6237f59880d34131f66cd4fc542fdaca09
|
Tim Lai
|
2020-10-22 04:16:31
|
fix(auth): support for oauth2 relative url (#6546)
|
* Handle relative urls for oauth authorization
The full URL is computed based on the current selected server
if a relative URL is used as authorizationUrl
or tokenUrl
|
fix(auth): support for oauth2 relative url (#6546)
* Handle relative urls for oauth authorization
The full URL is computed based on the current selected server
if a relative URL is used as authorizationUrl
or tokenUrl
Co-authored-by: Eliot Berriot <[email protected]>
|
diff --git a/src/core/components/auth/oauth2.jsx b/src/core/components/auth/oauth2.jsx
index 5daa2143a4a..aef95ac7662 100644
--- a/src/core/components/auth/oauth2.jsx
+++ b/src/core/components/auth/oauth2.jsx
@@ -11,6 +11,7 @@ export default class Oauth2 extends React.Component {
authSelectors: PropTypes.object.isRequired,
authActions: PropTypes.object.isRequired,
errSelectors: PropTypes.object.isRequired,
+ oas3Selectors: PropTypes.object.isRequired,
specSelectors: PropTypes.object.isRequired,
errActions: PropTypes.object.isRequired,
getConfigs: PropTypes.any
@@ -51,12 +52,19 @@ export default class Oauth2 extends React.Component {
}
authorize =() => {
- let { authActions, errActions, getConfigs, authSelectors } = this.props
+ let { authActions, errActions, getConfigs, authSelectors, oas3Selectors } = this.props
let configs = getConfigs()
let authConfigs = authSelectors.getConfigs()
errActions.clear({authId: name,type: "auth", source: "auth"})
- oauth2Authorize({auth: this.state, authActions, errActions, configs, authConfigs })
+ oauth2Authorize({
+ auth: this.state,
+ currentServer: oas3Selectors.serverEffectiveValue(oas3Selectors.selectedServer()),
+ authActions,
+ errActions,
+ configs,
+ authConfigs
+ })
}
onScopeChange =(e) => {
diff --git a/src/core/oauth2-authorize.js b/src/core/oauth2-authorize.js
index 15f2054f1d6..03d6286428c 100644
--- a/src/core/oauth2-authorize.js
+++ b/src/core/oauth2-authorize.js
@@ -1,8 +1,9 @@
+import parseUrl from "url-parse"
import win from "core/window"
import Im from "immutable"
import { btoa, sanitizeUrl, generateCodeVerifier, createCodeChallenge } from "core/utils"
-export default function authorize ( { auth, authActions, errActions, configs, authConfigs={} } ) {
+export default function authorize ( { auth, authActions, errActions, configs, authConfigs={}, currentServer } ) {
let { schema, scopes, name, clientId } = auth
let flow = schema.get("flow")
let query = []
@@ -95,7 +96,17 @@ export default function authorize ( { auth, authActions, errActions, configs, au
}
const authorizationUrl = schema.get("authorizationUrl")
- const sanitizedAuthorizationUrl = sanitizeUrl(authorizationUrl)
+ let sanitizedAuthorizationUrl
+ if (currentServer) {
+ // OpenAPI 3
+ sanitizedAuthorizationUrl = parseUrl(
+ sanitizeUrl(authorizationUrl),
+ currentServer,
+ true
+ ).toString()
+ } else {
+ sanitizedAuthorizationUrl = sanitizeUrl(authorizationUrl)
+ }
let url = [sanitizedAuthorizationUrl, query.join("&")].join(authorizationUrl.indexOf("?") === -1 ? "?" : "&")
// pass action authorizeOauth2 and authentication data through window
diff --git a/src/core/plugins/auth/actions.js b/src/core/plugins/auth/actions.js
index d3c4e3af945..6c124608e9e 100644
--- a/src/core/plugins/auth/actions.js
+++ b/src/core/plugins/auth/actions.js
@@ -174,8 +174,8 @@ export const authorizeRequest = ( data ) => ( { fn, getConfigs, authActions, err
let parsedUrl
if (specSelectors.isOAS3()) {
- const server = oas3Selectors.selectedServer()
- parsedUrl = parseUrl(url, oas3Selectors.serverEffectiveValue({ server }), true)
+ let finalServerUrl = oas3Selectors.serverEffectiveValue(oas3Selectors.selectedServer())
+ parsedUrl = parseUrl(url, finalServerUrl, true)
} else {
parsedUrl = parseUrl(url, specSelectors.url(), true)
}
diff --git a/test/unit/core/oauth2-authorize.js b/test/unit/core/oauth2-authorize.js
index 2626033a266..ddf2feda937 100644
--- a/test/unit/core/oauth2-authorize.js
+++ b/test/unit/core/oauth2-authorize.js
@@ -41,6 +41,27 @@ describe("oauth2", () => {
windowOpenSpy.mockReset()
})
+ it("should build authorize url relative", function () {
+ const windowOpenSpy = jest.spyOn(win, "open")
+ let relativeMockSchema = {
+ flow: "accessCode",
+ authorizationUrl: "/testAuthorizationUrl"
+ }
+ let relativeAuthConfig = {
+ auth: { schema: { get: (key) => relativeMockSchema[key] } },
+ authActions: {},
+ errActions: {},
+ configs: { oauth2RedirectUrl: "" },
+ authConfigs: {},
+ currentServer: "https://currentserver"
+ }
+ oauth2Authorize(relativeAuthConfig)
+ expect(windowOpenSpy.mock.calls.length).toEqual(1)
+ expect(windowOpenSpy.mock.calls[0][0]).toMatch("https://currentserver/testAuthorizationUrl?response_type=code&redirect_uri=&state=")
+
+ windowOpenSpy.mockReset()
+ })
+
it("should append query parameters to authorizeUrl with query parameters", () => {
const windowOpenSpy = jest.spyOn(win, "open")
mockSchema.authorizationUrl = "https://testAuthorizationUrl?param=1"
|
cilium
|
https://github.com/cilium/cilium
|
5ab773084f20e150a19c43dbc87e417a856eac71
|
Joe Stringer
|
2018-01-25 06:44:29
|
test: Build ginkgo as part of 'make tests'
|
Build the ginkgo tests as part of the regular make command, it doesn't
take long and ensures that we don't end up inadvertently breaking ginkgo
tests when refactoring common code.
|
test: Build ginkgo as part of 'make tests'
Build the ginkgo tests as part of the regular make command, it doesn't
take long and ensures that we don't end up inadvertently breaking ginkgo
tests when refactoring common code.
Signed-off-by: Joe Stringer <[email protected]>
|
diff --git a/Makefile b/Makefile
index c49c84316899d..a96d514c3ec47 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ clean-ginkgo-tests:
tests-common: force
go vet $(GOFILES)
+ make -C test/ build
tests-envoy:
@ $(MAKE) -C envoy tests
diff --git a/test/Makefile b/test/Makefile
index 860e731bef159..a05aefa765645 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,6 +2,17 @@ provision = true
# If you set provision to false the test will run without compile the code
# again.
+all: build
+
+build:
+ # This should print a message if ginkgo is missing, but allow the
+ # bash-based test VM to run CI without needing to add Ginkgo to it.
+ # Once the bash-based tests are migrated, the "|| true" can be removed.
+ # GH #1839
+ ginkgo build || true
+
+test: run k8s
+
run:
ginkgo --focus " Runtime*" -v -- --cilium.provision=$(provision)
|
greptimedb
|
https://github.com/GreptimeTeam/greptimedb
|
4dec06ec8600574112a322dbae0c3851b7fbb75e
|
Lei, HUANG
|
2023-07-04 14:34:27
|
chore: bump version 0.3.2 (#1876)
|
bump version 0.3.2
|
chore: bump version 0.3.2 (#1876)
bump version 0.3.2
|
diff --git a/Cargo.toml b/Cargo.toml
index 0b09ee555e5b..1231c930db6e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ members = [
]
[workspace.package]
-version = "0.4.0"
+version = "0.3.2"
edition = "2021"
license = "Apache-2.0"
|
MinerU
|
https://github.com/opendatalab/MinerU
|
f209ddea62b51e73b4b94b68332e3ab6becc7c0d
|
myhloli
|
2025-01-16 12:37:40
|
fix(magic_pdf): correct end page index and improve error handling
|
- Adjust end_page_id calculation to prevent IndexError when accessing pages
- Enhance error handling in LLM post-processing by specifically catching JSONDecodeError
|
fix(magic_pdf): correct end page index and improve error handling
- Adjust end_page_id calculation to prevent IndexError when accessing pages
- Enhance error handling in LLM post-processing by specifically catching JSONDecodeError
|
diff --git a/magic_pdf/model/doc_analyze_by_custom_model.py b/magic_pdf/model/doc_analyze_by_custom_model.py
index 3a916146..65851b67 100644
--- a/magic_pdf/model/doc_analyze_by_custom_model.py
+++ b/magic_pdf/model/doc_analyze_by_custom_model.py
@@ -158,7 +158,7 @@ def doc_analyze(
table_enable=None,
) -> InferenceResult:
- end_page_id = end_page_id if end_page_id else len(dataset)
+ end_page_id = end_page_id if end_page_id else len(dataset) - 1
model_manager = ModelSingleton()
custom_model = model_manager.get_model(
diff --git a/magic_pdf/post_proc/llm_aided.py b/magic_pdf/post_proc/llm_aided.py
index 12c11321..c2eb3c86 100644
--- a/magic_pdf/post_proc/llm_aided.py
+++ b/magic_pdf/post_proc/llm_aided.py
@@ -151,7 +151,7 @@ def llm_aided_title(pdf_info_dict, title_aided_config):
logger.warning("The number of titles in the optimized result is not equal to the number of titles in the input.")
retry_count += 1
except Exception as e:
- if e is json.JSONDecodeError:
+ if isinstance(e, json.decoder.JSONDecodeError):
logger.warning(f"JSON decode error on attempt {retry_count + 1}: {e}")
else:
logger.exception(e)
|
components
|
https://github.com/angular/components
|
36db1c03893d6a8445eb56b7f8c7d56450b8df98
|
Kristiyan Kostadinov
|
2019-01-03 05:34:11
|
fix(moment-adapter): incorrectly deserializing moment dates and not setting locale on deserialized values (#14685)
|
Fixes a couple of issues I noticed while doing the Luxon adapter:
* If a `Moment` instance was passed in to `deserialize`, we were returning a new `Moment` instance set to the current date/time, rather than the ones from the passed-in object.
* In some cases the object returned by `deserialize` didn't have its locale set to the one from the adapter.
|
fix(moment-adapter): incorrectly deserializing moment dates and not setting locale on deserialized values (#14685)
Fixes a couple of issues I noticed while doing the Luxon adapter:
* If a `Moment` instance was passed in to `deserialize`, we were returning a new `Moment` instance set to the current date/time, rather than the ones from the passed-in object.
* In some cases the object returned by `deserialize` didn't have its locale set to the one from the adapter.
|
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
index 41b5860e9383..10548e902f5d 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
@@ -333,6 +333,19 @@ describe('MomentDateAdapter', () => {
assertValidDate(adapter.deserialize(moment.invalid()), false);
});
+ it('should clone the date when deserializing a Moment date', () => {
+ let date = moment([2017, JAN, 1]);
+ expect(adapter.deserialize(date)!.format()).toEqual(date.format());
+ expect(adapter.deserialize(date)).not.toBe(date);
+ });
+
+ it('should deserialize dates with the correct locale', () => {
+ adapter.setLocale('ja');
+ expect(adapter.deserialize('1985-04-12T23:20:50.52Z')!.locale()).toBe('ja');
+ expect(adapter.deserialize(new Date())!.locale()).toBe('ja');
+ expect(adapter.deserialize(moment())!.locale()).toBe('ja');
+ });
+
it('setLocale should not modify global moment locale', () => {
expect(moment.locale()).toBe('en');
adapter.setLocale('ja-JP');
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.ts b/src/material-moment-adapter/adapter/moment-date-adapter.ts
index 32fc0b2b8f1b..ea05ecb63f76 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.ts
@@ -211,7 +211,10 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
deserialize(value: any): Moment | null {
let date;
if (value instanceof Date) {
- date = this._createMoment(value);
+ date = this._createMoment(value).locale(this.locale);
+ } else if (this.isDateInstance(value)) {
+ // Note: assumes that cloning also sets the correct locale.
+ return this.clone(value);
}
if (typeof value === 'string') {
if (!value) {
@@ -220,7 +223,7 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
date = this._createMoment(value, moment.ISO_8601).locale(this.locale);
}
if (date && this.isValid(date)) {
- return date;
+ return this._createMoment(date).locale(this.locale);
}
return super.deserialize(value);
}
|
appsmith
|
https://github.com/appsmithorg/appsmith
|
cc620b3ab33ab806ef82ee6288b1034be7f82beb
|
Aman Agarwal
|
2024-01-29 19:51:01
|
feat: removing delete multiple apps feature (#30661)
|
## Description
Removing the bulk delete applications feature as it not generally used
by many users and this was creating some UI conflicts rather than giving
us some valuable output.
Please follow this thread for more context :
|
feat: removing delete multiple apps feature (#30661)
## Description
Removing the bulk delete applications feature as it not generally used
by many users and this was creating some UI conflicts rather than giving
us some valuable output.
Please follow this thread for more context :
https://theappsmith.slack.com/archives/C02Q4B2AGM8/p1706249168968689
#### PR fixes following issue(s)
Fixes #30660
> if no issue exists, please create an issue and ask the maintainers
about this first
>
>
#### Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
>
>
#### Type of change
> Please delete options that are not relevant.
- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- Chore (housekeeping or task changes that don't impact user perception)
- This change requires a documentation update
>
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [ ] Manual
- [ ] JUnit
- [ ] Jest
- [ ] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Refactor**
- Streamlined the application deletion process to handle multiple
deletions more efficiently.
- **Bug Fixes**
- Removed redundant code and unused features related to the multiple
selection and deletion of applications.
- **Chores**
- Cleaned up various files by removing unused imports, constants, and
state variables.
- **Documentation**
- Adjusted code comments and documentation to reflect removal of
multiple application deletion features and related UI elements.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
|
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteMultipleApplications.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteMultipleApplications.ts
deleted file mode 100644
index d745604457d9..000000000000
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteMultipleApplications.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import {
- agHelper,
- homePage,
- assertHelper,
- inviteModal,
-} from "../../../../support/Objects/ObjectsCore";
-import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags";
-
-const timestamp = Date.now();
-
-const workspaceName = `w_${timestamp}`;
-const firstApplicationName = `app_${timestamp}_1`;
-const secondApplicationName = `app_${timestamp}_2`;
-
-const UnableToDeleteWorkspace = {
- workspaceName: `w_${timestamp}_3`,
- applicationName: `app_${timestamp}_3`,
-};
-
-describe(
- "Delete multiple application",
- { tags: ["@tag.Workspace"] },
- function () {
- before(() => {
- homePage.CreateNewWorkspace(workspaceName, true);
- homePage.CreateAppInWorkspace(workspaceName, firstApplicationName);
- homePage.NavigateToHome();
- homePage.CreateAppInWorkspace(workspaceName, secondApplicationName);
- });
-
- it("1. Should select & cancel delete multiple applications in different workspace & other action items should not be visible when selection mode is on", function () {
- homePage.NavigateToHome();
- homePage.SelectWorkspace(workspaceName);
-
- homePage.SelectMultipleApplicationToDelete(firstApplicationName);
- homePage.SelectMultipleApplicationToDelete(secondApplicationName);
-
- // Asserting all the other share & create new app button not visible
- agHelper.AssertElementVisibility(homePage._newIcon, false);
-
- agHelper.AssertElementAbsence(homePage._newButtonCreateApplication);
-
- agHelper.ClickButton("Cancel");
- agHelper.AssertElementAbsence(homePage._multipleSelectedApplication);
- agHelper.AssertElementExist(homePage._appCard(firstApplicationName));
- agHelper.AssertElementExist(homePage._appCard(secondApplicationName));
- });
-
- it("2. Should select & delete multiple applications in different workspace", function () {
- homePage.SelectMultipleApplicationToDelete(firstApplicationName);
- homePage.SelectMultipleApplicationToDelete(secondApplicationName);
- agHelper.ClickButton("Delete");
- agHelper.ClickButton("Yes");
- assertHelper.WaitForNetworkCall("@deleteMultipleApp").then((response) => {
- expect(response?.body?.data?.length).to.be.equal(2);
- agHelper.AssertElementAbsence(homePage._appCard(firstApplicationName));
- agHelper.AssertElementAbsence(homePage._appCard(secondApplicationName));
- });
- });
-
- it("3. Unable to select to multiple delete if not enough permissions to delete", function () {
- featureFlagIntercept({ license_gac_enabled: true });
- cy.wait(2000);
- homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
- homePage.CreateNewWorkspace(UnableToDeleteWorkspace.workspaceName);
- homePage.CreateAppInWorkspace(
- UnableToDeleteWorkspace.workspaceName,
- UnableToDeleteWorkspace.applicationName,
- );
-
- agHelper.GetNClick(inviteModal.locators._shareButton, 0, true);
- homePage.InviteUserToApplication(
- Cypress.env("TESTUSERNAME1"),
- "App Viewer",
- );
- homePage.LogOutviaAPI();
-
- homePage.LogintoApp(
- Cypress.env("TESTUSERNAME1"),
- Cypress.env("TESTPASSWORD1"),
- "App Viewer",
- );
-
- homePage.SelectWorkspace(UnableToDeleteWorkspace.workspaceName);
-
- homePage.SelectMultipleApplicationToDeleteByCard(
- UnableToDeleteWorkspace.applicationName,
- "topLeft",
- );
- agHelper.ValidateToastMessage(
- "You don't have permission to delete this application",
- );
- });
- },
-);
diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts
index 77ff61b6c785..4b6e176c2138 100644
--- a/app/client/cypress/support/Pages/HomePage.ts
+++ b/app/client/cypress/support/Pages/HomePage.ts
@@ -116,7 +116,6 @@ export class HomePage {
_importFromGitBtn = "div.t--import-json-card + div";
_helpButton = ".t--help-menu-option";
private signupUsername = "input[name='email']";
- _multipleSelectedApplication = ".t--application-card-selected";
private _applicationEditedText = (applicationName: string) =>
this._appCard(applicationName) +
"//div[contains(@class, 't--application-edited-text')]";
@@ -129,10 +128,6 @@ export class HomePage {
public _searchWorkspaceLocator = (workspaceName: string) =>
`[data-testid="${workspaceName}"]`;
- private _applicationMultiSelectionCheckbox = (applicationName: string) =>
- this._appCard(applicationName) +
- "//label[contains(@class, 't--app-multi-select-checkbox')]";
-
public SwitchToAppsTab() {
this.agHelper.GetNClick(this._homeTab);
}
@@ -770,30 +765,6 @@ export class HomePage {
}
});
}
-
- public SelectMultipleApplicationToDelete(applicationName: string) {
- this.agHelper
- .GetElement(this._appCard(applicationName))
- .first()
- .realHover();
- this.agHelper.GetNClick(
- this._applicationMultiSelectionCheckbox(applicationName),
- );
- }
- public SelectMultipleApplicationToDeleteByCard(
- applicationName: string,
- position: Cypress.PositionType = "center",
- ) {
- this.agHelper.GetNClick(
- this._appCard(applicationName),
- 0,
- true,
- 500,
- false,
- true,
- position,
- );
- }
public SelectWorkspace(workspaceName: string, networkCallAlias = true) {
this.agHelper
.GetElement(this._leftPanel)
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 4553ae9d7754..64d836675694 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -931,9 +931,6 @@ Cypress.Commands.add("startServerAndRoutes", () => {
"makePageDefault",
);
cy.intercept("DELETE", "/api/v1/applications/*").as("deleteApp");
- cy.intercept("POST", "/api/v1/applications/delete-apps").as(
- "deleteMultipleApp",
- );
cy.intercept("DELETE", "/api/v1/pages/*").as("deletePage");
//cy.intercept("POST", "/api/v1/datasources").as("createDatasource");
cy.intercept("DELETE", "/api/v1/datasources/*").as("deleteDatasource");
diff --git a/app/client/src/ce/api/ApplicationApi.tsx b/app/client/src/ce/api/ApplicationApi.tsx
index 758eafe81bc1..777ddaee27e0 100644
--- a/app/client/src/ce/api/ApplicationApi.tsx
+++ b/app/client/src/ce/api/ApplicationApi.tsx
@@ -379,12 +379,6 @@ export class ApplicationApi extends Api {
);
}
- static async deleteMultipleApps(request: {
- ids: string[];
- }): Promise<AxiosPromise<ApiResponse>> {
- return Api.post(`${ApplicationApi.baseURL}/delete-apps`, request.ids);
- }
-
static async importApplicationToWorkspace(
request: ImportApplicationRequest,
): Promise<AxiosPromise<ApiResponse>> {
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index 05e21d037e94..4e301bde5c0e 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -870,10 +870,6 @@ const ActionTypes = {
"SET_PUBLISHED_APP_TO_COMMUNITY_PORTAL",
FORM_EVALUATION_EMPTY_BUFFER: "FORM_EVALUATION_EMPTY_BUFFER",
CLEAR_CACHE: "CLEAR_CACHE",
- DELETE_MULTIPLE_APPS_INIT: "DELETE_MULTIPLE_APPS_INIT",
- DELETE_MULTIPLE_APPS_TOGGLE: "DELETE_MULTIPLE_APPS_TOGGLE",
- DELETE_MULTIPLE_APPLICATION_SUCCESS: "DELETE_MULTIPLE_APPLICATION_SUCCESS",
- DELETE_MULTIPLE_APPLICATION_CANCEL: "DELETE_MULTIPLE_APPLICATION_CANCEL",
TRIGGER_EVAL: "TRIGGER_EVAL",
UPDATE_ACTION_DATA: "UPDATE_ACTION_DATA",
SET_ACTIVE_EDITOR_FIELD: "SET_ACTIVE_EDITOR_FIELD",
@@ -1098,7 +1094,6 @@ export const ReduxActionErrorTypes = {
FETCH_PRODUCT_ALERT_FAILED: "FETCH_PRODUCT_ALERT_FAILED",
PUBLISH_APP_AS_COMMUNITY_TEMPLATE_ERROR:
"PUBLISH_APP_AS_COMMUNITY_TEMPLATE_ERROR",
- DELETE_MULTIPLE_APPLICATION_ERROR: "DELETE_MULTIPLE_APPLICATION_ERROR",
IMPORT_TEMPLATE_TO_APPLICATION_ONBOARDING_FLOW_ERROR:
"IMPORT_TEMPLATE_TO_APPLICATION_ONBOARDING_FLOW_ERROR",
SETUP_PAGE_ERROR: "SETUP_PAGE_ERROR",
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 9697f02074a1..11584ab9312c 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -220,16 +220,6 @@ export const USER_RESET_PASSWORD = () => "Reset password";
export const CREATE_PASSWORD_RESET_SUCCESS = () => `Your password has been set`;
export const CREATE_PASSWORD_RESET_SUCCESS_LOGIN_LINK = () => `Login`;
-export const DELETING_MULTIPLE_APPLICATION = () =>
- `Deleting multiple applications...`;
-export const NO_PERMISSION_TO_SELECT_FOR_DELETE = () =>
- `You don't have permission to delete this application`;
-
-export const DELETING_MULTIPLE_APPLICATION_MODAL_TITLE = () =>
- `Delete Confirmation`;
-export const DELETING_MULTIPLE_APPLICATION_MODAL_DESC = () =>
- `Are you sure you want to delete selected applications?`;
-
export const FORGOT_PASSWORD_PAGE_LOGIN_LINK = () => `Back to sign in`;
export const ADD_API_TO_PAGE_SUCCESS_MESSAGE = (actionName: string) =>
`${actionName} API added to page`;
diff --git a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx
index 4b0805fdbaa3..3007567db227 100644
--- a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx
+++ b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx
@@ -30,7 +30,6 @@ function ResourceListLoader({ isMobile, resources }: ResourcesLoaderProps) {
hasReadPermission
icon={DEFAULT_ICON}
isContextMenuOpen={false}
- isEnabledMultipleSelection={false}
isFetching
isMobile={isMobile}
moreActionItems={[]}
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index 00670d2daa54..24b81a5d15fc 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -20,7 +20,6 @@ import {
getApplicationSearchKeyword,
getCreateApplicationError,
getCurrentApplicationIdForCreateNewApp,
- getDeletingMultipleApps,
getIsCreatingApplication,
getIsDeletingApplication,
} from "@appsmith/selectors/applicationSelectors";
@@ -74,7 +73,6 @@ import {
NO_APPS_FOUND,
NO_WORKSPACE_DESCRIPTION,
NO_WORKSPACE_HEADING,
- SEARCH_APPS,
WORKSPACES_HEADING,
} from "@appsmith/constants/messages";
@@ -117,7 +115,6 @@ import {
getIsFetchingWorkspaces,
getIsSavingWorkspaceInfo,
} from "@appsmith/selectors/workspaceSelectors";
-import ApplicationsSubHeader from "pages/common/SubHeader";
import type { Workspace } from "@appsmith/constants/workspaceConstants";
import { getPackagesList } from "@appsmith/selectors/packageSelectors";
import {
@@ -188,10 +185,9 @@ export const ItemWrapper = styled.div`
export const StyledIcon = styled(Icon)`
margin-right: 11px;
`;
-export const WorkspaceShareUsers = styled.div<{ isHidden?: boolean }>`
+export const WorkspaceShareUsers = styled.div`
display: flex;
align-items: center;
- ${(props) => props.isHidden && "opacity: 0; visibility: hidden;"}
& .t--options-icon {
margin-left: 8px;
@@ -506,9 +502,6 @@ export function ApplicationsSection(props: any) {
const creatingApplicationMap = useSelector(getIsCreatingApplication);
const currentUser = useSelector(getCurrentUser);
const isMobile = useIsMobileDevice();
- const deleteMultipleApplicationObject = useSelector(getDeletingMultipleApps);
- const isEnabledMultipleSelection =
- !!deleteMultipleApplicationObject.list?.length;
const deleteApplication = (applicationId: string) => {
if (applicationId && applicationId.length > 0) {
dispatch({
@@ -733,7 +726,7 @@ export function ApplicationsSection(props: any) {
/>
)}
{!isLoadingResources && (
- <WorkspaceShareUsers isHidden={isEnabledMultipleSelection}>
+ <WorkspaceShareUsers>
<SharedUserList />
{canInviteToWorkspace && !isMobile && (
<FormDialogComponent
@@ -841,7 +834,7 @@ export function ApplicationsSection(props: any) {
}
export const ApplictionsMainPage = (props: any) => {
- const { searchApplications, searchKeyword } = props;
+ const { searchKeyword } = props;
const location = useLocation();
const urlParams = new URLSearchParams(location.search);
const workspaceIdFromQueryParams = urlParams.get("workspaceId");
@@ -939,13 +932,6 @@ export const ApplictionsMainPage = (props: any) => {
</Select>
</WorkspaceSelectorWrapper>
)}
- <ApplicationsSubHeader
- search={{
- placeholder: createMessage(SEARCH_APPS),
- queryFn: searchApplications,
- defaultValue: searchKeyword,
- }}
- />
<ApplicationsSection
activeWorkspaceId={activeWorkspaceId}
applications={fetchedApplications}
diff --git a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
index 90525bace20e..73094e57419a 100644
--- a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
+++ b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
@@ -47,7 +47,6 @@ export const initialState: ApplicationsReduxState = {
isErrorSavingNavigationSetting: false,
isUploadingNavigationLogo: false,
isDeletingNavigationLogo: false,
- deletingMultipleApps: {},
loadingStates: {
isFetchingAllRoles: false,
isFetchingAllUsers: false,
@@ -81,70 +80,6 @@ export const handlers = {
) => {
return { ...state, deletingApplication: false };
},
- [ReduxActionTypes.DELETE_MULTIPLE_APPS_TOGGLE]: (
- state: ApplicationsReduxState,
- action: ReduxAction<{ id: string }>,
- ) => {
- let deleteMultipleAppsList = state.deletingMultipleApps.list || [];
- if (deleteMultipleAppsList.includes(action.payload.id)) {
- deleteMultipleAppsList = deleteMultipleAppsList.filter(
- (i) => i !== action.payload.id,
- );
- } else {
- deleteMultipleAppsList = [...deleteMultipleAppsList, action.payload.id];
- }
- return {
- ...state,
- deletingMultipleApps: {
- list: deleteMultipleAppsList,
- },
- };
- },
- [ReduxActionTypes.DELETE_MULTIPLE_APPS_INIT]: (
- state: ApplicationsReduxState,
- ) => {
- return {
- ...state,
- deletingMultipleApps: {
- list: state.deletingMultipleApps.list,
- isDeleting: true,
- },
- };
- },
- [ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_SUCCESS]: (
- state: ApplicationsReduxState,
- // eslint-disable-next-line
- action: ReduxAction<ApplicationPayload[]>,
- ) => {
- return {
- ...state,
- deletingMultipleApps: {
- list: [],
- isDeleting: false,
- },
- };
- },
- [ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_CANCEL]: (
- state: ApplicationsReduxState,
- ) => {
- return {
- ...state,
- deletingMultipleApps: {
- list: [],
- isDeleting: false,
- },
- };
- },
- [ReduxActionErrorTypes.DELETE_MULTIPLE_APPLICATION_ERROR]: (
- state: ApplicationsReduxState,
- ) => {
- return {
- ...state,
- deletingMultipleApps: {
- isDeleting: false,
- },
- };
- },
[ReduxActionTypes.CHANGE_APPVIEW_ACCESS_INIT]: (
state: ApplicationsReduxState,
) => ({ ...state, isChangingViewAccess: true }),
@@ -766,11 +701,6 @@ const applicationsReducer = createReducer(initialState, handlers);
export type creatingApplicationMap = Record<string, boolean>;
-export interface DeletingMultipleApps {
- list?: string[];
- isDeleting?: boolean;
-}
-
export interface ApplicationsReduxState {
applicationList: ApplicationPayload[];
searchKeyword?: string;
@@ -794,7 +724,6 @@ export interface ApplicationsReduxState {
isErrorSavingNavigationSetting: boolean;
isUploadingNavigationLogo: boolean;
isDeletingNavigationLogo: boolean;
- deletingMultipleApps: DeletingMultipleApps;
loadingStates: {
isFetchingAllRoles: boolean;
isFetchingAllUsers: boolean;
diff --git a/app/client/src/ce/reducers/uiReducers/selectedWorkspaceReducer.ts b/app/client/src/ce/reducers/uiReducers/selectedWorkspaceReducer.ts
index d8302286e615..f0beca260ab3 100644
--- a/app/client/src/ce/reducers/uiReducers/selectedWorkspaceReducer.ts
+++ b/app/client/src/ce/reducers/uiReducers/selectedWorkspaceReducer.ts
@@ -61,16 +61,6 @@ export const handlers = {
) => {
draftState.loadingStates.isFetchingApplications = false;
},
- [ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_SUCCESS]: (
- draftState: SelectedWorkspaceReduxState,
- action: ReduxAction<ApplicationPayload[]>,
- ) => {
- const deletedApplicationIds = action.payload.map((app) => app.id);
- const applications = draftState.applications.filter(
- (app) => !deletedApplicationIds.includes(app.id),
- );
- draftState.applications = applications;
- },
[ReduxActionTypes.DELETE_APPLICATION_SUCCESS]: (
draftState: SelectedWorkspaceReduxState,
action: ReduxAction<ApplicationPayload>,
diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx
index 6f095a0de883..a4dc46faf37f 100644
--- a/app/client/src/ce/sagas/ApplicationSagas.tsx
+++ b/app/client/src/ce/sagas/ApplicationSagas.tsx
@@ -33,10 +33,7 @@ import ApplicationApi from "@appsmith/api/ApplicationApi";
import { all, call, put, select, take } from "redux-saga/effects";
import { validateResponse } from "sagas/ErrorSagas";
-import {
- getCurrentApplicationIdForCreateNewApp,
- getDeletingMultipleApps,
-} from "@appsmith/selectors/applicationSelectors";
+import { getCurrentApplicationIdForCreateNewApp } from "@appsmith/selectors/applicationSelectors";
import type { ApiResponse } from "api/ApiResponses";
import history from "utils/history";
import type { AppState } from "@appsmith/reducers";
@@ -63,7 +60,6 @@ import {
import AnalyticsUtil from "utils/AnalyticsUtil";
import {
createMessage,
- DELETING_MULTIPLE_APPLICATION,
ERROR_IMPORTING_APPLICATION_TO_WORKSPACE,
} from "@appsmith/constants/messages";
import { APP_MODE } from "entities/App";
@@ -118,7 +114,6 @@ import {
} from "constants/AppConstants";
import { setAllEntityCollapsibleStates } from "actions/editorContextActions";
import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors";
-import type { DeletingMultipleApps } from "@appsmith/reducers/uiReducers/applicationsReducer";
import { selectFeatureFlagCheck } from "@appsmith/selectors/featureFlagsSelectors";
import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
import { LayoutSystemTypes } from "layoutSystems/types";
@@ -492,40 +487,6 @@ export function* deleteApplicationSaga(
}
}
-export function* deleteMultipleApplicationSaga() {
- try {
- toast.show(createMessage(DELETING_MULTIPLE_APPLICATION));
- const deleteMultipleAppsObject: DeletingMultipleApps = yield select(
- getDeletingMultipleApps,
- );
-
- if (deleteMultipleAppsObject.list?.length) {
- const response: ApiResponse = yield call(
- ApplicationApi.deleteMultipleApps,
- { ids: deleteMultipleAppsObject.list },
- );
- const isValidResponse: boolean = yield validateResponse(response);
- if (isValidResponse) {
- yield put({
- type: ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_SUCCESS,
- payload: response.data,
- });
- deleteMultipleAppsObject.list.forEach(function* (id) {
- yield call(deleteRecentAppEntities, id);
- });
- toast.dismiss();
- }
- }
- } catch (error) {
- yield put({
- type: ReduxActionErrorTypes.DELETE_MULTIPLE_APPLICATION_ERROR,
- payload: {
- error,
- },
- });
- }
-}
-
export function* changeAppViewAccessSaga(
requestAction: ReduxAction<ChangeAppViewAccessRequest>,
) {
diff --git a/app/client/src/ce/selectors/applicationSelectors.tsx b/app/client/src/ce/selectors/applicationSelectors.tsx
index 93be32fc6252..9c7fc0326675 100644
--- a/app/client/src/ce/selectors/applicationSelectors.tsx
+++ b/app/client/src/ce/selectors/applicationSelectors.tsx
@@ -184,10 +184,6 @@ export const selectEvaluationVersion = (state: AppState) =>
state.ui.applications.currentApplication?.evaluationVersion ||
DEFAULT_EVALUATION_VERSION;
-export const getDeletingMultipleApps = (state: AppState) => {
- return state.ui.applications.deletingMultipleApps;
-};
-
export const getApplicationLoadingStates = (state: AppState) => {
return state.ui.applications?.loadingStates;
};
diff --git a/app/client/src/components/common/Card.tsx b/app/client/src/components/common/Card.tsx
index afbab4141312..a45638508731 100644
--- a/app/client/src/components/common/Card.tsx
+++ b/app/client/src/components/common/Card.tsx
@@ -5,19 +5,16 @@ import { omit } from "lodash";
import { AppIcon, Size, TextType, Text } from "design-system-old";
import type { PropsWithChildren } from "react";
import type { HTMLDivProps, ICardProps } from "@blueprintjs/core";
-import { Button, Checkbox, type MenuItemProps } from "design-system";
+import { Button, type MenuItemProps } from "design-system";
import GitConnectedBadge from "./GitConnectedBadge";
-import { noop } from "utils/AppsmithUtils";
type CardProps = PropsWithChildren<{
backgroundColor: string;
contextMenu: React.ReactNode;
editedByText: string;
- handleMultipleSelection?: (e: any) => void;
hasReadPermission: boolean;
icon: string;
- isEnabledMultipleSelection: boolean;
isContextMenuOpen: boolean;
isFetching: boolean;
isMobile?: boolean;
@@ -181,46 +178,6 @@ const NameWrapper = styled((props: HTMLDivProps & NameWrapperProps) => (
border-radius: var(--ads-v2-border-radius);
&:hover {
border-color: var(--ads-v2-color-gray-100);
- .t--app-multi-select-checkbox {
- display: inline;
- animation: multi-select-check 0.5s;
- animation-fill-mode: forwards;
- }
- }
-
- ${(props) => `&.${props.testId}-selected {
- border-color: var(--ads-v2-color-blue-300);
- .t--app-multi-select-checkbox {
- display: inline;
- animation: multi-select-check 0.5s;
- animation-fill-mode: forwards;
- }
- }`}
-
- .t--app-multi-select-checkbox {
- display: none;
- height: 14px;
- visibility: hidden;
- opacity: 0;
- margin-left: -24px;
- &.t--app-multi-select-mode-checkbox {
- display: inline;
- animation: multi-select-check 0.5s;
- animation-fill-mode: forwards;
- }
- }
-
- @keyframes multi-select-check {
- from {
- margin-left: -24px;
- visibility: hidden;
- opacity: 0;
- }
- to {
- visibility: visible;
- opacity: 1;
- margin-left: 4px;
- }
}
`;
@@ -355,15 +312,12 @@ function Card({
children,
contextMenu,
editedByText,
- handleMultipleSelection,
hasEditPermission,
hasReadPermission,
icon,
isContextMenuOpen,
- isEnabledMultipleSelection,
isFetching,
isMobile,
- isSelected,
moreActionItems,
primaryAction,
setShowOverlay,
@@ -374,16 +328,9 @@ function Card({
titleTestId,
}: CardProps) {
return (
- <Container
- isMobile={isMobile}
- onClick={
- isEnabledMultipleSelection && handleMultipleSelection
- ? handleMultipleSelection
- : primaryAction
- }
- >
+ <Container isMobile={isMobile} onClick={primaryAction}>
<NameWrapper
- className={`${testId} ${isSelected ? `${testId}-selected` : ""}`}
+ className={testId}
hasReadPermission={hasReadPermission}
isContextMenuOpen={isContextMenuOpen}
onMouseEnter={() => {
@@ -422,23 +369,6 @@ function Card({
)}
</Wrapper>
<CardFooter>
- {handleMultipleSelection && (
- <div
- onClick={
- isEnabledMultipleSelection ? noop : handleMultipleSelection
- }
- >
- <Checkbox
- aria-label="Multiple Selection"
- className={`t--app-multi-select-checkbox ${
- isEnabledMultipleSelection
- ? "t--app-multi-select-mode-checkbox"
- : ""
- }`}
- isSelected={isSelected}
- />
- </div>
- )}
{hasEditPermission ? (
<ModifiedDataComponent className="t--application-edited-text">
{editedByText}
diff --git a/app/client/src/ee/sagas/ApplicationSagas.tsx b/app/client/src/ee/sagas/ApplicationSagas.tsx
index 5409606e678d..92a47483d23b 100644
--- a/app/client/src/ee/sagas/ApplicationSagas.tsx
+++ b/app/client/src/ee/sagas/ApplicationSagas.tsx
@@ -16,7 +16,6 @@ import {
fetchUnconfiguredDatasourceList,
uploadNavigationLogoSaga,
deleteNavigationLogoSaga,
- deleteMultipleApplicationSaga,
fetchAllApplicationsOfWorkspaceSaga,
} from "ce/sagas/ApplicationSagas";
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
@@ -46,10 +45,6 @@ export default function* applicationSagas() {
setDefaultApplicationPageSaga,
),
takeLatest(ReduxActionTypes.DELETE_APPLICATION_INIT, deleteApplicationSaga),
- takeLatest(
- ReduxActionTypes.DELETE_MULTIPLE_APPS_INIT,
- deleteMultipleApplicationSaga,
- ),
takeLatest(ReduxActionTypes.IMPORT_APPLICATION_INIT, importApplicationSaga),
takeLatest(
ReduxActionTypes.UPLOAD_NAVIGATION_LOGO_INIT,
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index b6b39553c911..b8f9beb29119 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -7,7 +7,6 @@ import React, {
} from "react";
import styled, { ThemeContext } from "styled-components";
import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import {
hasDeleteApplicationPermission,
isPermitted,
@@ -43,7 +42,6 @@ import type {
import {
getIsSavingAppName,
getIsErroredSavingAppName,
- getDeletingMultipleApps,
} from "@appsmith/selectors/applicationSelectors";
import ForkApplicationModal from "./ForkApplicationModal";
import { getExportAppAPIRoute } from "@appsmith/constants/ApiConstants";
@@ -56,10 +54,6 @@ import { addItemsInContextMenu } from "@appsmith/utils";
import { getCurrentUser } from "actions/authActions";
import Card, { ContextMenuTrigger } from "components/common/Card";
import { generateEditedByText } from "./helpers";
-import {
- NO_PERMISSION_TO_SELECT_FOR_DELETE,
- createMessage,
-} from "@appsmith/constants/messages";
import { noop } from "lodash";
const { cloudHosting } = getAppsmithConfigs();
@@ -128,12 +122,6 @@ export function ApplicationCard(props: ApplicationCardProps) {
const applicationId = props.application?.id;
const showGitBadge = props.application?.gitApplicationMetadata?.branchName;
- const deleteMultipleApplicationObject = useSelector(getDeletingMultipleApps);
- const isApplicationSelected =
- deleteMultipleApplicationObject.list?.includes(applicationId);
- const isEnabledMultipleSelection =
- !!deleteMultipleApplicationObject.list?.length;
-
useEffect(() => {
let colorCode;
if (props.application.color) {
@@ -318,7 +306,6 @@ export function ApplicationCard(props: ApplicationCardProps) {
<ContextMenuTrigger
className="m-0.5"
data-testid="t--application-card-context-menu"
- isHidden={isEnabledMultipleSelection}
isIconButton
kind="tertiary"
size="sm"
@@ -479,40 +466,22 @@ export function ApplicationCard(props: ApplicationCardProps) {
dispatch(getCurrentUser());
}, [props.application.defaultPageId]);
- const handleMultipleSelection = (event: MouseEvent) => {
- if (typeof event === "object" && event.stopImmediatePropagation)
- event.stopImmediatePropagation();
- if (!hasDeletePermission) {
- toast.show(createMessage(NO_PERMISSION_TO_SELECT_FOR_DELETE), {
- kind: "error",
- });
- return;
- }
- dispatch({
- type: ReduxActionTypes.DELETE_MULTIPLE_APPS_TOGGLE,
- payload: { id: applicationId },
- });
- };
-
return (
<Card
backgroundColor={selectedColor}
contextMenu={contextMenu}
editedByText={editedByText}
- handleMultipleSelection={handleMultipleSelection}
hasEditPermission={hasEditPermission}
hasReadPermission={hasReadPermission}
icon={appIcon}
isContextMenuOpen={isMenuOpen}
- isEnabledMultipleSelection={isEnabledMultipleSelection}
isFetching={isFetchingApplications}
isMobile={props.isMobile}
- isSelected={!!isApplicationSelected}
moreActionItems={moreActionItems}
primaryAction={props.isMobile ? launchApp : noop}
setShowOverlay={setShowOverlay}
showGitBadge={Boolean(showGitBadge)}
- showOverlay={showOverlay && !isEnabledMultipleSelection}
+ showOverlay={showOverlay}
testId={`t--application-card ${props.application.name}`}
title={props.application.name}
titleTestId="t--app-card-name"
diff --git a/app/client/src/pages/common/SubHeader.tsx b/app/client/src/pages/common/SubHeader.tsx
deleted file mode 100644
index e68bbddbd455..000000000000
--- a/app/client/src/pages/common/SubHeader.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import type { ReactNode } from "react";
-import React, { useState } from "react";
-import styled from "styled-components";
-import {
- Button,
- Modal,
- ModalContent,
- ModalBody,
- ModalHeader,
- ModalFooter,
-} from "design-system";
-import { useDispatch, useSelector } from "react-redux";
-import { getDeletingMultipleApps } from "@appsmith/selectors/applicationSelectors";
-import { Indices } from "constants/Layers";
-import { useIsMobileDevice } from "utils/hooks/useDeviceDetect";
-import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import {
- DELETING_MULTIPLE_APPLICATION_MODAL_DESC,
- DELETING_MULTIPLE_APPLICATION_MODAL_TITLE,
- createMessage,
-} from "@appsmith/constants/messages";
-import { CONTAINER_WRAPPER_PADDING } from "@appsmith/pages/Applications";
-
-const SubHeaderWrapper = styled.div<{
- isMobile?: boolean;
- isBannerVisible?: boolean;
- isVisible?: boolean;
-}>`
- width: 100%;
- display: flex;
- justify-content: flex-end;
- background: var(--ads-v2-color-bg);
- z-index: ${({ isMobile }) => (isMobile ? Indices.Layer8 : Indices.Layer9)};
- ${({ isBannerVisible, isMobile }) =>
- isMobile
- ? `padding: 12px 16px;
- position: sticky; ${
- isBannerVisible ? "top: 80px; margin-top: 80px" : "top: 0; margin: 0"
- };
- `
- : `padding: ${CONTAINER_WRAPPER_PADDING} ${CONTAINER_WRAPPER_PADDING} 12px ${CONTAINER_WRAPPER_PADDING} ; position: sticky; ${
- isBannerVisible ? "top: 40px; margin-top: 40px" : "top: 0"
- }; align-items: center;`}
-`;
-
-const MultipleDeleteWrapper = styled.div`
- display: flex;
- gap: 8px;
-`;
-
-interface SubHeaderProps {
- add?: {
- form: ReactNode;
- title: string;
- formName: string;
- isAdding: boolean;
- formSubmitIntent: string;
- errorAdding?: string;
- formSubmitText: string;
- onClick: () => void;
- };
- search?: {
- placeholder: string;
- debounce?: boolean;
- queryFn?: (keyword: string) => void;
- defaultValue?: string;
- };
- isBannerVisible?: boolean;
-}
-
-export function ApplicationsSubHeader(props: SubHeaderProps) {
- const [showModal, setShowModal] = useState(false);
- const [showConfirmationModal, setShowConfirmationModal] = useState(false);
- const isMobile = useIsMobileDevice();
- const dispatch = useDispatch();
- const deleteMultipleApplicationObject = useSelector(getDeletingMultipleApps);
-
- const handleMultipleDelete = () => {
- setShowConfirmationModal(false);
- dispatch({
- type: ReduxActionTypes.DELETE_MULTIPLE_APPS_INIT,
- });
- };
- const handleCancelMultipleDelete = () => {
- dispatch({
- type: ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_CANCEL,
- });
- };
- const handleClose = (isOpen: boolean) => {
- if (!isOpen) {
- setShowConfirmationModal(false);
- handleCancelMultipleDelete();
- }
- };
-
- const isEnabledMultipleSelection =
- !!deleteMultipleApplicationObject.list?.length;
-
- return (
- <SubHeaderWrapper
- isBannerVisible={props.isBannerVisible}
- isMobile={isMobile}
- isVisible={!!(isEnabledMultipleSelection || props.add)}
- >
- {isEnabledMultipleSelection && (
- <MultipleDeleteWrapper>
- <Button
- isLoading={deleteMultipleApplicationObject.isDeleting}
- kind="error"
- onClick={() => setShowConfirmationModal(true)}
- size="md"
- startIcon="delete-bin-line"
- >
- Delete {deleteMultipleApplicationObject.list?.length} apps
- </Button>
- <Button
- kind="secondary"
- onClick={handleCancelMultipleDelete}
- size="md"
- startIcon="close"
- >
- Cancel
- </Button>
- <Modal onOpenChange={handleClose} open={showConfirmationModal}>
- <ModalContent
- data-testid="t--query-run-confirmation-modal"
- style={{ width: "600px" }}
- >
- <ModalHeader>
- {createMessage(DELETING_MULTIPLE_APPLICATION_MODAL_TITLE)}
- </ModalHeader>
- <ModalBody>
- {createMessage(DELETING_MULTIPLE_APPLICATION_MODAL_DESC)}
- </ModalBody>
- <ModalFooter>
- <Button
- kind="secondary"
- onClick={() => handleClose(false)}
- size="md"
- >
- No
- </Button>
- <Button kind="primary" onClick={handleMultipleDelete} size="md">
- Yes
- </Button>
- </ModalFooter>
- </ModalContent>
- </Modal>
- </MultipleDeleteWrapper>
- )}
-
- {props.add && !isEnabledMultipleSelection && (
- <>
- <Button size="md">{props.add.title}</Button>
- <Modal
- onOpenChange={(isOpen) => setShowModal(isOpen)}
- open={showModal}
- >
- <ModalContent style={{ width: "640px" }}>
- <ModalHeader>{props.add.title}</ModalHeader>
- <ModalBody>{props.add.form}</ModalBody>
- </ModalContent>
- </Modal>
- </>
- )}
- </SubHeaderWrapper>
- );
-}
-
-export default ApplicationsSubHeader;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
index 0a79cebda4ea..68b37c0298b0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
@@ -161,14 +161,6 @@ public Mono<ResponseDTO<Application>> delete(
.map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null));
}
- @JsonView(Views.Public.class)
- @PostMapping("/delete-apps")
- public Mono<ResponseDTO<List<Application>>> deleteMultipleApps(@Valid @RequestBody List<String> ids) {
- return applicationPageService
- .deleteMultipleApps(ids)
- .map(deletedResources -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResources, null));
- }
-
@Deprecated
@JsonView(Views.Public.class)
@GetMapping("/new")
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
index 8d964e57bceb..021a4883781a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java
@@ -9,8 +9,6 @@
import com.mongodb.client.result.UpdateResult;
import reactor.core.publisher.Mono;
-import java.util.List;
-
public interface ApplicationPageServiceCE {
Mono<PageDTO> createPage(PageDTO page);
@@ -42,8 +40,6 @@ Mono<PageDTO> getPageAndMigrateDslByBranchAndDefaultPageId(
Mono<Application> deleteApplication(String id);
- Mono<List<Application>> deleteMultipleApps(List<String> ids);
-
Mono<PageDTO> clonePage(String pageId, ClonePageMetaDTO clonePageMetaDTO);
Mono<PageDTO> clonePageByDefaultPageIdAndBranch(String defaultPageId, String branchName);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
index 985fe4d7eb16..86cab1c64973 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
@@ -572,13 +572,6 @@ public Mono<Application> deleteApplication(String id) {
});
}
- @Override
- public Mono<List<Application>> deleteMultipleApps(List<String> ids) {
- log.debug("Archiving application with ids: {}", ids.toString());
-
- return Flux.fromIterable(ids).flatMap(id -> deleteApplication(id)).collectList();
- }
-
@Override
public Mono<Application> deleteApplicationByResource(Application application) {
log.debug("Archiving actionCollections, actions, pages and themes for applicationId: {}", application.getId());
|
metersphere
|
https://github.com/metersphere/metersphere
|
fdd9c084773de71b0d8719c1b125522826e57299
|
CaptainB
|
2022-03-31 15:32:40
|
fix(测试计划): 修复测试阶段维护的数据
|
--bug=1011785 --user=刘瑞斌 [模板管理]github#12083测试阶段维护的数据，在V1.19.0版本之后就没法使用，有问题 https://www.tapd.cn/55049933/s/1128355
|
fix(测试计划): 修复测试阶段维护的数据
--bug=1011785 --user=刘瑞斌 [模板管理]github#12083测试阶段维护的数据，在V1.19.0版本之后就没法使用，有问题 https://www.tapd.cn/55049933/s/1128355
Closes #12083
|
diff --git a/frontend/src/network/test-plan.js b/frontend/src/network/test-plan.js
index 12acfa8ece7c..ca029d04f703 100644
--- a/frontend/src/network/test-plan.js
+++ b/frontend/src/network/test-plan.js
@@ -2,7 +2,7 @@ import {post, get} from "@/common/js/ajax";
import {success} from "@/common/js/message";
import i18n from "@/i18n/i18n";
import {baseGet, basePost} from "@/network/base-network";
-import {getCurrentWorkspaceId} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
export function getTestPlanReport(planId, callback) {
if (planId) {
@@ -172,8 +172,8 @@ export function editTestPlanLoadCaseOrder(request, callback) {
}
export function getPlanStageOption(callback) {
- let wId = getCurrentWorkspaceId();
- return wId ? baseGet('/test/plan/get/stage/option/' + wId, callback) : {};
+ let projectID = getCurrentProjectID();
+ return projectID ? baseGet('/test/plan/get/stage/option/' + projectID, callback) : {};
}
|
concourse
|
https://github.com/concourse/concourse
|
fd41dccb86f11da555a051ae7ac151fcb06b866b
|
dependabot[bot]
|
2021-10-04 07:03:17
|
build(deps): bump go.opentelemetry.io/otel from 1.0.0 to 1.0.1
|
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.0.0...v1.0.1)
---
|
build(deps): bump go.opentelemetry.io/otel from 1.0.0 to 1.0.1
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.0.0...v1.0.1)
---
updated-dependencies:
- dependency-name: go.opentelemetry.io/otel
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
|
diff --git a/go.mod b/go.mod
index 97ed3f0c23f..795459c83fe 100644
--- a/go.mod
+++ b/go.mod
@@ -82,13 +82,13 @@ require (
github.com/vito/go-sse v0.0.0-20160212001227-fd69d275caac
github.com/vito/houdini v1.1.1
github.com/vito/twentythousandtonnesofcrudeoil v0.0.0-20180305154709-3b21ad808fcb
- go.opentelemetry.io/otel v1.0.0
+ go.opentelemetry.io/otel v1.0.1
go.opentelemetry.io/otel/exporters/jaeger v1.0.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.0
go.opentelemetry.io/otel/oteltest v1.0.0-RC3
go.opentelemetry.io/otel/sdk v1.0.0
- go.opentelemetry.io/otel/trace v1.0.0
+ go.opentelemetry.io/otel/trace v1.0.1
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
diff --git a/go.sum b/go.sum
index 6969ac84544..88664379d2b 100644
--- a/go.sum
+++ b/go.sum
@@ -1042,8 +1042,9 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.21.0/go.mod h1:
go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I=
go.opentelemetry.io/otel v1.0.0-RC2/go.mod h1:w1thVQ7qbAy8MHb0IFj8a5Q2QU0l2ksf8u/CN8m3NOM=
go.opentelemetry.io/otel v1.0.0-RC3/go.mod h1:Ka5j3ua8tZs4Rkq4Ex3hwgBgOchyPVq5S6P2lz//nKQ=
-go.opentelemetry.io/otel v1.0.0 h1:qTTn6x71GVBvoafHK/yaRUmFzI4LcONZD0/kXxl5PHI=
go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg=
+go.opentelemetry.io/otel v1.0.1 h1:4XKyXmfqJLOQ7feyV5DB6gsBFZ0ltB8vLtp6pj4JIcc=
+go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU=
go.opentelemetry.io/otel/exporters/jaeger v1.0.0 h1:cLhx8llHw02h5JTqGqaRbYn+QVKHmrzD9vEbKnSPk5U=
go.opentelemetry.io/otel/exporters/jaeger v1.0.0/go.mod h1:q10N1AolE1JjqKrFJK2tYw0iZpmX+HBaXBtuCzRnBGQ=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0 h1:Vv4wbLEjheCTPV07jEav7fyUpJkyftQK7Ss2G7qgdSo=
@@ -1063,8 +1064,9 @@ go.opentelemetry.io/otel/sdk v1.0.0/go.mod h1:PCrDHlSy5x1kjezSdL37PhbFUMjrsLRshJ
go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg=
go.opentelemetry.io/otel/trace v1.0.0-RC2/go.mod h1:JPQ+z6nNw9mqEGT8o3eoPTdnNI+Aj5JcxEsVGREIAy4=
go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo=
-go.opentelemetry.io/otel/trace v1.0.0 h1:TSBr8GTEtKevYMG/2d21M989r5WJYVimhTHBKVEZuh4=
go.opentelemetry.io/otel/trace v1.0.0/go.mod h1:PXTWqayeFUlJV1YDNhsJYB184+IvAH814St6o6ajzIs=
+go.opentelemetry.io/otel/trace v1.0.1 h1:StTeIH6Q3G4r0Fiw34LTokUFESZgIDUr0qIJ7mKmAfw=
+go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.opentelemetry.io/proto/otlp v0.9.0 h1:C0g6TWmQYvjKRnljRULLWUVJGy8Uvu0NEL/5frY2/t4=
go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg=
|
agno
|
https://github.com/agno-agi/agno
|
51a0d3ea5b3a6fc6f7fe5b1e5ea1570519e0830d
|
Manthan Gupta
|
2025-01-08 15:08:46
|
Feat: Add upload support for files on playground (#1564)
|
## Description
This PR adds support for uploading files (PDF, Docx, CSV, Text) on
Playground
## Type of change
Please check the options that are relevant:
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] Model update
- [ ] Infrastructure change
## Checklist
- [x] My code follows Phidata's style guidelines and best practices
- [ ] I have performed a self-review of my code
- [ ] I have added docstrings and comments for complex logic
- [ ] My changes generate no new warnings or errors
- [ ] I have added cookbook examples for my new addition (if needed)
- [ ] I have updated requirements.txt/pyproject.toml (if needed)
- [ ] I have verified my changes in a clean environment
## Additional Notes
Include any deployment notes, performance implications, or other
relevant information:
|
Feat: Add upload support for files on playground (#1564)
## Description
This PR adds support for uploading files (PDF, Docx, CSV, Text) on
Playground
## Type of change
Please check the options that are relevant:
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] Model update
- [ ] Infrastructure change
## Checklist
- [x] My code follows Phidata's style guidelines and best practices
- [ ] I have performed a self-review of my code
- [ ] I have added docstrings and comments for complex logic
- [ ] My changes generate no new warnings or errors
- [ ] I have added cookbook examples for my new addition (if needed)
- [ ] I have updated requirements.txt/pyproject.toml (if needed)
- [ ] I have verified my changes in a clean environment
## Additional Notes
Include any deployment notes, performance implications, or other
relevant information:
|
diff --git a/cookbook/playground/upload_files.py b/cookbook/playground/upload_files.py
new file mode 100644
index 0000000000..be1247fc43
--- /dev/null
+++ b/cookbook/playground/upload_files.py
@@ -0,0 +1,30 @@
+from phi.agent import Agent
+from phi.knowledge.docx import DocxKnowledgeBase
+from phi.knowledge.json import JSONKnowledgeBase
+from phi.knowledge.pdf import PDFKnowledgeBase
+from phi.knowledge.csv import CSVKnowledgeBase
+from phi.knowledge.combined import CombinedKnowledgeBase
+from phi.knowledge.text import TextKnowledgeBase
+from phi.playground.playground import Playground
+from phi.playground.serve import serve_playground_app
+from phi.vectordb.pgvector import PgVector
+
+db_url = "postgresql+psycopg://ai:ai@localhost:5532/ai"
+
+knowledge_base = CombinedKnowledgeBase(
+ sources=[
+ PDFKnowledgeBase(vector_db=PgVector(table_name="recipes_pdf", db_url=db_url), path=""),
+ CSVKnowledgeBase(vector_db=PgVector(table_name="recipes_csv", db_url=db_url), path=""),
+ DocxKnowledgeBase(vector_db=PgVector(table_name="recipes_docx", db_url=db_url), path=""),
+ JSONKnowledgeBase(vector_db=PgVector(table_name="recipes_json", db_url=db_url), path=""),
+ TextKnowledgeBase(vector_db=PgVector(table_name="recipes_text", db_url=db_url), path=""),
+ ],
+ vector_db=PgVector(table_name="recipes_combined", db_url=db_url),
+)
+
+agent = Agent(knowledge=knowledge_base, use_tools=True, show_tool_calls=True)
+
+app = Playground(agents=[agent]).get_app()
+
+if __name__ == "__main__":
+ serve_playground_app("upload_files:app", reload=True)
diff --git a/phi/playground/router.py b/phi/playground/router.py
index 5023755bb9..e39a62147f 100644
--- a/phi/playground/router.py
+++ b/phi/playground/router.py
@@ -1,11 +1,16 @@
import base64
-from typing import List, Optional, AsyncGenerator, Dict, cast, Union, Generator
+from io import BytesIO
+from typing import Any, List, Optional, AsyncGenerator, Dict, cast, Union, Generator
-from fastapi import APIRouter, HTTPException, UploadFile
+from fastapi import APIRouter, File, Form, HTTPException, UploadFile
from fastapi.responses import StreamingResponse, JSONResponse
from phi.agent.agent import Agent, RunResponse
from phi.agent.session import AgentSession
+from phi.document.reader.csv_reader import CSVReader
+from phi.document.reader.docx import DocxReader
+from phi.document.reader.pdf import PDFReader
+from phi.document.reader.text import TextReader
from phi.workflow.workflow import Workflow
from phi.workflow.session import WorkflowSession
from phi.playground.operator import (
@@ -19,7 +24,6 @@
from phi.playground.schemas import (
AgentGetResponse,
- AgentRunRequest,
AgentSessionsRequest,
AgentSessionsResponse,
AgentRenameRequest,
@@ -99,42 +103,94 @@ def process_image(file: UploadFile) -> List[Union[str, Dict]]:
encoded = base64.b64encode(content).decode("utf-8")
image_info = {"filename": file.filename, "content_type": file.content_type, "size": len(content)}
-
return [encoded, image_info]
@playground_router.post("/agent/run")
- def agent_run(body: AgentRunRequest):
- logger.debug(f"AgentRunRequest: {body}")
- agent = get_agent_by_id(body.agent_id, agents)
+ def agent_run(
+ message: str = Form(...),
+ agent_id: str = Form(...),
+ stream: bool = Form(True),
+ monitor: bool = Form(False),
+ session_id: Optional[str] = Form(None),
+ user_id: Optional[str] = Form(None),
+ files: Optional[List[UploadFile]] = File(None),
+ image: Optional[UploadFile] = File(None),
+ ):
+ logger.debug(f"AgentRunRequest: {message} {agent_id} {stream} {monitor} {session_id} {user_id} {files}")
+ agent = get_agent_by_id(agent_id, agents)
if agent is None:
raise HTTPException(status_code=404, detail="Agent not found")
- if body.session_id is not None:
- logger.debug(f"Continuing session: {body.session_id}")
+ if files:
+ if agent.knowledge is None:
+ raise HTTPException(status_code=404, detail="KnowledgeBase not found")
+
+ if session_id is not None:
+ logger.debug(f"Continuing session: {session_id}")
else:
logger.debug("Creating new session")
# Create a new instance of this agent
- new_agent_instance = agent.deep_copy(update={"session_id": body.session_id})
- if body.user_id is not None:
- new_agent_instance.user_id = body.user_id
+ new_agent_instance = agent.deep_copy(update={"session_id": session_id})
+ if user_id is not None:
+ new_agent_instance.user_id = user_id
- if body.monitor:
+ if monitor:
new_agent_instance.monitoring = True
else:
new_agent_instance.monitoring = False
base64_image: Optional[List[Union[str, Dict]]] = None
- if body.image:
- base64_image = process_image(body.image)
-
- if body.stream:
+ if image:
+ base64_image = process_image(image)
+
+ if files:
+ for file in files:
+ if file.content_type == "application/pdf":
+ contents = file.file.read()
+ pdf_file = BytesIO(contents)
+ pdf_file.name = file.filename
+ file_content = PDFReader().read(pdf_file)
+ if agent.knowledge is not None:
+ agent.knowledge.load_documents(file_content)
+ elif file.content_type == "text/csv":
+ contents = file.file.read()
+ csv_file = BytesIO(contents)
+ csv_file.name = file.filename
+ file_content = CSVReader().read(csv_file)
+ if agent.knowledge is not None:
+ agent.knowledge.load_documents(file_content)
+ elif file.content_type == "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
+ contents = file.file.read()
+ docx_file = BytesIO(contents)
+ docx_file.name = file.filename
+ file_content = DocxReader().read(docx_file)
+ if agent.knowledge is not None:
+ agent.knowledge.load_documents(file_content)
+ elif file.content_type == "text/plain":
+ contents = file.file.read()
+ text_file = BytesIO(contents)
+ text_file.name = file.filename
+ file_content = TextReader().read(text_file)
+ if agent.knowledge is not None:
+ agent.knowledge.load_documents(file_content)
+ else:
+ raise HTTPException(status_code=400, detail="Unsupported file type")
+
+ if stream:
return StreamingResponse(
- chat_response_streamer(new_agent_instance, body.message, base64_image),
+ chat_response_streamer(new_agent_instance, message, images=base64_image),
media_type="text/event-stream",
)
else:
- run_response = cast(RunResponse, new_agent_instance.run(body.message, images=base64_image, stream=False))
+ run_response = cast(
+ RunResponse,
+ new_agent_instance.run(
+ message,
+ images=base64_image,
+ stream=False,
+ ),
+ )
return run_response.model_dump_json()
@playground_router.post("/agent/sessions/all")
@@ -394,9 +450,20 @@ async def agent_get():
return agent_list
async def chat_response_streamer(
- agent: Agent, message: str, images: Optional[List[Union[str, Dict]]] = None
+ agent: Agent,
+ message: str,
+ images: Optional[List[Union[str, Dict]]] = None,
+ audio_file_content: Optional[Any] = None,
+ video_file_content: Optional[Any] = None,
) -> AsyncGenerator:
- run_response = await agent.arun(message, images=images, stream=True, stream_intermediate_steps=True)
+ run_response = await agent.arun(
+ message,
+ images=images,
+ audio=audio_file_content,
+ videos=video_file_content,
+ stream=True,
+ stream_intermediate_steps=True,
+ )
async for run_response_chunk in run_response:
run_response_chunk = cast(RunResponse, run_response_chunk)
yield run_response_chunk.to_json()
@@ -410,39 +477,90 @@ async def process_image(file: UploadFile) -> List[Union[str, Dict]]:
return [encoded, image_info]
@playground_router.post("/agent/run")
- async def agent_run(body: AgentRunRequest):
- logger.debug(f"AgentRunRequest: {body}")
- agent = get_agent_by_id(body.agent_id, agents)
+ async def agent_run(
+ message: str = Form(...),
+ agent_id: str = Form(...),
+ stream: bool = Form(True),
+ monitor: bool = Form(False),
+ session_id: Optional[str] = Form(None),
+ user_id: Optional[str] = Form(None),
+ files: Optional[List[UploadFile]] = File(None),
+ image: Optional[UploadFile] = File(None),
+ ):
+ logger.debug(f"AgentRunRequest: {message} {session_id} {user_id} {agent_id}")
+ agent = get_agent_by_id(agent_id, agents)
if agent is None:
raise HTTPException(status_code=404, detail="Agent not found")
- if body.session_id is not None:
- logger.debug(f"Continuing session: {body.session_id}")
+ if files:
+ if agent.knowledge is None:
+ raise HTTPException(status_code=404, detail="KnowledgeBase not found")
+
+ if session_id is not None:
+ logger.debug(f"Continuing session: {session_id}")
else:
logger.debug("Creating new session")
# Create a new instance of this agent
- new_agent_instance = agent.deep_copy(update={"session_id": body.session_id})
- if body.user_id is not None:
- new_agent_instance.user_id = body.user_id
+ new_agent_instance = agent.deep_copy(update={"session_id": session_id})
+ if user_id is not None:
+ new_agent_instance.user_id = user_id
- if body.monitor:
+ if monitor:
new_agent_instance.monitoring = True
else:
new_agent_instance.monitoring = False
base64_image: Optional[List[Union[str, Dict]]] = None
- if body.image:
- base64_image = await process_image(body.image)
-
- if body.stream:
+ if image:
+ base64_image = await process_image(image)
+
+ if files:
+ for file in files:
+ if file.content_type == "application/pdf":
+ contents = await file.read()
+ pdf_file = BytesIO(contents)
+ pdf_file.name = file.filename
+ file_content = PDFReader().read(pdf_file)
+ if agent.knowledge is not None:
+ agent.knowledge.load_documents(file_content)
+ elif file.content_type == "text/csv":
+ contents = await file.read()
+ csv_file = BytesIO(contents)
+ csv_file.name = file.filename
+ file_content = CSVReader().read(csv_file)
+ if agent.knowledge is not None:
+ agent.knowledge.load_documents(file_content)
+ elif file.content_type == "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
+ contents = await file.read()
+ docx_file = BytesIO(contents)
+ docx_file.name = file.filename
+ file_content = DocxReader().read(docx_file)
+ if agent.knowledge is not None:
+ agent.knowledge.load_documents(file_content)
+ elif file.content_type == "text/plain":
+ contents = await file.read()
+ text_file = BytesIO(contents)
+ text_file.name = file.filename
+ file_content = TextReader().read(text_file)
+ if agent.knowledge is not None:
+ agent.knowledge.load_documents(file_content)
+ else:
+ raise HTTPException(status_code=400, detail="Unsupported file type")
+
+ if stream:
return StreamingResponse(
- chat_response_streamer(new_agent_instance, body.message, base64_image),
+ chat_response_streamer(new_agent_instance, message, images=base64_image),
media_type="text/event-stream",
)
else:
run_response = cast(
- RunResponse, await new_agent_instance.arun(body.message, images=base64_image, stream=False)
+ RunResponse,
+ await new_agent_instance.arun(
+ message,
+ images=base64_image,
+ stream=False,
+ ),
)
return run_response.model_dump_json()
diff --git a/phi/playground/schemas.py b/phi/playground/schemas.py
index 660e210a1a..2a3ccb1aa3 100644
--- a/phi/playground/schemas.py
+++ b/phi/playground/schemas.py
@@ -30,7 +30,7 @@ class AgentRunRequest(BaseModel):
monitor: bool = False
session_id: Optional[str] = None
user_id: Optional[str] = None
- image: Optional[UploadFile] = None
+ files: Optional[List[UploadFile]] = None
class AgentRenameRequest(BaseModel):
|
quivr
|
https://github.com/QuivrHQ/quivr
|
ed61880a38c39c16e75b585cb51a054baa2ac440
|
Ikko Eltociear Ashimine
|
2023-06-29 20:18:29
|
refactor: fix typo in useChats.ts (#393)
|
occured -> occurred
|
refactor: fix typo in useChats.ts (#393)
occured -> occurred
|
diff --git a/frontend/lib/context/ChatsProvider/hooks/useChats.ts b/frontend/lib/context/ChatsProvider/hooks/useChats.ts
index f76ba807a705..a137a3a87aaf 100644
--- a/frontend/lib/context/ChatsProvider/hooks/useChats.ts
+++ b/frontend/lib/context/ChatsProvider/hooks/useChats.ts
@@ -28,7 +28,7 @@ export default function useChats() {
console.error(error);
publish({
variant: "danger",
- text: "Error occured while fetching your chats",
+ text: "Error occurred while fetching your chats",
});
}
};
|
components
|
https://github.com/angular/components
|
8dc367cf09541589833288da52cd5645f1cf6c08
|
Kristiyan Kostadinov
|
2018-11-15 03:29:27
|
fix(form-field): users being able to select the hidden placeholder of disabled input (#13480)
|
Prevents the users from being able to select the hidden placeholder text by double-clicking on a disabled input.
|
fix(form-field): users being able to select the hidden placeholder of disabled input (#13480)
Prevents the users from being able to select the hidden placeholder text by double-clicking on a disabled input.
Fixes #13479.
|
diff --git a/src/lib/form-field/form-field-input.scss b/src/lib/form-field/form-field-input.scss
index 03060889ef4b..9e18e6237d65 100644
--- a/src/lib/form-field/form-field-input.scss
+++ b/src/lib/form-field/form-field-input.scss
@@ -85,6 +85,10 @@
}
@include input-placeholder {
+ // Prevent users from being able to select the placeholder text. Most of the time this can't
+ // happen, however it's possible to do it when clicking on a disabled input (see #13479).
+ @include user-select(none);
+
// Delay the transition until the label has animated about a third of the way through, in
// order to prevent the placeholder from overlapping for a split second.
transition: color $swift-ease-out-duration $swift-ease-out-duration / 3
|
sentry
|
https://github.com/getsentry/sentry
|
d143f8c04006e6667b4cb9f032644c50406f3fc9
|
Abdkhan14
|
2022-12-09 21:10:04
|
feat(discover-quick-context): Increased size of trigger icon. (#42210)
|
1. From 'xs' to 'sm'
|
feat(discover-quick-context): Increased size of trigger icon. (#42210)
1. From 'xs' to 'sm'
Co-authored-by: Abdullah Khan <[email protected]>
|
diff --git a/static/app/views/eventsV2/table/quickContext/actionDropdown.tsx b/static/app/views/eventsV2/table/quickContext/actionDropdown.tsx
index 568ab5be61f976..90dfa8c4ee1d5e 100644
--- a/static/app/views/eventsV2/table/quickContext/actionDropdown.tsx
+++ b/static/app/views/eventsV2/table/quickContext/actionDropdown.tsx
@@ -160,7 +160,7 @@ function ActionDropDown(props: Props) {
e.preventDefault();
triggerProps.onClick?.(e);
}}
- icon={<IconEllipsis size="xs" />}
+ icon={<IconEllipsis size="sm" />}
/>
)}
/>
|
check-if-email-exists
|
https://github.com/reacherhq/check-if-email-exists
|
5fd5e80e8daee7b6c117324d62d26a32ad413a02
|
dependabot[bot]
|
2022-08-15 14:38:12
|
chore: Bump clap from 3.2.16 to 3.2.17 (#1139)
|
Bumps [clap](https://github.com/clap-rs/clap) from 3.2.16 to 3.2.17.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/v3.2.17/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/v3.2.16...v3.2.17)
---
|
chore: Bump clap from 3.2.16 to 3.2.17 (#1139)
Bumps [clap](https://github.com/clap-rs/clap) from 3.2.16 to 3.2.17.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/v3.2.17/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/v3.2.16...v3.2.17)
---
updated-dependencies:
- dependency-name: clap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
diff --git a/Cargo.lock b/Cargo.lock
index 730b14710..1cb4083d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -499,9 +499,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.2.16"
+version = "3.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9"
+checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
dependencies = [
"atty",
"bitflags",
@@ -516,9 +516,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "3.2.15"
+version = "3.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4"
+checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa"
dependencies = [
"heck",
"proc-macro-error",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 076647210..cf4953d81 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/main.rs"
[dependencies]
check-if-email-exists = { path = "../core" }
-clap = { version = "3.2.16", features = ["derive", "env"] }
+clap = { version = "3.2.17", features = ["derive", "env"] }
env_logger = "0.9.0"
once_cell = "1.13.0"
openssl = { version = "0.10.41", features = ["vendored"] }
|
scylladb
|
https://github.com/scylladb/scylladb
|
1399dc0ff2212fc5cce8213bd7e5561028628f17
|
Asias He
|
2024-01-18 06:19:06
|
test: Add test_tablet_missing_data_repair
|
The test verifies repair brings the missing rows to the owner.
- Shutdown part of the nodes in the cluster
- Insert data
- Start all nodees
- Run repair
- Shutdown part of the nodes
- Check all data is present
|
test: Add test_tablet_missing_data_repair
The test verifies repair brings the missing rows to the owner.
- Shutdown part of the nodes in the cluster
- Insert data
- Start all nodees
- Run repair
- Shutdown part of the nodes
- Check all data is present
|
diff --git a/test/topology_experimental_raft/test_tablets.py b/test/topology_experimental_raft/test_tablets.py
index ae9bb244ecf9..52597734551e 100644
--- a/test/topology_experimental_raft/test_tablets.py
+++ b/test/topology_experimental_raft/test_tablets.py
@@ -408,3 +408,51 @@ async def check():
await check()
await cql.run_async("DROP KEYSPACE test;")
+
[email protected]
[email protected]
+async def test_tablet_missing_data_repair(manager: ManagerClient):
+ logger.info("Bootstrapping cluster")
+ cmdline = [
+ '--hinted-handoff-enabled', 'false',
+ ]
+ servers = [await manager.server_add(cmdline=cmdline),
+ await manager.server_add(cmdline=cmdline),
+ await manager.server_add(cmdline=cmdline)]
+
+ cql = manager.get_cql()
+ await cql.run_async("CREATE KEYSPACE test WITH replication = {'class': 'NetworkTopologyStrategy', "
+ "'replication_factor': 3} AND tablets = {'initial': 32};")
+ await cql.run_async("CREATE TABLE test.test (pk int PRIMARY KEY, c int);")
+
+ keys_list = [range(0, 100), range(100, 200), range(200, 300)]
+ keys = range(0, 300)
+
+ for idx in range(0,3):
+ s = servers[idx].server_id
+ await manager.server_stop_gracefully(s, timeout=120)
+ logger.info(f"Stopped server {idx}");
+ logger.info(f"Insert into server {idx}");
+ await asyncio.gather(*[cql.run_async(f"INSERT INTO test.test (pk, c) VALUES ({k}, {k});") for k in keys_list[idx]])
+ await manager.server_start(s)
+ logger.info(f"Started server {idx}");
+
+ await wait_for_cql_and_get_hosts(cql, servers, time.time() + 60)
+ logger.info("Repair table")
+ await manager.api.repair(servers[0].ip_addr, "test", "test")
+
+ async def check():
+ logger.info("Checking table")
+ query = SimpleStatement("SELECT * FROM test.test;", consistency_level=ConsistencyLevel.ONE)
+ rows = await cql.run_async(query)
+ assert len(rows) == len(keys)
+ for r in rows:
+ assert r.c == r.pk
+
+ for idx in range(0,3):
+ s = servers[idx].server_id
+ await manager.server_stop_gracefully(s, timeout=120)
+ await check()
+ await manager.server_start(s)
+
+ await cql.run_async("DROP KEYSPACE test;")
|
zulip
|
https://github.com/zulip/zulip
|
068dd6bdae1a857fb0e6cbe9f8f1d7a78f5f7fcd
|
Mateusz Mandera
|
2021-10-20 05:30:10
|
docs: Tweak Keycloak SAML instructions.
|
Keycloak docs say:
|
docs: Tweak Keycloak SAML instructions.
Keycloak docs say:
https://www.keycloak.org/getting-started/getting-started-docker
```
By default there is a single realm in Keycloak called master. This is
dedicated to manage Keycloak and should not be used for your own
applications.
```
Thus we should change what we assume the Keycloak realm to be to avoid
assuming as a default a practice
that Keycloak disourages.
|
diff --git a/templates/zerver/help/saml-authentication.md b/templates/zerver/help/saml-authentication.md
index cec0d3daa1c81..43e0a184eb074 100644
--- a/templates/zerver/help/saml-authentication.md
+++ b/templates/zerver/help/saml-authentication.md
@@ -117,8 +117,7 @@ how to configure these SAML providers to work with Zulip.
1. Make sure you have created your organization.
1. Make sure your Keycloak server is up and running. We assume the URL
- is `https://keycloak.example.com` and your Keycloak realm is `master` (which
- is the default name for a Keycloak realm).
+ is `https://keycloak.example.com` and your Keycloak realm is `yourrealm`.
1. In Keycloak, register a new Client for your Zulip organization:
* Client-ID: `https://zulipchat.com`
* Client Protocol: `saml`
@@ -150,7 +149,7 @@ following information to Zulip Support at [email protected]:
* The URL of your Zulip Cloud organization, i.e. `https://example.zulipchat.com`.
* The URL of your Keycloak realm. If `master` is your Keycloak
realm name, then the Keycloak realm URL should resemble
- `https://keycloak.example.com/auth/realms/master`.
+ `https://keycloak.example.com/auth/realms/yourrealm`.
## Related articles
|
leetcode
|
https://github.com/doocs/leetcode
|
ca31a03f830e6f9290a7baf1e0e9610c7e63aca4
|
yanglbme
|
2023-05-27 06:19:00
|
feat: add solutions to lc problems: No.1119,1132
|
* No.1119. Remove Vowels from a String
* No.1132. Reported Posts II
|
feat: add solutions to lc problems: No.1119,1132
* No.1119. Remove Vowels from a String
* No.1132. Reported Posts II
|
diff --git a/solution/1100-1199/1119.Remove Vowels from a String/Solution.ts b/solution/1100-1199/1119.Remove Vowels from a String/Solution.ts
new file mode 100644
index 0000000000000..3cfd5880dd116
--- /dev/null
+++ b/solution/1100-1199/1119.Remove Vowels from a String/Solution.ts
@@ -0,0 +1,3 @@
+function removeVowels(s: string): string {
+ return s.replace(/[aeiou]/g, '');
+}
diff --git a/solution/1100-1199/1132.Reported Posts II/README.md b/solution/1100-1199/1132.Reported Posts II/README.md
index bcd78b3bf14c0..14df621e93f6f 100644
--- a/solution/1100-1199/1132.Reported Posts II/README.md
+++ b/solution/1100-1199/1132.Reported Posts II/README.md
@@ -97,7 +97,21 @@ Removals table:
### **SQL**
```sql
-
+# Write your MySQL query statement below
+SELECT
+ round( avg( avg_per * 100 ), 2 ) AS average_daily_percent
+FROM
+ (
+ SELECT
+ count( DISTINCT t2.post_id ) / count( DISTINCT t1.post_id ) AS avg_per
+ FROM
+ Actions t1
+ LEFT JOIN Removals t2 ON t1.post_id = t2.post_id
+ WHERE
+ t1.extra = 'spam'
+ GROUP BY
+ action_date
+ ) t3;
```
<!-- tabs:end -->
diff --git a/solution/1100-1199/1132.Reported Posts II/README_EN.md b/solution/1100-1199/1132.Reported Posts II/README_EN.md
index b3efcd40c656b..f77d3a2125f76 100644
--- a/solution/1100-1199/1132.Reported Posts II/README_EN.md
+++ b/solution/1100-1199/1132.Reported Posts II/README_EN.md
@@ -92,7 +92,21 @@ Note that the output is only one number and that we do not care about the remove
### **SQL**
```sql
-
+# Write your MySQL query statement below
+SELECT
+ round( avg( avg_per * 100 ), 2 ) AS average_daily_percent
+FROM
+ (
+ SELECT
+ count( DISTINCT t2.post_id ) / count( DISTINCT t1.post_id ) AS avg_per
+ FROM
+ Actions t1
+ LEFT JOIN Removals t2 ON t1.post_id = t2.post_id
+ WHERE
+ t1.extra = 'spam'
+ GROUP BY
+ action_date
+ ) t3;
```
<!-- tabs:end -->
diff --git a/solution/1100-1199/1132.Reported Posts II/Solution.sql b/solution/1100-1199/1132.Reported Posts II/Solution.sql
new file mode 100644
index 0000000000000..93fb5d9053ea1
--- /dev/null
+++ b/solution/1100-1199/1132.Reported Posts II/Solution.sql
@@ -0,0 +1,15 @@
+# Write your MySQL query statement below
+SELECT
+ round( avg( avg_per * 100 ), 2 ) AS average_daily_percent
+FROM
+ (
+ SELECT
+ count( DISTINCT t2.post_id ) / count( DISTINCT t1.post_id ) AS avg_per
+ FROM
+ Actions t1
+ LEFT JOIN Removals t2 ON t1.post_id = t2.post_id
+ WHERE
+ t1.extra = 'spam'
+ GROUP BY
+ action_date
+ ) t3;
\ No newline at end of file
diff --git a/solution/1100-1199/1137.N-th Tribonacci Number/README.md b/solution/1100-1199/1137.N-th Tribonacci Number/README.md
index 68939b8717b4b..304f584ed7372 100644
--- a/solution/1100-1199/1137.N-th Tribonacci Number/README.md
+++ b/solution/1100-1199/1137.N-th Tribonacci Number/README.md
@@ -44,7 +44,7 @@ T_4 = 1 + 1 + 2 = 4
**方法一：动态规划**
-由于题目中给出的递推式，可以使用动态规划求解。
+根据题目中给出的递推式，我们可以使用动态规划求解。
我们定义三个变量 $a$, $b$, $c$，分别表示 $T_{n-3}$, $T_{n-2}$, $T_{n-1}$，初始值分别为 $0$, $1$, $1$。
diff --git a/solution/1100-1199/1141.User Activity for the Past 30 Days I/README.md b/solution/1100-1199/1141.User Activity for the Past 30 Days I/README.md
index f05a6f1f73b0d..2edef466870b1 100644
--- a/solution/1100-1199/1141.User Activity for the Past 30 Days I/README.md
+++ b/solution/1100-1199/1141.User Activity for the Past 30 Days I/README.md
@@ -72,14 +72,15 @@ Activity table:
```sql
SELECT
- activity_date AS day,
- COUNT(DISTINCT user_id) AS active_users
+ activity_date AS DAY,
+ COUNT( DISTINCT user_id ) AS active_users
FROM
- Activity
+ Activity
WHERE
- DATEDIFF('2019-07-27', activity_date) < 30
+ DATEDIFF( '2019-07-27', activity_date ) > 0
+ AND DATEDIFF( '2019-07-27', activity_date ) < 30
GROUP BY
- activity_date;
+ activity_date;
```
<!-- tabs:end -->
diff --git a/solution/1100-1199/1141.User Activity for the Past 30 Days I/README_EN.md b/solution/1100-1199/1141.User Activity for the Past 30 Days I/README_EN.md
index 7cf7bff84cd93..4822e49fbefb8 100644
--- a/solution/1100-1199/1141.User Activity for the Past 30 Days I/README_EN.md
+++ b/solution/1100-1199/1141.User Activity for the Past 30 Days I/README_EN.md
@@ -68,14 +68,15 @@ Activity table:
```sql
SELECT
- activity_date AS day,
- COUNT(DISTINCT user_id) AS active_users
+ activity_date AS DAY,
+ COUNT( DISTINCT user_id ) AS active_users
FROM
- Activity
+ Activity
WHERE
- DATEDIFF('2019-07-27', activity_date) < 30
+ DATEDIFF( '2019-07-27', activity_date ) > 0
+ AND DATEDIFF( '2019-07-27', activity_date ) < 30
GROUP BY
- activity_date;
+ activity_date;
```
<!-- tabs:end -->
diff --git a/solution/1100-1199/1141.User Activity for the Past 30 Days I/Solution.sql b/solution/1100-1199/1141.User Activity for the Past 30 Days I/Solution.sql
index feb62c48e4d40..7c31de460e285 100644
--- a/solution/1100-1199/1141.User Activity for the Past 30 Days I/Solution.sql
+++ b/solution/1100-1199/1141.User Activity for the Past 30 Days I/Solution.sql
@@ -1,9 +1,10 @@
SELECT
- activity_date AS day,
- COUNT(DISTINCT user_id) AS active_users
+ activity_date AS DAY,
+ COUNT( DISTINCT user_id ) AS active_users
FROM
- Activity
+ Activity
WHERE
- DATEDIFF('2019-07-27', activity_date) < 30
+ DATEDIFF( '2019-07-27', activity_date ) > 0
+ AND DATEDIFF( '2019-07-27', activity_date ) < 30
GROUP BY
- activity_date;
\ No newline at end of file
+ activity_date;
\ No newline at end of file
|
ockam
|
https://github.com/build-trust/ockam
|
caf97d039083ca161cb94be25405ab6b08d072ec
|
dependabot[bot]
|
2024-03-20 15:59:28
|
build: bump trybuild from 1.0.89 to 1.0.90
|
Bumps [trybuild](https://github.com/dtolnay/trybuild) from 1.0.89 to 1.0.90.
- [Release notes](https://github.com/dtolnay/trybuild/releases)
- [Commits](https://github.com/dtolnay/trybuild/compare/1.0.89...1.0.90)
---
|
build: bump trybuild from 1.0.89 to 1.0.90
Bumps [trybuild](https://github.com/dtolnay/trybuild) from 1.0.89 to 1.0.90.
- [Release notes](https://github.com/dtolnay/trybuild/releases)
- [Commits](https://github.com/dtolnay/trybuild/compare/1.0.89...1.0.90)
---
updated-dependencies:
- dependency-name: trybuild
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
|
diff --git a/Cargo.lock b/Cargo.lock
index 440d3b0475c..f8f443a1584 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1002,15 +1002,6 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-[[package]]
-name = "basic-toml"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "bincode"
version = "1.3.3"
@@ -1263,7 +1254,7 @@ dependencies = [
"serde_json",
"syn 1.0.109",
"tempfile",
- "toml",
+ "toml 0.5.11",
]
[[package]]
@@ -6201,6 +6192,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "serde_spanned"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "serde_urlencoded"
version = "0.7.1"
@@ -7305,6 +7305,40 @@ dependencies = [
"serde",
]
+[[package]]
+name = "toml"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd"
+dependencies = [
+ "indexmap 2.2.5",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
[[package]]
name = "tonic"
version = "0.11.0"
@@ -7497,11 +7531,10 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "trybuild"
-version = "1.0.89"
+version = "1.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9d3ba662913483d6722303f619e75ea10b7855b0f8e0d72799cf8621bb488f"
+checksum = "2aa6f84ec205ebf87fb7a0abdbcd1467fa5af0e86878eb6d888b78ecbb10b6d5"
dependencies = [
- "basic-toml",
"dissimilar",
"glob",
"once_cell",
@@ -7509,6 +7542,7 @@ dependencies = [
"serde_derive",
"serde_json",
"termcolor",
+ "toml 0.8.12",
]
[[package]]
@@ -8217,6 +8251,15 @@ version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+[[package]]
+name = "winnow"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "winreg"
version = "0.50.0"
|
docfx
|
https://github.com/dotnet/docfx
|
4b61c9e35b256092f4403fa7838e5c2c2dc5ffcf
|
dependabot[bot]
|
2024-08-01 13:48:08
|
build(deps): bump HtmlAgilityPack from 1.11.61 to 1.11.62 (#10139)
|
Bumps [HtmlAgilityPack](https://github.com/zzzprojects/html-agility-pack) from 1.11.61 to 1.11.62.
- [Release notes](https://github.com/zzzprojects/html-agility-pack/releases)
- [Commits](https://github.com/zzzprojects/html-agility-pack/compare/v1.11.61...v1.11.62)
---
|
build(deps): bump HtmlAgilityPack from 1.11.61 to 1.11.62 (#10139)
Bumps [HtmlAgilityPack](https://github.com/zzzprojects/html-agility-pack) from 1.11.61 to 1.11.62.
- [Release notes](https://github.com/zzzprojects/html-agility-pack/releases)
- [Commits](https://github.com/zzzprojects/html-agility-pack/compare/v1.11.61...v1.11.62)
---
updated-dependencies:
- dependency-name: HtmlAgilityPack
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
diff --git a/Directory.Packages.props b/Directory.Packages.props
index c280d36c81c..19c267651c6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,7 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
- <PackageVersion Include="HtmlAgilityPack" Version="1.11.61" />
+ <PackageVersion Include="HtmlAgilityPack" Version="1.11.62" />
<PackageVersion Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
<PackageVersion Include="IgnoresAccessChecksToGenerator" Version="0.7.0" />
<PackageVersion Include="Jint" Version="4.0.0" />
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.