From a573dec05ed72af3d57b00c64b8a541fd721d03b Mon Sep 17 00:00:00 2001
From: Luiz Aoqui <luiz@hashicorp.com>
Date: Wed, 6 Apr 2022 12:56:52 -0400
Subject: [PATCH] ci: make version script match ENT to avoid unnecessary merge
 conflicts (#12482)

---
 GNUmakefile        | 4 ++--
 scripts/version.sh | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 0396f5f21..3f841e489 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -412,9 +412,9 @@ ui-screenshots-local:
 
 version:
 ifneq (,$(wildcard version/version_ent.go))
-	@$(CURDIR)/scripts/version.sh version/version_ent.go
+	@$(CURDIR)/scripts/version.sh version/version.go version/version_ent.go
 else
-	@$(CURDIR)/scripts/version.sh version/version.go
+	@$(CURDIR)/scripts/version.sh version/version.go version/version.go
 endif
 
 .PHONY: version
diff --git a/scripts/version.sh b/scripts/version.sh
index 9aed32ef4..0fe92e1dd 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -1,10 +1,16 @@
 #!/usr/bin/env bash
 
 version_file=$1
+version_metadata_file=$2
 version=$(awk '$1 == "Version" && $2 == "=" { gsub(/"/, "", $3); print $3 }' <"${version_file}")
 prerelease=$(awk '$1 == "VersionPrerelease" && $2 == "=" { gsub(/"/, "", $3); print $3 }' <"${version_file}")
+metadata=$(awk '$1 == "VersionMetadata" && $2 == "=" { gsub(/"/, "", $3); print $3 }' <"${version_metadata_file}")
 
-if [ -n "$prerelease" ]; then
+if [ -n "$metadata" ] && [ -n "$prerelease" ]; then
+    echo "${version}-${prerelease}+${metadata}"
+elif [ -n "$metadata" ]; then
+    echo "${version}+${metadata}"
+elif [ -n "$prerelease" ]; then
     echo "${version}-${prerelease}"
 else
     echo "${version}"