Skip to content
Permalink
Browse files
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
  • Loading branch information
Neenu1995 committed Jun 14, 2021
1 parent 1da3a00 commit 24e1b7f408c0b752e0ad0fd0bad475e45ac9aa75
@@ -0,0 +1,3 @@
docker:
digest: sha256:689e998ca8b33117d8607b1c3df12b9cfebd68b621ba5ab6ce17be8715506203
image: gcr.io/repo-automation-bots/owlbot-java:latest
@@ -0,0 +1,29 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

docker:
image: "gcr.io/repo-automation-bots/owlbot-java:latest"

deep-remove-regex:
- "/grpc-google-.*/src"
- "/proto-google-.*/src"
- "/google-.*/src"

deep-copy-regex:
- source: "/google/cloud/channel/(v.*)/.*-java/proto-google-.*/src"
dest: "/owl-bot-staging/$1/proto-google-cloud-channel-$1/src"
- source: "/google/cloud/channel/(v.*)/.*-java/grpc-google-.*/src"
dest: "/owl-bot-staging/$1/grpc-google-cloud-channel-$1/src"
- source: "/google/cloud/channel/(v.*)/.*-java/gapic-google-.*/src"
dest: "/owl-bot-staging/$1/google-cloud-channel/src"
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version='1.0' encoding='UTF-8'?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
@@ -64,21 +64,20 @@

<dependencyManagement>
<dependencies>

<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-channel</artifactId>
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-channel:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-channel-v1</artifactId>
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-channel-v1:current} -->
<artifactId>grpc-google-cloud-channel-v1</artifactId>
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-channel-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-channel-v1</artifactId>
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-channel-v1:current} -->
<artifactId>proto-google-cloud-channel-v1</artifactId>
<version>2.2.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-channel-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
@@ -94,4 +93,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version='1.0' encoding='UTF-8'?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
@@ -108,4 +108,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
@@ -1215,6 +1215,11 @@ public static String getDefaultEndpoint() {
return "cloudchannel.googleapis.com:443";
}

/** Returns the default mTLS service endpoint. */
public static String getDefaultMtlsEndpoint() {
return "cloudchannel.mtls.googleapis.com:443";
}

/** Returns the default service scopes. */
public static List<String> getDefaultServiceScopes() {
return DEFAULT_SERVICE_SCOPES;
@@ -1679,6 +1684,8 @@ private static Builder createDefault() {
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setEndpoint(getDefaultEndpoint());
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
builder.setSwitchToMtlsEndpointAllowed(true);

return initDefaults(builder);
}
@@ -63,8 +63,8 @@
public class CloudChannelServiceClientTest {
private static MockCloudChannelService mockCloudChannelService;
private static MockServiceHelper mockServiceHelper;
private CloudChannelServiceClient client;
private LocalChannelProvider channelProvider;
private CloudChannelServiceClient client;

@BeforeClass
public static void startStaticServer() {
@@ -0,0 +1,24 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import synthtool as s
from synthtool.languages import java


for library in s.get_staging_dirs():
# put any special-case replacements here
s.move(library)

s.remove_staging_dirs()
java.common_templates()
@@ -112,8 +112,8 @@

<modules>
<module>google-cloud-channel</module>
<module>proto-google-cloud-channel-v1</module>
<module>grpc-google-cloud-channel-v1</module>
<module>proto-google-cloud-channel-v1</module>
<module>google-cloud-channel-bom</module>
</modules>

@@ -186,4 +186,4 @@
</plugin>
</plugins>
</reporting>
</project>
</project>
@@ -2,63 +2,18 @@
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
<differenceType>7002</differenceType>
<method>* get*(*)</method>
</difference>
<difference>
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
<differenceType>7002</differenceType>
<method>* set*(*)</method>
</difference>
<difference>
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
<differenceType>7002</differenceType>
<method>* clear*(*)</method>
</difference>
<difference>
<className>com/google/cloud/channel/v1/TransferableSku*</className>
<differenceType>7002</differenceType>
<differenceType>7012</differenceType>
<className>com/google/cloud/channel/v1/*OrBuilder</className>
<method>* get*(*)</method>
</difference>
<difference>
<className>com/google/cloud/channel/v1/TransferableSku*</className>
<differenceType>7002</differenceType>
<method>* has*(*)</method>
</difference>
<difference>
<className>com/google/cloud/channel/v1/TransferableSku*</className>
<differenceType>7002</differenceType>
<method>* clear*(*)</method>
</difference>
<difference>
<className>com/google/cloud/channel/v1/TransferableSku*</className>
<differenceType>7002</differenceType>
<method>* set*(*)</method>
</difference>
<difference>
<className>com/google/cloud/channel/v1/TransferableSku*</className>
<differenceType>7002</differenceType>
<method>* merge*(*)</method>
</difference>
<difference>
<className>com/google/cloud/channel/v1/CreateChannelPartnerLinkRequest*</className>
<differenceType>6011</differenceType>
<field>*_FIELD_NUMBER</field>
</difference>
<difference>
<className>com/google/cloud/channel/v1/TransferableSku*</className>
<differenceType>6011</differenceType>
<field>*_FIELD_NUMBER</field>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/channel/v1/*OrBuilder</className>
<method>* has*(*)</method>
<method>boolean contains*(*)</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/channel/v1/*OrBuilder</className>
<method>* get*(*)</method>
<method>boolean has*(*)</method>
</difference>
</differences>
</differences>

This file was deleted.

@@ -2,5 +2,5 @@
# module:released-version:current-version

google-cloud-channel:2.2.1:2.2.2-SNAPSHOT
grpc-google-cloud-channel-v1:2.2.1:2.2.2-SNAPSHOT
proto-google-cloud-channel-v1:2.2.1:2.2.2-SNAPSHOT
grpc-google-cloud-channel-v1:2.2.1:2.2.2-SNAPSHOT

0 comments on commit 24e1b7f

Please sign in to comment.