From 50dfb62df57dbed628b509cc2b9e0a2d3e1a9e0a Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 9 Oct 2023 12:51:37 +0200 Subject: [PATCH 1/6] remove ability to delete worker config on non ee --- frontend/src/lib/components/WorkspaceGroup.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/lib/components/WorkspaceGroup.svelte b/frontend/src/lib/components/WorkspaceGroup.svelte index fc8efd0752c44..b2985c709b4fd 100644 --- a/frontend/src/lib/components/WorkspaceGroup.svelte +++ b/frontend/src/lib/components/WorkspaceGroup.svelte @@ -77,7 +77,7 @@ }} >
- Are you sure you want to remove this worker nconfig? + Are you sure you want to remove this worker group {name}?
@@ -329,7 +329,7 @@ color="light" size="xs" on:click={() => { - if (!enterpriseLicense) { + if (!$enterpriseLicense) { sendUserToast('Worker Management UI is an EE feature', true) } else { openDelete = true From 08f561bdadf93cae2c984d0fa75d08d81ec02046 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:40:11 +0200 Subject: [PATCH 2/6] chore(deps): bump prettyplease from 0.1.25 to 0.2.15 in /backend (#2256) Bumps [prettyplease](https://github.com/dtolnay/prettyplease) from 0.1.25 to 0.2.15. - [Release notes](https://github.com/dtolnay/prettyplease/releases) - [Commits](https://github.com/dtolnay/prettyplease/compare/0.1.25...0.2.15) --- updated-dependencies: - dependency-name: prettyplease dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- backend/Cargo.lock | 14 ++------------ backend/windmill-api-client/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 3fbe67671b010..2e59f3dc823f5 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -606,7 +606,7 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.15", + "prettyplease", "proc-macro2", "quote", "regex", @@ -3891,16 +3891,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "prettyplease" version = "0.2.15" @@ -7200,7 +7190,7 @@ dependencies = [ "base64 0.21.4", "chrono", "openapiv3", - "prettyplease 0.1.25", + "prettyplease", "progenitor", "progenitor-client", "rand 0.8.5", diff --git a/backend/windmill-api-client/Cargo.toml b/backend/windmill-api-client/Cargo.toml index ab764e6670498..dac481d7c7e39 100644 --- a/backend/windmill-api-client/Cargo.toml +++ b/backend/windmill-api-client/Cargo.toml @@ -22,7 +22,7 @@ base64.workspace = true openapiv3 = "=1.0.2" [build-dependencies] -prettyplease = "0.1.25" +prettyplease = "0.2.15" progenitor = { git = "https://github.com/oxidecomputer/progenitor", rev = "3d96016ae8d422e90513b2d34fb5b63eeab30b01" } serde_json = "1.0" syn = "1.0" From a93af1f3c4771a2f204338976278e9c0eaec5454 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:40:12 +0200 Subject: [PATCH 3/6] chore(deps): bump openapiv3 from 1.0.2 to 1.0.3 in /backend (#2236) Bumps [openapiv3](https://github.com/glademiller/openapiv3) from 1.0.2 to 1.0.3. - [Commits](https://github.com/glademiller/openapiv3/compare/v1.0.2...v1.0.3) --- updated-dependencies: - dependency-name: openapiv3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- backend/Cargo.lock | 8 ++++---- backend/windmill-api-client/Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 2e59f3dc823f5..88edb6ef65ddc 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -2568,7 +2568,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -2579,6 +2578,7 @@ checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", "hashbrown 0.14.1", + "serde", ] [[package]] @@ -3387,11 +3387,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openapiv3" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1a9f106eb0a780abd17ba9fca8e0843e3461630bcbe2af0ad4d5d3ba4e9aa4" +checksum = "75e56d5c441965b6425165b7e3223cc933ca469834f4a8b4786817a1f9dc4f13" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.2", "serde", "serde_json", ] diff --git a/backend/windmill-api-client/Cargo.toml b/backend/windmill-api-client/Cargo.toml index dac481d7c7e39..14b934d067f41 100644 --- a/backend/windmill-api-client/Cargo.toml +++ b/backend/windmill-api-client/Cargo.toml @@ -19,11 +19,11 @@ uuid.workspace = true serde_json.workspace = true rand.workspace = true base64.workspace = true -openapiv3 = "=1.0.2" +openapiv3 = "=1.0.3" [build-dependencies] prettyplease = "0.2.15" progenitor = { git = "https://github.com/oxidecomputer/progenitor", rev = "3d96016ae8d422e90513b2d34fb5b63eeab30b01" } serde_json = "1.0" syn = "1.0" -openapiv3 = "=1.0.2" \ No newline at end of file +openapiv3 = "=1.0.3" \ No newline at end of file From 3d928593cf1ddc46c14abfad54d3732e7627f706 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:40:12 +0200 Subject: [PATCH 4/6] chore(deps): bump cla-assistant/github-action from 2.2.1 to 2.3.1 (#2302) Bumps [cla-assistant/github-action](https://github.com/cla-assistant/github-action) from 2.2.1 to 2.3.1. - [Release notes](https://github.com/cla-assistant/github-action/releases) - [Commits](https://github.com/cla-assistant/github-action/compare/v2.2.1...v2.3.1) --- updated-dependencies: - dependency-name: cla-assistant/github-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/sign-cla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sign-cla.yml b/.github/workflows/sign-cla.yml index bda4b49c61264..62c857808f5eb 100644 --- a/.github/workflows/sign-cla.yml +++ b/.github/workflows/sign-cla.yml @@ -12,7 +12,7 @@ jobs: - name: "CLA Assistant" if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' # Beta Release - uses: cla-assistant/github-action@v2.2.1 + uses: cla-assistant/github-action@v2.3.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_PAT }} From 61ee550227b02e33ed8d949a8a091b9670ce1669 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 9 Oct 2023 17:44:11 +0200 Subject: [PATCH 5/6] remove automerge dependabot --- .github/workflows/automerge-dependabot.yml | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml index 5b7224a07f67f..605243d0046d4 100644 --- a/.github/workflows/automerge-dependabot.yml +++ b/.github/workflows/automerge-dependabot.yml @@ -1,26 +1,26 @@ -name: dependabot auto-merge +# name: dependabot auto-merge -on: pull_request_target +# on: pull_request_target -permissions: - contents: read - pull-requests: read +# permissions: +# contents: read +# pull-requests: read -jobs: - dependabot: - runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} - steps: - - name: Dependabot metadata - id: metadata - uses: dependabot/fetch-metadata@v1.6.0 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - - name: Enable auto-merge for Dependabot PRs - if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' - run: | - echo ${{ secrets.RUBEN_PAT }} | gh auth login --with-token - gh pr review --approve "$PR_URL" - gh pr merge --auto --squash "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} +# jobs: +# dependabot: +# runs-on: ubuntu-latest +# if: ${{ github.actor == 'dependabot[bot]' }} +# steps: +# - name: Dependabot metadata +# id: metadata +# uses: dependabot/fetch-metadata@v1.6.0 +# with: +# github-token: "${{ secrets.GITHUB_TOKEN }}" +# - name: Enable auto-merge for Dependabot PRs +# if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' +# run: | +# echo ${{ secrets.RUBEN_PAT }} | gh auth login --with-token +# gh pr review --approve "$PR_URL" +# gh pr merge --auto --squash "$PR_URL" +# env: +# PR_URL: ${{github.event.pull_request.html_url}} From 112844f294383f6dd93198e3dc7d4d951f7c9606 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 9 Oct 2023 17:45:40 +0200 Subject: [PATCH 6/6] Revert "chore(deps): bump openapiv3 from 1.0.2 to 1.0.3 in /backend (#2236)" (#2408) This reverts commit a93af1f3c4771a2f204338976278e9c0eaec5454. --- backend/Cargo.lock | 8 ++++---- backend/windmill-api-client/Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 88edb6ef65ddc..2e59f3dc823f5 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -2568,6 +2568,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -2578,7 +2579,6 @@ checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", "hashbrown 0.14.1", - "serde", ] [[package]] @@ -3387,11 +3387,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openapiv3" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75e56d5c441965b6425165b7e3223cc933ca469834f4a8b4786817a1f9dc4f13" +checksum = "7b1a9f106eb0a780abd17ba9fca8e0843e3461630bcbe2af0ad4d5d3ba4e9aa4" dependencies = [ - "indexmap 2.0.2", + "indexmap 1.9.3", "serde", "serde_json", ] diff --git a/backend/windmill-api-client/Cargo.toml b/backend/windmill-api-client/Cargo.toml index 14b934d067f41..dac481d7c7e39 100644 --- a/backend/windmill-api-client/Cargo.toml +++ b/backend/windmill-api-client/Cargo.toml @@ -19,11 +19,11 @@ uuid.workspace = true serde_json.workspace = true rand.workspace = true base64.workspace = true -openapiv3 = "=1.0.3" +openapiv3 = "=1.0.2" [build-dependencies] prettyplease = "0.2.15" progenitor = { git = "https://github.com/oxidecomputer/progenitor", rev = "3d96016ae8d422e90513b2d34fb5b63eeab30b01" } serde_json = "1.0" syn = "1.0" -openapiv3 = "=1.0.3" \ No newline at end of file +openapiv3 = "=1.0.2" \ No newline at end of file