Skip to content

Commit 80430bf

Browse files
committed
updated owlbot configs
1 parent 38497f8 commit 80430bf

57 files changed

Lines changed: 230 additions & 13 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.
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#!/bin/bash
2+
3+
# If generated samples directory doesn't exist yet, add it to the owlbot config
4+
5+
# Usage:
6+
# add_snippetdirectory_owlbot.sh <.OwlBot.yaml path from the root>
7+
# Example:
8+
# $ add_snippetdirectory_owlbot.sh java-dataform/.OwlBot.yaml
9+
#
10+
# To apply the change to all OwlBot configuration files in all modules:
11+
# $ for F in `find . -maxdepth 2 -name '.OwlBot.yaml'`; do sh generation/add_snippetdirectory_owlbot.sh $F; done
12+
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+
34+
35+
# If snippets are already being copied, exit out
36+
if grep -q samples/snippets/generated ${OWLBOT_FILE}; then
37+
echo "module ${module_name} already copies generated snippets"
38+
exit 1
39+
fi
40+
41+
42+
# Insert into `deep-remove-regex:` section
43+
deep_remove_regex="- \"\/${module_name}\/samples\/snippets\/generated\""
44+
entry_before_deep_remove_regex="${module_name}\/google-.*\/src"
45+
sed -i "/${entry_before_deep_remove_regex}/a ${deep_remove_regex}" ${OWLBOT_FILE}
46+
47+
# Insert into `deep-copy-regex:` section
48+
deep_copy_regex="- source: \"/google/cloud/${dir_name}/(v.*)/.*-java/samples/snippets/generated\"\n dest: \"/owl-bot-staging/${module_name}/\$1/samples/snippets/generated\""
49+
50+
entry_before_deep_copy_regex="dest: \"\/owl-bot-staging\/${module_name}\/\$1\/google-"
51+
52+
sed -i "/${entry_before_deep_copy_regex}/a ${deep_copy_regex}" ${OWLBOT_FILE}
53+
54+
# Remove duplicate lines
55+
perl -i -ne 'if ( /^\s*#/ ) { print } else { print if ! $SEEN{$_}++}' ${OWLBOT_FILE}
56+
57+
# Add back new lines between sections
58+
sed -i 's/deep-copy-regex/\n&/g' ${OWLBOT_FILE}
59+
sed -i 's/deep-remove-regex/\n&/g' ${OWLBOT_FILE}
60+
sed -i 's/deep-preserve-regex/\n&/g' ${OWLBOT_FILE}
61+
sed -i 's/api-name/\n&/g' ${OWLBOT_FILE}

generation/set_owlbot_config.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,3 @@ if grep --quiet 'owl-bot-staging/$1' "${OWLBOT_FILE}"; then
4343
sed -i.bak "s|owl-bot-staging|owl-bot-staging/${module_name}|" "${OWLBOT_FILE}" && rm "${OWLBOT_FILE}".bak
4444
fi
4545

46-
# TODO: If generated samples directory doesn't exist yet, add it to the owlbot config
47-

java-aiplatform/.OwlBot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ deep-remove-regex:
1717
- "/java-aiplatform/grpc-google-.*/src"
1818
- "/java-aiplatform/proto-google-.*/src"
1919
- "/java-aiplatform/google-.*/src/main/java/com/google/cloud/aiplatform/v1"
20+
- "/java-aiplatform/samples/snippets/generated"
2021
- "/java-aiplatform/google-.*/src/main/java/com/google/cloud/aiplatform/v1beta1"
2122

2223
deep-copy-regex:
@@ -26,5 +27,7 @@ deep-copy-regex:
2627
dest: "/owl-bot-staging/java-aiplatform/$1/grpc-google-cloud-aiplatform-$1/src"
2728
- source: "/google/cloud/aiplatform/(v.*)/.*-java/gapic-google-.*/src"
2829
dest: "/owl-bot-staging/java-aiplatform/$1/google-cloud-aiplatform/src"
30+
- source: "/google/cloud/./java-aiplatform/(v.*)/.*-java/samples/snippets/generated"
31+
dest: "/owl-bot-staging/java-aiplatform/$1/samples/snippets/generated"
2932

