From 342329dc72af51a3d43dd6d741b53feb66de8476 Mon Sep 17 00:00:00 2001 From: Bianca Lisle Date: Fri, 26 Sep 2025 17:13:59 +0100 Subject: [PATCH 1/3] chore: cleanup old barque credentials --- build/ci/release.yml | 4 ---- build/package/curator-push.sh | 15 --------------- 2 files changed, 19 deletions(-) diff --git a/build/ci/release.yml b/build/ci/release.yml index 03ed09620f..f5dc1fed23 100644 --- a/build/ci/release.yml +++ b/build/ci/release.yml @@ -242,10 +242,6 @@ functions: - revision - created_at - ext - - signing_auth_token_46 - - signing_auth_token_50 - - signing_auth_token_60 - - signing_auth_token_70 - arch env: <<: *go_env diff --git a/build/package/curator-push.sh b/build/package/curator-push.sh index d2b8a0f2e8..8507c721b4 100755 --- a/build/package/curator-push.sh +++ b/build/package/curator-push.sh @@ -14,23 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -export NOTARY_KEY_NAME export BARQUE_USERNAME export BARQUE_API_KEY -case "${NOTARY_KEY_NAME}" in -server-4.6) - export NOTARY_TOKEN=${signing_auth_token_46:?} - ;; -server-5.0) - export NOTARY_TOKEN=${signing_auth_token_50:?} - ;; -server-6.0) - export NOTARY_TOKEN=${signing_auth_token_60:?} - ;; -server-7.0) - export NOTARY_TOKEN=${signing_auth_token_70:?} - ;; -esac set -Eeou pipefail From 6832c288f89517609b73dc3a433c2d7292ee9d86 Mon Sep 17 00:00:00 2001 From: Bianca Lisle Date: Fri, 26 Sep 2025 17:28:36 +0100 Subject: [PATCH 2/3] remove notary key --- build/ci/release.yml | 1 - tools/cmd/genevergreen/generate/publish.go | 1 - 2 files changed, 2 deletions(-) diff --git a/build/ci/release.yml b/build/ci/release.yml index f5dc1fed23..b48661f2fa 100644 --- a/build/ci/release.yml +++ b/build/ci/release.yml @@ -245,7 +245,6 @@ functions: - arch env: <<: *go_env - NOTARY_KEY_NAME: ${notary_key_name|server-5.0} BARQUE_USERNAME: ${barque_user} BARQUE_API_KEY: ${barque_api_key} binary: build/package/curator-push.sh diff --git a/tools/cmd/genevergreen/generate/publish.go b/tools/cmd/genevergreen/generate/publish.go index 520cb95471..1347cb3b3c 100644 --- a/tools/cmd/genevergreen/generate/publish.go +++ b/tools/cmd/genevergreen/generate/publish.go @@ -90,7 +90,6 @@ func newPublishTask(taskName, extension, edition, distro, taskServerVersion, not "ext": extension, "server_version": taskServerVersion, "pgp_server_version": getGpgServerVersion(taskServerVersion), - "notary_key_name": notaryKey, "arch": arch, "edition": edition, }) From bafea6900043ca6b0b7af52a1aed4e202c9d11b0 Mon Sep 17 00:00:00 2001 From: Bianca Lisle Date: Mon, 6 Oct 2025 11:55:44 +0100 Subject: [PATCH 3/3] remove notary key --- tools/cmd/genevergreen/generate/publish.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/cmd/genevergreen/generate/publish.go b/tools/cmd/genevergreen/generate/publish.go index 1347cb3b3c..4fdfce79f5 100644 --- a/tools/cmd/genevergreen/generate/publish.go +++ b/tools/cmd/genevergreen/generate/publish.go @@ -75,7 +75,7 @@ var distros = map[string]Platform{ }, } -func newPublishTask(taskName, extension, edition, distro, taskServerVersion, notaryKey, arch string, stable bool, dependency []shrub.TaskDependency) *shrub.Task { +func newPublishTask(taskName, extension, edition, distro, taskServerVersion, arch string, stable bool, dependency []shrub.TaskDependency) *shrub.Task { t := &shrub.Task{ Name: taskName, } @@ -98,7 +98,6 @@ func newPublishTask(taskName, extension, edition, distro, taskServerVersion, not func publishVariant(c *shrub.Configuration, v *shrub.Variant, sv, stableSuffix string, dependency []shrub.TaskDependency, stable bool) { taskServerVersion := sv + ".0" - notaryKey := "server-" + sv taskSv := "_" + sv if !stable { taskServerVersion += "-rc1" @@ -111,7 +110,7 @@ func publishVariant(c *shrub.Configuration, v *shrub.Variant, sv, stableSuffix s } for _, a := range d.architectures { taskName := fmt.Sprintf("push_atlascli_%s_%s_%s%s%s", k, r, a, strings.ReplaceAll(taskSv, ".", ""), stableSuffix) - t := newPublishTask(taskName, d.extension, r, k, taskServerVersion, notaryKey, a, stable, dependency) + t := newPublishTask(taskName, d.extension, r, k, taskServerVersion, a, stable, dependency) c.Tasks = append(c.Tasks, t) v.AddTasks(t.Name) }