chore: integrate `wash` into the repository #807

rvolosatovs · 2023-10-26T17:22:24Z

Feature or Problem

Integrate wash into the workspace and CI pipelines.

cargo build -p wash-cli will now produce a wash binary in workspace target (also, cargo build --workspace, for example)
That means that nix build '.#wasmcloud-${target}' now also produce both binaries reproducibly-built

I had to switch to native Windows builds due to rust-lang/rust#92212, which is now hit by wash, but not wasmcloud. We can revisit this if/when either:

wash dependency set becomes smaller
issue is fixed upstream
using MSVC on Linux is feasible

Things done:

Addressed cargo audit issues
Cleaned up the wash-cli code originally such that we could simply have a second binary in root-level src/bin, but I have since switched the approach and moved the binary back to crates/wash-cli. I've left the improvements in.
washboard MUST be a subdirectory of wherever wash-cli Cargo.toml is located, now that's crates/wash-cli.

Some things may still be broken - there's a lot of hidden details in configs etc. (like the wash snapcraft config), but I tried my best to address everything. It's best to address anything left in follow-ups to minimize diff and get this one over the line, archive wash repo

Related Issues

Release Information

Consumer Impact

Testing

Built on platform(s)

Tested on platform(s)

Unit Test(s)

Acceptance or Integration

Manual Verification

Signed-off-by: Connor Smith <connor.smith.256@gmail.com>

Bumps [lucide-react](https://github.com/lucide-icons/lucide/tree/HEAD/packages/lucide-react) from 0.287.0 to 0.288.0. - [Release notes](https://github.com/lucide-icons/lucide/releases) - [Commits](https://github.com/lucide-icons/lucide/commits/0.288.0/packages/lucide-react) --- updated-dependencies: - dependency-name: lucide-react dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…rn/washboard/lucide-react-0.288.0 build(deps): Bump lucide-react from 0.287.0 to 0.288.0 in /washboard

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.11 to 4.5.0. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v4.5.0/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v4.5.0/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.2.13 to 18.2.14. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom) --- updated-dependencies: - dependency-name: "@types/react-dom" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.8.6 to 20.8.7. - [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] <support@github.com>

Signed-off-by: Lachlan Heywood <lachieh@users.noreply.github.com>

This PR fixes some flakiness in E2E tests -- what was happening was that in that in-between tests (particularly the `integration_stop.rs` suite) `TestWashInstance`s were not having enough time to shut down, and failing calls to `wash get hosts` were causing a failure. The serial tests work in such a way that once one of the tests failes in a way that leaves `nats-server`/`wasmcloud_host` processes around, the rest will fail (e.x. `wash` commands behave differently with a host already running). In *theory* we should be able to get rid of the serial tests in the future with more aggressive port randomization and the use of `wash ctx` and augmentation to the `TestWashInstance` machinery (the main reason we couldn't in the past was that hosts would clobber each other, and could not be shut down individually). This commit allows for failure of `wash get hosts` that is used in testing machinery (within a timeout), which fixes the issue. Signed-off-by: Victor Adossi <vadossi@cosmonic.com>

…rn/washboard/vite-4.5.0 build(deps-dev): Bump vite from 4.4.11 to 4.5.0 in /washboard

…rn/washboard/types/react-dom-18.2.14 build(deps-dev): Bump @types/react-dom from 18.2.13 to 18.2.14 in /washboard

…rn/washboard/types/node-20.8.7 build(deps-dev): Bump @types/node from 20.8.6 to 20.8.7 in /washboard

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.28 to 18.2.29. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

fix(ui): update washboard build files

…rn/washboard/types/react-18.2.29 build(deps-dev): Bump @types/react from 18.2.28 to 18.2.29 in /washboard

chore: update test message

This commit refactors some of the testing code to: - ensure we always print integration test output (save time root causing in CI and elsewhere) - consistent use of TARGET to choose which test to run - use system provided randomized ports (port 0) - fix some uses of context - remove some process scanning that was never used This commit also includes changes test flake fixes from wasmCloud/wash#921 Signed-off-by: Victor Adossi <vadossi@cosmonic.com>

…esting-code-refactor refactor: various fixes to testing code

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.29 to 18.2.30. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…rn/washboard/types/react-18.2.30 build(deps-dev): Bump @types/react from 18.2.29 to 18.2.30 in /washboard

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.49 to 1.0.50. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](dtolnay/thiserror@1.0.49...1.0.50) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: Connor Smith <connor.smith.256@gmail.com>

Bumps [eslint](https://github.com/eslint/eslint) from 8.51.0 to 8.52.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.51.0...v8.52.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.30 to 18.2.31. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.8.7 to 20.8.8. - [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] <support@github.com>

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.8.0 to 6.9.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.9.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.1 to 2.29.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.28.1...v2.29.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.8.0 to 6.9.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/v6.9.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] <support@github.com>

As the component model and WASI are still maturing, the components-first codebases built with `wash` should reflect the experimental nature of support to related tooling. This commit marks both components as experimental at two levels -- a custom section in the Wasm metadata (as a custom section) and as a tag on the signed wasmCloud actor that is produced. Signed-off-by: Victor Adossi <vadossi@cosmonic.com>

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

brooksmtownsend

LGTM

Dockerfile

connorsmith256

Reviewing post-merge to help me understand, and to file at least one follow-up. Huge thank you for getting this migration over the line 🙌

flake.nix

connorsmith256 · 2023-10-30T18:59:09Z

flake.nix

+            "crates/wash-cli/Dockerfile"
+            "crates/wash-cli/docs"
+            "crates/wash-cli/Makefile"
+            "crates/wash-cli/README.md"


This looks a little odd to ignore

actually the README does affect the cargo doc build, you're right, I'll remove that

.github/workflows/wash.yml

connorsmith256 · 2023-10-30T19:01:44Z

.cargo/audit.toml

