Skip to content

Commit d42c6d5

Browse files
suztomosuztomo
authored
build: OwlBot config to specify correct paths with module names (googleapis#8482)
* build: set_owlbot_config * Updating OwlBot configuration files with modules * build: checking deep-copy destination * /google-cloud entries * fixed google-cloud-* directory entries
1 parent b0e22b7 commit d42c6d5

129 files changed

Lines changed: 730 additions & 686 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎generation/set_owlbot_config.sh‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/bash
2+
3+
# Adds module directory name into the paths in a OwlBot configuration file so
4+
# that the paths correctly reference the files under the modules in this monorepo.
5+
#
6+
# Usage:
7+
# set_owlbot_config.sh <.OwlBot.yaml path from the root>
8+
# Example:
9+
# $ set_owlbot_config.sh java-dataform/.OwlBot.yaml
10+
#
11+
# To apply the change to all OwlBot configuration files in all modules:
12+
# $ for F in `find . -maxdepth 2 -name '.OwlBot.yaml'`; do sh generation/set_owlbot_config.sh $F; done
13+
OWLBOT_FILE=$1
14+
15+
if [ -z "${OWLBOT_FILE}" ]; then
16+
echo "Please specify file name"
17+
exit 1
18+
fi
19+
20+
if [ ! -r "${OWLBOT_FILE}" ]; then
21+
echo "File not found"
22+
exit 1
23+
fi
24+
25+
dir_name=$(dirname "${OWLBOT_FILE}")
26+
module_name=$(basename "${dir_name}")
27+
28+
if [ ! -d "${module_name}" ]; then
29+
echo "module ${module_name} does not exist"
30+
exit 1
31+
fi
32+
33+
# For deep-remove-regex and deep-preserve-regex fields
34+
sed -i "s|\"/grpc-google|\"/${module_name}/grpc-google|" "${OWLBOT_FILE}"
35+
sed -i "s|\"/proto-google|\"/${module_name}/proto-google|" "${OWLBOT_FILE}"
36+
sed -i "s|\"/google-\.\*|\"/${module_name}/google-.*|" "${OWLBOT_FILE}"
37+
sed -i "s|\"/google-cloud|\"/${module_name}/google-cloud|" "${OWLBOT_FILE}"
38+
sed -i "s|\"/samples|\"/${module_name}/samples|" "${OWLBOT_FILE}"
39+
40+
# In monorepo, the staging directory structure tells the destination module to
41+
# which the OwlBot Java postprocessor copies the files.
42+
if grep --quiet 'owl-bot-staging/$1' "${OWLBOT_FILE}"; then
43+
sed -i "s|owl-bot-staging|owl-bot-staging/${module_name}|" "${OWLBOT_FILE}"
44+
fi

‎java-accessapproval/.OwlBot.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515

1616
deep-remove-regex:
17-
- "/grpc-google-.*/src"
18-
- "/proto-google-.*/src"
19-
- "/google-.*/src"
20-
- "/samples/snippets/generated"
17+
- "/java-accessapproval/grpc-google-.*/src"
18+
- "/java-accessapproval/proto-google-.*/src"
19+
- "/java-accessapproval/google-.*/src"
20+
- "/java-accessapproval/samples/snippets/generated"
2121

2222
deep-preserve-regex:
23-
- "/google-cloud-accessapproval/src/test/java/com/google/cloud/accessapproval/v1/it"
23+
- "/java-accessapproval/google-cloud-accessapproval/src/test/java/com/google/cloud/accessapproval/v1/it"
2424

2525
deep-copy-regex:
2626
- source: "/google/cloud/accessapproval/(v.*)/.*-java/proto-google-.*/src"

‎java-accesscontextmanager/.OwlBot.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515

1616
deep-remove-regex:
17-
- "/proto-google-.*/src"
17+
- "/java-accesscontextmanager/proto-google-.*/src"
1818

1919
deep-preserve-regex:
20-
- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
20+
- "/java-accesscontextmanager/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
2121

2222
deep-copy-regex:
2323
- source: "/google/identity/accesscontextmanager/(v\\d)/.*-java/proto-google-.*/src"

‎java-aiplatform/.OwlBot.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515

1616
deep-remove-regex:
17-
- "/grpc-google-.*/src"
18-
- "/proto-google-.*/src"
19-
- "/google-.*/src/main/java/com/google/cloud/aiplatform/v1"
20-
- "/google-.*/src/main/java/com/google/cloud/aiplatform/v1beta1"
17+
- "/java-aiplatform/grpc-google-.*/src"
18+
- "/java-aiplatform/proto-google-.*/src"
19+
- "/java-aiplatform/google-.*/src/main/java/com/google/cloud/aiplatform/v1"
20+
- "/java-aiplatform/google-.*/src/main/java/com/google/cloud/aiplatform/v1beta1"
2121

2222
deep-copy-regex:
2323
- source: "/google/cloud/aiplatform/(v.*)/.*-java/proto-google-.*/src"

‎java-analytics-admin/.OwlBot.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515

1616
deep-remove-regex:
17-
- "/grpc-google-.*/src"
18-
- "/proto-google-.*/src"
19-
- "/google-.*/src"
17+
- "/java-analytics-admin/grpc-google-.*/src"
18+
- "/java-analytics-admin/proto-google-.*/src"
19+
- "/java-analytics-admin/google-.*/src"
2020

2121
deep-copy-regex:
2222
- source: "/google/analytics/admin/(v.*)/.*-java/proto-google-.*/src"

‎java-analytics-data/.OwlBot.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515

1616
deep-remove-regex:
17-
- "/grpc-google-.*/src"
18-
- "/proto-google-.*/src"
19-
- "/google-.*/src"
17+
- "/java-analytics-data/grpc-google-.*/src"
18+
- "/java-analytics-data/proto-google-.*/src"
19+
- "/java-analytics-data/google-.*/src"
2020

2121
deep-copy-regex:
2222
- source: "/google/analytics/data/(v.*)/.*-java/proto-google-.*/src"

‎java-api-gateway/.OwlBot.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515

1616
deep-remove-regex:
17-
- "/samples/snippets/generated"
18-
- "/grpc-google-.*/src"
19-
- "/proto-google-.*/src"
20-
- "/google-.*/src"
17+
- "/java-api-gateway/samples/snippets/generated"
18+
- "/java-api-gateway/grpc-google-.*/src"
19+
- "/java-api-gateway/proto-google-.*/src"
20+
- "/java-api-gateway/google-.*/src"
2121

2222
deep-preserve-regex:
23-
- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
23+
- "/java-api-gateway/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
2424

2525
deep-copy-regex:
2626
- source: "/google/cloud/apigateway/(v.*)/.*-java/proto-google-.*/src"

‎java-apigee-connect/.OwlBot.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515

1616
deep-remove-regex:
17-
- "/samples/snippets/generated"
18-
- "/grpc-google-.*/src"
19-
- "/proto-google-.*/src"
20-
- "/google-.*/src"
17+
- "/java-apigee-connect/samples/snippets/generated"
18+
- "/java-apigee-connect/grpc-google-.*/src"
19+
- "/java-apigee-connect/proto-google-.*/src"
20+
- "/java-apigee-connect/google-.*/src"
2121

2222
deep-copy-regex:
2323
- source: "/google/cloud/apigeeconnect/(v.*)/.*-java/proto-google-.*/src"

‎java-apigee-registry/.OwlBot.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515

1616
deep-remove-regex:
17-
- "/grpc-google-.*/src"
18-
- "/proto-google-.*/src"
19-
- "/google-.*/src"
20-
- "/samples/snippets/generated"
17+
- "/java-apigee-registry/grpc-google-.*/src"
18+
- "/java-apigee-registry/proto-google-.*/src"
19+
- "/java-apigee-registry/google-.*/src"
20+
- "/java-apigee-registry/samples/snippets/generated"
2121

2222
deep-preserve-regex:
23-
- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
23+
- "/java-apigee-registry/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
2424

2525
deep-copy-regex:
2626
- source: "/google/cloud/apigeeregistry/(v.*)/.*-java/proto-google-.*/src"

‎java-appengine-admin/.OwlBot.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515

1616
deep-remove-regex:
17-
- "/grpc-google-.*/src"
18-
- "/proto-google-.*/src"
19-
- "/google-.*/src"
17+
- "/java-appengine-admin/grpc-google-.*/src"
18+
- "/java-appengine-admin/proto-google-.*/src"
19+
- "/java-appengine-admin/google-.*/src"
2020

2121
deep-copy-regex:
2222
- source: "/google/appengine/(v.*)/.*-java/proto-google-.*/src"

0 commit comments

Comments
 (0)