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

Commit 24e1b7f

Browse files
Neenu1995Neenu1995
authored
chore: migrate to owlbot (#116)
feat: Add/Update API definitions for Cloud Channel API, including feat: Update descriptions of APIs. feat: Add additional_bindings to HTTP annotations of Customer related APIs (list/create/get/update/delete). feat: Add a new LookupOffer RPC and LookupOfferRequest proto. feat: Add a new enum value LICENSE_CAP_CHANGED to enum EntitlementEvent.Type
1 parent 1da3a00 commit 24e1b7f

11 files changed

Lines changed: 80 additions & 95 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:689e998ca8b33117d8607b1c3df12b9cfebd68b621ba5ab6ce17be8715506203
3+
image: gcr.io/repo-automation-bots/owlbot-java:latest

‎.github/.OwlBot.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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-copy-regex:
24+
- source: "/google/cloud/channel/(v.*)/.*-java/proto-google-.*/src"
25+
dest: "/owl-bot-staging/$1/proto-google-cloud-channel-$1/src"
26+
- source: "/google/cloud/channel/(v.*)/.*-java/grpc-google-.*/src"
27+
dest: "/owl-bot-staging/$1/grpc-google-cloud-channel-$1/src"
28+
- source: "/google/cloud/channel/(v.*)/.*-java/gapic-google-.*/src"
29+
dest: "/owl-bot-staging/$1/google-cloud-channel/src"

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

Lines changed: 6 additions & 7 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>
@@ -64,21 +64,20 @@
6464

6565
<dependencyManagement>
6666
<dependencies>
67-
6867
<dependency>
6968
<groupId>com.google.cloud</groupId>
7069
<artifactId>google-cloud-channel</artifactId>
7170
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-channel:current} -->
7271
</dependency>
7372
<dependency>
7473
<groupId>com.google.api.grpc</groupId>
75-
<artifactId>proto-google-cloud-channel-v1</artifactId>
76-
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-channel-v1:current} -->
74+
<artifactId>grpc-google-cloud-channel-v1</artifactId>
75+
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-channel-v1:current} -->
7776
</dependency>
7877
<dependency>
7978
<groupId>com.google.api.grpc</groupId>
80-
<artifactId>grpc-google-cloud-channel-v1</artifactId>
81-
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-channel-v1:current} -->
79+
<artifactId>proto-google-cloud-channel-v1</artifactId>
80+
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-channel-v1:current} -->
8281
</dependency>
8382
</dependencies>
8483
</dependencyManagement>
@@ -94,4 +93,4 @@
9493
</plugin>
9594
</plugins>
9695
</build>
97-
</project>
96+
</project>

‎google-cloud-channel/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>
@@ -108,4 +108,4 @@
108108
</plugin>
109109
</plugins>
110110
</build>
111-
</project>
111+
</project>

‎google-cloud-channel/src/main/java/com/google/cloud/channel/v1/stub/CloudChannelServiceStubSettings.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,6 +1215,11 @@ public static String getDefaultEndpoint() {
12151215
return "cloudchannel.googleapis.com:443";
12161216
}
12171217

1218+
/** Returns the default mTLS service endpoint. */
1219+
public static String getDefaultMtlsEndpoint() {
1220+
return "cloudchannel.mtls.googleapis.com:443";
1221+
}
1222+
12181223
/** Returns the default service scopes. */
12191224
public static List<String> getDefaultServiceScopes() {
12201225
return DEFAULT_SERVICE_SCOPES;
@@ -1679,6 +1684,8 @@ private static Builder createDefault() {
16791684
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
16801685
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
16811686
builder.setEndpoint(getDefaultEndpoint());
1687+
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
1688+
builder.setSwitchToMtlsEndpointAllowed(true);
16821689

16831690
return initDefaults(builder);
16841691
}

‎google-cloud-channel/src/test/java/com/google/cloud/channel/v1/CloudChannelServiceClientTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
public class CloudChannelServiceClientTest {
6464
private static MockCloudChannelService mockCloudChannelService;
6565
private static MockServiceHelper mockServiceHelper;
66-
private CloudChannelServiceClient client;
6766
private LocalChannelProvider channelProvider;
67+
private CloudChannelServiceClient client;
6868

6969
@BeforeClass
7070
public static void startStaticServer() {

‎owlbot.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
s.move(library)
22+
23+
s.remove_staging_dirs()
24+
java.common_templates()

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112

113113
<modules>
114114
<module>google-cloud-channel</module>
115-
<module>proto-google-cloud-channel-v1</module>
116115
<module>grpc-google-cloud-channel-v1</module>
116+
<module>proto-google-cloud-channel-v1</module>
117117
<module>google-cloud-channel-bom</module>
118118
</modules>
119119

@@ -186,4 +186,4 @@
186186
</plugin>
187187
</plugins>
188188
</reporting>
189-
</project>
189+
</project>

‎proto-google-cloud-channel-v1/clirr-ignored-differences.xml‎

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,18 @@
22
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
33
<differences>
44
<difference>
5-
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
6-
<differenceType>7002</differenceType>
7-
<method>* get*(*)</method>
8-
</difference>
9-
<difference>
10-
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
11-
<differenceType>7002</differenceType>
12-
<method>* set*(*)</method>
13-
</difference>
14-
<difference>
15-
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
16-
<differenceType>7002</differenceType>
17-
<method>* clear*(*)</method>
18-
</difference>
19-
<difference>
20-
<className>com/google/cloud/channel/v1/TransferableSku*</className>
21-
<differenceType>7002</differenceType>
5+
<differenceType>7012</differenceType>
6+
<className>com/google/cloud/channel/v1/*OrBuilder</className>
227
<method>* get*(*)</method>
238
</difference>
24-
<difference>
25-
<className>com/google/cloud/channel/v1/TransferableSku*</className>
26-
<differenceType>7002</differenceType>
27-
<method>* has*(*)</method>
28-
</difference>
29-
<difference>
30-
<className>com/google/cloud/channel/v1/TransferableSku*</className>
31-
<differenceType>7002</differenceType>
32-
<method>* clear*(*)</method>
33-
</difference>
34-
<difference>
35-
<className>com/google/cloud/channel/v1/TransferableSku*</className>
36-
<differenceType>7002</differenceType>
37-
<method>* set*(*)</method>
38-
</difference>
39-
<difference>
40-
<className>com/google/cloud/channel/v1/TransferableSku*</className>
41-
<differenceType>7002</differenceType>
42-
<method>* merge*(*)</method>
43-
</difference>
44-
<difference>
45-
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
46-
<differenceType>6011</differenceType>
47-
<field>*_FIELD_NUMBER</field>
48-
</difference>
49-
<difference>
50-
<className>com/google/cloud/channel/v1/TransferableSku*</className>
51-
<differenceType>6011</differenceType>
52-
<field>*_FIELD_NUMBER</field>
53-
</difference>
549
<difference>
5510
<differenceType>7012</differenceType>
5611
<className>com/google/cloud/channel/v1/*OrBuilder</className>
57-
<method>* has*(*)</method>
12+
<method>boolean contains*(*)</method>
5813
</difference>
5914
<difference>
6015
<differenceType>7012</differenceType>
6116
<className>com/google/cloud/channel/v1/*OrBuilder</className>
62-
<method>* get*(*)</method>
17+
<method>boolean has*(*)</method>
6318
</difference>
64-
</differences>
19+
</differences>

‎synth.py‎

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

0 commit comments

Comments
 (0)