3033
api-name: aiplatform

java-analytics-admin/.OwlBot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ deep-remove-regex:
1717
- "/java-analytics-admin/grpc-google-.*/src"
1818
- "/java-analytics-admin/proto-google-.*/src"
1919
- "/java-analytics-admin/google-.*/src"
20+
- "/java-analytics-admin/samples/snippets/generated"
2021

2122
deep-copy-regex:
2223
- source: "/google/analytics/admin/(v.*)/.*-java/proto-google-.*/src"
@@ -25,5 +26,7 @@ deep-copy-regex:
2526
dest: "/owl-bot-staging/java-analytics-admin/$1/grpc-google-analytics-admin-$1/src"
2627
- source: "/google/analytics/admin/(v.*)/.*-java/gapic-google-.*/src"
2728
dest: "/owl-bot-staging/java-analytics-admin/$1/google-analytics-admin/src"
29+
- source: "/google/cloud/./java-analytics-admin/(v.*)/.*-java/samples/snippets/generated"
30+
dest: "/owl-bot-staging/java-analytics-admin/$1/samples/snippets/generated"
2831

2932
api-name: analyticsadmin

java-analytics-data/.OwlBot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ deep-remove-regex:
1717
- "/java-analytics-data/grpc-google-.*/src"
1818
- "/java-analytics-data/proto-google-.*/src"
1919
- "/java-analytics-data/google-.*/src"
20+
- "/java-analytics-data/samples/snippets/generated"
2021

2122
deep-copy-regex:
2223
- source: "/google/analytics/data/(v.*)/.*-java/proto-google-.*/src"
@@ -25,5 +26,7 @@ deep-copy-regex:
2526
dest: "/owl-bot-staging/java-analytics-data/$1/grpc-google-analytics-data-$1/src"
2627
- source: "/google/analytics/data/(v.*)/.*-java/gapic-google-.*/src"
2728
dest: "/owl-bot-staging/java-analytics-data/$1/google-analytics-data/src"
29+
- source: "/google/cloud/./java-analytics-data/(v.*)/.*-java/samples/snippets/generated"
30+
dest: "/owl-bot-staging/java-analytics-data/$1/samples/snippets/generated"
2831

2932
api-name: analyticsdata

java-analyticshub/.OwlBot.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
1716
deep-remove-regex:
1817
- "/java-analyticshub/grpc-google-.*/src"
1918
- "/java-analyticshub/proto-google-.*/src"
2019
- "/java-analyticshub/google-.*/src"
20+
- "/java-analyticshub/samples/snippets/generated"
2121

2222
deep-preserve-regex:
2323
- "/java-analyticshub/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
@@ -29,5 +29,7 @@ deep-copy-regex:
2929
dest: "/owl-bot-staging/java-analyticshub/$1/grpc-google-cloud-analyticshub-$1/src"
3030
- source: "/google/cloud/bigquery/analyticshub/(v.*)/.*-java/gapic-google-.*/src"
3131
dest: "/owl-bot-staging/java-analyticshub/$1/google-cloud-analyticshub/src"
32+
- source: "/google/cloud/./java-analyticshub/(v.*)/.*-java/samples/snippets/generated"
33+
dest: "/owl-bot-staging/java-analyticshub/$1/samples/snippets/generated"
3234

3335
api-name: analyticshub

java-apikeys/.OwlBot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ deep-remove-regex:
1717
- "/java-apikeys/grpc-google-.*/src"
1818
- "/java-apikeys/proto-google-.*/src"
1919
- "/java-apikeys/google-.*/src"
20+
- "/java-apikeys/samples/snippets/generated"
2021

