Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.

Commit e63967c

Browse files
Neenu1995Neenu1995
authored
chore: migrate to owlbot (#650)
1 parent a3122af commit e63967c

8 files changed

Lines changed: 121 additions & 80 deletions

File tree

‎.github/.OwlBot.lock.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
docker:
2+
digest: sha256:2595f321d9a9acf34c2d02e4dc5ec214ce07eecdb43978382d8a88476dec0c16
3+
image: gcr.io/repo-automation-bots/owlbot-java:latest

‎.github/.OwlBot.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
docker:
16+
image: "gcr.io/repo-automation-bots/owlbot-java:latest"
17+
18+
deep-remove-regex:
19+
- "/grpc-google-.*/src"
20+
- "/proto-google-.*/src"
21+
- "/google-.*/src"
22+
23+
deep-preserve-regex:
24+
- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
25+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplateNames.java"
26+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectFindingName.java"
27+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplateNames.java"
28+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationDeidentifyTemplateName.java"
29+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationInspectTemplateName.java"
30+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationStoredInfoTypeName.java"
31+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectDeidentifyTemplateName.java"
32+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectInspectTemplateName.java"
33+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectJobTriggerName.java"
34+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectStoredInfoTypeName.java"
35+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeNames.java"
36+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedDeidentifyTemplateName.java"
37+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedInspectTemplateName.java"
38+
- "/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedStoredInfoTypeName.java"
39+
40+
41+
deep-copy-regex:
42+
- source: "/google/privacy/dlp/(v.*)/.*-java/proto-google-.*/src"
43+
dest: "/owl-bot-staging/$1/proto-google-cloud-dlp-$1/src"
44+
- source: "/google/privacy/dlp/(v.*)/.*-java/grpc-google-.*/src"
45+
dest: "/owl-bot-staging/$1/grpc-google-cloud-dlp-$1/src"
46+
- source: "/google/privacy/dlp/(v.*)/.*-java/gapic-google-.*/src"
47+
dest: "/owl-bot-staging/$1/google-cloud-dlp/src"

‎google-cloud-dlp-bom/pom.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version='1.0' encoding='UTF-8'?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
@@ -49,17 +49,16 @@
4949

5050
<dependencyManagement>
5151
<dependencies>
52-
53-
<dependency>
54-
<groupId>com.google.api.grpc</groupId>
55-
<artifactId>grpc-google-cloud-dlp-v2</artifactId>
56-
<version>3.0.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dlp-v2:current} -->
57-
</dependency>
5852
<dependency>
5953
<groupId>com.google.cloud</groupId>
6054
<artifactId>google-cloud-dlp</artifactId>
6155
<version>3.0.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
6256
</dependency>
57+
<dependency>
58+
<groupId>com.google.api.grpc</groupId>
59+
<artifactId>grpc-google-cloud-dlp-v2</artifactId>
60+
<version>3.0.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dlp-v2:current} -->
61+
</dependency>
6362
<dependency>
6463
<groupId>com.google.api.grpc</groupId>
6564
<artifactId>proto-google-cloud-dlp-v2</artifactId>
@@ -79,4 +78,4 @@
7978
</plugin>
8079
</plugins>
8180
</build>
82-
</project>
81+
</project>

‎google-cloud-dlp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version='1.0' encoding='UTF-8'?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
@@ -107,4 +107,4 @@
107107
</plugin>
108108
</plugins>
109109
</build>
110-
</project>
110+
</project>

‎owlbot.py‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# https://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import synthtool as s
16+
from synthtool.languages import java
17+
18+
19+
for library in s.get_staging_dirs():
20+
# put any special-case replacements here
21+
22+
# TODO: remove this for the next semver major release
23+
# remove ResourceName base parseList and toStringList for backward-compatibility with legacy
24+
# resource name implementation
25+
java.remove_method(
26+
"owl-bot-staging/v2/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplateName.java",
27+
"public static List<InspectTemplateName> parseList(List<String> formattedStrings)"
28+
)
29+
java.remove_method(
30+
"owl-bot-staging/v2/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplateName.java",
31+
"public static List<String> toStringList(List<InspectTemplateName> values)"
32+
)
33+
java.remove_method(
34+
"owl-bot-staging/v2/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplateName.java",
35+
"public static List<DeidentifyTemplateName> parseList(List<String> formattedStrings)"
36+
)
37+
java.remove_method(
38+
"owl-bot-staging/v2/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplateName.java",
39+
"public static List<String> toStringList(List<DeidentifyTemplateName> values)"
40+
)
41+
java.remove_method(
42+
"owl-bot-staging/v2/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeName.java",
43+
"public static List<StoredInfoTypeName> parseList(List<String> formattedStrings)"
44+
)
45+
java.remove_method(
46+
"owl-bot-staging/v2/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeName.java",
47+
"public static List<String> toStringList(List<StoredInfoTypeName> values)"
48+
)
49+
s.move(library)
50+
51+
s.remove_staging_dirs()
52+
java.common_templates(
53+
excludes=[
54+
".kokoro/presubmit/samples.cfg",
55+
".kokoro/nightly/samples.cfg",
56+
".kokoro/build.sh",
57+
]
58+
)

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
</build>
110110

111111
<modules>
112-
<module>proto-google-cloud-dlp-v2</module>
113-
<module>grpc-google-cloud-dlp-v2</module>
114112
<module>google-cloud-dlp</module>
113+
<module>grpc-google-cloud-dlp-v2</module>
114+
<module>proto-google-cloud-dlp-v2</module>
115115
<module>google-cloud-dlp-bom</module>
116116
</modules>
117117

‎synth.py‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎versions.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Format:
22
# module:released-version:current-version
33

4-
proto-google-cloud-dlp-v2:3.0.3:3.0.4-SNAPSHOT
5-
grpc-google-cloud-dlp-v2:3.0.3:3.0.4-SNAPSHOT
64
google-cloud-dlp:3.0.3:3.0.4-SNAPSHOT
5+
grpc-google-cloud-dlp-v2:3.0.3:3.0.4-SNAPSHOT
6+
proto-google-cloud-dlp-v2:3.0.3:3.0.4-SNAPSHOT

0 commit comments

Comments
 (0)