From bb1461d5d8c6797c06edb73fb30bd3091d842557 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 30 Nov 2024 18:00:11 +0100 Subject: [PATCH 1/3] Fix spellcheck in purge log (#4491) --- cli/pipeline/purge.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cli/pipeline/purge.go b/cli/pipeline/purge.go index 759b9cbf2..a9c5e39d1 100644 --- a/cli/pipeline/purge.go +++ b/cli/pipeline/purge.go @@ -113,7 +113,8 @@ func pipelinePurge(c *cli.Command, client woodpecker.Client) (err error) { } for i, p := range pipelinesToPurge { - log.Debug().Msgf("%sprune %v/%v pipelines from repo '%v'", msgPrefix, i+1, len(pipelinesToPurge), repoIDOrFullName) + // cspell:words spurge + log.Debug().Msgf("%spurge %v/%v pipelines from repo '%v'", msgPrefix, i+1, len(pipelinesToPurge), repoIDOrFullName) if dryRun { continue } From 0f87ddc0578f27a4b89395fbc84729e2cf0b93bf Mon Sep 17 00:00:00 2001 From: qwerty287 <80460567+qwerty287@users.noreply.github.com> Date: Sat, 30 Nov 2024 20:11:57 +0200 Subject: [PATCH 2/3] Sort cli commands alphabetically (#4489) Co-authored-by: Robert Kaussow --- cli/admin/admin.go | 6 +++--- cli/admin/registry/registry.go | 4 ++-- cli/admin/secret/secret.go | 4 ++-- cli/admin/user/user.go | 4 ++-- cli/org/registry/registry.go | 4 ++-- cli/org/secret/secret.go | 4 ++-- cli/pipeline/log/log.go | 2 +- cli/pipeline/pipeline.go | 20 ++++++++++---------- cli/repo/cron/cron.go | 4 ++-- cli/repo/registry/registry.go | 4 ++-- cli/repo/repo.go | 14 +++++++------- cli/repo/secret/secret.go | 4 ++-- cmd/cli/app.go | 6 +++--- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/cli/admin/admin.go b/cli/admin/admin.go index f96c5fd0b..f99b79f0f 100644 --- a/cli/admin/admin.go +++ b/cli/admin/admin.go @@ -28,9 +28,9 @@ var Command = &cli.Command{ Name: "admin", Usage: "manage server settings", Commands: []*cli.Command{ - secret.Command, - registry.Command, - user.Command, loglevel.Command, + registry.Command, + secret.Command, + user.Command, }, } diff --git a/cli/admin/registry/registry.go b/cli/admin/registry/registry.go index 1717803c6..7055c2873 100644 --- a/cli/admin/registry/registry.go +++ b/cli/admin/registry/registry.go @@ -25,8 +25,8 @@ var Command = &cli.Command{ Commands: []*cli.Command{ registryCreateCmd, registryDeleteCmd, - registryUpdateCmd, - registryShowCmd, registryListCmd, + registryShowCmd, + registryUpdateCmd, }, } diff --git a/cli/admin/secret/secret.go b/cli/admin/secret/secret.go index b3496b076..da805a98e 100644 --- a/cli/admin/secret/secret.go +++ b/cli/admin/secret/secret.go @@ -25,8 +25,8 @@ var Command = &cli.Command{ Commands: []*cli.Command{ secretCreateCmd, secretDeleteCmd, - secretUpdateCmd, - secretShowCmd, secretListCmd, + secretShowCmd, + secretUpdateCmd, }, } diff --git a/cli/admin/user/user.go b/cli/admin/user/user.go index fe68e5d47..29951a635 100644 --- a/cli/admin/user/user.go +++ b/cli/admin/user/user.go @@ -23,9 +23,9 @@ var Command = &cli.Command{ Name: "user", Usage: "manage users", Commands: []*cli.Command{ - userListCmd, - userShowCmd, userAddCmd, + userListCmd, userRemoveCmd, + userShowCmd, }, } diff --git a/cli/org/registry/registry.go b/cli/org/registry/registry.go index ed8051bd9..38ca0454e 100644 --- a/cli/org/registry/registry.go +++ b/cli/org/registry/registry.go @@ -29,9 +29,9 @@ var Command = &cli.Command{ Commands: []*cli.Command{ registryCreateCmd, registryDeleteCmd, - registryUpdateCmd, - registryShowCmd, registryListCmd, + registryShowCmd, + registryUpdateCmd, }, } diff --git a/cli/org/secret/secret.go b/cli/org/secret/secret.go index 21579993b..b50880c91 100644 --- a/cli/org/secret/secret.go +++ b/cli/org/secret/secret.go @@ -29,9 +29,9 @@ var Command = &cli.Command{ Commands: []*cli.Command{ secretCreateCmd, secretDeleteCmd, - secretUpdateCmd, - secretShowCmd, secretListCmd, + secretShowCmd, + secretUpdateCmd, }, } diff --git a/cli/pipeline/log/log.go b/cli/pipeline/log/log.go index 4ea569d79..4227288dc 100644 --- a/cli/pipeline/log/log.go +++ b/cli/pipeline/log/log.go @@ -23,7 +23,7 @@ var Command = &cli.Command{ Name: "log", Usage: "manage logs", Commands: []*cli.Command{ - logShowCmd, logPurgeCmd, + logShowCmd, }, } diff --git a/cli/pipeline/pipeline.go b/cli/pipeline/pipeline.go index 454e7064d..cc86ddf07 100644 --- a/cli/pipeline/pipeline.go +++ b/cli/pipeline/pipeline.go @@ -33,20 +33,20 @@ var Command = &cli.Command{ Name: "pipeline", Usage: "manage pipelines", Commands: []*cli.Command{ - buildPipelineListCmd(), - pipelineLastCmd, - pipelineShowCmd, - pipelineStopCmd, - pipelineStartCmd, pipelineApproveCmd, - pipelineDeclineCmd, - pipelineQueueCmd, - pipelineKillCmd, - pipelinePsCmd, pipelineCreateCmd, - log.Command, + pipelineDeclineCmd, deploy.Command, + pipelineKillCmd, + pipelineLastCmd, + buildPipelineListCmd(), + log.Command, + pipelinePsCmd, pipelinePurgeCmd, + pipelineQueueCmd, + pipelineShowCmd, + pipelineStartCmd, + pipelineStopCmd, }, } diff --git a/cli/repo/cron/cron.go b/cli/repo/cron/cron.go index 364813876..90edf8f9c 100644 --- a/cli/repo/cron/cron.go +++ b/cli/repo/cron/cron.go @@ -25,8 +25,8 @@ var Command = &cli.Command{ Commands: []*cli.Command{ cronCreateCmd, cronDeleteCmd, - cronUpdateCmd, - cronShowCmd, cronListCmd, + cronShowCmd, + cronUpdateCmd, }, } diff --git a/cli/repo/registry/registry.go b/cli/repo/registry/registry.go index 98b4ef84a..ab362934a 100644 --- a/cli/repo/registry/registry.go +++ b/cli/repo/registry/registry.go @@ -28,9 +28,9 @@ var Command = &cli.Command{ Commands: []*cli.Command{ registryCreateCmd, registryDeleteCmd, - registryUpdateCmd, - registryShowCmd, registryListCmd, + registryShowCmd, + registryUpdateCmd, }, } diff --git a/cli/repo/repo.go b/cli/repo/repo.go index e9467694c..8bb3b612a 100644 --- a/cli/repo/repo.go +++ b/cli/repo/repo.go @@ -27,16 +27,16 @@ var Command = &cli.Command{ Name: "repo", Usage: "manage repositories", Commands: []*cli.Command{ - repoListCmd, - repoShowCmd, repoAddCmd, - repoUpdateCmd, + repoChownCmd, + cron.Command, + repoListCmd, + registry.Command, repoRemoveCmd, repoRepairCmd, - repoChownCmd, - repoSyncCmd, - registry.Command, secret.Command, - cron.Command, + repoShowCmd, + repoSyncCmd, + repoUpdateCmd, }, } diff --git a/cli/repo/secret/secret.go b/cli/repo/secret/secret.go index 3284539d3..2d5d965e6 100644 --- a/cli/repo/secret/secret.go +++ b/cli/repo/secret/secret.go @@ -28,9 +28,9 @@ var Command = &cli.Command{ Commands: []*cli.Command{ secretCreateCmd, secretDeleteCmd, - secretUpdateCmd, - secretShowCmd, secretListCmd, + secretShowCmd, + secretUpdateCmd, }, } diff --git a/cmd/cli/app.go b/cmd/cli/app.go index 347513b1c..2784b08a3 100644 --- a/cmd/cli/app.go +++ b/cmd/cli/app.go @@ -43,12 +43,12 @@ func newApp() *cli.Command { app.Suggest = true app.Commands = []*cli.Command{ admin.Command, - org.Command, - repo.Command, - pipeline.Command, exec.Command, info.Command, lint.Command, + org.Command, + pipeline.Command, + repo.Command, setup.Command, update.Command, } From 6c96040aa590143a403a6fbaf592a909ebb29f5d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 22:59:06 +0100 Subject: [PATCH 3/3] chore(deps): update dependency isomorphic-dompurify to v2.18.0 (#4493) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docs/pnpm-lock.yaml | 63 +++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index e403a7234..eeefea251 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -119,7 +119,7 @@ importers: version: 9.1.0 isomorphic-dompurify: specifier: ^2.16.0 - version: 2.17.0 + version: 2.18.0 marked: specifier: ^15.0.2 version: 15.0.3 @@ -2753,8 +2753,8 @@ packages: resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} engines: {node: '>= 4'} - dompurify@3.2.1: - resolution: {integrity: sha512-NBHEsc0/kzRYQd+AY6HR6B/IgsqzBABrqJbpCDQII/OK6h7B7LXzweZTDsqSW2LkTRpoxf18YUP+YjGySk6B3w==} + dompurify@3.2.2: + resolution: {integrity: sha512-YMM+erhdZ2nkZ4fTNRTSI94mb7VG7uVF5vj5Zde7tImgnhZE3R6YW/IACGIHb2ux+QkEXMhe591N+5jWOmL4Zw==} domutils@2.8.0: resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} @@ -3233,6 +3233,10 @@ packages: gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + gopd@1.1.0: + resolution: {integrity: sha512-FQoVQnqcdk4hVM4JN1eromaun4iuS34oStkdlLENLdpULsuQcTyXj8w7ayhuUfPwEYZ1ZOooOTT6fdA9Vmx/RA==} + engines: {node: '>= 0.4'} + got@14.4.5: resolution: {integrity: sha512-sq+uET8TnNKRNnjEOPJzMcxeI0irT8BBNmf+GtZcJpmhYsQM1DSKmCROUjPWKsXZ5HzwD5Cf5/RV+QD9BSTxJg==} engines: {node: '>=20'} @@ -3658,6 +3662,10 @@ packages: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} + is-regex@1.2.0: + resolution: {integrity: sha512-B6ohK4ZmoftlUe+uvenXSbPJFo6U37BH7oO1B3nQH8f/7h27N56s85MhUtbFJAziz5dcmuR3i8ovUl35zp8pFA==} + engines: {node: '>= 0.4'} + is-regexp@1.0.0: resolution: {integrity: sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==} engines: {node: '>=0.10.0'} @@ -3732,8 +3740,8 @@ packages: resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} engines: {node: '>=0.10.0'} - isomorphic-dompurify@2.17.0: - resolution: {integrity: sha512-W9RC9aPgEAFF55VMo/9AUQ+GYkQ68gTRMLqS8fP9rw1VoYCsI7RdrRMAePhhqyCLfZS3JNjA4ahFi1L4aczUUg==} + isomorphic-dompurify@2.18.0: + resolution: {integrity: sha512-e0AaROtWPy6ofSTCnUuBvXFidt1eFmrwEbi+Acpz0du6v2H+fq+3svPBn0g/AfBXz24FTWA9ccle7HSFT3HG7A==} engines: {node: '>=18'} jest-util@29.7.0: @@ -4319,8 +4327,8 @@ packages: peerDependencies: webpack: ^4.0.0 || ^5.0.0 - nwsapi@2.2.13: - resolution: {integrity: sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==} + nwsapi@2.2.16: + resolution: {integrity: sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==} oas-kit-common@1.0.8: resolution: {integrity: sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==} @@ -5702,11 +5710,11 @@ packages: tiny-warning@1.0.3: resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==} - tldts-core@6.1.64: - resolution: {integrity: sha512-uqnl8vGV16KsyflHOzqrYjjArjfXaU6rMPXYy2/ZWoRKCkXtghgB4VwTDXUG+t0OTGeSewNAG31/x1gCTfLt+Q==} + tldts-core@6.1.65: + resolution: {integrity: sha512-Uq5t0N0Oj4nQSbU8wFN1YYENvMthvwU13MQrMJRspYCGLSAZjAfoBOJki5IQpnBM/WFskxxC/gIOTwaedmHaSg==} - tldts@6.1.64: - resolution: {integrity: sha512-ph4AE5BXWIOsSy9stpoeo7bYe/Cy7VfpciIH4RhVZUPItCJmhqWCN0EVzxd8BOHiyNb42vuJc6NWTjJkg91Tuw==} + tldts@6.1.65: + resolution: {integrity: sha512-xU9gLTfAGsADQ2PcWee6Hg8RFAv0DnjMGVJmDnUmI8a9+nYmapMQix4afwrdaCtT+AqP4MaxEzu7cCrYmBPbzQ==} hasBin: true to-regex-range@5.0.1: @@ -9793,7 +9801,7 @@ snapshots: dependencies: domelementtype: 2.3.0 - dompurify@3.2.1: + dompurify@3.2.2: optionalDependencies: '@types/trusted-types': 2.0.7 @@ -9870,7 +9878,7 @@ snapshots: is-boolean-object: 1.1.2 is-callable: 1.2.7 is-number-object: 1.0.7 - is-regex: 1.1.4 + is-regex: 1.2.0 is-string: 1.0.7 is-subset: 0.1.1 lodash.escape: 4.0.1 @@ -10414,6 +10422,10 @@ snapshots: dependencies: get-intrinsic: 1.2.4 + gopd@1.1.0: + dependencies: + get-intrinsic: 1.2.4 + got@14.4.5: dependencies: '@sindresorhus/is': 7.0.1 @@ -10898,6 +10910,13 @@ snapshots: call-bind: 1.0.7 has-tostringtag: 1.0.2 + is-regex@1.2.0: + dependencies: + call-bind: 1.0.7 + gopd: 1.1.0 + has-tostringtag: 1.0.2 + hasown: 2.0.2 + is-regexp@1.0.0: {} is-root@2.1.0: {} @@ -10953,9 +10972,9 @@ snapshots: isobject@3.0.1: {} - isomorphic-dompurify@2.17.0: + isomorphic-dompurify@2.18.0: dependencies: - dompurify: 3.2.1 + dompurify: 3.2.2 jsdom: 25.0.1 transitivePeerDependencies: - bufferutil @@ -11018,7 +11037,7 @@ snapshots: http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.5 is-potential-custom-element-name: 1.0.1 - nwsapi: 2.2.13 + nwsapi: 2.2.16 parse5: 7.2.1 rrweb-cssom: 0.7.1 saxes: 6.0.0 @@ -11799,7 +11818,7 @@ snapshots: schema-utils: 3.3.0 webpack: 5.96.1 - nwsapi@2.2.13: {} + nwsapi@2.2.16: {} oas-kit-common@1.0.8: dependencies: @@ -12750,7 +12769,7 @@ snapshots: classnames: 2.5.1 core-js: 3.39.0 decko: 1.2.0 - dompurify: 3.2.1 + dompurify: 3.2.2 eventemitter3: 5.0.1 json-pointer: 0.6.2 lunr: 2.3.9 @@ -13453,11 +13472,11 @@ snapshots: tiny-warning@1.0.3: {} - tldts-core@6.1.64: {} + tldts-core@6.1.65: {} - tldts@6.1.64: + tldts@6.1.65: dependencies: - tldts-core: 6.1.64 + tldts-core: 6.1.65 to-regex-range@5.0.1: dependencies: @@ -13469,7 +13488,7 @@ snapshots: tough-cookie@5.0.0: dependencies: - tldts: 6.1.64 + tldts: 6.1.65 tr46@0.0.3: {}