2122
deep-preserve-regex:
2223
- "/java-apikeys/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
@@ -28,5 +29,7 @@ deep-copy-regex:
2829
dest: "/owl-bot-staging/java-apikeys/$1/grpc-google-cloud-apikeys-$1/src"
2930
- source: "/google/api/apikeys/(v.*)/.*-java/gapic-google-.*/src"
3031
dest: "/owl-bot-staging/java-apikeys/$1/google-cloud-apikeys/src"
32+
- source: "/google/cloud/./java-apikeys/(v.*)/.*-java/samples/snippets/generated"
33+
dest: "/owl-bot-staging/java-apikeys/$1/samples/snippets/generated"
3134

3235
api-name: apikeys

java-appengine-admin/.OwlBot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ deep-remove-regex:
1717
- "/java-appengine-admin/grpc-google-.*/src"
1818
- "/java-appengine-admin/proto-google-.*/src"
1919
- "/java-appengine-admin/google-.*/src"
20+
- "/java-appengine-admin/samples/snippets/generated"
2021

2122
deep-copy-regex:
2223
- source: "/google/appengine/(v.*)/.*-java/proto-google-.*/src"
@@ -25,5 +26,7 @@ deep-copy-regex:
2526
dest: "/owl-bot-staging/java-appengine-admin/$1/grpc-google-cloud-appengine-admin-$1/src"
2627
- source: "/google/appengine/(v.*)/.*-java/gapic-google-.*/src"
2728
dest: "/owl-bot-staging/java-appengine-admin/$1/google-cloud-appengine-admin/src"
29+
- source: "/google/cloud/./java-appengine-admin/(v.*)/.*-java/samples/snippets/generated"
30+
dest: "/owl-bot-staging/java-appengine-admin/$1/samples/snippets/generated"
2831

2932
api-name: appengine

java-area120-tables/.OwlBot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ deep-remove-regex:
1717
- "/java-area120-tables/grpc-google-.*/src"
1818
- "/java-area120-tables/proto-google-.*/src"
1919
- "/java-area120-tables/google-.*/src"
20+
- "/java-area120-tables/samples/snippets/generated"
2021

2122
deep-copy-regex:
2223
- source: "/google/area120/tables/(v.*)/.*-java/proto-google-.*/src"
@@ -25,5 +26,7 @@ deep-copy-regex:
2526
dest: "/owl-bot-staging/java-area120-tables/$1/grpc-google-area120-tables-$1/src"
2627
- source: "/google/area120/tables/(v.*)/.*-java/gapic-google-.*/src"
2728
dest: "/owl-bot-staging/java-area120-tables/$1/google-area120-tables/src"
29+
- source: "/google/cloud/./java-area120-tables/(v.*)/.*-java/samples/snippets/generated"
30+
dest: "/owl-bot-staging/java-area120-tables/$1/samples/snippets/generated"
2831

2932
api-name: area120tables

java-artifact-registry/.OwlBot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ deep-remove-regex:
1717
- "/java-artifact-registry/grpc-google-.*/src"
1818
- "/java-artifact-registry/proto-google-.*/src"
1919
- "/java-artifact-registry/google-.*/src"
20+
- "/java-artifact-registry/samples/snippets/generated"
2021

2122
deep-copy-regex:
2223
- source: "/google/devtools/artifactregistry/(v.*)/.*-java/proto-google-.*/src"
@@ -25,5 +26,7 @@ deep-copy-regex:
2526
dest: "/owl-bot-staging/java-artifact-registry/$1/grpc-google-cloud-artifact-registry-$1/src"
2627
- source: "/google/devtools/artifactregistry/(v.*)/.*-java/gapic-google-.*/src"
2728
dest: "/owl-bot-staging/java-artifact-registry/$1/google-cloud-artifact-registry/src"
29+
- source: "/google/cloud/./java-artifact-registry/(v.*)/.*-java/samples/snippets/generated"
30+
dest: "/owl-bot-staging/java-artifact-registry/$1/samples/snippets/generated"
2831

2932
api-name: artifactregistry

0 commit comments

Comments
 (0)