Merge branch 'master' into mrschmidt/transactionretries

google-cloud-firestore/pom.xml

@@ -162,7 +162,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-conformance-tests</artifactId>
-      <version>0.0.8</version>
+      <version>0.0.9</version>
       <scope>test</scope>
     </dependency>
     <dependency>

grpc-google-cloud-firestore-admin-v1/clirr-ignored-differences.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <!-- TODO: remove after 1.32.6 released -->
+    <differenceType>6001</differenceType>
+    <className>com/google/firestore/admin/v1/*Grpc</className>
+    <field>METHOD_*</field>
+  </difference>
+</differences>

grpc-google-cloud-firestore-v1/clirr-ignored-differences.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <!-- TODO: remove after 1.32.6 released -->
+    <differenceType>6001</differenceType>
+    <className>com/google/firestore/v1/*Grpc</className>
+    <field>METHOD_*</field>
+  </difference>
+</differences>

grpc-google-cloud-firestore-v1beta1/clirr-ignored-differences.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <!-- TODO: remove after 1.32.6 released -->
+    <differenceType>6001</differenceType>
+    <className>com/google/firestore/v1beta1/*Grpc</className>
+    <field>METHOD_*</field>
+  </difference>
+</differences>

renovate.json

@@ -57,7 +57,8 @@
     {
       "packagePatterns": [
         "^com.google.cloud:google-cloud-firestore",
-        "^com.google.cloud:libraries-bom"
+        "^com.google.cloud:libraries-bom",
+        "^com.google.cloud.samples:shared-configuration"
       ],
       "semanticCommitType": "chore",
       "semanticCommitScope": "deps"

synth.metadata

@@ -1,5 +1,5 @@
 {
-  "updateTime": "2020-03-25T10:00:54.676418Z",
+  "updateTime": "2020-03-25T17:37:29.133752Z",
   "sources": [
     {
       "generator": {
@@ -12,17 +12,17 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551cf1e6e3addcc63740427c4f9b40dedd3dac27",
-        "internalRef": "302792195",
-        "log": "551cf1e6e3addcc63740427c4f9b40dedd3dac27\nfeat: Add OS Config AgentEndpointService v1 PatchJobs and Tasks APIs.\n\nPiperOrigin-RevId: 302792195\n\n1df117114c73299b614dfd3ba3632bf246669336\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 302753982\n\n71d6c56a14bb433beb1237dccb48dabcd9597924\nRefresh monitoring client libraries.\nRename to Cloud Monitoring API.\nAdded support for TimeSeriesQueryLanguageCondition condition type in alert policies.\n\nPiperOrigin-RevId: 302735422\n\n25a1781c096974df99d556cc5888fefa82bc6425\nbazel: migrate all go_gapic_library targets to microgenerator implementation\n\n* update rules_go and gazelle bazel dependencies\n* update gapic-generator bazel dependency (with build file generator changes)\n\nPiperOrigin-RevId: 302730217\n\n36c0febd0fa7267ab66d14408eec2afd1b6bec4e\nUpdate GAPIC configurations to v2 .yaml.\n\nPiperOrigin-RevId: 302639621\n\n078f222366ed344509a48f2f084944ef61476613\nFix containeranalysis v1beta1 assembly target name\n\nPiperOrigin-RevId: 302529186\n\n0be7105dc52590fa9a24e784052298ae37ce53aa\nAdd BUILD.bazel file to asset/v1p1beta1\n\nPiperOrigin-RevId: 302154871\n\n6c248fd13e8543f8d22cbf118d978301a9fbe2a8\nAdd missing resource annotations and additional_bindings to dialogflow v2 API.\n\nPiperOrigin-RevId: 302063117\n\n9a3a7f33be9eeacf7b3e98435816b7022d206bd7\nChange the service name from \"chromeos-moblab.googleapis.com\" to \"chromeosmoblab.googleapis.com\"\n\nPiperOrigin-RevId: 302060989\n\n98a339237577e3de26cb4921f75fb5c57cc7a19f\nfeat: devtools/build/v1 publish client library config annotations\n\n* add details field to some of the BuildEvents\n* add final_invocation_id and build_tool_exit_code fields to BuildStatus\n\nPiperOrigin-RevId: 302044087\n\ncfabc98c6bbbb22d1aeaf7612179c0be193b3a13\nfeat: home/graph/v1 publish client library config annotations & comment updates\n\nThis change includes adding the client library configuration annotations, updated proto comments, and some client library configuration files.\n\nPiperOrigin-RevId: 302042647\n\nc8c8c0bd15d082db9546253dbaad1087c7a9782c\nchore: use latest gapic-generator in bazel WORKSPACE.\nincluding the following commits from gapic-generator:\n- feat: take source protos in all sub-packages (#3144)\n\nPiperOrigin-RevId: 301843591\n\ne4daf5202ea31cb2cb6916fdbfa9d6bd771aeb4c\nAdd bazel file for v1 client lib generation\n\nPiperOrigin-RevId: 301802926\n\n"
+        "sha": "fd83ab212176a1042e8d45ea90766b3bf59ac679",
+        "internalRef": "302913609",
+        "log": "fd83ab212176a1042e8d45ea90766b3bf59ac679\nfix: migrate osconfig/agentendpoint/v1 go_gapic_library target to microgen impl\n\nPiperOrigin-RevId: 302913609\n\n0e07113e776bdd8fcc0783372e08bb6e76cb1b5b\ndocs: Update documentation with links to smart home developer guides and reference pages. Remove outdated authorization instructions.\n\nPiperOrigin-RevId: 302892245\n\n"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "ee4330a0e5f4b93978e8683fbda8e6d4148326b7",
-        "log": "ee4330a0e5f4b93978e8683fbda8e6d4148326b7\nchore(java_templates): mark version bumps of current library as a chore (#452)\n\nWith the samples/install-without-bom/pom.xml referencing the latest released library, we want to mark updates of this version as a chore for renovate bot.\na0d3133a5d45544a66345059eebf76933265c099\nfix(java): run mvn install with retry (#453)\n\n* fix(java): run mvn install with retry\n\n* fix invocation of command\n6a17abc7652e2fe563e1288c6e8c23fc260dda97\ndocs: document the release schedule we follow (#454)\n\n\n7e98e1609c91082f4eeb63b530c6468aefd18cfd\nbuild: use checkout@v2, not v1, as this allows manual re-running of tests (#451)\n\nhttps://github.com/actions/checkout/issues/23\n"
+        "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8",
+        "log": "e36822bfa0acb355502dab391b8ef9c4f30208d8\nchore(java): treat samples shared configuration dependency update as chore (#457)\n\n\n1b4cc80a7aaf164f6241937dd87f3bd1f4149e0c\nfix: do not run node 8 CI (#456)\n\n\n"
       }
     }
   ],

synth.py

@@ -20,7 +20,7 @@
 
 AUTOSYNTH_MULTIPLE_COMMITS = True
 
-gapic = gcp.GAPICGenerator()
+gapic = gcp.GAPICBazel()
 
 protobuf_header = "// Generated by the protocol buffer compiler.  DO NOT EDIT!"
 # License header
@@ -56,66 +56,68 @@
 """
 
 
-def generate_client(service, version, config_path, package, include_gapic=True):
+def generate_client(service, version, proto_path=None, bazel_target=None, package=None, include_gapic=True):
   library = gapic.java_library(
       service=service,
       version=version,
-      config_path=config_path,
-      artman_output_name='')
+      proto_path=proto_path if proto_path else f'google/{service}/{version}',
+      bazel_target=bazel_target if bazel_target else f'//google/{service}/{version}:google-cloud-{service}-{version}-java',
+  )
+
+  library = library / f"google-cloud-{service}-{version}-java"
 
   s.replace(
-      library / f'proto-google-cloud-{service}-{version}/src/**/*.java',
+      library / f'proto-google-cloud-{service}-{version}-java/src/**/*.java',
       protobuf_header,
       f'{license_header}{protobuf_header}'
   )
   s.replace(
-      library / f'grpc-google-cloud-{service}-{version}/src/**/*.java',
+      library / f'grpc-google-cloud-{service}-{version}-java/src/**/*.java',
       bad_license_header,
       license_header
   )
   s.replace(
-      library / f'proto-google-cloud-{service}-{version}/src/**/*.java',
+      library / f'proto-google-cloud-{service}-{version}-java/src/**/*.java',
       bad_license_header,
       license_header
   )
