From 07827cae080743ff90ee8365542b52e2f6e2ce2f Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Tue, 6 Aug 2024 13:09:54 +0200 Subject: [PATCH 01/23] Change to Release key --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index da9a46f..398fbd6 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -23,7 +23,7 @@ builds: hooks: post: - env: - - SP_SIGNING_POLICY=Stage + - SP_SIGNING_POLICY=Release - SP_ARTIFACT_CONFIGURATION=exe cmd: pwsh -c "Submit-SigningRequest -ApiToken "$env:SP_CI_USER_TOKEN" -OrganizationId "$env:SP_ORGANIZATION_ID" -ProjectSlug "$env:SP_PROJECT" -SigningPolicySlug "$env:SP_SIGNING_POLICY" -ArtifactConfigurationSlug "$env:SP_ARTIFACT_CONFIGURATION" -InputArtifactPath '{{ .Path }}' -OutputArtifactPath '{{ .Path }}' -Force -WaitForCompletion" output: true From 693cdfacc68f688d14d8ad0e2053ef5718357322 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Tue, 6 Aug 2024 13:10:42 +0200 Subject: [PATCH 02/23] Change version --- cmd/swo/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/swo/main.go b/cmd/swo/main.go index c7e5261..5f82bf0 100644 --- a/cmd/swo/main.go +++ b/cmd/swo/main.go @@ -8,7 +8,7 @@ import ( "github.com/urfave/cli/v2" ) -var version = "v1.2.0" +var version = "v1.3.2" func main() { app := &cli.App{ From fb455b9401fc442c27ac715b02d96e70bfb9a899 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Mon, 19 Aug 2024 14:44:58 +0200 Subject: [PATCH 03/23] Test of secret variable --- .github/workflows/test.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..20b72a4 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,20 @@ +name: Check Secret Variable + +on: + push: + branches: + - NH-85695-Add-signing-binaries-mac + pull_request: + +jobs: + check-secret: + runs-on: ubuntu-latest + steps: + - name: Check if SECRET_KEY is set + run: | + if [ -z "${{ secrets.SWO_ISSUER_ID }}" ]; then + echo "Error: SECRET_KEY is not set." + exit 1 + else + echo "SECRET_KEY is set." + fi From a958ea08492c2e179c960282f9bdb5da059ce575 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Mon, 19 Aug 2024 14:58:39 +0200 Subject: [PATCH 04/23] Test of secret variable 2 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 20b72a4..594c8f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,11 +10,11 @@ jobs: check-secret: runs-on: ubuntu-latest steps: - - name: Check if SECRET_KEY is set + - name: Check if SWO_ISSUER_ID is set run: | if [ -z "${{ secrets.SWO_ISSUER_ID }}" ]; then - echo "Error: SECRET_KEY is not set." + echo "Error: SWO_ISSUER_ID is not set." exit 1 else - echo "SECRET_KEY is set." + echo "SWO_ISSUER_ID is set." fi From e26ff414359c2ae00ff2fb3ec4b82b4a9de395d2 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Mon, 19 Aug 2024 18:16:55 +0200 Subject: [PATCH 05/23] Test of secret variable 3 --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 594c8f7..b779256 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,6 @@ on: push: branches: - NH-85695-Add-signing-binaries-mac - pull_request: jobs: check-secret: From b8bc01eff75b9c911753a4a660c4a677808e016f Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 21 Aug 2024 09:00:44 +0200 Subject: [PATCH 06/23] Test of secret variable 4 --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b779256..55e2414 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,7 @@ on: branches: - NH-85695-Add-signing-binaries-mac + jobs: check-secret: runs-on: ubuntu-latest From 6bf738262d771da6665c39ab4538244527b5e149 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 21 Aug 2024 16:19:43 +0200 Subject: [PATCH 07/23] Test of secret variable 5 --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 55e2414..b779256 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,6 @@ on: branches: - NH-85695-Add-signing-binaries-mac - jobs: check-secret: runs-on: ubuntu-latest From dd6b19c5a238b6ab1ffa987a169110739a2a78d5 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Thu, 22 Aug 2024 08:52:03 +0200 Subject: [PATCH 08/23] Test of secret variable 6 --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b779256..2c2a7a6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,6 @@ on: push: branches: - NH-85695-Add-signing-binaries-mac - jobs: check-secret: runs-on: ubuntu-latest From e2da086ed212c1c9dc499d29c6ce46890b572821 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Mon, 26 Aug 2024 09:32:59 +0200 Subject: [PATCH 09/23] Test of secret variable 7 --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2c2a7a6..b779256 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,6 +4,7 @@ on: push: branches: - NH-85695-Add-signing-binaries-mac + jobs: check-secret: runs-on: ubuntu-latest From 43e62958d0067abf351c66c882ea4c07d3091176 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Mon, 26 Aug 2024 09:43:24 +0200 Subject: [PATCH 10/23] Test of secret variable 8 --- .github/workflows/test.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b779256..0903f5d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,12 +8,11 @@ on: jobs: check-secret: runs-on: ubuntu-latest + env: + super_secret: ${{ secrets.SWO_ISSUER_ID }} steps: - - name: Check if SWO_ISSUER_ID is set - run: | - if [ -z "${{ secrets.SWO_ISSUER_ID }}" ]; then - echo "Error: SWO_ISSUER_ID is not set." - exit 1 - else - echo "SWO_ISSUER_ID is set." - fi + - if: ${{ env.super_secret != '' }} + run: echo 'This step will only run if the secret has a value set.' + - if: ${{ env.super_secret == '' }} + run: echo 'This step will only run if the secret does not have a value set.' + From 0fb4a792e246a0263aca9795ab1b76d087a40579 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Mon, 26 Aug 2024 09:54:32 +0200 Subject: [PATCH 11/23] Test of secret variable 9 --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0903f5d..8283094 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,10 +9,11 @@ jobs: check-secret: runs-on: ubuntu-latest env: - super_secret: ${{ secrets.SWO_ISSUER_ID }} + super_secret: ${{ secrets.SWO_KEY_ID }} steps: - if: ${{ env.super_secret != '' }} run: echo 'This step will only run if the secret has a value set.' - if: ${{ env.super_secret == '' }} run: echo 'This step will only run if the secret does not have a value set.' + - run: echo ${{ secrets.SWO_KEY_ID }} From 1d2757c8f564b8be27ad8c084cb6f0e4ce459895 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Tue, 27 Aug 2024 09:11:17 +0200 Subject: [PATCH 12/23] Test of secret variable 10 --- .github/workflows/test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8283094..aefcf16 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,6 +14,3 @@ jobs: - if: ${{ env.super_secret != '' }} run: echo 'This step will only run if the secret has a value set.' - if: ${{ env.super_secret == '' }} - run: echo 'This step will only run if the secret does not have a value set.' - - run: echo ${{ secrets.SWO_KEY_ID }} - From f266641b4197fbdf95d10de0c1e814a1e0a380e9 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Tue, 27 Aug 2024 09:13:46 +0200 Subject: [PATCH 13/23] Test of secret variable 11 --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aefcf16..22e7374 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,3 +14,5 @@ jobs: - if: ${{ env.super_secret != '' }} run: echo 'This step will only run if the secret has a value set.' - if: ${{ env.super_secret == '' }} + run: echo 'This step will only run if the secret does not have a value set.' + From 3103e136246e5ffc09d96833b2981c99d7bb4c58 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 28 Aug 2024 09:28:14 +0200 Subject: [PATCH 14/23] Test of secret variable 12 --- .github/workflows/test.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22e7374..57559e0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,11 +8,15 @@ on: jobs: check-secret: runs-on: ubuntu-latest - env: - super_secret: ${{ secrets.SWO_KEY_ID }} steps: - - if: ${{ env.super_secret != '' }} - run: echo 'This step will only run if the secret has a value set.' - - if: ${{ env.super_secret == '' }} - run: echo 'This step will only run if the secret does not have a value set.' + - name: "check is SWO_KEY_ID exists" + env: + super_secret: ${{ secrets.SWO_KEY_ID }} + if: ${{ env.super_secret == '' }} + run: 'echo "echo the secret \"SWO_KEY_ID\" has not been made; echo please go to \"settings \> secrets \> actions\" to create it"' + - name: "check is REPO_KEY_ID exists" + env: + super_secret_2: ${{ secrets.REPO_KEY_ID }} + if: ${{ env.super_secret_2 == '' }} + run: 'echo "echo the secret \"REPO_KEY_ID\" has not been made; echo please go to \"settings \> secrets \> actions\" to create it"' From f142e5b45d2f51dc56d47c06727eafc1b403b64b Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Tue, 3 Sep 2024 15:38:40 +0200 Subject: [PATCH 15/23] Test of secret variable 13 --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 57559e0..bce1625 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,6 +8,7 @@ on: jobs: check-secret: runs-on: ubuntu-latest + environment: prod steps: - name: "check is SWO_KEY_ID exists" env: From acdda998daa59d471811292e8570c88248a0e310 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 4 Sep 2024 11:36:26 +0200 Subject: [PATCH 16/23] Test notarization 1 --- .github/workflows/release.yml | 7 +++++++ .goreleaser.yaml | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef44cd3..595f4fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,7 @@ permissions: jobs: goreleaser: runs-on: ubuntu-latest + environment: prod steps: - name: Checkout uses: actions/checkout@v4 @@ -37,3 +38,9 @@ jobs: SP_CI_USER_TOKEN: ${{ secrets.SP_CI_USER_TOKEN }} SP_ORGANIZATION_ID: ${{ secrets.SP_ORGANIZATION_ID }} SP_PROJECT: ${{ secrets.SP_PROJECT }} + + SWO_ISSUER_ID: ${{ secrets.SWO_ISSUER_ID }} + SWO_KEY_ID: ${{ secrets.SWO_KEY_ID }} + SWO_MAC_P8_FILE: ${{ secrets.SWO_MAC_P8_FILE }} + SWO_MAC_P12_CERT: ${{ secrets.SWO_MAC_P12_CERT }} + SWO_P12_PASSWORD: ${{ secrets.SWO_P12_PASSWORD }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 398fbd6..87fce10 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -2,6 +2,7 @@ env: - CGO_ENABLED=0 - REPO_OWNER=solarwinds - REPO_NAME=swo-cli + builds: - main: ./cmd/swo/main.go id: linux @@ -27,6 +28,7 @@ builds: - SP_ARTIFACT_CONFIGURATION=exe cmd: pwsh -c "Submit-SigningRequest -ApiToken "$env:SP_CI_USER_TOKEN" -OrganizationId "$env:SP_ORGANIZATION_ID" -ProjectSlug "$env:SP_PROJECT" -SigningPolicySlug "$env:SP_SIGNING_POLICY" -ArtifactConfigurationSlug "$env:SP_ARTIFACT_CONFIGURATION" -InputArtifactPath '{{ .Path }}' -OutputArtifactPath '{{ .Path }}' -Force -WaitForCompletion" output: true + archives: - builds: - win @@ -42,6 +44,22 @@ universal_binaries: replace: true name_template: "swo" +notarize: + macos: + enabled: '{{ isEnvSet "SWO_MAC_P12_CERT" }}' + ids: + - mac + sign: + certificate: "{{.Env.SWO_MAC_P12_CERT}}" + password: "{{.Env.SWO_P12_PASSWORD}}" + + notarize: + issuer_id: "{{.Env.SWO_ISSUER_ID}}" + key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}" + key: "{{.Env.SWO_MAC_P8_FILE}}" + wait: true + timeout: 20m + changelog: disable: true From 6ac2bd7a4bf59c19726625896006c65f6046963f Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 4 Sep 2024 12:00:50 +0200 Subject: [PATCH 17/23] Test notarization 2 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 595f4fb..3dc643e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,8 @@ name: release on: push: - tags: - - "v*" + branches: + - NH-85695-Add-signing-binaries-mac permissions: contents: write From 658748ef0c915729eccead8be9e4beb160ccf82b Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 4 Sep 2024 12:51:17 +0200 Subject: [PATCH 18/23] Test notarization 3 --- .goreleaser.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 87fce10..a304de6 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -46,19 +46,19 @@ universal_binaries: notarize: macos: - enabled: '{{ isEnvSet "SWO_MAC_P12_CERT" }}' - ids: - - mac - sign: - certificate: "{{.Env.SWO_MAC_P12_CERT}}" - password: "{{.Env.SWO_P12_PASSWORD}}" + - enabled: '{{ isEnvSet "SWO_MAC_P12_CERT" }}' + ids: + - mac + sign: + certificate: "{{.Env.SWO_MAC_P12_CERT}}" + password: "{{.Env.SWO_P12_PASSWORD}}" - notarize: - issuer_id: "{{.Env.SWO_ISSUER_ID}}" - key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}" - key: "{{.Env.SWO_MAC_P8_FILE}}" - wait: true - timeout: 20m + notarize: + issuer_id: "{{.Env.SWO_ISSUER_ID}}" + key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}" + key: "{{.Env.SWO_MAC_P8_FILE}}" + wait: true + timeout: 20 changelog: disable: true From b9e14f3e1f88c72b1173631304829e6baee600a1 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 4 Sep 2024 12:52:10 +0200 Subject: [PATCH 19/23] Test notarization 4 --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index a304de6..dd9be68 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -58,7 +58,7 @@ notarize: key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}" key: "{{.Env.SWO_MAC_P8_FILE}}" wait: true - timeout: 20 + timeout: 20m changelog: disable: true From dc7ed71cdc0b752b3f8991f016be1456d17077e5 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 4 Sep 2024 12:57:52 +0200 Subject: [PATCH 20/23] Test notarization 5 --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index dd9be68..5a96fc9 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -55,7 +55,7 @@ notarize: notarize: issuer_id: "{{.Env.SWO_ISSUER_ID}}" - key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}" + key_id: "{{.Env.SWO_KEY_ID}}" key: "{{.Env.SWO_MAC_P8_FILE}}" wait: true timeout: 20m From ae96605b7aa7d408a950c724a38d2263cd72f15f Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 4 Sep 2024 13:35:32 +0200 Subject: [PATCH 21/23] Cleaning up --- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 23 ----------------------- Makefile | 2 +- 3 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3dc643e..595f4fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,8 @@ name: release on: push: - branches: - - NH-85695-Add-signing-binaries-mac + tags: + - "v*" permissions: contents: write diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index bce1625..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Check Secret Variable - -on: - push: - branches: - - NH-85695-Add-signing-binaries-mac - -jobs: - check-secret: - runs-on: ubuntu-latest - environment: prod - steps: - - name: "check is SWO_KEY_ID exists" - env: - super_secret: ${{ secrets.SWO_KEY_ID }} - if: ${{ env.super_secret == '' }} - run: 'echo "echo the secret \"SWO_KEY_ID\" has not been made; echo please go to \"settings \> secrets \> actions\" to create it"' - - - name: "check is REPO_KEY_ID exists" - env: - super_secret_2: ${{ secrets.REPO_KEY_ID }} - if: ${{ env.super_secret_2 == '' }} - run: 'echo "echo the secret \"REPO_KEY_ID\" has not been made; echo please go to \"settings \> secrets \> actions\" to create it"' diff --git a/Makefile b/Makefile index 8186bbc..6829c07 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -golangci-lint-version = v1.56.1 +golangci-lint-version = v1.60.3 .PHONY: install-golangci-lint install-golangci-lint: From 05676aae77acdbcb9d022057f2bc1047b04c9358 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 4 Sep 2024 14:03:39 +0200 Subject: [PATCH 22/23] change golangci-lint --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd5e866..eab448e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.59 + version: v1.60 build: runs-on: ubuntu-latest steps: From 6461df17384bf786c02b17d54c6c093315b41290 Mon Sep 17 00:00:00 2001 From: Arkadiusz Nitka Date: Wed, 4 Sep 2024 14:09:10 +0200 Subject: [PATCH 23/23] change golangci-lint 2 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eab448e..fc88143 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.60 + version: v1.60.3 build: runs-on: ubuntu-latest steps: