From 084d146a2eb8441fd6cd56953d5283b7199966ec Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Tue, 21 May 2024 13:52:52 +0000 Subject: [PATCH] change source dir --- java-common-protos/.OwlBot-hermetic.yaml | 28 ++++++++++++------------ java-iam/.OwlBot-hermetic.yaml | 16 ++++---------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/java-common-protos/.OwlBot-hermetic.yaml b/java-common-protos/.OwlBot-hermetic.yaml index 1c93522786..1aed221695 100644 --- a/java-common-protos/.OwlBot-hermetic.yaml +++ b/java-common-protos/.OwlBot-hermetic.yaml @@ -22,50 +22,50 @@ deep-preserve-regex: - "/java-common-protos/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" deep-copy-regex: -- source: "/google/api/google-api-java/proto-google-api-java/src" +- source: "/google/api/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/cloud/audit/google-cloud-audit-java/proto-google-cloud-audit-java/src" +- source: "/google/cloud/audit/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" # For geo common protos -- source: "/google/geo/type/google-geo-type-java/proto-google-geo-type-java/src" +- source: "/google/geo/type/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" # For shopping common protos -- source: "/google/shopping/type/google-shopping-type-java/proto-google-shopping-type-java/src" +- source: "/google/shopping/type/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" # It is only used once in https://github.com/googleapis/googleapis/blob/master/google/chat/v1/BUILD.bazel#L47, # and technically not a common proto, maybe a violation of AIP-215 if it is not. # However, it's better to put it here so that we don't have to manually add it to BUILD.bazel file and hermetic build scripts. -- source: "/google/apps/card/v1/google-apps-card-v1-java/proto-google-apps-card-v1-java/src" +- source: "/google/apps/card/v1/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/logging/type/google-logging-type-java/proto-google-logging-type-java/src" +- source: "/google/logging/type/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/longrunning/google-longrunning-java/proto-google-longrunning-java/src" +- source: "/google/longrunning/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/rpc/google-rpc-java/proto-google-rpc-java/src" +- source: "/google/rpc/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/rpc/context/google-context-java/proto-google-context-java/src" +- source: "/google/rpc/context/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/type/google-type-java/proto-google-type-java/src" +- source: "/google/type/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/cloud/google-apps-script-type-java/proto-google-apps-script-type-java/src" +- source: "/google/cloud/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/cloud/location/google-cloud-location-java/proto-google-cloud-location-java/src" +- source: "/google/cloud/location/.*-java/proto-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/proto-google-common-protos/src" -- source: "/google/cloud/location/google-cloud-location-java/grpc-google-cloud-location-java/src" +- source: "/google/cloud/location/.*-java/grpc-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/grpc-google-common-protos/src" -- source: "/google/longrunning/google-longrunning-java/grpc-google-longrunning-java/src" +- source: "/google/longrunning/.*-java/grpc-google-.*/src" dest: "/owl-bot-staging/java-common-protos/v1/grpc-google-common-protos/src" api-name: common-protos diff --git a/java-iam/.OwlBot-hermetic.yaml b/java-iam/.OwlBot-hermetic.yaml index d79161a495..907bd5cd5e 100644 --- a/java-iam/.OwlBot-hermetic.yaml +++ b/java-iam/.OwlBot-hermetic.yaml @@ -22,17 +22,9 @@ deep-preserve-regex: - "/java-iam/proto-google-iam-v1/src/main/proto/google/iam/v1" deep-copy-regex: - - source: "/google/iam/v1/google-iam-v1-java/grpc-google-iam-v1-java/src" - dest: "/owl-bot-staging/java-iam/v1/grpc-google-iam-v1/src" - - source: "/google/iam/v1/google-iam-v1-java/proto-google-iam-v1-java/src" - dest: "/owl-bot-staging/java-iam/v1/proto-google-iam-v1/src" - - source: "/google/iam/v2beta/google-cloud-iam-v2beta-java/grpc-google-cloud-iam-v2beta-java/src" - dest: "/owl-bot-staging/java-iam/v2beta/grpc-google-iam-v2beta/src" - - source: "/google/iam/v2beta/google-cloud-iam-v2beta-java/proto-google-cloud-iam-v2beta-java/src" - dest: "/owl-bot-staging/java-iam/v2beta/proto-google-iam-v2beta/src" - - source: "/google/iam/v2/google-cloud-iam-v2-java/grpc-google-cloud-iam-v2-java/src" - dest: "/owl-bot-staging/java-iam/v2/grpc-google-iam-v2/src" - - source: "/google/iam/v2/google-cloud-iam-v2-java/proto-google-cloud-iam-v2-java/src" - dest: "/owl-bot-staging/java-iam/v2/proto-google-iam-v2/src" + - source: "/google/iam/(v.*)/.*-java/grpc-google-.*/src" + dest: "/owl-bot-staging/java-iam/$1/grpc-google-iam-$1/src" + - source: "/google/iam/(v.*)/.*-java/proto-google-.*/src" + dest: "/owl-bot-staging/java-iam/$1/proto-google-iam-$1/src" api-name: iam