diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index be3b9bde4f..8807efcad4 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:7062473f423f339256346ddbee3d81fb1de6b784fabc2a4d959d7df2c720e375 + digest: sha256:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846 diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg new file mode 100644 index 0000000000..58049cc38f --- /dev/null +++ b/.kokoro/nightly/java11-integration.cfg @@ -0,0 +1,37 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-public-resources/java11014" +} + +env_vars: { + key: "JOB_TYPE" + value: "integration" +} +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef6235a15..bf34390fd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [2.8.4](https://github.com/googleapis/java-bigquerystorage/compare/v2.8.3...v2.8.4) (2022-02-03) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-bigquery to v2.7.1 ([#1505](https://github.com/googleapis/java-bigquerystorage/issues/1505)) ([a700d92](https://github.com/googleapis/java-bigquerystorage/commit/a700d92c9f591f2b653aad6d79b2f61c4c44df98)) +* update dependency com.google.cloud:google-cloud-bigquery to v2.8.0 ([#1508](https://github.com/googleapis/java-bigquerystorage/issues/1508)) ([b9ab6aa](https://github.com/googleapis/java-bigquerystorage/commit/b9ab6aac2f360f9ab541d83ad1f2d921657a56bf)) + + +### Documentation + +* **tutorials:** add integration test file structure for tutorials ([#1507](https://github.com/googleapis/java-bigquerystorage/issues/1507)) ([ecb1fbb](https://github.com/googleapis/java-bigquerystorage/commit/ecb1fbb1186a2bb22a2c27ba85ff6ecfab883011)) +* **tutorials:** Add README, other small fixes to JsonWriterDefaultStream tutorial ([#1504](https://github.com/googleapis/java-bigquerystorage/issues/1504)) ([691eae5](https://github.com/googleapis/java-bigquerystorage/commit/691eae56f80a6751f25ef0db4f1d7b4bd6db2f66)) + ### [2.8.3](https://github.com/googleapis/java-bigquerystorage/compare/v2.8.2...v2.8.3) (2022-01-28) diff --git a/README.md b/README.md index 4cd0479de8..771e298fa5 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-bigquerystorage - 2.8.2 + 2.8.3 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigquerystorage' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-bigquerystorage:2.8.2' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.8.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.8.2" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.8.3" ``` ## Authentication diff --git a/google-cloud-bigquerystorage-bom/pom.xml b/google-cloud-bigquerystorage-bom/pom.xml index 81d72fce43..6aa62ae572 100644 --- a/google-cloud-bigquerystorage-bom/pom.xml +++ b/google-cloud-bigquerystorage-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage-bom - 2.8.3 + 2.8.4 pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-bigquerystorage - 2.8.3 + 2.8.4 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.132.3 + 0.132.4 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.132.3 + 0.132.4 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.8.3 + 2.8.4 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.132.3 + 0.132.4 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.132.3 + 0.132.4 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.8.3 + 2.8.4 diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml index f53f449b6a..74d742a01f 100644 --- a/google-cloud-bigquerystorage/pom.xml +++ b/google-cloud-bigquerystorage/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage - 2.8.3 + 2.8.4 jar BigQuery Storage https://github.com/googleapis/java-bigquerystorage @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerystorage-parent - 2.8.3 + 2.8.4 google-cloud-bigquerystorage diff --git a/grpc-google-cloud-bigquerystorage-v1/pom.xml b/grpc-google-cloud-bigquerystorage-v1/pom.xml index 14b7f78065..dbbe488b04 100644 --- a/grpc-google-cloud-bigquerystorage-v1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.8.3 + 2.8.4 grpc-google-cloud-bigquerystorage-v1 GRPC library for grpc-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.8.3 + 2.8.4 diff --git a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml index 46f65be059..bad7086452 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.132.3 + 0.132.4 grpc-google-cloud-bigquerystorage-v1beta1 GRPC library for grpc-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.8.3 + 2.8.4 diff --git a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml index 38bc8b2509..c06f4bc453 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.132.3 + 0.132.4 grpc-google-cloud-bigquerystorage-v1beta2 GRPC library for grpc-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.8.3 + 2.8.4 diff --git a/pom.xml b/pom.xml index 2f8112965b..90345438ce 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerystorage-parent pom - 2.8.3 + 2.8.4 BigQuery Storage Parent https://github.com/googleapis/java-bigquerystorage @@ -83,37 +83,37 @@ com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.132.3 + 0.132.4 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.132.3 + 0.132.4 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.8.3 + 2.8.4 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.132.3 + 0.132.4 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.132.3 + 0.132.4 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.8.3 + 2.8.4 com.google.cloud google-cloud-bigquerystorage - 2.8.3 + 2.8.4 org.json @@ -132,7 +132,7 @@ com.google.cloud google-cloud-bigquery - 2.7.0 + 2.8.0 test diff --git a/proto-google-cloud-bigquerystorage-v1/pom.xml b/proto-google-cloud-bigquerystorage-v1/pom.xml index 65497a8742..e00b64f10c 100644 --- a/proto-google-cloud-bigquerystorage-v1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.8.3 + 2.8.4 proto-google-cloud-bigquerystorage-v1 PROTO library for proto-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.8.3 + 2.8.4 diff --git a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml index 3c90bfd645..30ffb92ece 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.132.3 + 0.132.4 proto-google-cloud-bigquerystorage-v1beta1 PROTO library for proto-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.8.3 + 2.8.4 diff --git a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml index e9636e1a54..414904dcf5 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.132.3 + 0.132.4 proto-google-cloud-bigquerystorage-v1beta2 PROTO library for proto-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.8.3 + 2.8.4 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 010d45cfe0..3ae228954e 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -30,14 +30,14 @@ com.google.cloud google-cloud-bigquerystorage - 2.8.2 + 2.8.3 com.google.cloud google-cloud-bigquery - 2.7.0 + 2.8.0 org.apache.avro diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c30dead39f..5650d063c4 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,14 +29,14 @@ com.google.cloud google-cloud-bigquerystorage - 2.8.3 + 2.8.4 com.google.cloud google-cloud-bigquery - 2.7.0 + 2.8.0 org.apache.avro diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index f24a64050e..61ed614d62 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -48,7 +48,7 @@ com.google.cloud google-cloud-bigquery - 2.7.0 + 2.8.0 org.apache.avro diff --git a/tutorials/JsonWriterDefaultStream/README.md b/tutorials/JsonWriterDefaultStream/README.md new file mode 100644 index 0000000000..d4201d953f --- /dev/null +++ b/tutorials/JsonWriterDefaultStream/README.md @@ -0,0 +1,21 @@ +# BigQuery Write API streaming tutorial + +This sample shows how to stream data from a JSON source into BigQuery by using +the [BigQuery Write API](https://cloud.google.com/bigquery/docs/write-api) with +the default stream. + +## Usage + +Download the +[sample data file](https://storage.googleapis.com/cloud-samples-data/bigquery/tutorials/github.json). + +From this directory, run: + +``` +mvn compile exec:java \ + -Dexec.mainClass=com.example.bigquerystorage.JsonWriterDefaultStream \ + -Dexec.args="project_id dataset table filepath` +``` + +where `file_path` is the path to the JSON data file. + diff --git a/tutorials/JsonWriterDefaultStream/pom.xml b/tutorials/JsonWriterDefaultStream/pom.xml index 2fadfe3bf4..de972b9123 100644 --- a/tutorials/JsonWriterDefaultStream/pom.xml +++ b/tutorials/JsonWriterDefaultStream/pom.xml @@ -19,12 +19,12 @@ com.google.cloud google-cloud-bigquerystorage - 2.8.2 + 2.8.3 com.google.cloud google-cloud-bigquery - 2.6.0 + 2.8.0 org.apache.avro @@ -57,8 +57,8 @@ - src/main/java - ../snippets/src/main/java/com/example/bigquerystorage + . + ../../samples/snippets/src/main/java/com/example/bigquerystorage @@ -81,4 +81,4 @@ - \ No newline at end of file + diff --git a/tutorials/JsonWriterDefaultStream/JsonWriterDefaultStream.java b/tutorials/JsonWriterDefaultStream/src/main/java/com/example/JsonWriterDefaultStream.java similarity index 98% rename from tutorials/JsonWriterDefaultStream/JsonWriterDefaultStream.java rename to tutorials/JsonWriterDefaultStream/src/main/java/com/example/JsonWriterDefaultStream.java index 18eebcba4f..70d5da08c8 100644 --- a/tutorials/JsonWriterDefaultStream/JsonWriterDefaultStream.java +++ b/tutorials/JsonWriterDefaultStream/src/main/java/com/example/JsonWriterDefaultStream.java @@ -67,7 +67,7 @@ public static void createDestinationTable( .build(), Field.of("author", StandardSQLTypeName.STRING), Field.of("committer", StandardSQLTypeName.STRING), - Field.of("time_sec", StandardSQLTypeName.INT64), + Field.of("ts", StandardSQLTypeName.DATETIME), Field.of("subject", StandardSQLTypeName.STRING), Field.of("message", StandardSQLTypeName.STRING), Field.of("repo_name", StandardSQLTypeName.STRING)); diff --git a/tutorials/JsonWriterDefaultStream/src/test/java/com/example/JsonWriterDefaultStreamIT.java b/tutorials/JsonWriterDefaultStream/src/test/java/com/example/JsonWriterDefaultStreamIT.java new file mode 100644 index 0000000000..cb716c17bb --- /dev/null +++ b/tutorials/JsonWriterDefaultStream/src/test/java/com/example/JsonWriterDefaultStreamIT.java @@ -0,0 +1,22 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigquerystorage; + +@RunWith(JUnit4.class) +public class JsonWriterDefaultStreamIT { + // TODO(mwasson): ADD Integration Test +} diff --git a/tutorials/pom.xml b/tutorials/pom.xml new file mode 100644 index 0000000000..eb891e4255 --- /dev/null +++ b/tutorials/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + com.google.cloud + google-cloud-bigquerystorage-tutorials + 0.0.1-SNAPSHOT + pom + Google BigQuery Storage Tutorials Parent + https://github.com/googleapis/java-bigquerystorage + + Java idiomatic client for Google Cloud Platform services. + + + + + com.google.cloud.samples + shared-configuration + 1.2.0 + + + + 1.8 + 1.8 + UTF-8 + + + + JsonWriterDefaultStream + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + + \ No newline at end of file diff --git a/versions.txt b/versions.txt index 7d465482b8..4667551b88 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigquerystorage:2.8.3:2.8.3 -grpc-google-cloud-bigquerystorage-v1beta1:0.132.3:0.132.3 -grpc-google-cloud-bigquerystorage-v1beta2:0.132.3:0.132.3 -grpc-google-cloud-bigquerystorage-v1:2.8.3:2.8.3 -proto-google-cloud-bigquerystorage-v1beta1:0.132.3:0.132.3 -proto-google-cloud-bigquerystorage-v1beta2:0.132.3:0.132.3 -proto-google-cloud-bigquerystorage-v1:2.8.3:2.8.3 +google-cloud-bigquerystorage:2.8.4:2.8.4 +grpc-google-cloud-bigquerystorage-v1beta1:0.132.4:0.132.4 +grpc-google-cloud-bigquerystorage-v1beta2:0.132.4:0.132.4 +grpc-google-cloud-bigquerystorage-v1:2.8.4:2.8.4 +proto-google-cloud-bigquerystorage-v1beta1:0.132.4:0.132.4 +proto-google-cloud-bigquerystorage-v1beta2:0.132.4:0.132.4 +proto-google-cloud-bigquerystorage-v1:2.8.4:2.8.4