From 937dcaf8e875a6c02bf82347f233466f9e9b3740 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Fri, 2 Feb 2018 16:30:05 -0500 Subject: [PATCH 1/7] Bigtable: 00. Add a couple of developer helper scripts This is to ease updating the gapic client and updating googleapis --- google-cloud-bigtable/.gitignore | 1 + .../scripts/autogen_files.lst | 27 +++ .../scripts/handwritten_files.lst | 0 google-cloud-bigtable/scripts/regenerate.sh | 158 ++++++++++++++++++ google-cloud-bigtable/scripts/update-deps.sh | 41 +++++ 5 files changed, 227 insertions(+) create mode 100644 google-cloud-bigtable/.gitignore create mode 100644 google-cloud-bigtable/scripts/autogen_files.lst create mode 100644 google-cloud-bigtable/scripts/handwritten_files.lst create mode 100755 google-cloud-bigtable/scripts/regenerate.sh create mode 100755 google-cloud-bigtable/scripts/update-deps.sh diff --git a/google-cloud-bigtable/.gitignore b/google-cloud-bigtable/.gitignore new file mode 100644 index 000000000000..fab07de50e34 --- /dev/null +++ b/google-cloud-bigtable/.gitignore @@ -0,0 +1 @@ +/deps diff --git a/google-cloud-bigtable/scripts/autogen_files.lst b/google-cloud-bigtable/scripts/autogen_files.lst new file mode 100644 index 000000000000..c76055422218 --- /dev/null +++ b/google-cloud-bigtable/scripts/autogen_files.lst @@ -0,0 +1,27 @@ +src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java +src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java +src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java +src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java +src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java +src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java +src/main/java/com/google/cloud/bigtable/data/v2/package-info.java +src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java +src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java +src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java +src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java +src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java +src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java +src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java +src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java +src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java +src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java +src/main/java/com/google/cloud/bigtable/admin/v2/PagedResponseWrappers.java +src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java +src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java diff --git a/google-cloud-bigtable/scripts/handwritten_files.lst b/google-cloud-bigtable/scripts/handwritten_files.lst new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/google-cloud-bigtable/scripts/regenerate.sh b/google-cloud-bigtable/scripts/regenerate.sh new file mode 100755 index 000000000000..934a5c841a33 --- /dev/null +++ b/google-cloud-bigtable/scripts/regenerate.sh @@ -0,0 +1,158 @@ +#!/usr/bin/env bash + +# This script is used to regenerate protos & GAPIC stubs. +# It stages all of the generated code in deps/ and then installs it into the local maven repo. +# It is meant to be used to test changes to the gapic config before publishing +# To pull in upstream changes, please use update-deps.sh + +set -eE # same as: `set -o errexit -o errtrace` +handle_error() { + echo "Failed, exiting" + exit 1 +} +trap 'handle_error' ERR + + +PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" +WORKDIR="$PROJECT_DIR/deps" +LOG="$WORKDIR/output.log" + +DOCKER_IMAGE=googleapis/artman:stable +TOOLKIT="$WORKDIR/toolkit" + +function run { + init + run_artman + copy_api_client_staging + copy_google_cloud_java + install_protos + + echo "Successfully completed!" +} + +function init { + mkdir -p "$WORKDIR" + echo "" > $WORKDIR/output.log + + log "Pulling docker image" + docker pull "$DOCKER_IMAGE" >>$LOG 2>&1 + + if [ ! -d "$WORKDIR/googleapis" ]; then + log "Fetching googleapis" + git clone "https://github.com/googleapis/googleapis.git" "$WORKDIR/googleapis" >>$LOG 2>&1 + fi + + if [ ! -d "$WORKDIR/toolkit" ]; then + log "Fetching toolkit" + git clone "https://github.com/googleapis/toolkit.git" "$WORKDIR/toolkit" >>$LOG 2>&1 + fi + + if [ ! -d "$WORKDIR/api-client-staging" ]; then + log "Fetching api-client-staging" + git clone "https://github.com/googleapis/api-client-staging.git" "$WORKDIR/api-client-staging" >>$LOG 2>&1 + fi +} + +function run_artman { + rm -rf artman-genfiles/* + + run_gapic "google/bigtable/artman_bigtable.yaml" + run_gapic "google/bigtable/admin/artman_bigtableadmin.yaml" +} + +function run_gapic { + CONFIG="$1" + + log "Running gapic for $CONFIG" + + INNER_CMD="artman --local \ + --config /googleapis/$CONFIG \ + --root-dir /googleapis \ + --output /tmp/artman-genfiles \ + generate java_gapic" + + DOCKER_CMD="docker run --name igor-artman --rm -it \ + -e RUNNING_IN_ARTMAN_DOCKER=True \ + -e HOST_USER_ID=$UID -e HOST_GROUP_ID=`id -g` \ + -v $WORKDIR/googleapis:/googleapis \ + -v $WORKDIR/artman-genfiles:/tmp/artman-genfiles" + + if [ -n "$TOOLKIT" ]; then + DOCKER_CMD="$DOCKER_CMD -v $WORKDIR/toolkit:/toolkit" + fi + + FULL_CMD="$DOCKER_CMD $DOCKER_IMAGE $INNER_CMD" + log "$FULL_CMD" + $FULL_CMD >>$LOG 2>&1 +} + +function copy_api_client_staging { + log "Copying files to api-client-staging" + + rm -rf \ + "$WORKDIR/api-client-staging/generated/java/proto-google-cloud-bigtable-v2" \ + "$WORKDIR/api-client-staging/generated/java/proto-google-cloud-bigtable-admin-v2" \ + "$WORKDIR/api-client-staging/generated/java/grpc-google-cloud-bigtable-v2" \ + "$WORKDIR/api-client-staging/generated/java/grpc-google-cloud-bigtable-admin-v2" \ + "$WORKDIR/api-client-staging/generated/java/gapic-google-cloud-bigtable-v2" \ + "$WORKDIR/api-client-staging/generated/java/gapic-google-cloud-bigtable-admin-v2" + + cp -r \ + "$WORKDIR/artman-genfiles/java/grpc-google-cloud-bigtable-v2" \ + "$WORKDIR/artman-genfiles/java/grpc-google-cloud-bigtable-admin-v2" \ + "$WORKDIR/artman-genfiles/java/proto-google-cloud-bigtable-v2" \ + "$WORKDIR/artman-genfiles/java/proto-google-cloud-bigtable-admin-v2" \ + "$WORKDIR/api-client-staging/generated/java/" + + cp -r \ + "$WORKDIR/artman-genfiles/java/google-cloud-bigtable" \ + "$WORKDIR/api-client-staging/generated/java/gapic-google-cloud-bigtable-v2" + cp -r \ + "$WORKDIR/artman-genfiles/java/google-cloud-bigtable-admin" \ + "$WORKDIR/api-client-staging/generated/java/gapic-google-cloud-bigtable-admin-v2" +} + +function copy_google_cloud_java { + log "Copying google-cloud-java" + + # Delete old files + xargs rm < scripts/autogen_files.lst + cat /dev/null > scripts/autogen_files.lst + + # Update manual files + find src -type f > $PROJECT_DIR/scripts/handwritten_files.lst + + # Generate a list of new files + # Data + pushd "$WORKDIR/artman-genfiles/java/google-cloud-bigtable" + find src -type f >> $PROJECT_DIR/scripts/autogen_files.lst + cp -r "src" "$PROJECT_DIR" + popd + # Admin + pushd "$WORKDIR/artman-genfiles/java/google-cloud-bigtable-admin" + find src -type f >> $PROJECT_DIR/scripts/autogen_files.lst + cp -r "src" "$PROJECT_DIR" + popd +} + +function install_protos { + log "Installing protos from api-client-staging" + + pushd "$WORKDIR/api-client-staging/generated/java" > /dev/null + ./gradlew \ + :proto-google-cloud-bigtable-v2:install \ + :grpc-google-cloud-bigtable-v2:install \ + :proto-google-cloud-bigtable-admin-v2:install \ + :grpc-google-cloud-bigtable-admin-v2:install \ + -x javadoc \ + >>$LOG 2>&1 + + popd > /dev/null +} + +function log { + echo ">>>>>>> $@" + echo ">>>>>>> $@" >> $LOG +} + +run diff --git a/google-cloud-bigtable/scripts/update-deps.sh b/google-cloud-bigtable/scripts/update-deps.sh new file mode 100755 index 000000000000..09fd89ad7868 --- /dev/null +++ b/google-cloud-bigtable/scripts/update-deps.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +# This script pulls in upstream updates from the veneer code generator and rebases your local +# changes on top. +# +# Specifically it: +# - fetches changes from googleapis for updated protos +# - fetches changes from toolkit for updates to the code generator +# - fetches api-client-staging to use as a staging area for the generated grpc stubs +# - fetches google-cloud-java to use as a staging area for the generated GAPIC client +# +# This is meant to be used conjunction with install-deps.sh to regenerate the underlying client with +# the latest upstream changes. + +set -eE # same as: `set -o errexit -o errtrace` +handle_error() { + echo "Failed, exiting" + exit 1 +} +trap 'handle_error' ERR + +PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" +WORKDIR="$PROJECT_DIR/deps" + + +DIRS=( googleapis toolkit api-client-staging ) + +for DIR in "${DIRS[@]}"; do + echo ">>> Updating $DIR" + DIR="$WORKDIR/$DIR" + + echo "Fetching upstream" + git -C "$DIR" fetch origin + + echo "Dropping uncommitted local changes" + git -C "$DIR" reset --hard HEAD + git -C "$DIR" clean -f + + echo "Rebasing local changes" + git -C "$DIR" rebase origin/master +done From 05657318e7885d89f5c0d5cdf22e23cc3464c348 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Fri, 2 Feb 2018 16:39:16 -0500 Subject: [PATCH 2/7] add a code formater --- google-cloud-bigtable/pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index aa71c7e543c5..28d327afd554 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -123,6 +123,24 @@ + + com.theoryinpractise + googleformatter-maven-plugin + 1.5.1 + + + reformat-sources + process-sources + + format + + + + true + + + + org.apache.maven.plugins maven-javadoc-plugin From 413c1ae28bd583b5d1ba6bfcf3d09b2e362d14d1 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Fri, 2 Feb 2018 17:00:19 -0500 Subject: [PATCH 3/7] Improve split between update-deps & regenerate --- google-cloud-bigtable/scripts/README.md | 14 ++++ google-cloud-bigtable/scripts/regenerate.sh | 26 +------- google-cloud-bigtable/scripts/update-deps.sh | 69 +++++++++++++++----- 3 files changed, 69 insertions(+), 40 deletions(-) create mode 100644 google-cloud-bigtable/scripts/README.md diff --git a/google-cloud-bigtable/scripts/README.md b/google-cloud-bigtable/scripts/README.md new file mode 100644 index 000000000000..0c215aae191a --- /dev/null +++ b/google-cloud-bigtable/scripts/README.md @@ -0,0 +1,14 @@ +# Developer Scripts + +This directory contains scripts to help in development of this client. Specifically to test out +changes in the autogenerated protobufs and GAPIC client before publishing the changes to googleapis. + +- update-deps.sh downloads dependencies needed to regenerate the protobufs and the GAPIC client. + It will stage everything in `deps/`. It can be run again to refresh the dependencies. It will + try rebase any changes that are committed locally in the dependency. + +- regenerate.sh is used to regenerate the base GAPIC layer. It will regenerate the protobufs and + all of the GAPIC classes in this project. + +- autogen_files.lst and handwritten_files.lst track the origin of the files in `src/`, they will be + updated when `regenerate.sh` is run diff --git a/google-cloud-bigtable/scripts/regenerate.sh b/google-cloud-bigtable/scripts/regenerate.sh index 934a5c841a33..4ae0da9097f7 100755 --- a/google-cloud-bigtable/scripts/regenerate.sh +++ b/google-cloud-bigtable/scripts/regenerate.sh @@ -7,7 +7,7 @@ set -eE # same as: `set -o errexit -o errtrace` handle_error() { - echo "Failed, exiting" + echo "Failed, exiting. See deps/output.log for more details" exit 1 } trap 'handle_error' ERR @@ -21,7 +21,6 @@ DOCKER_IMAGE=googleapis/artman:stable TOOLKIT="$WORKDIR/toolkit" function run { - init run_artman copy_api_client_staging copy_google_cloud_java @@ -30,29 +29,6 @@ function run { echo "Successfully completed!" } -function init { - mkdir -p "$WORKDIR" - echo "" > $WORKDIR/output.log - - log "Pulling docker image" - docker pull "$DOCKER_IMAGE" >>$LOG 2>&1 - - if [ ! -d "$WORKDIR/googleapis" ]; then - log "Fetching googleapis" - git clone "https://github.com/googleapis/googleapis.git" "$WORKDIR/googleapis" >>$LOG 2>&1 - fi - - if [ ! -d "$WORKDIR/toolkit" ]; then - log "Fetching toolkit" - git clone "https://github.com/googleapis/toolkit.git" "$WORKDIR/toolkit" >>$LOG 2>&1 - fi - - if [ ! -d "$WORKDIR/api-client-staging" ]; then - log "Fetching api-client-staging" - git clone "https://github.com/googleapis/api-client-staging.git" "$WORKDIR/api-client-staging" >>$LOG 2>&1 - fi -} - function run_artman { rm -rf artman-genfiles/* diff --git a/google-cloud-bigtable/scripts/update-deps.sh b/google-cloud-bigtable/scripts/update-deps.sh index 09fd89ad7868..bafba8d633b9 100755 --- a/google-cloud-bigtable/scripts/update-deps.sh +++ b/google-cloud-bigtable/scripts/update-deps.sh @@ -7,35 +7,74 @@ # - fetches changes from googleapis for updated protos # - fetches changes from toolkit for updates to the code generator # - fetches api-client-staging to use as a staging area for the generated grpc stubs -# - fetches google-cloud-java to use as a staging area for the generated GAPIC client # -# This is meant to be used conjunction with install-deps.sh to regenerate the underlying client with +# This is meant to be used conjunction with update-deps.sh to regenerate the underlying client with # the latest upstream changes. set -eE # same as: `set -o errexit -o errtrace` handle_error() { - echo "Failed, exiting" + echo "Failed, exiting. See deps/output.log for more details" exit 1 } trap 'handle_error' ERR PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" WORKDIR="$PROJECT_DIR/deps" - +LOG="$WORKDIR/output.log" DIRS=( googleapis toolkit api-client-staging ) -for DIR in "${DIRS[@]}"; do - echo ">>> Updating $DIR" - DIR="$WORKDIR/$DIR" +DOCKER_IMAGE=googleapis/artman:stable + +function run { + init + update +} + +# Make sure all of the dependencies are checked out +function init() { + mkdir -p "$WORKDIR" + echo "" > $WORKDIR/output.log + + log "Pulling docker image" + docker pull "$DOCKER_IMAGE" >>$LOG 2>&1 + + if [ ! -d "$WORKDIR/googleapis" ]; then + log "Fetching googleapis" + git clone "https://github.com/googleapis/googleapis.git" "$WORKDIR/googleapis" >>$LOG 2>&1 + fi + + if [ ! -d "$WORKDIR/toolkit" ]; then + log "Fetching toolkit" + git clone "https://github.com/googleapis/toolkit.git" "$WORKDIR/toolkit" >>$LOG 2>&1 + fi - echo "Fetching upstream" - git -C "$DIR" fetch origin + if [ ! -d "$WORKDIR/api-client-staging" ]; then + log "Fetching api-client-staging" + git clone "https://github.com/googleapis/api-client-staging.git" "$WORKDIR/api-client-staging" >>$LOG 2>&1 + fi +} + +function update() { + for DIR in "${DIRS[@]}"; do + log "Updating $DIR" + DIR="$WORKDIR/$DIR" + + log "Fetching upstream" + git -C "$DIR" fetch origin >>$LOG 2>&1 + + log "Dropping uncommitted local changes" + git -C "$DIR" reset --hard HEAD >>$LOG 2>&1 + git -C "$DIR" clean -f >>$LOG 2>&1 - echo "Dropping uncommitted local changes" - git -C "$DIR" reset --hard HEAD - git -C "$DIR" clean -f + log "Rebasing local changes" + git -C "$DIR" rebase origin/master >>$LOG 2>&1 + done +} + +function log { + echo ">>>>>>> $@" + echo ">>>>>>> $@" >> $LOG +} - echo "Rebasing local changes" - git -C "$DIR" rebase origin/master -done +run From 573ebd90d6c131bfed99a13481f377325db71996 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Fri, 2 Feb 2018 18:20:32 -0500 Subject: [PATCH 4/7] don't reformat by default --- google-cloud-bigtable/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 28d327afd554..0ce08cb18508 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -129,8 +129,7 @@ 1.5.1 - reformat-sources - process-sources + default-cli format From f60d4f8ee7f7d91714cee935ed37f5ad558147aa Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 5 Feb 2018 10:11:00 -0500 Subject: [PATCH 5/7] only reformat sources when developing --- google-cloud-bigtable/pom.xml | 43 +++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 0ce08cb18508..7f1d17ae0da2 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -104,6 +104,32 @@ -Xdoclint:none + + + bigtable-dev + + + + com.theoryinpractise + googleformatter-maven-plugin + 1.5.1 + + + reformat-sources + process-sources + + format + + + + true + + + + + + + @@ -123,23 +149,6 @@ - - com.theoryinpractise - googleformatter-maven-plugin - 1.5.1 - - - default-cli - - format - - - - true - - - - org.apache.maven.plugins maven-javadoc-plugin From dcd905cf887cc994a977b7015be0713247008300 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 5 Feb 2018 11:39:27 -0500 Subject: [PATCH 6/7] tweaks --- google-cloud-bigtable/pom.xml | 26 -------------------- google-cloud-bigtable/scripts/regenerate.sh | 3 ++- google-cloud-bigtable/scripts/update-deps.sh | 3 ++- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 7f1d17ae0da2..aa71c7e543c5 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -104,32 +104,6 @@ -Xdoclint:none - - - bigtable-dev - - - - com.theoryinpractise - googleformatter-maven-plugin - 1.5.1 - - - reformat-sources - process-sources - - format - - - - true - - - - - - - diff --git a/google-cloud-bigtable/scripts/regenerate.sh b/google-cloud-bigtable/scripts/regenerate.sh index 4ae0da9097f7..36173ba2572f 100755 --- a/google-cloud-bigtable/scripts/regenerate.sh +++ b/google-cloud-bigtable/scripts/regenerate.sh @@ -5,7 +5,8 @@ # It is meant to be used to test changes to the gapic config before publishing # To pull in upstream changes, please use update-deps.sh -set -eE # same as: `set -o errexit -o errtrace` +set -o errexit -o errtrace + handle_error() { echo "Failed, exiting. See deps/output.log for more details" exit 1 diff --git a/google-cloud-bigtable/scripts/update-deps.sh b/google-cloud-bigtable/scripts/update-deps.sh index bafba8d633b9..382e107ae902 100755 --- a/google-cloud-bigtable/scripts/update-deps.sh +++ b/google-cloud-bigtable/scripts/update-deps.sh @@ -11,7 +11,8 @@ # This is meant to be used conjunction with update-deps.sh to regenerate the underlying client with # the latest upstream changes. -set -eE # same as: `set -o errexit -o errtrace` +set -o errexit -o errtrace + handle_error() { echo "Failed, exiting. See deps/output.log for more details" exit 1 From 0ab3b2993e233f999b2a66a42d2339e552d80a9b Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 5 Feb 2018 11:46:46 -0500 Subject: [PATCH 7/7] moved file lists --- google-cloud-bigtable/{scripts => }/autogen_files.lst | 0 .../{scripts => }/handwritten_files.lst | 0 google-cloud-bigtable/scripts/regenerate.sh | 10 +++++----- 3 files changed, 5 insertions(+), 5 deletions(-) rename google-cloud-bigtable/{scripts => }/autogen_files.lst (100%) rename google-cloud-bigtable/{scripts => }/handwritten_files.lst (100%) diff --git a/google-cloud-bigtable/scripts/autogen_files.lst b/google-cloud-bigtable/autogen_files.lst similarity index 100% rename from google-cloud-bigtable/scripts/autogen_files.lst rename to google-cloud-bigtable/autogen_files.lst diff --git a/google-cloud-bigtable/scripts/handwritten_files.lst b/google-cloud-bigtable/handwritten_files.lst similarity index 100% rename from google-cloud-bigtable/scripts/handwritten_files.lst rename to google-cloud-bigtable/handwritten_files.lst diff --git a/google-cloud-bigtable/scripts/regenerate.sh b/google-cloud-bigtable/scripts/regenerate.sh index 36173ba2572f..5c443989ed39 100755 --- a/google-cloud-bigtable/scripts/regenerate.sh +++ b/google-cloud-bigtable/scripts/regenerate.sh @@ -93,21 +93,21 @@ function copy_google_cloud_java { log "Copying google-cloud-java" # Delete old files - xargs rm < scripts/autogen_files.lst - cat /dev/null > scripts/autogen_files.lst + xargs rm < autogen_files.lst + cat /dev/null > autogen_files.lst # Update manual files - find src -type f > $PROJECT_DIR/scripts/handwritten_files.lst + find src -type f > $PROJECT_DIR/handwritten_files.lst # Generate a list of new files # Data pushd "$WORKDIR/artman-genfiles/java/google-cloud-bigtable" - find src -type f >> $PROJECT_DIR/scripts/autogen_files.lst + find src -type f >> $PROJECT_DIR/autogen_files.lst cp -r "src" "$PROJECT_DIR" popd # Admin pushd "$WORKDIR/artman-genfiles/java/google-cloud-bigtable-admin" - find src -type f >> $PROJECT_DIR/scripts/autogen_files.lst + find src -type f >> $PROJECT_DIR/autogen_files.lst cp -r "src" "$PROJECT_DIR" popd }