diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f1ae58408d..26ffa6a353 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,19 +37,23 @@ 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 - bash ${KOKORO_GFILE_DIR}/codecov.sh - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; 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,21 +63,46 @@ integration) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; 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 + RETURN_CODE=$? + popd + else + echo "no sample pom.xml found - skipping sample tests" + fi ;; clirr) mvn -B -Denforcer.skip=true clirr:check + RETURN_CODE=$? ;; *) ;; esac + +if [ "${REPORT_COVERAGE}" == "true" ] +then + bash ${KOKORO_GFILE_DIR}/codecov.sh +fi + +# 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-bigtable +fi + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg index 3b017fc80f..495cc7bacd 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 3b017fc80f..8bf59c02ed 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 3b017fc80f..495cc7bacd 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 9a9102490d..b4b051cd01 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 3b017fc80f..495cc7bacd 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/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java index 34b33fe5c2..ba1becc266 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java @@ -173,124 +173,127 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "quest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bigtable.go" + "ogleapis.com/Table\022\036\n\021consistency_token\030" + "\002 \001(\tB\003\340A\002\".\n\030CheckConsistencyResponse\022\022" - + "\n\nconsistent\030\001 \001(\010\"\207\001\n\024SnapshotTableRequ" - + "est\022\014\n\004name\030\001 \001(\t\022\017\n\007cluster\030\002 \001(\t\022\023\n\013sn" - + "apshot_id\030\003 \001(\t\022&\n\003ttl\030\004 \001(\0132\031.google.pr" - + "otobuf.Duration\022\023\n\013description\030\005 \001(\t\"L\n\022" - + "GetSnapshotRequest\0226\n\004name\030\001 \001(\tB(\340A\002\372A\"" - + "\n bigtable.googleapis.com/Snapshot\"v\n\024Li" - + "stSnapshotsRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372" - + "A!\n\037bigtable.googleapis.com/Cluster\022\021\n\tp" - + "age_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"g\n\025Li" - + "stSnapshotsResponse\0225\n\tsnapshots\030\001 \003(\0132\"" - + ".google.bigtable.admin.v2.Snapshot\022\027\n\017ne" - + "xt_page_token\030\002 \001(\t\"O\n\025DeleteSnapshotReq" - + "uest\0226\n\004name\030\001 \001(\tB(\340A\002\372A\"\n bigtable.goo" - + "gleapis.com/Snapshot\"\304\001\n\025SnapshotTableMe" - + "tadata\022H\n\020original_request\030\001 \001(\0132..googl" - + "e.bigtable.admin.v2.SnapshotTableRequest" - + "\0220\n\014request_time\030\002 \001(\0132\032.google.protobuf" - + ".Timestamp\022/\n\013finish_time\030\003 \001(\0132\032.google" - + ".protobuf.Timestamp\"\330\001\n\037CreateTableFromS" - + "napshotMetadata\022R\n\020original_request\030\001 \001(" - + "\01328.google.bigtable.admin.v2.CreateTable" - + "FromSnapshotRequest\0220\n\014request_time\030\002 \001(" - + "\0132\032.google.protobuf.Timestamp\022/\n\013finish_" - + "time\030\003 \001(\0132\032.google.protobuf.Timestamp2\351" - + "\033\n\022BigtableTableAdmin\022\253\001\n\013CreateTable\022,." - + "google.bigtable.admin.v2.CreateTableRequ" - + "est\032\037.google.bigtable.admin.v2.Table\"M\202\323" - + "\344\223\002/\"*/v2/{parent=projects/*/instances/*" - + "}/tables:\001*\332A\025parent,table_id,table\022\212\002\n\027" - + "CreateTableFromSnapshot\0228.google.bigtabl" - + "e.admin.v2.CreateTableFromSnapshotReques" - + "t\032\035.google.longrunning.Operation\"\225\001\202\323\344\223\002" - + "B\"=/v2/{parent=projects/*/instances/*}/t" - + "ables:createFromSnapshot:\001*\332A\037parent,tab" - + "le_id,source_snapshot\312A(\n\005Table\022\037CreateT" - + "ableFromSnapshotMetadata\022\244\001\n\nListTables\022" - + "+.google.bigtable.admin.v2.ListTablesReq" - + "uest\032,.google.bigtable.admin.v2.ListTabl" - + "esResponse\";\202\323\344\223\002,\022*/v2/{parent=projects" - + "/*/instances/*}/tables\332A\006parent\022\221\001\n\010GetT" - + "able\022).google.bigtable.admin.v2.GetTable" - + "Request\032\037.google.bigtable.admin.v2.Table" - + "\"9\202\323\344\223\002,\022*/v2/{name=projects/*/instances" - + "/*/tables/*}\332A\004name\022\216\001\n\013DeleteTable\022,.go" - + "ogle.bigtable.admin.v2.DeleteTableReques" - + "t\032\026.google.protobuf.Empty\"9\202\323\344\223\002,**/v2/{" - + "name=projects/*/instances/*/tables/*}\332A\004" - + "name\022\317\001\n\024ModifyColumnFamilies\0225.google.b" - + "igtable.admin.v2.ModifyColumnFamiliesReq" - + "uest\032\037.google.bigtable.admin.v2.Table\"_\202" - + "\323\344\223\002D\"?/v2/{name=projects/*/instances/*/" - + "tables/*}:modifyColumnFamilies:\001*\332A\022name" - + ",modifications\022\231\001\n\014DropRowRange\022-.google" - + ".bigtable.admin.v2.DropRowRangeRequest\032\026" - + ".google.protobuf.Empty\"B\202\323\344\223\002<\"7/v2/{nam" - + "e=projects/*/instances/*/tables/*}:dropR" - + "owRange:\001*\022\350\001\n\030GenerateConsistencyToken\022" - + "9.google.bigtable.admin.v2.GenerateConsi" - + "stencyTokenRequest\032:.google.bigtable.adm" - + "in.v2.GenerateConsistencyTokenResponse\"U" - + "\202\323\344\223\002H\"C/v2/{name=projects/*/instances/*" - + "/tables/*}:generateConsistencyToken:\001*\332A" - + "\004name\022\332\001\n\020CheckConsistency\0221.google.bigt" - + "able.admin.v2.CheckConsistencyRequest\0322." - + "google.bigtable.admin.v2.CheckConsistenc" - + "yResponse\"_\202\323\344\223\002@\";/v2/{name=projects/*/" - + "instances/*/tables/*}:checkConsistency:\001" - + "*\332A\026name,consistency_token\022\352\001\n\rSnapshotT" - + "able\022..google.bigtable.admin.v2.Snapshot" - + "TableRequest\032\035.google.longrunning.Operat" - + "ion\"\211\001\202\323\344\223\0028\"3/v2/{name=projects/*/insta" - + "nces/*/tables/*}:snapshot:\001*\332A$name,clus" - + "ter,snapshot_id,description\312A!\n\010Snapshot" - + "\022\025SnapshotTableMetadata\022\250\001\n\013GetSnapshot\022" - + ",.google.bigtable.admin.v2.GetSnapshotRe" - + "quest\032\".google.bigtable.admin.v2.Snapsho" - + "t\"G\202\323\344\223\002:\0228/v2/{name=projects/*/instance" - + "s/*/clusters/*/snapshots/*}\332A\004name\022\273\001\n\rL" - + "istSnapshots\022..google.bigtable.admin.v2." - + "ListSnapshotsRequest\032/.google.bigtable.a" - + "dmin.v2.ListSnapshotsResponse\"I\202\323\344\223\002:\0228/" - + "v2/{parent=projects/*/instances/*/cluste" - + "rs/*}/snapshots\332A\006parent\022\242\001\n\016DeleteSnaps" - + "hot\022/.google.bigtable.admin.v2.DeleteSna" - + "pshotRequest\032\026.google.protobuf.Empty\"G\202\323" - + "\344\223\002:*8/v2/{name=projects/*/instances/*/c" - + "lusters/*/snapshots/*}\332A\004name\022\234\001\n\014GetIam" - + "Policy\022\".google.iam.v1.GetIamPolicyReque" - + "st\032\025.google.iam.v1.Policy\"Q\202\323\344\223\002@\";/v2/{" - + "resource=projects/*/instances/*/tables/*" - + "}:getIamPolicy:\001*\332A\010resource\022\363\001\n\014SetIamP" - + "olicy\022\".google.iam.v1.SetIamPolicyReques" - + "t\032\025.google.iam.v1.Policy\"\247\001\202\323\344\223\002\216\001\";/v2/" - + "{resource=projects/*/instances/*/tables/" - + "*}:setIamPolicy:\001*ZL\"G/v2/{resource=proj" - + "ects/*/instances/*/clusters/*/backups/*}" - + ":setIamPolicy:\001*\332A\017resource,policy\022\244\002\n\022T" - + "estIamPermissions\022(.google.iam.v1.TestIa" - + "mPermissionsRequest\032).google.iam.v1.Test" - + "IamPermissionsResponse\"\270\001\202\323\344\223\002\232\001\"A/v2/{r" - + "esource=projects/*/instances/*/tables/*}" - + ":testIamPermissions:\001*ZR\"M/v2/{resource=" - + "projects/*/instances/*/clusters/*/backup" - + "s/*}:testIamPermissions:\001*\332A\024resource,pe" - + "rmissions\032\336\002\312A\034bigtableadmin.googleapis." - + "com\322A\273\002https://www.googleapis.com/auth/b" - + "igtable.admin,https://www.googleapis.com" - + "/auth/bigtable.admin.table,https://www.g" - + "oogleapis.com/auth/cloud-bigtable.admin," - + "https://www.googleapis.com/auth/cloud-bi" - + "gtable.admin.table,https://www.googleapi" - + "s.com/auth/cloud-platform,https://www.go" - + "ogleapis.com/auth/cloud-platform.read-on" - + "lyB\272\001\n\034com.google.bigtable.admin.v2B\027Big" - + "tableTableAdminProtoP\001Z=google.golang.or" - + "g/genproto/googleapis/bigtable/admin/v2;" - + "admin\252\002\036Google.Cloud.Bigtable.Admin.V2\312\002" - + "\036Google\\Cloud\\Bigtable\\Admin\\V2b\006proto3" + + "\n\nconsistent\030\001 \001(\010\"\334\001\n\024SnapshotTableRequ" + + "est\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bigtable.goog" + + "leapis.com/Table\0228\n\007cluster\030\002 \001(\tB\'\340A\002\372A" + + "!\n\037bigtable.googleapis.com/Cluster\022\030\n\013sn" + + "apshot_id\030\003 \001(\tB\003\340A\002\022&\n\003ttl\030\004 \001(\0132\031.goog" + + "le.protobuf.Duration\022\023\n\013description\030\005 \001(" + + "\t\"L\n\022GetSnapshotRequest\0226\n\004name\030\001 \001(\tB(\340" + + "A\002\372A\"\n bigtable.googleapis.com/Snapshot\"" + + "v\n\024ListSnapshotsRequest\0227\n\006parent\030\001 \001(\tB" + + "\'\340A\002\372A!\n\037bigtable.googleapis.com/Cluster" + + "\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"" + + "g\n\025ListSnapshotsResponse\0225\n\tsnapshots\030\001 " + + "\003(\0132\".google.bigtable.admin.v2.Snapshot\022" + + "\027\n\017next_page_token\030\002 \001(\t\"O\n\025DeleteSnapsh" + + "otRequest\0226\n\004name\030\001 \001(\tB(\340A\002\372A\"\n bigtabl" + + "e.googleapis.com/Snapshot\"\304\001\n\025SnapshotTa" + + "bleMetadata\022H\n\020original_request\030\001 \001(\0132.." + + "google.bigtable.admin.v2.SnapshotTableRe" + + "quest\0220\n\014request_time\030\002 \001(\0132\032.google.pro" + + "tobuf.Timestamp\022/\n\013finish_time\030\003 \001(\0132\032.g" + + "oogle.protobuf.Timestamp\"\330\001\n\037CreateTable" + + "FromSnapshotMetadata\022R\n\020original_request" + + "\030\001 \001(\01328.google.bigtable.admin.v2.Create" + + "TableFromSnapshotRequest\0220\n\014request_time" + + "\030\002 \001(\0132\032.google.protobuf.Timestamp\022/\n\013fi" + + "nish_time\030\003 \001(\0132\032.google.protobuf.Timest" + + "amp2\351\033\n\022BigtableTableAdmin\022\253\001\n\013CreateTab" + + "le\022,.google.bigtable.admin.v2.CreateTabl" + + "eRequest\032\037.google.bigtable.admin.v2.Tabl" + + "e\"M\202\323\344\223\002/\"*/v2/{parent=projects/*/instan" + + "ces/*}/tables:\001*\332A\025parent,table_id,table" + + "\022\212\002\n\027CreateTableFromSnapshot\0228.google.bi" + + "gtable.admin.v2.CreateTableFromSnapshotR" + + "equest\032\035.google.longrunning.Operation\"\225\001" + + "\202\323\344\223\002B\"=/v2/{parent=projects/*/instances" + + "/*}/tables:createFromSnapshot:\001*\332A\037paren" + + "t,table_id,source_snapshot\312A(\n\005Table\022\037Cr" + + "eateTableFromSnapshotMetadata\022\244\001\n\nListTa" + + "bles\022+.google.bigtable.admin.v2.ListTabl" + + "esRequest\032,.google.bigtable.admin.v2.Lis" + + "tTablesResponse\";\202\323\344\223\002,\022*/v2/{parent=pro" + + "jects/*/instances/*}/tables\332A\006parent\022\221\001\n" + + "\010GetTable\022).google.bigtable.admin.v2.Get" + + "TableRequest\032\037.google.bigtable.admin.v2." + + "Table\"9\202\323\344\223\002,\022*/v2/{name=projects/*/inst" + + "ances/*/tables/*}\332A\004name\022\216\001\n\013DeleteTable" + + "\022,.google.bigtable.admin.v2.DeleteTableR" + + "equest\032\026.google.protobuf.Empty\"9\202\323\344\223\002,**" + + "/v2/{name=projects/*/instances/*/tables/" + + "*}\332A\004name\022\317\001\n\024ModifyColumnFamilies\0225.goo" + + "gle.bigtable.admin.v2.ModifyColumnFamili" + + "esRequest\032\037.google.bigtable.admin.v2.Tab" + + "le\"_\202\323\344\223\002D\"?/v2/{name=projects/*/instanc" + + "es/*/tables/*}:modifyColumnFamilies:\001*\332A" + + "\022name,modifications\022\231\001\n\014DropRowRange\022-.g" + + "oogle.bigtable.admin.v2.DropRowRangeRequ" + + "est\032\026.google.protobuf.Empty\"B\202\323\344\223\002<\"7/v2" + + "/{name=projects/*/instances/*/tables/*}:" + + "dropRowRange:\001*\022\350\001\n\030GenerateConsistencyT" + + "oken\0229.google.bigtable.admin.v2.Generate" + + "ConsistencyTokenRequest\032:.google.bigtabl" + + "e.admin.v2.GenerateConsistencyTokenRespo" + + "nse\"U\202\323\344\223\002H\"C/v2/{name=projects/*/instan" + + "ces/*/tables/*}:generateConsistencyToken" + + ":\001*\332A\004name\022\332\001\n\020CheckConsistency\0221.google" + + ".bigtable.admin.v2.CheckConsistencyReque" + + "st\0322.google.bigtable.admin.v2.CheckConsi" + + "stencyResponse\"_\202\323\344\223\002@\";/v2/{name=projec" + + "ts/*/instances/*/tables/*}:checkConsiste" + + "ncy:\001*\332A\026name,consistency_token\022\352\001\n\rSnap" + + "shotTable\022..google.bigtable.admin.v2.Sna" + + "pshotTableRequest\032\035.google.longrunning.O" + + "peration\"\211\001\202\323\344\223\0028\"3/v2/{name=projects/*/" + + "instances/*/tables/*}:snapshot:\001*\332A$name" + + ",cluster,snapshot_id,description\312A!\n\010Sna" + + "pshot\022\025SnapshotTableMetadata\022\250\001\n\013GetSnap" + + "shot\022,.google.bigtable.admin.v2.GetSnaps" + + "hotRequest\032\".google.bigtable.admin.v2.Sn" + + "apshot\"G\202\323\344\223\002:\0228/v2/{name=projects/*/ins" + + "tances/*/clusters/*/snapshots/*}\332A\004name\022" + + "\273\001\n\rListSnapshots\022..google.bigtable.admi" + + "n.v2.ListSnapshotsRequest\032/.google.bigta" + + "ble.admin.v2.ListSnapshotsResponse\"I\202\323\344\223" + + "\002:\0228/v2/{parent=projects/*/instances/*/c" + + "lusters/*}/snapshots\332A\006parent\022\242\001\n\016Delete" + + "Snapshot\022/.google.bigtable.admin.v2.Dele" + + "teSnapshotRequest\032\026.google.protobuf.Empt" + + "y\"G\202\323\344\223\002:*8/v2/{name=projects/*/instance" + + "s/*/clusters/*/snapshots/*}\332A\004name\022\234\001\n\014G" + + "etIamPolicy\022\".google.iam.v1.GetIamPolicy" + + "Request\032\025.google.iam.v1.Policy\"Q\202\323\344\223\002@\";" + + "/v2/{resource=projects/*/instances/*/tab" + + "les/*}:getIamPolicy:\001*\332A\010resource\022\363\001\n\014Se" + + "tIamPolicy\022\".google.iam.v1.SetIamPolicyR" + + "equest\032\025.google.iam.v1.Policy\"\247\001\202\323\344\223\002\216\001\"" + + ";/v2/{resource=projects/*/instances/*/ta" + + "bles/*}:setIamPolicy:\001*ZL\"G/v2/{resource" + + "=projects/*/instances/*/clusters/*/backu" + + "ps/*}:setIamPolicy:\001*\332A\017resource,policy\022" + + "\244\002\n\022TestIamPermissions\022(.google.iam.v1.T" + + "estIamPermissionsRequest\032).google.iam.v1" + + ".TestIamPermissionsResponse\"\270\001\202\323\344\223\002\232\001\"A/" + + "v2/{resource=projects/*/instances/*/tabl" + + "es/*}:testIamPermissions:\001*ZR\"M/v2/{reso" + + "urce=projects/*/instances/*/clusters/*/b" + + "ackups/*}:testIamPermissions:\001*\332A\024resour" + + "ce,permissions\032\336\002\312A\034bigtableadmin.google" + + "apis.com\322A\273\002https://www.googleapis.com/a" + + "uth/bigtable.admin,https://www.googleapi" + + "s.com/auth/bigtable.admin.table,https://" + + "www.googleapis.com/auth/cloud-bigtable.a" + + "dmin,https://www.googleapis.com/auth/clo" + + "ud-bigtable.admin.table,https://www.goog" + + "leapis.com/auth/cloud-platform,https://w" + + "ww.googleapis.com/auth/cloud-platform.re" + + "ad-onlyB\272\001\n\034com.google.bigtable.admin.v2" + + "B\027BigtableTableAdminProtoP\001Z=google.gola" + + "ng.org/genproto/googleapis/bigtable/admi" + + "n/v2;admin\252\002\036Google.Cloud.Bigtable.Admin" + + ".V2\312\002\036Google\\Cloud\\Bigtable\\Admin\\V2b\006pr" + + "oto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java index 86ef0b534b..d7d35ec628 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java @@ -165,7 +165,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The name. */ @@ -189,7 +191,9 @@ public java.lang.String getName() { * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for name. */ @@ -216,7 +220,9 @@ public com.google.protobuf.ByteString getNameBytes() { * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The cluster. */ @@ -240,7 +246,9 @@ public java.lang.String getCluster() { * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for cluster. */ @@ -268,7 +276,7 @@ public com.google.protobuf.ByteString getClusterBytes() { * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @return The snapshotId. */ @@ -293,7 +301,7 @@ public java.lang.String getSnapshotId() { * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @return The bytes for snapshotId. */ @@ -817,7 +825,9 @@ public Builder mergeFrom( * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The name. */ @@ -841,7 +851,9 @@ public java.lang.String getName() { * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for name. */ @@ -865,7 +877,9 @@ public com.google.protobuf.ByteString getNameBytes() { * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The name to set. * @return This builder for chaining. @@ -888,7 +902,9 @@ public Builder setName(java.lang.String value) { * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return This builder for chaining. */ @@ -907,7 +923,9 @@ public Builder clearName() { * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bytes for name to set. * @return This builder for chaining. @@ -933,7 +951,9 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The cluster. */ @@ -957,7 +977,9 @@ public java.lang.String getCluster() { * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for cluster. */ @@ -981,7 +1003,9 @@ public com.google.protobuf.ByteString getClusterBytes() { * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The cluster to set. * @return This builder for chaining. @@ -1004,7 +1028,9 @@ public Builder setCluster(java.lang.String value) { * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return This builder for chaining. */ @@ -1023,7 +1049,9 @@ public Builder clearCluster() { * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bytes for cluster to set. * @return This builder for chaining. @@ -1050,7 +1078,7 @@ public Builder setClusterBytes(com.google.protobuf.ByteString value) { * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @return The snapshotId. */ @@ -1075,7 +1103,7 @@ public java.lang.String getSnapshotId() { * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @return The bytes for snapshotId. */ @@ -1100,7 +1128,7 @@ public com.google.protobuf.ByteString getSnapshotIdBytes() { * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @param value The snapshotId to set. * @return This builder for chaining. @@ -1124,7 +1152,7 @@ public Builder setSnapshotId(java.lang.String value) { * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @return This builder for chaining. */ @@ -1144,7 +1172,7 @@ public Builder clearSnapshotId() { * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @param value The bytes for snapshotId to set. * @return This builder for chaining. diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequestOrBuilder.java index a23eb7aa6c..3f9c6a452c 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequestOrBuilder.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequestOrBuilder.java @@ -32,7 +32,9 @@ public interface SnapshotTableRequestOrBuilder * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The name. */ @@ -46,7 +48,9 @@ public interface SnapshotTableRequestOrBuilder * `projects/{project}/instances/{instance}/tables/{table}`. * * - * string name = 1; + * + * string name = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for name. */ @@ -61,7 +65,9 @@ public interface SnapshotTableRequestOrBuilder * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The cluster. */ @@ -75,7 +81,9 @@ public interface SnapshotTableRequestOrBuilder * `projects/{project}/instances/{instance}/clusters/{cluster}`. * * - * string cluster = 2; + * + * string cluster = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for cluster. */ @@ -91,7 +99,7 @@ public interface SnapshotTableRequestOrBuilder * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @return The snapshotId. */ @@ -106,7 +114,7 @@ public interface SnapshotTableRequestOrBuilder * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. * * - * string snapshot_id = 3; + * string snapshot_id = 3 [(.google.api.field_behavior) = REQUIRED]; * * @return The bytes for snapshotId. */ diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto b/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto index 6b1caac1e2..b1e1d02952 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto +++ b/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto @@ -527,18 +527,22 @@ message SnapshotTableRequest { // The unique name of the table to have the snapshot taken. // Values are of the form // `projects/{project}/instances/{instance}/tables/{table}`. - string name = 1; + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference).type = "bigtable.googleapis.com/Table"]; // The name of the cluster where the snapshot will be created in. // Values are of the form // `projects/{project}/instances/{instance}/clusters/{cluster}`. - string cluster = 2; + string cluster = 2 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference).type = "bigtable.googleapis.com/Cluster"]; // The ID by which the new snapshot should be referred to within the parent // cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` // rather than // `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`. - string snapshot_id = 3; + string snapshot_id = 3 [(google.api.field_behavior) = REQUIRED]; // The amount of time that the new snapshot can stay active after it is // created. Once 'ttl' expires, the snapshot will get deleted. The maximum diff --git a/renovate.json b/renovate.json index 268a4669ab..fc6412701a 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 d15460e06a..44382dd8b2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,20 +1,20 @@ { - "updateTime": "2020-02-11T10:30:55.675615Z", + "updateTime": "2020-02-24T22:43:03.307534Z", "sources": [ { "generator": { "name": "artman", - "version": "0.45.0", - "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b" + "version": "0.45.1", + "dockerImage": "googleapis/artman@sha256:36956ca6a4dc70a59de5d5d0fd35061b050bb56884516f0898f46d8220f25738" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "5006247aa157e59118833658084345ee59af7c09", - "internalRef": "294383128", - "log": "5006247aa157e59118833658084345ee59af7c09\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" + "sha": "1e47e676cddbbd8d93f19ba0665af15b5532417e", + "internalRef": "296901854", + "log": "1e47e676cddbbd8d93f19ba0665af15b5532417e\nFix: Restore a method signature for UpdateCluster\n\nPiperOrigin-RevId: 296901854\n\n7f910bcc4fc4704947ccfd3ceed015d16b9e00c2\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\n" } }, {