@@ -1,5 +1,4 @@
 [advisories]
 ignore = [
-    "RUSTSEC-2020-0071", # `time` localtime_r segfault
    "RUSTSEC-2022-0093", # `ed25519-dalek` Oracle attack, remove once https://github.com/deislabs/bindle/pull/368 is merged


Is this one still needed? The linked bindle PR has been merged

there has been no release

cc @thomastaylor312

.github/CODEOWNERS

crates/wash-cli/src/app/mod.rs

connorsmith256 and others added 30 commits October 17, 2023 21:37

chore: update test message

9caf89a

Signed-off-by: Connor Smith <connor.smith.256@gmail.com>

Merge pull request wasmCloud#915 from wasmCloud/dependabot/npm_and_ya…

16ed849

…rn/washboard/lucide-react-0.288.0 build(deps): Bump lucide-react from 0.287.0 to 0.288.0 in /washboard

fix(ui): update washboard build files

ffb2595

Signed-off-by: Lachlan Heywood <lachieh@users.noreply.github.com>

Merge pull request wasmCloud#917 from wasmCloud/dependabot/npm_and_ya…

b962e13

…rn/washboard/vite-4.5.0 build(deps-dev): Bump vite from 4.4.11 to 4.5.0 in /washboard

Merge pull request wasmCloud#918 from wasmCloud/dependabot/npm_and_ya…

d8f7b12

…rn/washboard/types/react-dom-18.2.14 build(deps-dev): Bump @types/react-dom from 18.2.13 to 18.2.14 in /washboard

Merge pull request wasmCloud#919 from wasmCloud/dependabot/npm_and_ya…

083623f

…rn/washboard/types/node-20.8.7 build(deps-dev): Bump @types/node from 20.8.6 to 20.8.7 in /washboard

Merge pull request wasmCloud#925 from lachieh/update-ui-build

f6fe832

fix(ui): update washboard build files

Merge pull request wasmCloud#920 from wasmCloud/dependabot/npm_and_ya…

647a555

…rn/washboard/types/react-18.2.29 build(deps-dev): Bump @types/react from 18.2.28 to 18.2.29 in /washboard

Merge pull request wasmCloud#914 from connorsmith256/chore/update-test

516aa5e

chore: update test message

Merge pull request wasmCloud#922 from vados-cosmonic/refactor/light-t…

0b9e1ca

…esting-code-refactor refactor: various fixes to testing code

Merge pull request wasmCloud#927 from wasmCloud/dependabot/npm_and_ya…

443670a

…rn/washboard/types/react-18.2.30 build(deps-dev): Bump @types/react from 18.2.29 to 18.2.30 in /washboard

chore!: remove prov_rpc options

d53bf1b

Signed-off-by: Connor Smith <connor.smith.256@gmail.com>

chore: remove unused var

5ef2c4c

Signed-off-by: Connor Smith <connor.smith.256@gmail.com>

rvolosatovs added 5 commits October 30, 2023 11:50

doc: revert to upstream wash dev doc

413e395

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

build: avoid setting tinygo config for tests

fe1db9f

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

build(nix): ignore unused wash-cli paths

2349c4e

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

build: only build required crates

8a51e55

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

ci: upload Windows binaries in a directory

7a43c07

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs force-pushed the merge/wash branch from fcc1c0c to 7a43c07 Compare October 30, 2023 12:28

rvolosatovs added 3 commits October 30, 2023 12:36

ci(wash): fix docker-compose path

b5b139f

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

build: move nextest config to root

6343ebf

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

ci(wash): use glob pull-request paths

587a041

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs force-pushed the merge/wash branch from e62a4ff to 587a041 Compare October 30, 2023 12:46

rvolosatovs added 3 commits October 30, 2023 12:47

ci(wash): remove CI suffix

2ed524e

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

ci(wash): cancel concurrent jobs

f902caf

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

build(audit): remove time audit exception

870ebcb

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs force-pushed the merge/wash branch from ce7719e to 67ca3be Compare October 30, 2023 13:02

rvolosatovs marked this pull request as ready for review October 30, 2023 13:09

rvolosatovs requested review from a team as code owners October 30, 2023 13:09

build(docker): add wash to dev images

21602aa

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs force-pushed the merge/wash branch from 67ca3be to 21602aa Compare October 30, 2023 15:06

rvolosatovs mentioned this pull request Oct 30, 2023

chore(ctl)!: update ctl to 0.31.0 #816

Merged

10 tasks

ci: add bin prefix to Darwin lipo

5257461

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs force-pushed the merge/wash branch from 3aa8a37 to 5257461 Compare October 30, 2023 18:01

brooksmtownsend approved these changes Oct 30, 2023

View reviewed changes

Dockerfile Show resolved Hide resolved

brooksmtownsend merged commit f2bc010 into wasmCloud:main Oct 30, 2023
30 checks passed

rvolosatovs mentioned this pull request Oct 30, 2023

ci(wash): run wash CI when wash CI changes #828

Merged

10 tasks

connorsmith256 reviewed Oct 30, 2023

View reviewed changes

rvolosatovs deleted the merge/wash branch October 30, 2023 19:09

rvolosatovs mentioned this pull request Oct 30, 2023

build(nix): do not remove wash README from sandbox #830

Merged

10 tasks

brooksmtownsend mentioned this pull request Dec 18, 2023

chore: wasmCloud 0.81 bumps #1186

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: integrate `wash` into the repository #807

chore: integrate `wash` into the repository #807

rvolosatovs commented Oct 26, 2023 •

edited

brooksmtownsend left a comment

connorsmith256 left a comment

connorsmith256 Oct 30, 2023

rvolosatovs Oct 30, 2023

connorsmith256 Oct 30, 2023

rvolosatovs Oct 30, 2023

rvolosatovs Oct 30, 2023

chore: integrate wash into the repository #807

chore: integrate wash into the repository #807

Conversation

rvolosatovs commented Oct 26, 2023 • edited

Feature or Problem

Related Issues

Release Information

Consumer Impact

Testing

Unit Test(s)

Acceptance or Integration

Manual Verification

brooksmtownsend left a comment

Choose a reason for hiding this comment

connorsmith256 left a comment

Choose a reason for hiding this comment

connorsmith256 Oct 30, 2023

Choose a reason for hiding this comment

rvolosatovs Oct 30, 2023

Choose a reason for hiding this comment

connorsmith256 Oct 30, 2023

Choose a reason for hiding this comment

rvolosatovs Oct 30, 2023

Choose a reason for hiding this comment

rvolosatovs Oct 30, 2023

Choose a reason for hiding this comment

chore: integrate `wash` into the repository #807

chore: integrate `wash` into the repository #807

rvolosatovs commented Oct 26, 2023 •

edited