googleapis · sduskis · Feb 8, 2019 · Jan 8, 2019 · Jan 8, 2019 · Jan 9, 2019
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -17,14 +17,44 @@ set -eo pipefail
 
 cd github/google-cloud-java/
 
+function client_has_changes() {
+  CLIENT_NAME=$1
+  if [[ ! -z $(git diff master google-cloud-clients/google-cloud-core*) ]]; then
+    echo "true"
+    return
+  fi
+
+  if [[ ! -z $(git diff master google-cloud-clients/${CLIENT_NAME}) ]]; then
+    echo "true"
+    return
+  fi
+
+  if [[ ! -z $(git diff master google-api-grpc/*${CLIENT_NAME}*) ]]; then
+    echo "true"
+    return
+  fi
+
+  echo "false"
+}
+
 # Print out Java version
 java -version
 echo $JOB_TYPE
 
+if [[ "${SKIP_INTEGRATION_TESTS_IF_NO_CHANGES}" == "true" ]] &&
+   [[ "${JOB_TYPE}" == "integration" ]]; then
+  CLIENT=$(echo ${INTEGRATION_TEST_ARGS} | cut -d' ' -f1 | cut -d'/' -f2)
+  CLIENT_HAS_CHANGES=$(client_has_changes ${CLIENT})
+  if [[ "${CLIENT_HAS_CHANGES}" == "false" ]]; then
+    echo "No difference from master, skipping tests."
+    exit 0
+  fi
+fi
+
 mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V
 
 # prepend Kokoro root directory onto GOOGLE_APPLICATION_CREDENTIALS path
-if [ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
+if [[ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]]; then
     export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
 

diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
@@ -11,3 +11,9 @@ env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
     value: "github/google-auth-library-java/.kokoro/build.sh"
 }
+
+# By default, always run integration tests
+env_vars: {
+  key: "SKIP_INTEGRATION_TESTS_IF_NO_CHANGES"
+  value: "false"
+}
diff --git a/.kokoro/continuous/bigtableadmin-it.cfg b/.kokoro/continuous/bigtableadmin-it.cfg
@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
     key: "INTEGRATION_TEST_ARGS"
-    value: "google-cloud-clients/google-cloud-bigtable-admin -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable"
+    value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/bigtableadmin-it.cfg b/.kokoro/nightly/bigtableadmin-it.cfg
@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
     key: "INTEGRATION_TEST_ARGS"
-    value: "google-cloud-clients/google-cloud-bigtable-admin -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable"
+    value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/bigtableadmin-it.cfg b/.kokoro/presubmit/bigtableadmin-it.cfg
@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
     key: "INTEGRATION_TEST_ARGS"
-    value: "google-cloud-clients/google-cloud-bigtable-admin -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable"
+    value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg
@@ -14,13 +14,19 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 build_file: "google-cloud-java/.kokoro/trampoline.sh"
 
 env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/google-cloud-java/.kokoro/build.sh"
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-cloud-java/.kokoro/build.sh"
 }
 
 env_vars: {
-    key: "JOB_TYPE"
-    value: "test"
+  key: "JOB_TYPE"
+  value: "test"
+}
+
+# For presubmits, only run integrations if the code has changed
+env_vars: {
+  key: "SKIP_INTEGRATION_TESTS_IF_NO_CHANGES"
+  value: "true"
 }
 
 before_action {

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Google Cloud Client Library for Java
 Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
 
 [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/master.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/master.html)
-[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.google.cloud%22%20a%3A%22google-cloud%22)
+[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bom.svg)](https://search.maven.org/search?q=g:com.google.cloud%20a:google-cloud-bom)
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java)
 
 - [Google Cloud Platform Documentation][cloud-platform-docs]
@@ -42,7 +42,6 @@ This library supports the following Google Cloud Platform services with clients
 This library supports the following Google Cloud Platform services with clients at an [Alpha](#versioning) quality level:
 
 -  [Cloud Bigtable](google-cloud-clients/google-cloud-bigtable) (Alpha)
--  [Cloud Bigtable Admin](google-cloud-clients/google-cloud-bigtable-admin) (Alpha)
 -  [Cloud Compute](google-cloud-clients/google-cloud-compute) (Alpha)
 -  [Cloud Dataproc](google-cloud-clients/google-cloud-dataproc) (Alpha)
 -  [Cloud DNS](google-cloud-clients/google-cloud-dns) (Alpha)
@@ -67,7 +66,7 @@ If you are using Maven, add this to your pom.xml file
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bom</artifactId>
-        <version>0.76.0-alpha</version>
+        <version>0.80.0-alpha</version>
         <type>pom</type>
         <scope>import</scope>
        </dependency>
@@ -86,11 +85,11 @@ If you are using Maven, add this to your pom.xml file
 [//]: # ({x-version-update-start:google-cloud-storage:released})
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-storage:1.58.0'
+compile 'com.google.cloud:google-cloud-storage:1.62.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.58.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.62.0"
 ```
 [//]: # ({x-version-update-end})
 
@@ -111,7 +110,7 @@ If you are running into problems with version conflicts, the easiest way to solv
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bom</artifactId>
-        <version>0.76.0-alpha</version>
+        <version>0.80.0-alpha</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/TESTING.md b/TESTING.md
@@ -56,8 +56,8 @@ To use the `prod` environment:
 2. Download the [JSON service account credentials file][create-service-account] from the Google 
    Developer's Console.
 3. Set the environment variable `GOOGLE_APPLICATION_CREDENTIALS` to the path of the credentials file
-4. Set the system property `bigtable.env=prod` and `bigtable.table` to the full table name you 
-    created earlier. Example: 
+4. Set the system property `bigtable.env=prod`, `bigtable.project`, `bigtable.instance` and
+   `bigtable.table` to created earlier. Example: 
     ```shell
     mvn verify -am -pl google-cloud-bigtable \
       -Dbigtable.env=prod \
@@ -66,23 +66,6 @@ To use the `prod` environment:
       -Dbigtable.table=my-table
     ```
 
-### Testing code that uses Bigtable Admin
-
-Bigtable Admin integration tests are run against a real Bigtable instance.
-
-To run the tests:
-1. Set up the target table using `google-cloud-bigtable/scripts/setup-test-table.sh`
-2. Download the [JSON service account credentials file][create-service-account] from the Google
-   Developer's Console.
-3. Set the environment variable `GOOGLE_APPLICATION_CREDENTIALS` to the path of the credentials file
-4. Set the system property `bigtable.instance` to the full instance name you
-    created earlier. Example:
-    ```shell
-    mvn verify -am -pl google-cloud-bigtable-admin \
-      -Dbigtable.project=my-project
-      -Dbigtable.instance=my-instance
-    ```
-
 ### Testing code that uses Compute
 
 Currently, there isn't an emulator for Google Compute, so an alternative is to create a test
@@ -173,50 +156,7 @@ uses the `RemoteLoggingHelper` to create a metric.
 
 You can test against a Pub/Sub emulator:
 
-1. [Install Cloud SDK](https://cloud.google.com/sdk/downloads)
-
-2. Start the emulator:
-```shell
-$ gcloud beta emulators pubsub start
-```
-
-To determine which host/port the emulator is running on:
-```shell
-$ gcloud beta emulators pubsub env-init
-# Sample output:
-#   export PUBSUB_EMULATOR_HOST=localhost:8759
-```
-
-3. Point your client to the emulator.
-```java
-String hostport = System.getenv("PUBSUB_EMULATOR_HOST");
-ManagedChannel channel = ManagedChannelBuilder.forTarget(hostport).usePlaintext(true).build();
-try {
-  ChannelProvider channelProvider = FixedChannelProvider.create(channel);
-  CredentialsProvider credentialsProvider = new NoCredentialsProvider();
-
-  // Similarly for SubscriptionAdminSettings
-  TopicAdminClient topicClient = TopicAdminClient.create(
-    TopicAdminSettings
-      .defaultBuilder()
-        .setTransportProvider(
-            GrpcTransportProvider.newBuilder()
-                .setChannelProvider(channelProvider)
-                .build())
-      .setCredentialsProvider(credentialsProvider)
-      .build());
-
-  // Similarly for Subscriber
-  Publisher publisher =
-    Publisher
-      .defaultBuilder(topicName)
-      .setChannelProvider(channelProvider)
-      .setCredentialsProvider(credentialsProvider)
-      .build();
-} finally {
-  channel.shutdown();
-}
-```
+1. [Set up the emulator](https://cloud.google.com/pubsub/docs/emulator)
 
 ### Testing code that uses Redis
 

diff --git a/google-api-grpc/grpc-google-cloud-asset-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-asset-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-asset-v1beta1</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-asset-v1beta1:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-asset-v1beta1:current} -->
   <name>grpc-google-cloud-asset-v1beta1</name>
   <description>GRPC library for grpc-google-cloud-asset-v1beta1</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-api-grpc/grpc-google-cloud-automl-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-automl-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-automl-v1beta1</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-automl-v1beta1:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-automl-v1beta1:current} -->
   <name>grpc-google-cloud-automl-v1beta1</name>
   <description>GRPC library for grpc-google-cloud-automl-v1beta1</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-bigquerydatatransfer-v1</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-bigquerydatatransfer-v1:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerydatatransfer-v1:current} -->
   <name>grpc-google-cloud-bigquerydatatransfer-v1</name>
   <description>GRPC library for grpc-google-cloud-bigquerydatatransfer-v1</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-api-grpc/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-bigquerystorage-v1beta1</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta1:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1beta1:current} -->
   <name>grpc-google-cloud-bigquerystorage-v1beta1</name>
   <description>GRPC library for grpc-google-cloud-bigquerystorage-v1beta1</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
   <name>grpc-google-cloud-bigtable-admin-v2</name>
   <description>GRPC library for grpc-google-cloud-bigtable-admin-v2</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
   <name>grpc-google-cloud-bigtable-v2</name>
   <description>GRPC library for grpc-google-cloud-bigtable-v2</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-container-v1</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
   <name>grpc-google-cloud-container-v1</name>
   <description>GRPC library for grpc-google-cloud-container-v1</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-api-grpc/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-containeranalysis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-containeranalysis-v1beta1</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-containeranalysis-v1beta1:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-containeranalysis-v1beta1:current} -->
   <name>grpc-google-cloud-containeranalysis-v1beta1</name>
   <description>GRPC library for grpc-google-cloud-containeranalysis-v1beta1</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-dataproc-v1</artifactId>
-  <version>0.41.0</version><!-- {x-version-update:grpc-google-cloud-dataproc-v1:current} -->
+  <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dataproc-v1:current} -->
   <name>grpc-google-cloud-dataproc-v1</name>
   <description>GRPC library for grpc-google-cloud-dataproc-v1</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-api-grpc</artifactId>
-    <version>0.41.0</version><!-- {x-version-update:google-api-grpc:current} -->
+    <version>0.45.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
   </parent>
   <dependencies>
     <dependency>