CLOUDP-114080: [Mongocli] Investigate how to get the correct git tag version in evergreen (#1014)

andreaangiolillo · web-flow · commit 5db0fa1d7119 · 2022-03-04T11:42:46.000Z
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ COVERAGE=coverage.out
 
 MCLI_SOURCE_FILES?=./cmd/mongocli
 MCLI_BINARY_NAME=mongocli
-MCLI_VERSION?=$(shell git describe --always --tags | cut -d "v" -f 2)
+MCLI_VERSION?=$(shell git tag --list 'mongocli/v*' --sort=committerdate | tail -1 | cut -d "v" -f 2 |  xargs -I % sh -c 'echo %-next' )
 MCLI_GIT_SHA?=$(shell git rev-parse HEAD)
 MCLI_DESTINATION=./bin/$(MCLI_BINARY_NAME)
 MCLI_INSTALL_PATH="${GOPATH}/bin/$(MCLI_BINARY_NAME)"
@@ -16,12 +16,19 @@ MCLI_E2E_BINARY?=../../bin/${MCLI_BINARY_NAME}
 
 ATLAS_SOURCE_FILES?=./cmd/atlas
 ATLAS_BINARY_NAME=atlas
+ATLAS_VERSION?=$(shell git tag --list 'atlascli/v*' --sort=committerdate | tail -1 | cut -d "v" -f 2 | xargs -I % sh -c 'echo %-next' )
 ATLAS_DESTINATION=./bin/$(ATLAS_BINARY_NAME)
 ATLAS_INSTALL_PATH="${GOPATH}/bin/$(ATLAS_BINARY_NAME)"
 
-LINKER_FLAGS=-s -w -X github.com/mongodb/mongocli/internal/version.Version=${MCLI_VERSION} -X github.com/mongodb/mongocli/internal/version.GitCommit=${MCLI_GIT_SHA}
-MCLI_LINKER_FLAGS=${LINKER_FLAGS} -X github.com/mongodb/mongocli/internal/config.ToolName=$(MCLI_BINARY_NAME)
-ATLAS_LINKER_FLAGS=${LINKER_FLAGS} -X github.com/mongodb/mongocli/internal/config.ToolName=atlascli
+
+ifeq ($(ATLAS_VERSION),) # use git describe if we don't have an atlascli tag
+	ATLAS_VERSION=$(shell git describe --always --tags | cut -d "v" -f 2)
+endif
+
+
+LINKER_FLAGS=-s -w -X github.com/mongodb/mongocli/internal/version.GitCommit=${MCLI_GIT_SHA}
+MCLI_LINKER_FLAGS=${LINKER_FLAGS} -X github.com/mongodb/mongocli/internal/config.ToolName=$(MCLI_BINARY_NAME) -X github.com/mongodb/mongocli/internal/version.Version=${MCLI_VERSION}
+ATLAS_LINKER_FLAGS=${LINKER_FLAGS} -X github.com/mongodb/mongocli/internal/config.ToolName=atlascli -X github.com/mongodb/mongocli/internal/version.Version=${ATLAS_VERSION}
 ATLAS_E2E_BINARY?=../../bin/${ATLAS_BINARY_NAME}
 
 DEBUG_FLAGS=all=-N -l
diff --git a/build/ci/release.yml b/build/ci/release.yml
@@ -70,15 +70,18 @@ functions:
           - goreleaser_key
         script: |
           set -Eeou pipefail
-
           export GOROOT="${go_root}"
           export PATH="./bin:${go_bin}:$PATH"
           export GITHUB_TOKEN=${github_token}
           export NOTARY_SERVICE_URL=${notary_service_url}
           export MACOS_NOTARY_KEY=${notary_service_key_id}
           export MACOS_NOTARY_SECRET=${notary_service_secret}
           export GORELEASER_KEY=${goreleaser_key}
-          export VERSION_GIT=$(git describe --abbrev=0 | cut -d "v" -f 2)
+          export VERSION_GIT="$(git tag --list "${tool_name:?}/v*" --sort=committerdate | tail -1 | cut -d "v" -f 2)"
+
+          if [[ -z "${VERSION_GIT}" ]]; then
+             export VERSION_GIT=$(git describe --abbrev=0 | cut -d "v" -f 2)
+          fi
 
           # avoid race conditions on the notarization step by using `-p 1`
           ${goreleaser_cmd|goreleaser --rm-dist --snapshot -p 1}
@@ -120,6 +123,7 @@ functions:
           - latest_deb
           - latest_rpm
           - package_name
+          - tool_name
         working_dir: src/github.com/mongodb/mongocli
         env:
           <<: *go_options
@@ -139,19 +143,18 @@ functions:
           - TOOL_NAME
         binary: build/package/send-slack-notification.sh
   "generate download archive json":
-    - command: shell.exec
+    - command: subprocess.exec
       type: test
       params:
         working_dir: src/github.com/mongodb/mongocli/dist
         include_expansions_in_env:
           - FEED_FILE_NAME
-        script: |
-          set -Eeou pipefail
-
-          export GOROOT="${go_root}"
-          export PATH="./bin:${go_bin}:$PATH"
-
-          go run ../internal/release/main.go --version "$(git describe | cut -d "v" -f 2)" --file "${FEED_FILE_NAME}"
+          - TOOL_NAME
+        add_to_path:
+          - ${go_bin}
+        env:
+          <<: *go_options
+        binary: ../build/package/generate-download-archive-manifest.sh
   "upload dist":
     - command: s3.put
       params:
@@ -246,6 +249,7 @@ tasks:
       - func: "install macos notarization service"
       - func: "package"
         vars:
+          tool_name: ${tool_name}
           goreleaser_file: ${goreleaser_file}
           goreleaser_cmd: goreleaser --config "${goreleaser_file}" --rm-dist --snapshot -p 1
       - func: "rename pkg"
@@ -254,22 +258,24 @@ tasks:
           latest_deb: ~latest
           latest_rpm: .latest
           package_name: ${package_name}
+          tool_name: ${tool_name}
       - command: archive.targz_pack
         params:
-          target: src/github.com/mongodb/mongocli/dist/mongocli-deb.tgz
+          target: src/github.com/mongodb/mongocli/dist/${package_name}-deb.tgz
           source_dir: src/github.com/mongodb/mongocli/dist/apt
           include:
             - "*.deb"
       - command: archive.targz_pack
         params:
-          target: src/github.com/mongodb/mongocli/dist/mongocli-rpm.tgz
+          target: src/github.com/mongodb/mongocli/dist/${package_name}-rpm.tgz
           source_dir: src/github.com/mongodb/mongocli/dist/yum
           include:
             - "*.rpm"
       - func: "generate download archive json"
         vars:
           package_name: ${package_name}
           FEED_FILE_NAME: "${package_name}.json"
+          TOOL_NAME: ${tool_name}
       - func: "upload dist"
   - name: pkg_test_mongocli_docker_ubuntu1804
     tags: ["smoke-test"]
@@ -436,10 +442,12 @@ tasks:
           binary: build/package/download-msi.sh
       - func: "package"
         vars:
+          tool_name: "mongocli"
           goreleaser_cmd: goreleaser --config .mongocli.goreleaser.yml --rm-dist --release-notes CHANGELOG.md -p 1
       - func: "rename pkg"
         vars:
           package_name: mongocli
+          tool_name: mongocli
       - command: archive.targz_pack
         params:
           target: src/github.com/mongodb/mongocli/dist/mongocli-deb.tgz
@@ -455,6 +463,7 @@ tasks:
       - func: "generate download archive json"
         vars:
           FEED_FILE_NAME: mongocli.json
+          TOOL_NAME: mongocli
       - func: "upload dist"
       - command: s3.put
         params:
@@ -497,10 +506,12 @@ tasks:
           binary: build/package/download-msi.sh
       - func: "package"
         vars:
+          tool_name: "atlascli"
           goreleaser_cmd: goreleaser --config .atlascli.goreleaser.yml --rm-dist --release-notes CHANGELOG.md -p 1
       - func: "rename pkg"
         vars:
           package_name: mongodb-atlas-cli
+          tool_name: atlascli
       - command: archive.targz_pack
         params:
           target: src/github.com/mongodb/mongocli/dist/atlascli-deb.tgz
@@ -516,6 +527,7 @@ tasks:
       - func: "generate download archive json"
         vars:
           FEED_FILE_NAME: mongodb-atlas-cli.json
+          TOOL_NAME: atlascli
 #      - func: "upload dist" TODO CLOUDP-113712: WAITING FOR https://jira.mongodb.org/browse/WEBSITE-11811
 #      - command: s3.put
 #        params:
@@ -1240,6 +1252,7 @@ buildvariants:
       server_version: "4.4.0-rc3"
       goreleaser_file: ".mongocli.goreleaser.yml"
       package_name: "mongocli"
+      tool_name: "mongocli"
     tasks:
       - name: package_goreleaser
   - name: goreleaser_atlascli_snapshot
@@ -1252,6 +1265,7 @@ buildvariants:
       server_version: "4.4.0-rc3"
       goreleaser_file: ".atlascli.goreleaser.yml"
       package_name: "mongodb-atlas-cli"
+      tool_name: "atlascli"
     tasks:
       - name: package_goreleaser
   - name: publish_snapshot
diff --git a/build/package/docker/docker-build.sh b/build/package/docker/docker-build.sh
@@ -16,7 +16,10 @@
 
 set -Eeou pipefail
 
-VERSION=$(git describe --abbrev=0 | cut -d "v" -f 2)
+VERSION="$(git tag --list "${tool_name:?}/v*" --sort=committerdate | tail -1 | cut -d "v" -f 2)"
+if [[ -z "${VERSION}" ]]; then
+    VERSION="$(git describe --abbrev=0 | cut -d "v" -f 2)"
+fi
 
 FILE_EXT=deb
 if [[ "${image-}" =~ "rpm" ]]; then
diff --git a/build/package/download-msi.sh b/build/package/download-msi.sh
@@ -15,7 +15,10 @@
 
 set -Eeou pipefail
 
-VERSION=$(git describe | cut -d "v" -f 2)
+VERSION="$(git tag --list "${TOOL_NAME:?}/v*" --sort=committerdate | tail -1 | cut -d "v" -f 2)"
+if [[ -z "${VERSION}" ]]; then
+    VERSION="$(git describe --abbrev=0 | cut -d "v" -f 2)"
+fi
 
 PACKAGE_NAME=mongocli_"${VERSION}"_windows_x86_64.msi
 if [[ "${TOOL_NAME:?}" == atlascli ]]; then
diff --git a/build/package/generate-download-archive-manifest.sh b/build/package/generate-download-archive-manifest.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright 2022 MongoDB Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -Eeou pipefail
+
+VERSION="$(git tag --list "${TOOL_NAME}/v*" --sort=committerdate | tail -1 | cut -d "v" -f 2)"
+
+if [[ -z "${VERSION}" ]]; then
+    VERSION=$(git describe | cut -d "v" -f 2)
+fi
+
+go run ../internal/release/main.go --file "${FEED_FILE_NAME}" --version "${VERSION}"
diff --git a/build/package/generate-msi.sh b/build/package/generate-msi.sh
@@ -24,7 +24,11 @@ export CGO_ENABLED
 go-msi check-env
 
 
-VERSION=$(git describe | cut -d "v" -f 2)
+VERSION="$(git tag --list "${TOOL_NAME:?}/v*" --sort=committerdate | tail -1 | cut -d "v" -f 2)"
+if [[ -z "${VERSION}" ]]; then
+    VERSION="$(git describe --abbrev=0 | cut -d "v" -f 2)"
+fi
+
 COMMIT=$(git log -n1 --format=format:"%H")
 
 SOURCE_FILES=./cmd/mongocli
diff --git a/build/package/rename-pkg.sh b/build/package/rename-pkg.sh
@@ -16,10 +16,16 @@
 
 set -Eeou pipefail
 
-VERSION=$(git describe --abbrev=0 | cut -d "v" -f 2)
+
+VERSION="$(git tag --list "${tool_name:?}/v*" --sort=committerdate | tail -1 | cut -d "v" -f 2)"
+if [[ -z "${VERSION}" ]]; then
+    VERSION="$(git describe --abbrev=0 | cut -d "v" -f 2)"
+fi
+
 FILENAME="${package_name-}"_"${VERSION}"_linux_x86_64
 if [[ "${unstable-}" == "-unstable" ]]; then
-  FILENAME="${package_name-}_${VERSION}-next_linux_x86_64"
+  VERSION="${VERSION}-next"
+  FILENAME="${package_name-}_${VERSION}_linux_x86_64"
 fi
 
 cd dist
diff --git a/build/package/send-slack-notification.sh b/build/package/send-slack-notification.sh
@@ -15,7 +15,11 @@
 
 set -Eeou pipefail
 
-VERSION=$(git describe | cut -d "v" -f 2)
+VERSION="$(git tag --list "${TOOL_NAME:?}/v*" --sort=committerdate | tail -1 | cut -d "v" -f 2)"
+if [[ -z "${VERSION}" ]]; then
+    VERSION="$(git describe --abbrev=0 | cut -d "v" -f 2)"
+fi
+
 TOOL_NAME_MESSAGE="MongoDB CLI"
 
 if [[ "${TOOL_NAME:?}" == atlascli ]]; then
