Update tooling to replace release tag in EnvoyContainer.java (#285)

rulex123 · web-flow · commit 446f3b806f72 · 2023-05-19T16:30:51.000+02:00
Signed-off-by: rulex123 &lt;erica.manno@gmail.com&gt;
diff --git a/tools/update-sha.sh b/tools/update-sha.sh
@@ -22,6 +22,7 @@ function find_envoy_sha_from_tag() {
   curl -s https://api.github.com/repos/envoyproxy/envoy/tags | grep "$TAG" -A 4 | grep sha | awk '{print $2}' | tr -d '"' | tr -d ","
 }
 
+CURRENT_ENVOY_RELEASE=$(cat envoy_release)
 ENVOY_VERSION=$(find_envoy_sha_from_tag "$1")
 
 CURL_OUTPUT=$(curl -s "https://raw.githubusercontent.com/envoyproxy/envoy/$ENVOY_VERSION/api/bazel/repository_locations.bzl")
@@ -59,7 +60,7 @@ UDPA_SHA=\"$UDPA_SHA\"  # $UDPA_DATE
 "
 
 # replace version in EnvoyContainer.java
-sed -i 's/\(envoy-dev:\).*\(\");\)/\1'"$ENVOY_VERSION"'\2/g'  ../server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java
+sed -i "s/$CURRENT_ENVOY_RELEASE/$1/g" ../server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java
 
 # update tag in envoy_release file
 echo $1 > envoy_release

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ function find_envoy_sha_from_tag() {`
`22`	`22`	`curl -s https://api.github.com/repos/envoyproxy/envoy/tags \| grep "$TAG" -A 4 \| grep sha \| awk '{print $2}' \| tr -d '"' \| tr -d ","`
`23`	`23`	`}`
`24`	`24`
	`25`	`+CURRENT_ENVOY_RELEASE=$(cat envoy_release)`
`25`	`26`	`ENVOY_VERSION=$(find_envoy_sha_from_tag "$1")`
`26`	`27`
`27`	`28`	`CURL_OUTPUT=$(curl -s "https://raw.githubusercontent.com/envoyproxy/envoy/$ENVOY_VERSION/api/bazel/repository_locations.bzl")`
`@@ -59,7 +60,7 @@ UDPA_SHA=\"$UDPA_SHA\" # $UDPA_DATE`
`59`	`60`	`"`
`60`	`61`
`61`	`62`	`# replace version in EnvoyContainer.java`
`62`		`-sed -i 's/\(envoy-dev:\).*\(\");\)/\1'"$ENVOY_VERSION"'\2/g' ../server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java`
	`63`	`+sed -i "s/$CURRENT_ENVOY_RELEASE/$1/g" ../server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java`
`63`	`64`
`64`	`65`	`# update tag in envoy_release file`
`65`	`66`	`echo $1 > envoy_release`