flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: Fix import scripts deleting the wrong files, use of trap, and full git clone 

The scripts used `git rev-parse --show-toplevel` so it appeared they
could be used from any directory. But references to "GIT_BASE_DIR"
weren't absolute, so it did matter the starting directory. And it
mattered in a big way for xds/import.sh as if you ran it from the
grpc-java directory it would delete the xds directory in grpc-java, not
third_party.

The trap that deleted the GIT_BASE_DIR was very broken. In addition to
potentially deleting the wrong directory, it was unnecessary because
that directory was in tmpdir. But you can only have one trap per signal,
so this unnecessary trap disabled the trap that deleted tmpdir.

The script needed a full clone because it needed to check out a specific
commit. To work with --depth 1 you have to use some convoluted syntax.
But just downloading a tar.gz is easy and seems should work fine on Mac.

protoc-gen-validate/import.sh didn't have the trap problem, but seemed
to have drifted from the other scritps. All the scripts were synced to
match.
This commit is contained in:
Eric Anderson 2023-06-08 08:48:07 -07:00
parent 5850de2f5f
commit b5d7f1394d
4 changed files with 38 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xds/third_party/envoy/import.sh vendored
View File

@ -13,15 +13,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Update VERSION then in this directory run ./import.sh # Update VERSION then execute this script
set -e set -e
BRANCH=main
# import VERSION from the google internal copybara_version.txt for Envoy # import VERSION from the google internal copybara_version.txt for Envoy
VERSION=0478eba2a495027bf6ac8e787c42e2f5b9eb553b VERSION=0478eba2a495027bf6ac8e787c42e2f5b9eb553b
GIT_REPO="https://github.com/envoyproxy/envoy.git" DOWNLOAD_URL="https://github.com/envoyproxy/envoy/archive/${VERSION}.tar.gz"
GIT_BASE_DIR=envoy DOWNLOAD_BASE_DIR="envoy-${VERSION}"
SOURCE_PROTO_BASE_DIR=envoy/api SOURCE_PROTO_BASE_DIR="${DOWNLOAD_BASE_DIR}/api"
TARGET_PROTO_BASE_DIR=src/main/proto TARGET_PROTO_BASE_DIR=src/main/proto
# Sorted alphabetically. # Sorted alphabetically.
FILES=( FILES=(
@ -181,19 +180,13 @@ envoy/type/v3/semantic_version.proto
pushd `git rev-parse --show-toplevel`/xds/third_party/envoy pushd `git rev-parse --show-toplevel`/xds/third_party/envoy
# clone the envoy github repo in a tmp directory # put the repo in a tmp directory
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
trap "rm -rf ${tmpdir}" EXIT trap "rm -rf ${tmpdir}" EXIT
curl -Ls "${DOWNLOAD_URL}" | tar xz -C "${tmpdir}"
pushd "${tmpdir}" cp -p "${tmpdir}/${DOWNLOAD_BASE_DIR}/LICENSE" LICENSE
git clone -b $BRANCH $GIT_REPO cp -p "${tmpdir}/${DOWNLOAD_BASE_DIR}/NOTICE" NOTICE
trap "rm -rf $GIT_BASE_DIR" EXIT
cd "$GIT_BASE_DIR"
git checkout $VERSION
popd
cp -p "${tmpdir}/${GIT_BASE_DIR}/LICENSE" LICENSE
cp -p "${tmpdir}/${GIT_BASE_DIR}/NOTICE" NOTICE
rm -rf "${TARGET_PROTO_BASE_DIR}" rm -rf "${TARGET_PROTO_BASE_DIR}"
mkdir -p "${TARGET_PROTO_BASE_DIR}" mkdir -p "${TARGET_PROTO_BASE_DIR}"

21
xds/third_party/googleapis/import.sh vendored
View File

@ -13,14 +13,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Update VERSION then in this directory run ./import.sh # Update VERSION then execute this script
set -e set -e
BRANCH=master
VERSION=ca1372c6d7bcb199638ebfdb40d2b2660bab7b88 VERSION=ca1372c6d7bcb199638ebfdb40d2b2660bab7b88
GIT_REPO="https://github.com/googleapis/googleapis.git" DOWNLOAD_URL="https://github.com/googleapis/googleapis/archive/${VERSION}.tar.gz"
GIT_BASE_DIR=googleapis DOWNLOAD_BASE_DIR="googleapis-${VERSION}"
SOURCE_PROTO_BASE_DIR=googleapis SOURCE_PROTO_BASE_DIR="${DOWNLOAD_BASE_DIR}"
TARGET_PROTO_BASE_DIR=src/main/proto TARGET_PROTO_BASE_DIR=src/main/proto
# Sorted alphabetically. # Sorted alphabetically.
FILES=( FILES=(
@ -30,18 +29,12 @@ google/api/expr/v1alpha1/syntax.proto
pushd `git rev-parse --show-toplevel`/xds/third_party/googleapis pushd `git rev-parse --show-toplevel`/xds/third_party/googleapis
# clone the googleapis github repo in a tmp directory # put the repo in a tmp directory
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
trap "rm -rf ${tmpdir}" EXIT trap "rm -rf ${tmpdir}" EXIT
curl -Ls "${DOWNLOAD_URL}" | tar xz -C "${tmpdir}"
pushd "${tmpdir}" cp -p "${tmpdir}/${DOWNLOAD_BASE_DIR}/LICENSE" LICENSE
git clone -b $BRANCH $GIT_REPO
trap "rm -rf $GIT_BASE_DIR" EXIT
cd "$GIT_BASE_DIR"
git checkout $VERSION
popd
cp -p "${tmpdir}/${GIT_BASE_DIR}/LICENSE" LICENSE
rm -rf "${TARGET_PROTO_BASE_DIR}" rm -rf "${TARGET_PROTO_BASE_DIR}"
mkdir -p "${TARGET_PROTO_BASE_DIR}" mkdir -p "${TARGET_PROTO_BASE_DIR}"

32
xds/third_party/protoc-gen-validate/import.sh vendored
View File

@ -13,33 +13,31 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Update GIT_ORIGIN_REV_ID then in this directory run ./import.sh # Update VERSION then execute this script
set -e set -e
BRANCH=main # import VERSION from one of the google internal CLs
# import GIT_ORIGIN_REV_ID from one of the google internal CLs VERSION=dfcdc5ea103dda467963fb7079e4df28debcfd28
GIT_ORIGIN_REV_ID=dfcdc5ea103dda467963fb7079e4df28debcfd28 DOWNLOAD_URL="https://github.com/envoyproxy/protoc-gen-validate/archive/${VERSION}.tar.gz"
GIT_REPO="https://github.com/envoyproxy/protoc-gen-validate.git" DOWNLOAD_BASE_DIR="protoc-gen-validate-${VERSION}"
GIT_BASE_DIR=protoc-gen-validate SOURCE_PROTO_BASE_DIR="${DOWNLOAD_BASE_DIR}"
SOURCE_PROTO_BASE_DIR=protoc-gen-validate
TARGET_PROTO_BASE_DIR=src/main/proto TARGET_PROTO_BASE_DIR=src/main/proto
# Sorted alphabetically. # Sorted alphabetically.
FILES=( FILES=(
validate/validate.proto validate/validate.proto
) )
# clone the protoc-gen-validate github repo in a tmp directory pushd `git rev-parse --show-toplevel`/xds/third_party/protoc-gen-validate
# put the repo in a tmp directory
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
pushd "${tmpdir}" trap "rm -rf ${tmpdir}" EXIT
rm -rf "$GIT_BASE_DIR" curl -Ls "${DOWNLOAD_URL}" | tar xz -C "${tmpdir}"
git clone -b $BRANCH $GIT_REPO
cd "$GIT_BASE_DIR"
git checkout $GIT_ORIGIN_REV_ID
popd
cp -p "${tmpdir}/${GIT_BASE_DIR}/LICENSE" LICENSE cp -p "${tmpdir}/${DOWNLOAD_BASE_DIR}/LICENSE" LICENSE
cp -p "${tmpdir}/${GIT_BASE_DIR}/NOTICE" NOTICE cp -p "${tmpdir}/${DOWNLOAD_BASE_DIR}/NOTICE" NOTICE
rm -rf "${TARGET_PROTO_BASE_DIR}"
mkdir -p "${TARGET_PROTO_BASE_DIR}" mkdir -p "${TARGET_PROTO_BASE_DIR}"
pushd "${TARGET_PROTO_BASE_DIR}" pushd "${TARGET_PROTO_BASE_DIR}"
@ -51,4 +49,4 @@ do
done done
popd popd
rm -rf "$tmpdir" popd

23
xds/third_party/xds/import.sh vendored
View File

@ -13,15 +13,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Update VERSION then in this directory run ./import.sh # Update VERSION then execute this script
set -e set -e
BRANCH=main
# import VERSION from one of the google internal CLs # import VERSION from one of the google internal CLs
VERSION=e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7 VERSION=e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7
GIT_REPO="https://github.com/cncf/xds.git" DOWNLOAD_URL="https://github.com/cncf/xds/archive/${VERSION}.tar.gz"
GIT_BASE_DIR=xds DOWNLOAD_BASE_DIR="xds-${VERSION}"
SOURCE_PROTO_BASE_DIR=xds SOURCE_PROTO_BASE_DIR="${DOWNLOAD_BASE_DIR}"
TARGET_PROTO_BASE_DIR=src/main/proto TARGET_PROTO_BASE_DIR=src/main/proto
# Sorted alphabetically. # Sorted alphabetically.
FILES=( FILES=(
@ -54,18 +53,12 @@ xds/type/v3/typed_struct.proto
pushd `git rev-parse --show-toplevel`/xds/third_party/xds pushd `git rev-parse --show-toplevel`/xds/third_party/xds
# clone the xds github repo in a tmp directory # put the repo in a tmp directory
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
trap "rm -rf $tmpdir" EXIT trap "rm -rf ${tmpdir}" EXIT
curl -Ls "${DOWNLOAD_URL}" | tar xz -C "${tmpdir}"
pushd "${tmpdir}" cp -p "${tmpdir}/${DOWNLOAD_BASE_DIR}/LICENSE" LICENSE
git clone -b $BRANCH $GIT_REPO
trap "rm -rf $GIT_BASE_DIR" EXIT
cd "$GIT_BASE_DIR"
git checkout $VERSION
popd
cp -p "${tmpdir}/${GIT_BASE_DIR}/LICENSE" LICENSE
rm -rf "${TARGET_PROTO_BASE_DIR}" rm -rf "${TARGET_PROTO_BASE_DIR}"
mkdir -p "${TARGET_PROTO_BASE_DIR}" mkdir -p "${TARGET_PROTO_BASE_DIR}"