+
+  pkg = package if package else f'com.google.{service}.{version}'
   s.replace(
-      library / f'grpc-google-cloud-{service}-{version}/src/**/*.java',
-      f'package {package};',
-      f'{license_header}package {package};'
+      library / f'grpc-google-cloud-{service}-{version}-java/src/**/*.java',
+      f'package {pkg};',
+      f'{license_header}package {pkg};'
   )
 
-  s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'grpc-google-cloud-{service}-{version}/src')
-  s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src')
+  s.copy(library / f'grpc-google-cloud-{service}-{version}-java/src', f'grpc-google-cloud-{service}-{version}/src')
+  s.copy(library / f'proto-google-cloud-{service}-{version}-java/src', f'proto-google-cloud-{service}-{version}/src')
   java.format_code(f'grpc-google-cloud-{service}-{version}/src')
   java.format_code(f'proto-google-cloud-{service}-{version}/src')
 
   if include_gapic:
-    s.copy(library / f'gapic-google-cloud-{service}-{version}/src', 'google-cloud-firestore/src')
+    s.copy(library / f'gapic-google-cloud-{service}-{version}-java/src', 'google-cloud-firestore/src')
     java.format_code(f'google-cloud-firestore/src')
 
   return library
 
 admin_v1 = generate_client(
     service='firestore-admin',
     version='v1',
-    config_path='/google/firestore/admin/artman_firestore_v1.yaml',
+    proto_path='google/firestore/admin/v1',
+    bazel_target='//google/firestore/admin/v1:google-cloud-firestore-admin-v1-java',
     package='com.google.firestore.admin.v1',
     include_gapic=True
 )
 
 firestore_v1 = generate_client(
     service='firestore',
     version='v1',
-    config_path='/google/firestore/artman_firestore_v1.yaml',
-    package='com.google.firestore.v1',
     include_gapic=True
 )
 
 firestore_v1beta1 = generate_client(
     service='firestore',
     version='v1beta1',
-    config_path='/google/firestore/artman_firestore.yaml',
-    package='com.google.firestore.v1beta1',
     include_gapic=False
 )