cli: show release version with --version (envoyproxy#2276)

The release version shows the last released version.

Before:

  version: 92a31b6f67d06078653c75645126639578c266cc/Modified/DEBUG

After:

  version: 1c61b12055ff3e4138daa91ccff8bc7cef7bc866/1.5.0/Modified/DEBUG

Signed-off-by: Taiki Ono <[email protected]>

Author: taiki45

BUILD

@@ -1 +1,3 @@
 licenses(["notice"])  # Apache 2
+
+exports_files(["RAW_RELEASE_NOTES.md"])

bazel/repository_locations.bzl

@@ -67,7 +67,7 @@ REPOSITORY_LOCATIONS = dict(
         urls = ["https://github.com/google/protobuf/archive/v3.5.0.tar.gz"],
     ),
     envoy_api = dict(
-        commit = "48688e7874113027193ce7b8f9f29c60bea159ae",
+        commit = "aa73175ddf5e229dd4d97a019e5312ba1263d252",
         remote = "https://github.com/envoyproxy/data-plane-api",
     ),
     grpc_httpjson_transcoding = dict(

docs/publish.sh

@@ -21,6 +21,15 @@ pushd "${DOCS_BUILD_DIR}"
 git clone "${GIT_INFO[0]}"
 cd data-plane-api
 git checkout "${GIT_INFO[1]}"
+# Check the git tag matches the version number in the VERSION file.
+VERSION_NUMBER=$(cat VERSION)
+if [ "v${VERSION_NUMBER}" != "${CIRCLE_TAG}" ]; then
+  echo "Given git tag does not match the VERSION file content:"
+  echo "${CIRCLE_TAG} vs $(cat VERSION)"
+  exit 1
+fi
+# Check the version_history.rst contains current release version.
+grep --fixed-strings "$VERSION_NUMBER" docs/root/intro/version_history.rst
 ./docs/build.sh
 popd
 rsync -av "${DOCS_BUILD_DIR}"/data-plane-api/generated/* generated/

source/common/common/BUILD

@@ -123,9 +123,19 @@ envoy_cc_library(
     deps = ["//include/envoy/common:time_interface"],
 )
 
+genrule(
+    name = "generate_version_number",
+    srcs = ["@envoy_api//:VERSION"],
+    outs = ["version_number.h"],
+    cmd = """echo "#define BUILD_VERSION_NUMBER \\"$$(cat $<)\\"" >$@""",
+)
+
 envoy_cc_library(
     name = "version_includes",
-    hdrs = ["version.h"],
+    hdrs = [
+        "version.h",
+        ":generate_version_number",
+    ],
 )
 
 envoy_cc_library(

source/common/common/version.cc

@@ -18,7 +18,7 @@ const std::string& VersionInfo::revisionStatus() {
 }
 
 std::string VersionInfo::version() {
-  return fmt::format("{}/{}/{}", revision(), revisionStatus(),
+  return fmt::format("{}/{}/{}/{}", revision(), BUILD_VERSION_NUMBER, revisionStatus(),
 #ifdef NDEBUG
                      "RELEASE"
 #else

source/common/common/version.h

@@ -2,7 +2,10 @@
 
 #include <string>
 
+#include "common/common/version_number.h"
+
 namespace Envoy {
+
 /**
  * Wraps compiled in code versioning.
  */

test/exe/BUILD

@@ -17,6 +17,12 @@ sh_test(
     tags = ["no_asan"],
 )
 
+sh_test(
+    name = "version_out_test",
+    srcs = ["version_out_test.sh"],
+    data = ["//source/exe:envoy-static"],
+)
+
 envoy_cc_test(
     name = "signals_test",
     srcs = ["signals_test.cc"],

test/exe/version_out_test.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e -o pipefail
+
+source/exe/envoy-static --version | grep -E '[0-9]+\.[0-9]+\.[0-9]+'