From 8966c449b68dbfee7935873b3b29b35b87324e02 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 10 Feb 2020 09:07:04 -0800 Subject: [PATCH 01/17] docs(regen): update sample code to set total timeout, add API client header test --- .../v1/ContainerAnalysisSettings.java | 8 ++++++-- .../v1/stub/ContainerAnalysisStubSettings.java | 8 ++++++-- .../v1beta1/ContainerAnalysisV1Beta1Settings.java | 8 ++++++-- .../v1beta1/GrafeasV1Beta1Settings.java | 8 ++++++-- .../stub/ContainerAnalysisV1Beta1StubSettings.java | 8 ++++++-- .../v1beta1/stub/GrafeasV1Beta1StubSettings.java | 8 ++++++-- synth.metadata | 14 +++++++------- 7 files changed, 43 insertions(+), 19 deletions(-) diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisSettings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisSettings.java index 12e649ef..34c9ab7a 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisSettings.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisSettings.java @@ -57,8 +57,12 @@ * * ContainerAnalysisSettings.Builder containerAnalysisSettingsBuilder = * ContainerAnalysisSettings.newBuilder(); - * containerAnalysisSettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * containerAnalysisSettingsBuilder + * .setIamPolicySettings() + * .setRetrySettings( + * containerAnalysisSettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ContainerAnalysisSettings containerAnalysisSettings = containerAnalysisSettingsBuilder.build(); * * diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java index c385145d..25c70e40 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java @@ -66,8 +66,12 @@ * * ContainerAnalysisStubSettings.Builder containerAnalysisSettingsBuilder = * ContainerAnalysisStubSettings.newBuilder(); - * containerAnalysisSettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * containerAnalysisSettingsBuilder + * .setIamPolicySettings() + * .setRetrySettings( + * containerAnalysisSettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ContainerAnalysisStubSettings containerAnalysisSettings = containerAnalysisSettingsBuilder.build(); * * diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1Settings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1Settings.java index 9947b15e..4b9b0a67 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1Settings.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1Settings.java @@ -65,8 +65,12 @@ * * ContainerAnalysisV1Beta1Settings.Builder containerAnalysisV1Beta1SettingsBuilder = * ContainerAnalysisV1Beta1Settings.newBuilder(); - * containerAnalysisV1Beta1SettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * containerAnalysisV1Beta1SettingsBuilder + * .setIamPolicySettings() + * .setRetrySettings( + * containerAnalysisV1Beta1SettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ContainerAnalysisV1Beta1Settings containerAnalysisV1Beta1Settings = containerAnalysisV1Beta1SettingsBuilder.build(); * * diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1Settings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1Settings.java index d6c13766..4691f594 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1Settings.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1Settings.java @@ -81,8 +81,12 @@ * * GrafeasV1Beta1Settings.Builder grafeasV1Beta1SettingsBuilder = * GrafeasV1Beta1Settings.newBuilder(); - * grafeasV1Beta1SettingsBuilder.getOccurrenceSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * grafeasV1Beta1SettingsBuilder + * .getOccurrenceSettings() + * .setRetrySettings( + * grafeasV1Beta1SettingsBuilder.getOccurrenceSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * GrafeasV1Beta1Settings grafeasV1Beta1Settings = grafeasV1Beta1SettingsBuilder.build(); * * diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/ContainerAnalysisV1Beta1StubSettings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/ContainerAnalysisV1Beta1StubSettings.java index 267595eb..e8373875 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/ContainerAnalysisV1Beta1StubSettings.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/ContainerAnalysisV1Beta1StubSettings.java @@ -80,8 +80,12 @@ * * ContainerAnalysisV1Beta1StubSettings.Builder containerAnalysisV1Beta1SettingsBuilder = * ContainerAnalysisV1Beta1StubSettings.newBuilder(); - * containerAnalysisV1Beta1SettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * containerAnalysisV1Beta1SettingsBuilder + * .setIamPolicySettings() + * .setRetrySettings( + * containerAnalysisV1Beta1SettingsBuilder.setIamPolicySettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * ContainerAnalysisV1Beta1StubSettings containerAnalysisV1Beta1Settings = containerAnalysisV1Beta1SettingsBuilder.build(); * * diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/GrafeasV1Beta1StubSettings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/GrafeasV1Beta1StubSettings.java index ce351d89..11ac43f9 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/GrafeasV1Beta1StubSettings.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1beta1/stub/GrafeasV1Beta1StubSettings.java @@ -96,8 +96,12 @@ * * GrafeasV1Beta1StubSettings.Builder grafeasV1Beta1SettingsBuilder = * GrafeasV1Beta1StubSettings.newBuilder(); - * grafeasV1Beta1SettingsBuilder.getOccurrenceSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * grafeasV1Beta1SettingsBuilder + * .getOccurrenceSettings() + * .setRetrySettings( + * grafeasV1Beta1SettingsBuilder.getOccurrenceSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * GrafeasV1Beta1StubSettings grafeasV1Beta1Settings = grafeasV1Beta1SettingsBuilder.build(); * * diff --git a/synth.metadata b/synth.metadata index da97ad5b..a4325cdd 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,27 +1,27 @@ { - "updateTime": "2020-02-01T08:42:58.170395Z", + "updateTime": "2020-02-08T09:45:31.709746Z", "sources": [ { "generator": { "name": "artman", - "version": "0.44.4", - "dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8" + "version": "0.45.0", + "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "b5cbe4a4ba64ab19e6627573ff52057a1657773d", - "internalRef": "292647187", - "log": "b5cbe4a4ba64ab19e6627573ff52057a1657773d\nSecurityCenter v1p1beta1: move file-level option on top to workaround protobuf.js bug.\n\nPiperOrigin-RevId: 292647187\n\nb224b317bf20c6a4fbc5030b4a969c3147f27ad3\nAdds API definitions for bigqueryreservation v1beta1.\n\nPiperOrigin-RevId: 292634722\n\nc1468702f9b17e20dd59007c0804a089b83197d2\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 292626173\n\nffdfa4f55ab2f0afc11d0eb68f125ccbd5e404bd\nvision: v1p3beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605599\n\n78f61482cd028fc1d9892aa5d89d768666a954cd\nvision: v1p1beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605125\n\n60bb5a294a604fd1778c7ec87b265d13a7106171\nvision: v1p2beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604980\n\n3bcf7aa79d45eb9ec29ab9036e9359ea325a7fc3\nvision: v1p4beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604656\n\n2717b8a1c762b26911b45ecc2e4ee01d98401b28\nFix dataproc artman client library generation.\n\nPiperOrigin-RevId: 292555664\n\n" + "sha": "e7d8a694f4559201e6913f6610069cb08b39274e", + "internalRef": "293903652", + "log": "e7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\n" } }, { "template": { "name": "java_library", "origin": "synthtool.gcp", - "version": "2019.10.17" + "version": "2020.2.4" } } ], From 5650cefd16f4e7d7b0fdbec32b8140d72789d7f0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2020 11:07:15 -0800 Subject: [PATCH 02/17] chore: release 0.119.2-SNAPSHOT (#64) * updated versions.txt [ci skip] * updated google-cloud-containeranalysis-bom/pom.xml [ci skip] * updated google-cloud-containeranalysis/pom.xml [ci skip] * updated grpc-google-cloud-containeranalysis-v1/pom.xml [ci skip] * updated grpc-google-cloud-containeranalysis-v1beta1/pom.xml [ci skip] * updated pom.xml [ci skip] * updated proto-google-cloud-containeranalysis-v1/pom.xml [ci skip] * updated proto-google-cloud-containeranalysis-v1beta1/pom.xml [ci skip] --- google-cloud-containeranalysis-bom/pom.xml | 12 ++++++------ google-cloud-containeranalysis/pom.xml | 4 ++-- grpc-google-cloud-containeranalysis-v1/pom.xml | 4 ++-- grpc-google-cloud-containeranalysis-v1beta1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-containeranalysis-v1/pom.xml | 4 ++-- proto-google-cloud-containeranalysis-v1beta1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index 7a3c0a59..fd91a668 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 0.119.1-beta + 0.119.2-beta-SNAPSHOT pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 0.84.1 + 0.84.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.84.1 + 0.84.2-SNAPSHOT com.google.cloud google-cloud-containeranalysis - 0.119.1-beta + 0.119.2-beta-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 0.84.1 + 0.84.2-SNAPSHOT com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.84.1 + 0.84.2-SNAPSHOT diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index afe50197..e7df5dd4 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 0.119.1-beta + 0.119.2-beta-SNAPSHOT jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 0.119.1-beta + 0.119.2-beta-SNAPSHOT google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index da831eb0..f0c442e0 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 0.84.1 + 0.84.2-SNAPSHOT grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 0.119.1-beta + 0.119.2-beta-SNAPSHOT diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index dad75d32..ca0f57bb 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.84.1 + 0.84.2-SNAPSHOT grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 0.119.1-beta + 0.119.2-beta-SNAPSHOT diff --git a/pom.xml b/pom.xml index da29ce57..71d1358d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 0.119.1-beta + 0.119.2-beta-SNAPSHOT Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -81,27 +81,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 0.84.1 + 0.84.2-SNAPSHOT com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.84.1 + 0.84.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.84.1 + 0.84.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 0.84.1 + 0.84.2-SNAPSHOT com.google.cloud google-cloud-containeranalysis - 0.119.1-beta + 0.119.2-beta-SNAPSHOT diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 62db3682..8c37f5c6 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 0.84.1 + 0.84.2-SNAPSHOT proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 0.119.1-beta + 0.119.2-beta-SNAPSHOT diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index 626c34aa..66808e87 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.84.1 + 0.84.2-SNAPSHOT proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 0.119.1-beta + 0.119.2-beta-SNAPSHOT diff --git a/versions.txt b/versions.txt index 82ff0104..ecc280fb 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:0.84.1:0.84.1 -proto-google-cloud-containeranalysis-v1beta1:0.84.1:0.84.1 -grpc-google-cloud-containeranalysis-v1beta1:0.84.1:0.84.1 -grpc-google-cloud-containeranalysis-v1:0.84.1:0.84.1 -google-cloud-containeranalysis:0.119.1-beta:0.119.1-beta +proto-google-cloud-containeranalysis-v1:0.84.1:0.84.2-SNAPSHOT +proto-google-cloud-containeranalysis-v1beta1:0.84.1:0.84.2-SNAPSHOT +grpc-google-cloud-containeranalysis-v1beta1:0.84.1:0.84.2-SNAPSHOT +grpc-google-cloud-containeranalysis-v1:0.84.1:0.84.2-SNAPSHOT +google-cloud-containeranalysis:0.119.1-beta:0.119.2-beta-SNAPSHOT From 99f69ad0492eeea329bdf8c7fcdebbfd6c02c6ac Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 11 Feb 2020 11:49:30 -0800 Subject: [PATCH 03/17] chore: only allow renovate-bot for trusted-contribution auto-labeling --- .github/trusted-contribution.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/trusted-contribution.yml diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml new file mode 100644 index 00000000..f247d5c7 --- /dev/null +++ b/.github/trusted-contribution.yml @@ -0,0 +1,2 @@ +trustedContributors: +- renovate-bot \ No newline at end of file From 6ebbfc37cdfdd774feee4976d55649c427a5fb94 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 21 Feb 2020 17:34:22 +0100 Subject: [PATCH 04/17] deps: update dependency com.google.protobuf:protobuf-java to v3.11.4 This PR contains the following updates: | Package | Update | Change | |---|---|---| | com.google.protobuf:protobuf-java | patch | `3.11.3` -> `3.11.4` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or if you tick the rebase/retry checkbox below. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-containeranalysis). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71d1358d..2c33ed10 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.17.0 1.53.1 1.27.0 - 3.11.3 + 3.11.4 4.13 28.2-android 1.4.1 From d853e83c8b8ffc992dbb429683d38dd3076d34d2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 21 Feb 2020 18:24:03 +0100 Subject: [PATCH 05/17] deps: update dependency io.grpc:grpc-bom to v1.27.1 This PR contains the following updates: | Package | Update | Change | |---|---|---| | [io.grpc:grpc-bom](https://togithub.com/grpc/grpc-java) | patch | `1.27.0` -> `1.27.1` | --- ### Release Notes
grpc/grpc-java ### [`v1.27.1`](https://togithub.com/grpc/grpc-java/releases/v1.27.1) [Compare Source](https://togithub.com/grpc/grpc-java/compare/v1.27.0...v1.27.1) #### Bug Fixes - alts: Fix using the wrong way of checking if Conscrypt is available ([#​6672](https://togithub.com/grpc/grpc-java/issues/6672))
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or if you tick the rebase/retry checkbox below. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-containeranalysis). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c33ed10..290a1e61 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.8.1 1.17.0 1.53.1 - 1.27.0 + 1.27.1 3.11.4 4.13 28.2-android From 0c9c542b68792ba7eff9c6bc791d1a6c62452cbb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 21 Feb 2020 19:54:13 +0100 Subject: [PATCH 06/17] deps: update dependency com.google.protobuf:protobuf-java-util to v3.11.4 (#69) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 290a1e61..b73ae55c 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ com.google.protobuf protobuf-java-util - 3.11.3 + 3.11.4 From 473c70d53ea1dfbe4939b3e8dbd093a236099674 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 21 Feb 2020 15:39:58 -0800 Subject: [PATCH 07/17] chore: update common templates --- .kokoro/build.sh | 23 +++++++++++++++-------- renovate.json | 7 +++++++ synth.metadata | 22 ++++++++++++++++++---- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f1ae5840..d11958c5 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -62,14 +62,21 @@ integration) bash .kokoro/coerce_logs.sh ;; samples) - mvn -B \ - -Penable-samples \ - -DtrimStackTrace=false \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -fae \ - verify - bash .kokoro/coerce_logs.sh + if [[ -f samples/pom.xml ]] + then + pushd samples + mvn -B \ + -Penable-samples \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + bash .kokoro/coerce_logs.sh + popd + else + echo "no sample pom.xml found - skipping sample tests" + fi ;; clirr) mvn -B -Denforcer.skip=true clirr:check diff --git a/renovate.json b/renovate.json index 268a4669..fc641270 100644 --- a/renovate.json +++ b/renovate.json @@ -54,6 +54,13 @@ "semanticCommitType": "build", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^com.google.cloud:libraries-bom" + ], + "semanticCommitType": "chore", + "semanticCommitScope": "deps" + }, { "packagePatterns": [ "^com.google.cloud:google-cloud-" diff --git a/synth.metadata b/synth.metadata index a4325cdd..031e9dee 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-02-08T09:45:31.709746Z", + "updateTime": "2020-02-21T22:44:57.421019Z", "sources": [ { "generator": { @@ -8,13 +8,27 @@ "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b" } }, + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-containeranalysis.git", + "sha": "0c9c542b68792ba7eff9c6bc791d1a6c62452cbb" + } + }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e7d8a694f4559201e6913f6610069cb08b39274e", - "internalRef": "293903652", - "log": "e7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\n" + "sha": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2", + "internalRef": "296451205", + "log": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2\nUpdate Dataproc v1beta2 client.\n\nPiperOrigin-RevId: 296451205\n\nde287524405a3dce124d301634731584fc0432d7\nFix: Reinstate method signatures that had been missed off some RPCs\nFix: Correct resource types for two fields\n\nPiperOrigin-RevId: 296435091\n\ne5bc9566ae057fb4c92f8b7e047f1c8958235b53\nDeprecate the endpoint_uris field, as it is unused.\n\nPiperOrigin-RevId: 296357191\n\n8c12e2b4dca94e12bff9f538bdac29524ff7ef7a\nUpdate Dataproc v1 client.\n\nPiperOrigin-RevId: 296336662\n\n17567c4a1ef0a9b50faa87024d66f8acbb561089\nRemoving erroneous comment, a la https://github.com/googleapis/java-speech/pull/103\n\nPiperOrigin-RevId: 296332968\n\n3eaaaf8626ce5b0c0bc7eee05e143beffa373b01\nAdd BUILD.bazel for v1 secretmanager.googleapis.com\n\nPiperOrigin-RevId: 296274723\n\ne76149c3d992337f85eeb45643106aacae7ede82\nMove securitycenter v1 to use generate from annotations.\n\nPiperOrigin-RevId: 296266862\n\n203740c78ac69ee07c3bf6be7408048751f618f8\nAdd StackdriverLoggingConfig field to Cloud Tasks v2 API.\n\nPiperOrigin-RevId: 296256388\n\ne4117d5e9ed8bbca28da4a60a94947ca51cb2083\nCreate a Bazel BUILD file for the google.actions.type export.\n\nPiperOrigin-RevId: 296212567\n\na9639a0a9854fd6e1be08bba1ac3897f4f16cb2f\nAdd secretmanager.googleapis.com v1 protos\n\nPiperOrigin-RevId: 295983266\n\nce4f4c21d9dd2bfab18873a80449b9d9851efde8\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295861722\n\ncb61d6c2d070b589980c779b68ffca617f789116\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295855449\n\nab2685d8d3a0e191dc8aef83df36773c07cb3d06\nfix: Dataproc v1 - AutoscalingPolicy annotation\n\nThis adds the second resource name pattern to the\nAutoscalingPolicy resource.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 295738415\n\n8a1020bf6828f6e3c84c3014f2c51cb62b739140\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295286165\n\n5cfa105206e77670369e4b2225597386aba32985\nAdd service control related proto build rule.\n\nPiperOrigin-RevId: 295262088\n\nee4dddf805072004ab19ac94df2ce669046eec26\nmonitoring v3: Add prefix \"https://cloud.google.com/\" into the link for global access\ncl 295167522, get ride of synth.py hacks\n\nPiperOrigin-RevId: 295238095\n\nd9835e922ea79eed8497db270d2f9f85099a519c\nUpdate some minor docs changes about user event proto\n\nPiperOrigin-RevId: 295185610\n\n5f311e416e69c170243de722023b22f3df89ec1c\nfix: use correct PHP package name in gapic configuration\n\nPiperOrigin-RevId: 295161330\n\n6cdd74dcdb071694da6a6b5a206e3a320b62dd11\npubsub: v1 add client config annotations and retry config\n\nPiperOrigin-RevId: 295158776\n\n5169f46d9f792e2934d9fa25c36d0515b4fd0024\nAdded cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295026522\n\n56b55aa8818cd0a532a7d779f6ef337ba809ccbd\nFix: Resource annotations for CreateTimeSeriesRequest and ListTimeSeriesRequest should refer to valid resources. TimeSeries is not a named resource.\n\nPiperOrigin-RevId: 294931650\n\n0646bc775203077226c2c34d3e4d50cc4ec53660\nRemove unnecessary languages from bigquery-related artman configuration files.\n\nPiperOrigin-RevId: 294809380\n\n8b78aa04382e3d4147112ad6d344666771bb1909\nUpdate backend.proto for schemes and protocol\n\nPiperOrigin-RevId: 294788800\n\n80b8f8b3de2359831295e24e5238641a38d8488f\nAdds artman config files for bigquerystorage endpoints v1beta2, v1alpha2, v1\n\nPiperOrigin-RevId: 294763931\n\n2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\nd5e8a8953f2acdfe96fb15e85eb2f33739623957\nMove bigquery datatransfer to gapic v2.\n\nPiperOrigin-RevId: 294703703\n\nefd36705972cfcd7d00ab4c6dfa1135bafacd4ae\nfix: Add two annotations that we missed.\n\nPiperOrigin-RevId: 294664231\n\n8a36b928873ff9c05b43859b9d4ea14cd205df57\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1beta2).\n\nPiperOrigin-RevId: 294459768\n\nc7a3caa2c40c49f034a3c11079dd90eb24987047\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1).\n\nPiperOrigin-RevId: 294456889\n\n5006247aa157e59118833658084345ee59af7c09\nFix: Make deprecated fields optional\nFix: Deprecate SetLoggingServiceRequest.zone in line with the comments\nFeature: Add resource name method signatures where appropriate\n\nPiperOrigin-RevId: 294383128\n\neabba40dac05c5cbe0fca3a35761b17e372036c4\nFix: C# and PHP package/namespace capitalization for BigQuery Storage v1.\n\nPiperOrigin-RevId: 294382444\n\nf8d9a858a7a55eba8009a23aa3f5cc5fe5e88dde\nfix: artman configuration file for bigtable-admin\n\nPiperOrigin-RevId: 294322616\n\n0f29555d1cfcf96add5c0b16b089235afbe9b1a9\nAPI definition for (not-yet-launched) GCS gRPC.\n\nPiperOrigin-RevId: 294321472\n\nfcc86bee0e84dc11e9abbff8d7c3529c0626f390\nfix: Bigtable Admin v2\n\nChange LRO metadata from PartialUpdateInstanceMetadata\nto UpdateInstanceMetadata. (Otherwise, it will not build.)\n\nPiperOrigin-RevId: 294264582\n\n6d9361eae2ebb3f42d8c7ce5baf4bab966fee7c0\nrefactor: Add annotations to Bigtable Admin v2.\n\nPiperOrigin-RevId: 294243406\n\nad7616f3fc8e123451c8b3a7987bc91cea9e6913\nFix: Resource type in CreateLogMetricRequest should use logging.googleapis.com.\nFix: ListLogEntries should have a method signature for convenience of calling it.\n\nPiperOrigin-RevId: 294222165\n\n63796fcbb08712676069e20a3e455c9f7aa21026\nFix: Remove extraneous resource definition for cloudkms.googleapis.com/CryptoKey.\n\nPiperOrigin-RevId: 294176658\n\n" + } + }, + { + "git": { + "name": "synthtool", + "remote": "rpc://devrel/cloud/libraries/tools/autosynth", + "sha": "706a38c26db42299845396cdae55db635c38794a" } }, { From fb81fbfba807ed790743ef069645c4c1a8522371 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 24 Feb 2020 10:36:52 -0800 Subject: [PATCH 08/17] chore: update common templates --- .kokoro/build.sh | 24 +++++++++++++++++++++--- synth.metadata | 11 +++++------ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index d11958c5..e833b989 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,19 +37,24 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}) fi +RETURN_CODE=0 +set +e + case ${JOB_TYPE} in test) mvn test -B -Dclirr.skip=true -Denforcer.skip=true + RETURN_CODE=$? bash ${KOKORO_GFILE_DIR}/codecov.sh - bash .kokoro/coerce_logs.sh ;; lint) mvn \ -Penable-samples \ com.coveo:fmt-maven-plugin:check + RETURN_CODE=$? ;; javadoc) mvn javadoc:javadoc javadoc:test-javadoc + RETURN_CODE=$? ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ @@ -59,7 +64,7 @@ integration) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; samples) if [[ -f samples/pom.xml ]] @@ -72,7 +77,7 @@ samples) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? popd else echo "no sample pom.xml found - skipping sample tests" @@ -80,7 +85,20 @@ samples) ;; clirr) mvn -B -Denforcer.skip=true clirr:check + RETURN_CODE=$? ;; *) ;; esac + +# fix output location of logs +bash .kokoro/coerce_logs.sh + +if [[ "${ENABLE_BUILD_COP}" == "true" ]] +then + chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop + ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-containeranalysis +fi + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index 031e9dee..82132085 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,18 +1,18 @@ { - "updateTime": "2020-02-21T22:44:57.421019Z", + "updateTime": "2020-02-22T09:46:15.934341Z", "sources": [ { "generator": { "name": "artman", - "version": "0.45.0", - "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b" + "version": "0.45.1", + "dockerImage": "googleapis/artman@sha256:36956ca6a4dc70a59de5d5d0fd35061b050bb56884516f0898f46d8220f25738" } }, { "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "0c9c542b68792ba7eff9c6bc791d1a6c62452cbb" + "sha": "473c70d53ea1dfbe4939b3e8dbd093a236099674" } }, { @@ -20,8 +20,7 @@ "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", "sha": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2", - "internalRef": "296451205", - "log": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2\nUpdate Dataproc v1beta2 client.\n\nPiperOrigin-RevId: 296451205\n\nde287524405a3dce124d301634731584fc0432d7\nFix: Reinstate method signatures that had been missed off some RPCs\nFix: Correct resource types for two fields\n\nPiperOrigin-RevId: 296435091\n\ne5bc9566ae057fb4c92f8b7e047f1c8958235b53\nDeprecate the endpoint_uris field, as it is unused.\n\nPiperOrigin-RevId: 296357191\n\n8c12e2b4dca94e12bff9f538bdac29524ff7ef7a\nUpdate Dataproc v1 client.\n\nPiperOrigin-RevId: 296336662\n\n17567c4a1ef0a9b50faa87024d66f8acbb561089\nRemoving erroneous comment, a la https://github.com/googleapis/java-speech/pull/103\n\nPiperOrigin-RevId: 296332968\n\n3eaaaf8626ce5b0c0bc7eee05e143beffa373b01\nAdd BUILD.bazel for v1 secretmanager.googleapis.com\n\nPiperOrigin-RevId: 296274723\n\ne76149c3d992337f85eeb45643106aacae7ede82\nMove securitycenter v1 to use generate from annotations.\n\nPiperOrigin-RevId: 296266862\n\n203740c78ac69ee07c3bf6be7408048751f618f8\nAdd StackdriverLoggingConfig field to Cloud Tasks v2 API.\n\nPiperOrigin-RevId: 296256388\n\ne4117d5e9ed8bbca28da4a60a94947ca51cb2083\nCreate a Bazel BUILD file for the google.actions.type export.\n\nPiperOrigin-RevId: 296212567\n\na9639a0a9854fd6e1be08bba1ac3897f4f16cb2f\nAdd secretmanager.googleapis.com v1 protos\n\nPiperOrigin-RevId: 295983266\n\nce4f4c21d9dd2bfab18873a80449b9d9851efde8\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295861722\n\ncb61d6c2d070b589980c779b68ffca617f789116\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295855449\n\nab2685d8d3a0e191dc8aef83df36773c07cb3d06\nfix: Dataproc v1 - AutoscalingPolicy annotation\n\nThis adds the second resource name pattern to the\nAutoscalingPolicy resource.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 295738415\n\n8a1020bf6828f6e3c84c3014f2c51cb62b739140\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295286165\n\n5cfa105206e77670369e4b2225597386aba32985\nAdd service control related proto build rule.\n\nPiperOrigin-RevId: 295262088\n\nee4dddf805072004ab19ac94df2ce669046eec26\nmonitoring v3: Add prefix \"https://cloud.google.com/\" into the link for global access\ncl 295167522, get ride of synth.py hacks\n\nPiperOrigin-RevId: 295238095\n\nd9835e922ea79eed8497db270d2f9f85099a519c\nUpdate some minor docs changes about user event proto\n\nPiperOrigin-RevId: 295185610\n\n5f311e416e69c170243de722023b22f3df89ec1c\nfix: use correct PHP package name in gapic configuration\n\nPiperOrigin-RevId: 295161330\n\n6cdd74dcdb071694da6a6b5a206e3a320b62dd11\npubsub: v1 add client config annotations and retry config\n\nPiperOrigin-RevId: 295158776\n\n5169f46d9f792e2934d9fa25c36d0515b4fd0024\nAdded cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295026522\n\n56b55aa8818cd0a532a7d779f6ef337ba809ccbd\nFix: Resource annotations for CreateTimeSeriesRequest and ListTimeSeriesRequest should refer to valid resources. TimeSeries is not a named resource.\n\nPiperOrigin-RevId: 294931650\n\n0646bc775203077226c2c34d3e4d50cc4ec53660\nRemove unnecessary languages from bigquery-related artman configuration files.\n\nPiperOrigin-RevId: 294809380\n\n8b78aa04382e3d4147112ad6d344666771bb1909\nUpdate backend.proto for schemes and protocol\n\nPiperOrigin-RevId: 294788800\n\n80b8f8b3de2359831295e24e5238641a38d8488f\nAdds artman config files for bigquerystorage endpoints v1beta2, v1alpha2, v1\n\nPiperOrigin-RevId: 294763931\n\n2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\nd5e8a8953f2acdfe96fb15e85eb2f33739623957\nMove bigquery datatransfer to gapic v2.\n\nPiperOrigin-RevId: 294703703\n\nefd36705972cfcd7d00ab4c6dfa1135bafacd4ae\nfix: Add two annotations that we missed.\n\nPiperOrigin-RevId: 294664231\n\n8a36b928873ff9c05b43859b9d4ea14cd205df57\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1beta2).\n\nPiperOrigin-RevId: 294459768\n\nc7a3caa2c40c49f034a3c11079dd90eb24987047\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1).\n\nPiperOrigin-RevId: 294456889\n\n5006247aa157e59118833658084345ee59af7c09\nFix: Make deprecated fields optional\nFix: Deprecate SetLoggingServiceRequest.zone in line with the comments\nFeature: Add resource name method signatures where appropriate\n\nPiperOrigin-RevId: 294383128\n\neabba40dac05c5cbe0fca3a35761b17e372036c4\nFix: C# and PHP package/namespace capitalization for BigQuery Storage v1.\n\nPiperOrigin-RevId: 294382444\n\nf8d9a858a7a55eba8009a23aa3f5cc5fe5e88dde\nfix: artman configuration file for bigtable-admin\n\nPiperOrigin-RevId: 294322616\n\n0f29555d1cfcf96add5c0b16b089235afbe9b1a9\nAPI definition for (not-yet-launched) GCS gRPC.\n\nPiperOrigin-RevId: 294321472\n\nfcc86bee0e84dc11e9abbff8d7c3529c0626f390\nfix: Bigtable Admin v2\n\nChange LRO metadata from PartialUpdateInstanceMetadata\nto UpdateInstanceMetadata. (Otherwise, it will not build.)\n\nPiperOrigin-RevId: 294264582\n\n6d9361eae2ebb3f42d8c7ce5baf4bab966fee7c0\nrefactor: Add annotations to Bigtable Admin v2.\n\nPiperOrigin-RevId: 294243406\n\nad7616f3fc8e123451c8b3a7987bc91cea9e6913\nFix: Resource type in CreateLogMetricRequest should use logging.googleapis.com.\nFix: ListLogEntries should have a method signature for convenience of calling it.\n\nPiperOrigin-RevId: 294222165\n\n63796fcbb08712676069e20a3e455c9f7aa21026\nFix: Remove extraneous resource definition for cloudkms.googleapis.com/CryptoKey.\n\nPiperOrigin-RevId: 294176658\n\n" + "internalRef": "296451205" } }, { From fa5dabcc08d77db1eadf015364367c3f88c27ba6 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 25 Feb 2020 09:44:29 -0800 Subject: [PATCH 09/17] chore: update common templates --- .kokoro/build.sh | 8 ++++++-- .kokoro/continuous/java8.cfg | 5 +++++ .kokoro/nightly/integration.cfg | 14 ++++++++++++++ .kokoro/nightly/java8.cfg | 5 +++++ .kokoro/nightly/samples.cfg | 21 +++++++++++++-------- .kokoro/presubmit/java8.cfg | 5 +++++ synth.metadata | 21 ++++----------------- 7 files changed, 52 insertions(+), 27 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index e833b989..203725fa 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -44,7 +44,6 @@ case ${JOB_TYPE} in test) mvn test -B -Dclirr.skip=true -Denforcer.skip=true RETURN_CODE=$? - bash ${KOKORO_GFILE_DIR}/codecov.sh ;; lint) mvn \ @@ -91,6 +90,11 @@ clirr) ;; esac +if [ "${REPORT_COVERAGE}" == "true" ] +then + bash ${KOKORO_GFILE_DIR}/codecov.sh +fi + # fix output location of logs bash .kokoro/coerce_logs.sh @@ -101,4 +105,4 @@ then fi echo "exiting with ${RETURN_CODE}" -exit ${RETURN_CODE} \ No newline at end of file +exit ${RETURN_CODE} diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg index 3b017fc8..495cc7ba 100644 --- a/.kokoro/continuous/java8.cfg +++ b/.kokoro/continuous/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 3b017fc8..8bf59c02 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -5,3 +5,17 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/nightly/java8.cfg b/.kokoro/nightly/java8.cfg index 3b017fc8..495cc7ba 100644 --- a/.kokoro/nightly/java8.cfg +++ b/.kokoro/nightly/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index 9a910249..b4b051cd 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -2,23 +2,28 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" } env_vars: { - key: "JOB_TYPE" - value: "samples" + key: "JOB_TYPE" + value: "samples" } env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "gcloud-devel" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" } before_action { diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg index 3b017fc8..495cc7ba 100644 --- a/.kokoro/presubmit/java8.cfg +++ b/.kokoro/presubmit/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/synth.metadata b/synth.metadata index 82132085..57edc0a0 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-02-22T09:46:15.934341Z", + "updateTime": "2020-02-24T22:46:06.403853Z", "sources": [ { "generator": { @@ -8,26 +8,13 @@ "dockerImage": "googleapis/artman@sha256:36956ca6a4dc70a59de5d5d0fd35061b050bb56884516f0898f46d8220f25738" } }, - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "473c70d53ea1dfbe4939b3e8dbd093a236099674" - } - }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2", - "internalRef": "296451205" - } - }, - { - "git": { - "name": "synthtool", - "remote": "rpc://devrel/cloud/libraries/tools/autosynth", - "sha": "706a38c26db42299845396cdae55db635c38794a" + "sha": "1e47e676cddbbd8d93f19ba0665af15b5532417e", + "internalRef": "296901854", + "log": "1e47e676cddbbd8d93f19ba0665af15b5532417e\nFix: Restore a method signature for UpdateCluster\n\nPiperOrigin-RevId: 296901854\n\n" } }, { From 1da0cead4f88476ffd4a144239ef33b483cca9da Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 25 Feb 2020 13:29:39 -0800 Subject: [PATCH 10/17] chore: generate README from templates --- README.md | 181 +++++++++++++++++++++++++++++++------------------ synth.metadata | 2 +- synth.py | 6 +- 3 files changed, 116 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index 0861c4fb..187845b3 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,43 @@ -Google Cloud Java Client for Container Analysis -====================================== +# Google Cloud Container Analysis Client for Java -Java idiomatic client for [Google Cloud Container Analysis][cloud-containeranalysis]. +Java idiomatic client for [Cloud Container Analysis][product-docs]. -[![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-containeranalysis.svg)](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-containeranalysis.svg) -[![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java) +[![Maven][maven-version-image]][maven-version-link] +![Stability][stability-image] -- [Product Documentation][containeranalysis-product-docs] -- [Client Library Documentation][containeranalysis-client-lib-docs] +- [Product Documentation][product-docs] +- [Client Library Documentation][javadocs] -Quickstart ----------- +> Note: This client is a work-in-progress, and may occasionally +> make backwards-incompatible changes. -[//]: # ({x-version-update-start:google-cloud-containeranalysis:released}) -If you are using Maven with Bom, Add this to your pom.xml file. +## Quickstart + +If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file ```xml - + + + com.google.cloud + libraries-bom + 4.1.1 + pom + import + + + + com.google.cloud - libraries-bom - 0.119.1-beta - pom - import - - - - - - com.google.cloud - google-cloud-containeranalysis - + google-cloud-containeranalysis + + ``` -If you are using Maven without Bom, Add this to your dependencies. + +[//]: # ({x-version-update-start:google-cloud-containeranalysis:released}) + +If you are using Maven without BOM, add this to your dependencies: + ```xml com.google.cloud @@ -41,6 +45,7 @@ If you are using Maven without Bom, Add this to your dependencies. 0.119.1-beta ``` + If you are using Gradle, add this to your dependencies ```Groovy compile 'com.google.cloud:google-cloud-containeranalysis:0.119.1-beta' @@ -51,66 +56,108 @@ libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % " ``` [//]: # ({x-version-update-end}) -Authentication --------------- +## Authentication -See the [Authentication](https://github.com/googleapis/google-cloud-java#authentication) section in the base directory's README. +See the [Authentication][authentication] section in the base directory's README. -About Google Cloud Container Analysis ----------------------------- +## Getting Started -Google [Cloud Container Analysis API][cloud-containeranalysis] is an implementation of the Grafeas API, which stores, and enables querying and retrieval of critical metadata about all of your software artifacts. +### Prerequisites -See the [Container Analysis client library docs][containeranalysis-client-lib-docs] to learn how to use this Cloud Container Analysis API Client Library. +You will need a [Google Cloud Platform Console][developer-console] project with the Cloud Container Analysis [API enabled][enable-api]. +You will need to [enable billing][enable-billing] to use Google Cloud Container Analysis. +[Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by +[installing the Google Cloud SDK][cloud-sdk] and running the following commands in command line: +`gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. -Getting Started ---------------- -#### Prerequisites -You will need a [Google Developers Console](https://console.developers.google.com/) project with the Container Analysis API enabled. [Follow these instructions](https://cloud.google.com/resource-manager/docs/creating-managing-projects) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. +### Installation and setup -#### Installation and setup -You'll need to obtain the `google-cloud-containeranalysis` library. See the [Quickstart](#quickstart) section to add `google-cloud-containeranalysis` as a dependency in your code. +You'll need to obtain the `google-cloud-containeranalysis` library. See the [Quickstart](#quickstart) section +to add `google-cloud-containeranalysis` as a dependency in your code. -Troubleshooting ---------------- +## About Cloud Container Analysis -To get help, follow the instructions in the [shared Troubleshooting document](https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting). -Transport ---------- -Container Analysis uses gRPC for the transport layer. +[Cloud Container Analysis][product-docs] is a service that provides vulnerability scanning and metadata storage for software artifacts. The service performs vulnerability scans on built software artifacts, such as the images in Container Registry, then stores the resulting metadata and makes it available for consumption through an API. The metadata may come from several sources, including vulnerability scanning, other Cloud services, and third-party providers. -Java Versions -------------- +See the [Cloud Container Analysis client library docs][javadocs] to learn how to +use this Cloud Container Analysis Client Library. -Java 7 or above is required for using this client. -Versioning ----------- -This library follows [Semantic Versioning](http://semver.org/). -It is currently in major version one (``1.y.z``), which means that the public API should be considered stable. -Contributing ------------- -Contributions to this library are always welcome and highly encouraged. +## Troubleshooting + +To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting]. + +## Transport + +Cloud Container Analysis uses gRPC for the transport layer. + +## Java Versions -See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/googleapis/google-cloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started. +Java 7 or above is required for using this client. + +## Versioning + +This library follows [Semantic Versioning](http://semver.org/). -Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. -License -------- +It is currently in major version zero (``0.y.z``), which means that anything may change at any time +and the public API should not be considered stable. -Apache 2.0 - See [LICENSE] for more information. +## Contributing + + +Contributions to this library are always welcome and highly encouraged. -[CONTRIBUTING]:https://github.com/googleapis/google-cloud-java/blob/master/CONTRIBUTING.md -[code-of-conduct]:https://github.com/googleapis/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[LICENSE]: https://github.com/googleapis/google-cloud-java/blob/master/LICENSE -[cloud-platform]: https://cloud.google.com/ -[cloud-containeranalysis]: https://cloud.google.com/container-registry/docs/container-analysis -[containeranalysis-product-docs]: https://cloud.google.com/container-registry/docs/container-analysis -[containeranalysis-client-lib-docs]: https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/devtools/containeranalysis/v1beta1/package-summary.html +See [CONTRIBUTING][contributing] for more information how to get started. + +Please note that this project is released with a Contributor Code of Conduct. By participating in +this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more +information. + +## License + +Apache 2.0 - See [LICENSE][license] for more information. + +## CI Status + +Java Version | Status +------------ | ------ +Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1] +Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2] +Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3] +Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4] +Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] + +[product-docs]: https://cloud.google.com/container-registry/docs/container-analysis +[javadocs]: https://googleapis.dev/java/google-cloud-containeranalysis/latest/ +[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java7.svg +[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java7.html +[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java8.svg +[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java8.html +[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java8-osx.svg +[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java8-osx.html +[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java8-win.svg +[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java8-win.html +[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java11.svg +[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java11.html +[stability-image]: https://img.shields.io/badge/stability-beta-yellow +[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-containeranalysis.svg +[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-containeranalysis&core=gav +[authentication]: https://github.com/googleapis/google-cloud-java#authentication +[developer-console]: https://console.developers.google.com/ +[create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects +[cloud-sdk]: https://cloud.google.com/sdk/ +[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting +[contributing]: https://github.com/googleapis/java-containeranalysis/blob/master/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-containeranalysis/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-containeranalysis/blob/master/LICENSE +[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing +[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=containeranalysis.googleapis.com +[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM +[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png diff --git a/synth.metadata b/synth.metadata index 57edc0a0..3eeddf1f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-02-24T22:46:06.403853Z", + "updateTime": "2020-02-25T20:36:46.752852Z", "sources": [ { "generator": { diff --git a/synth.py b/synth.py index 755b7011..2c09e4b9 100644 --- a/synth.py +++ b/synth.py @@ -72,9 +72,5 @@ java.format_code(f'grpc-google-cloud-{service}-{version}/src') java.format_code(f'proto-google-cloud-{service}-{version}/src') -common_templates = gcp.CommonTemplates() -templates = common_templates.java_library() -s.copy(templates, excludes=[ - 'README.md', -]) +java.common_templates() From 113bc0c54f42f8daad400e2950677ce746504d79 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 27 Feb 2020 18:26:31 +0100 Subject: [PATCH 11/17] deps: update dependency io.grpc:grpc-bom to v1.27.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b73ae55c..af4ad05e 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.8.1 1.17.0 1.53.1 - 1.27.1 + 1.27.2 3.11.4 4.13 28.2-android From 073714c2f9d603adf1c044c5c0733ab5fb3a03c7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 28 Feb 2020 06:39:47 +0100 Subject: [PATCH 12/17] deps: update core dependencies to v1.54.0 (#78) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.api:gax-grpc](https://togithub.com/googleapis/gax-java) | minor | `1.53.1` -> `1.54.0` | | [com.google.api:gax-bom](https://togithub.com/googleapis/gax-java) | minor | `1.53.1` -> `1.54.0` | --- ### Release Notes
googleapis/gax-java ### [`v1.54.0`](https://togithub.com/googleapis/gax-java/releases/v1.54.0) [Compare Source](https://togithub.com/googleapis/gax-java/compare/v1.53.1...v1.54.0) 02-27-2020 09:07 PST ##### New Features - Scale number of threads to scale with number of cpus ([#​878](https://togithub.com/googleapis/gax-java/pull/878)) - Do not shut down executor when WatchDog is shut down ([#​871](https://togithub.com/googleapis/gax-java/pull/871)) ##### Dependencies - Update google-http-client to 1.34.2 ([#​886](https://togithub.com/googleapis/gax-java/pull/886)) - Update gRPC to 1.27.2 ([#​885](https://togithub.com/googleapis/gax-java/pull/885)) - Update protobuf to 3.11.4 and gRPC to 1.27.1 ([#​882](https://togithub.com/googleapis/gax-java/pull/882)) ##### Documentation - Add javadoc about being called within single thread ([#​856](https://togithub.com/googleapis/gax-java/pull/856)) ##### Internal / Testing Changes - Update jacoco to 0.8.5 ([#​883](https://togithub.com/googleapis/gax-java/pull/883)) - Update google format plugin ([#​868](https://togithub.com/googleapis/gax-java/pull/868)) - Set up linkage monitor Kokoro build config for gax-java ([#​864](https://togithub.com/googleapis/gax-java/pull/864))
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-containeranalysis). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af4ad05e..9307d82c 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 1.91.1 1.8.1 1.17.0 - 1.53.1 + 1.54.0 1.27.2 3.11.4 4.13 From b9f172ea97845c74d06c2eb039f09a7e7a9ed006 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 28 Feb 2020 17:25:41 -0500 Subject: [PATCH 13/17] deps: update java-core (#80) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9307d82c..ae1812b9 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ UTF-8 github google-cloud-containeranalysis-parent - 1.91.1 + 1.93.0 1.8.1 1.17.0 1.54.0 @@ -287,4 +287,4 @@ - \ No newline at end of file + From 67ebce8e427cc99e8022c39eb51dd3533e6838b4 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 2 Mar 2020 09:24:12 -0800 Subject: [PATCH 14/17] chore: update libraries-bom to 4.2.0 (#79) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/badf69d0-35e6-44bc-af51-7c1c8f83a086/targets --- README.md | 2 +- synth.metadata | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 187845b3..90874ac2 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 4.1.1 + 4.2.0 pom import diff --git a/synth.metadata b/synth.metadata index 3eeddf1f..ae7592fd 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,20 +1,20 @@ { - "updateTime": "2020-02-25T20:36:46.752852Z", + "updateTime": "2020-02-28T20:03:43.051369Z", "sources": [ { "generator": { "name": "artman", - "version": "0.45.1", - "dockerImage": "googleapis/artman@sha256:36956ca6a4dc70a59de5d5d0fd35061b050bb56884516f0898f46d8220f25738" + "version": "0.46.0", + "dockerImage": "googleapis/artman@sha256:6248a21fba8f0d618c3b032669cec2618e684b66922bb70391fe08c41b05f6ee" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "1e47e676cddbbd8d93f19ba0665af15b5532417e", - "internalRef": "296901854", - "log": "1e47e676cddbbd8d93f19ba0665af15b5532417e\nFix: Restore a method signature for UpdateCluster\n\nPiperOrigin-RevId: 296901854\n\n" + "sha": "e9e90a787703ec5d388902e2cb796aaed3a385b4", + "internalRef": "297671458", + "log": "e9e90a787703ec5d388902e2cb796aaed3a385b4\nDialogflow weekly v2/v2beta1 library update:\n - adding get validation result\n - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297671458\n\n1a2b05cc3541a5f7714529c665aecc3ea042c646\nAdding .yaml and .json config files.\n\nPiperOrigin-RevId: 297570622\n\ndfe1cf7be44dee31d78f78e485d8c95430981d6e\nPublish `QueryOptions` proto.\n\nIntroduced a `query_options` input in `ExecuteSqlRequest`.\n\nPiperOrigin-RevId: 297497710\n\ndafc905f71e5d46f500b41ed715aad585be062c3\npubsub: revert pull init_rpc_timeout & max_rpc_timeout back to 25 seconds and reset multiplier to 1.0\n\nPiperOrigin-RevId: 297486523\n\nf077632ba7fee588922d9e8717ee272039be126d\nfirestore: add update_transform\n\nPiperOrigin-RevId: 297405063\n\n0aba1900ffef672ec5f0da677cf590ee5686e13b\ncluster: use square brace for cross-reference\n\nPiperOrigin-RevId: 297204568\n\n5dac2da18f6325cbaed54603c43f0667ecd50247\nRestore retry params in gapic config because securitycenter has non-standard default retry params.\nRestore a few retry codes for some idempotent methods.\n\nPiperOrigin-RevId: 297196720\n\n1eb61455530252bba8b2c8d4bc9832960e5a56f6\npubsub: v1 replace IAM HTTP rules\n\nPiperOrigin-RevId: 297188590\n\n80b2d25f8d43d9d47024ff06ead7f7166548a7ba\nDialogflow weekly v2/v2beta1 library update:\n - updates to mega agent api\n - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297187629\n\n0b1876b35e98f560f9c9ca9797955f020238a092\nUse an older version of protoc-docs-plugin that is compatible with the specified gapic-generator and protobuf versions.\n\nprotoc-docs-plugin >=0.4.0 (see commit https://github.com/googleapis/protoc-docs-plugin/commit/979f03ede6678c487337f3d7e88bae58df5207af) is incompatible with protobuf 3.9.1.\n\nPiperOrigin-RevId: 296986742\n\n" } }, { From 552f4dd67ea0de9c9994b3eb7d2e8cf4be5f9c8c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 2 Mar 2020 14:56:06 -0800 Subject: [PATCH 15/17] fix: undeprecate resource name classes until multi-pattern resources are available (#81) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/4dab4959-5dfd-4ed4-82be-4395c5168c51/targets --- .../com/google/containeranalysis/v1/NoteName.java | 7 +------ .../google/containeranalysis/v1/OccurrenceName.java | 7 +------ .../google/containeranalysis/v1beta1/NoteName.java | 7 +------ .../containeranalysis/v1beta1/OccurrenceName.java | 7 +------ .../src/main/java/io/grafeas/v1beta1/NoteName.java | 7 +------ .../main/java/io/grafeas/v1beta1/OccurrenceName.java | 7 +------ .../io/grafeas/v1beta1/attestation/NoteName.java | 7 +------ .../grafeas/v1beta1/attestation/OccurrenceName.java | 7 +------ .../main/java/io/grafeas/v1beta1/build/NoteName.java | 7 +------ .../io/grafeas/v1beta1/build/OccurrenceName.java | 7 +------ .../java/io/grafeas/v1beta1/common/NoteName.java | 7 +------ .../io/grafeas/v1beta1/common/OccurrenceName.java | 7 +------ .../java/io/grafeas/v1beta1/deployment/NoteName.java | 7 +------ .../grafeas/v1beta1/deployment/OccurrenceName.java | 7 +------ .../java/io/grafeas/v1beta1/discovery/NoteName.java | 7 +------ .../io/grafeas/v1beta1/discovery/OccurrenceName.java | 7 +------ .../main/java/io/grafeas/v1beta1/image/NoteName.java | 7 +------ .../io/grafeas/v1beta1/image/OccurrenceName.java | 7 +------ .../main/java/io/grafeas/v1beta1/pkg/NoteName.java | 7 +------ .../java/io/grafeas/v1beta1/pkg/OccurrenceName.java | 7 +------ .../java/io/grafeas/v1beta1/provenance/NoteName.java | 7 +------ .../grafeas/v1beta1/provenance/OccurrenceName.java | 7 +------ .../java/io/grafeas/v1beta1/source/NoteName.java | 7 +------ .../io/grafeas/v1beta1/source/OccurrenceName.java | 7 +------ .../io/grafeas/v1beta1/vulnerability/NoteName.java | 7 +------ .../v1beta1/vulnerability/OccurrenceName.java | 7 +------ synth.metadata | 12 ++++++------ 27 files changed, 32 insertions(+), 162 deletions(-) diff --git a/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/NoteName.java b/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/NoteName.java index d19da1d1..1d951956 100644 --- a/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/OccurrenceName.java index 37f048d1..10a29eab 100644 --- a/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1/src/main/java/com/google/containeranalysis/v1/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/NoteName.java index ce8bed75..708addb7 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/OccurrenceName.java index 3c3da5b3..35fb2e19 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/NoteName.java index 7cbd5755..fe1b27bc 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/OccurrenceName.java index d31780e8..fb1189c1 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/NoteName.java index 1683e3ba..43eba9a7 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/OccurrenceName.java index ae757f28..fc04e1af 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/NoteName.java index 4dcebb8b..ee63219c 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/OccurrenceName.java index c660bcab..686f3bd0 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/NoteName.java index df429694..8b78cc7b 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/OccurrenceName.java index 92bdc440..1aa5c71a 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/NoteName.java index 8a3d0117..0d2c63c0 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/OccurrenceName.java index 9a325489..8b35de3b 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/NoteName.java index c7c81dff..54638318 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/OccurrenceName.java index 66cff7d1..85f22e53 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/NoteName.java index 4197ecdf..6c5a5a3e 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/OccurrenceName.java index 19edc420..00bff309 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/NoteName.java index 933c6877..4f047d90 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/OccurrenceName.java index efe9712b..7c332e53 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/NoteName.java index 7b1a4f53..f9f5fa95 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/OccurrenceName.java index a4cc5e7c..0818dd13 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/NoteName.java index 4cc3f5b3..b6479c8d 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/OccurrenceName.java index e7751ce3..311b4284 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/NoteName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/NoteName.java index dafbf2ca..ab096617 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/NoteName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/NoteName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class NoteName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/OccurrenceName.java b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/OccurrenceName.java index 26afa2a9..d1f969b9 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/OccurrenceName.java +++ b/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/OccurrenceName.java @@ -23,13 +23,8 @@ import java.util.List; import java.util.Map; -/** - * AUTO-GENERATED DOCUMENTATION AND CLASS - * - * @deprecated This resource name class will be removed in the next major version. - */ +/** AUTO-GENERATED DOCUMENTATION AND CLASS */ @javax.annotation.Generated("by GAPIC protoc plugin") -@Deprecated public class OccurrenceName extends IamResourceName { private static final PathTemplate PATH_TEMPLATE = diff --git a/synth.metadata b/synth.metadata index ae7592fd..66424e14 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,20 +1,20 @@ { - "updateTime": "2020-02-28T20:03:43.051369Z", + "updateTime": "2020-03-02T22:46:55.339863Z", "sources": [ { "generator": { "name": "artman", - "version": "0.46.0", - "dockerImage": "googleapis/artman@sha256:6248a21fba8f0d618c3b032669cec2618e684b66922bb70391fe08c41b05f6ee" + "version": "0.47.0", + "dockerImage": "googleapis/artman@sha256:b3e50d6b8de03920b9f065bbc3d210e2ca93a043446f1fa16cdf567393c09678" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e9e90a787703ec5d388902e2cb796aaed3a385b4", - "internalRef": "297671458", - "log": "e9e90a787703ec5d388902e2cb796aaed3a385b4\nDialogflow weekly v2/v2beta1 library update:\n - adding get validation result\n - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297671458\n\n1a2b05cc3541a5f7714529c665aecc3ea042c646\nAdding .yaml and .json config files.\n\nPiperOrigin-RevId: 297570622\n\ndfe1cf7be44dee31d78f78e485d8c95430981d6e\nPublish `QueryOptions` proto.\n\nIntroduced a `query_options` input in `ExecuteSqlRequest`.\n\nPiperOrigin-RevId: 297497710\n\ndafc905f71e5d46f500b41ed715aad585be062c3\npubsub: revert pull init_rpc_timeout & max_rpc_timeout back to 25 seconds and reset multiplier to 1.0\n\nPiperOrigin-RevId: 297486523\n\nf077632ba7fee588922d9e8717ee272039be126d\nfirestore: add update_transform\n\nPiperOrigin-RevId: 297405063\n\n0aba1900ffef672ec5f0da677cf590ee5686e13b\ncluster: use square brace for cross-reference\n\nPiperOrigin-RevId: 297204568\n\n5dac2da18f6325cbaed54603c43f0667ecd50247\nRestore retry params in gapic config because securitycenter has non-standard default retry params.\nRestore a few retry codes for some idempotent methods.\n\nPiperOrigin-RevId: 297196720\n\n1eb61455530252bba8b2c8d4bc9832960e5a56f6\npubsub: v1 replace IAM HTTP rules\n\nPiperOrigin-RevId: 297188590\n\n80b2d25f8d43d9d47024ff06ead7f7166548a7ba\nDialogflow weekly v2/v2beta1 library update:\n - updates to mega agent api\n - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297187629\n\n0b1876b35e98f560f9c9ca9797955f020238a092\nUse an older version of protoc-docs-plugin that is compatible with the specified gapic-generator and protobuf versions.\n\nprotoc-docs-plugin >=0.4.0 (see commit https://github.com/googleapis/protoc-docs-plugin/commit/979f03ede6678c487337f3d7e88bae58df5207af) is incompatible with protobuf 3.9.1.\n\nPiperOrigin-RevId: 296986742\n\n" + "sha": "83c6f84035ee0f80eaa44d8b688a010461cc4080", + "internalRef": "297918498", + "log": "83c6f84035ee0f80eaa44d8b688a010461cc4080\nUpdate google/api/auth.proto to make AuthProvider to have JwtLocation\n\nPiperOrigin-RevId: 297918498\n\n" } }, { From 0c3e998aa3c182c5eb63e26976d9b39478e44fa2 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 11 Mar 2020 13:44:43 -0700 Subject: [PATCH 16/17] chore: switch synth.py to helper library to avoid double injecting license header (#85) --- synth.metadata | 33 +++++++++++++++++++++++++++------ synth.py | 25 ++++++------------------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/synth.metadata b/synth.metadata index 66424e14..f14212d9 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,20 +1,41 @@ { - "updateTime": "2020-03-02T22:46:55.339863Z", + "updateTime": "2020-03-11T20:11:26.452995Z", "sources": [ { "generator": { "name": "artman", - "version": "0.47.0", - "dockerImage": "googleapis/artman@sha256:b3e50d6b8de03920b9f065bbc3d210e2ca93a043446f1fa16cdf567393c09678" + "version": "1.1.0", + "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9" + } + }, + { + "generator": { + "name": "artman", + "version": "1.1.0", + "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9" + } + }, + { + "generator": { + "name": "artman", + "version": "1.1.0", + "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9" + } + }, + { + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "85e454be7a353f7fe1bf2b0affb753305785b872", + "internalRef": "300367734" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "83c6f84035ee0f80eaa44d8b688a010461cc4080", - "internalRef": "297918498", - "log": "83c6f84035ee0f80eaa44d8b688a010461cc4080\nUpdate google/api/auth.proto to make AuthProvider to have JwtLocation\n\nPiperOrigin-RevId: 297918498\n\n" + "sha": "85e454be7a353f7fe1bf2b0affb753305785b872", + "internalRef": "300367734" } }, { diff --git a/synth.py b/synth.py index 2c09e4b9..bb8870a6 100644 --- a/synth.py +++ b/synth.py @@ -37,40 +37,27 @@ for version in versions: - library = gapic.java_library( + library = java.gapic_library( service=service, version=version, - config_path=config_pattern.format(version=version), - artman_output_name='') + config_pattern=config_pattern, + ) if version == 'v1': # add GrafeasClient import s.replace( - library / f'gapic-google-cloud-{service}-{version}/src/**/ContainerAnalysisClient.java', + f'google-cloud-{service}/src/main/java/com/google/cloud/devtools/containeranalysis/{version}/ContainerAnalysisClient.java', 'import com.google.iam.v1.TestIamPermissionsResponse;', 'import com.google.iam.v1.TestIamPermissionsResponse;\nimport io.grafeas.v1.GrafeasClient;' ) # add getGrafeasClient() s.replace( - library / f'gapic-google-cloud-{service}-{version}/src/**/ContainerAnalysisClient.java', + f'google-cloud-{service}/src/main/java/com/google/cloud/devtools/containeranalysis/{version}/ContainerAnalysisClient.java', r'(\s+private final ContainerAnalysisStub stub;.*)', f'\g<1>{get_grafeas_code}' ) - - package_name = f'com.google.{service}.{version}' - java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}') - java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', package_name) - java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', f'io.grafeas.{version}') - - - s.copy(library / f'gapic-google-cloud-{service}-{version}/src', f'google-cloud-{service}/src') - 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') - - java.format_code(f'google-cloud-{service}/src') - java.format_code(f'grpc-google-cloud-{service}-{version}/src') - java.format_code(f'proto-google-cloud-{service}-{version}/src') + java.format_code('google-cloud-containeranalysis/src') java.common_templates() From 66fd682186d7098e6edbb4bc92b55176cd675308 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 20:56:05 +0000 Subject: [PATCH 17/17] chore: release 0.119.2 (#82) :robot: I have created a release \*beep\* \*boop\* --- ### [0.119.2](https://www.github.com/googleapis/java-containeranalysis/compare/v0.119.1...v0.119.2) (2020-03-11) ### Bug Fixes * undeprecate resource name classes until multi-pattern resources are available ([#81](https://www.github.com/googleapis/java-containeranalysis/issues/81)) ([552f4dd](https://www.github.com/googleapis/java-containeranalysis/commit/552f4dd67ea0de9c9994b3eb7d2e8cf4be5f9c8c)) ### Dependencies * update core dependencies to v1.54.0 ([#78](https://www.github.com/googleapis/java-containeranalysis/issues/78)) ([073714c](https://www.github.com/googleapis/java-containeranalysis/commit/073714c2f9d603adf1c044c5c0733ab5fb3a03c7)) * update dependency com.google.protobuf:protobuf-java to v3.11.4 ([6ebbfc3](https://www.github.com/googleapis/java-containeranalysis/commit/6ebbfc37cdfdd774feee4976d55649c427a5fb94)) * update dependency com.google.protobuf:protobuf-java-util to v3.11.4 ([#69](https://www.github.com/googleapis/java-containeranalysis/issues/69)) ([0c9c542](https://www.github.com/googleapis/java-containeranalysis/commit/0c9c542b68792ba7eff9c6bc791d1a6c62452cbb)) * update dependency io.grpc:grpc-bom to v1.27.1 ([d853e83](https://www.github.com/googleapis/java-containeranalysis/commit/d853e83c8b8ffc992dbb429683d38dd3076d34d2)) * update dependency io.grpc:grpc-bom to v1.27.2 ([113bc0c](https://www.github.com/googleapis/java-containeranalysis/commit/113bc0c54f42f8daad400e2950677ce746504d79)) * update java-core ([#80](https://www.github.com/googleapis/java-containeranalysis/issues/80)) ([b9f172e](https://www.github.com/googleapis/java-containeranalysis/commit/b9f172ea97845c74d06c2eb039f09a7e7a9ed006)) ### Documentation * **regen:** update sample code to set total timeout, add API client header test ([8966c44](https://www.github.com/googleapis/java-containeranalysis/commit/8966c449b68dbfee7935873b3b29b35b87324e02)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- CHANGELOG.md | 22 +++++++++++++++++++ README.md | 6 ++--- google-cloud-containeranalysis-bom/pom.xml | 12 +++++----- google-cloud-containeranalysis/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- pom.xml | 12 +++++----- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- versions.txt | 10 ++++----- 10 files changed, 52 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b85b9132..7e17328b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +### [0.119.2](https://www.github.com/googleapis/java-containeranalysis/compare/v0.119.1...v0.119.2) (2020-03-11) + + +### Bug Fixes + +* undeprecate resource name classes until multi-pattern resources are available ([#81](https://www.github.com/googleapis/java-containeranalysis/issues/81)) ([552f4dd](https://www.github.com/googleapis/java-containeranalysis/commit/552f4dd67ea0de9c9994b3eb7d2e8cf4be5f9c8c)) + + +### Dependencies + +* update core dependencies to v1.54.0 ([#78](https://www.github.com/googleapis/java-containeranalysis/issues/78)) ([073714c](https://www.github.com/googleapis/java-containeranalysis/commit/073714c2f9d603adf1c044c5c0733ab5fb3a03c7)) +* update dependency com.google.protobuf:protobuf-java to v3.11.4 ([6ebbfc3](https://www.github.com/googleapis/java-containeranalysis/commit/6ebbfc37cdfdd774feee4976d55649c427a5fb94)) +* update dependency com.google.protobuf:protobuf-java-util to v3.11.4 ([#69](https://www.github.com/googleapis/java-containeranalysis/issues/69)) ([0c9c542](https://www.github.com/googleapis/java-containeranalysis/commit/0c9c542b68792ba7eff9c6bc791d1a6c62452cbb)) +* update dependency io.grpc:grpc-bom to v1.27.1 ([d853e83](https://www.github.com/googleapis/java-containeranalysis/commit/d853e83c8b8ffc992dbb429683d38dd3076d34d2)) +* update dependency io.grpc:grpc-bom to v1.27.2 ([113bc0c](https://www.github.com/googleapis/java-containeranalysis/commit/113bc0c54f42f8daad400e2950677ce746504d79)) +* update java-core ([#80](https://www.github.com/googleapis/java-containeranalysis/issues/80)) ([b9f172e](https://www.github.com/googleapis/java-containeranalysis/commit/b9f172ea97845c74d06c2eb039f09a7e7a9ed006)) + + +### Documentation + +* **regen:** update sample code to set total timeout, add API client header test ([8966c44](https://www.github.com/googleapis/java-containeranalysis/commit/8966c449b68dbfee7935873b3b29b35b87324e02)) + ### [0.119.1](https://www.github.com/googleapis/java-containeranalysis/compare/v0.119.0...v0.119.1) (2020-02-04) diff --git a/README.md b/README.md index 90874ac2..93cc37ad 100644 --- a/README.md +++ b/README.md @@ -42,17 +42,17 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-containeranalysis - 0.119.1-beta + 0.119.2-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-containeranalysis:0.119.1-beta' +compile 'com.google.cloud:google-cloud-containeranalysis:0.119.2-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "0.119.1-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "0.119.2-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index fd91a668..d0af21b7 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 0.119.2-beta-SNAPSHOT + 0.119.2-beta pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 0.84.2-SNAPSHOT + 0.84.2 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.84.2-SNAPSHOT + 0.84.2 com.google.cloud google-cloud-containeranalysis - 0.119.2-beta-SNAPSHOT + 0.119.2-beta com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 0.84.2-SNAPSHOT + 0.84.2 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.84.2-SNAPSHOT + 0.84.2 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index e7df5dd4..577b3755 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 0.119.2-beta-SNAPSHOT + 0.119.2-beta jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 0.119.2-beta-SNAPSHOT + 0.119.2-beta google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index f0c442e0..533b2dde 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 0.84.2-SNAPSHOT + 0.84.2 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 0.119.2-beta-SNAPSHOT + 0.119.2-beta diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index ca0f57bb..693836c9 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.84.2-SNAPSHOT + 0.84.2 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 0.119.2-beta-SNAPSHOT + 0.119.2-beta diff --git a/pom.xml b/pom.xml index ae1812b9..35390525 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 0.119.2-beta-SNAPSHOT + 0.119.2-beta Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -81,27 +81,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 0.84.2-SNAPSHOT + 0.84.2 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.84.2-SNAPSHOT + 0.84.2 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.84.2-SNAPSHOT + 0.84.2 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 0.84.2-SNAPSHOT + 0.84.2 com.google.cloud google-cloud-containeranalysis - 0.119.2-beta-SNAPSHOT + 0.119.2-beta diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 8c37f5c6..15e7fd18 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 0.84.2-SNAPSHOT + 0.84.2 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 0.119.2-beta-SNAPSHOT + 0.119.2-beta diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index 66808e87..64bc6c8b 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.84.2-SNAPSHOT + 0.84.2 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 0.119.2-beta-SNAPSHOT + 0.119.2-beta diff --git a/versions.txt b/versions.txt index ecc280fb..7e1d77b6 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:0.84.1:0.84.2-SNAPSHOT -proto-google-cloud-containeranalysis-v1beta1:0.84.1:0.84.2-SNAPSHOT -grpc-google-cloud-containeranalysis-v1beta1:0.84.1:0.84.2-SNAPSHOT -grpc-google-cloud-containeranalysis-v1:0.84.1:0.84.2-SNAPSHOT -google-cloud-containeranalysis:0.119.1-beta:0.119.2-beta-SNAPSHOT +proto-google-cloud-containeranalysis-v1:0.84.2:0.84.2 +proto-google-cloud-containeranalysis-v1beta1:0.84.2:0.84.2 +grpc-google-cloud-containeranalysis-v1beta1:0.84.2:0.84.2 +grpc-google-cloud-containeranalysis-v1:0.84.2:0.84.2 +google-cloud-containeranalysis:0.119.2-beta:0.119.2-beta