diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/BackendService.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/BackendService.java index 5d31e0ecf7db..156cc2effa99 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/BackendService.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/BackendService.java @@ -35,6 +35,7 @@ public final class BackendService implements ApiMessage { private final BackendServiceCdnPolicy cdnPolicy; private final ConnectionDraining connectionDraining; private final String creationTimestamp; + private final List customRequestHeaders; private final String description; private final Boolean enableCDN; private final String fingerprint; @@ -59,6 +60,7 @@ private BackendService() { this.cdnPolicy = null; this.connectionDraining = null; this.creationTimestamp = null; + this.customRequestHeaders = null; this.description = null; this.enableCDN = null; this.fingerprint = null; @@ -84,6 +86,7 @@ private BackendService( BackendServiceCdnPolicy cdnPolicy, ConnectionDraining connectionDraining, String creationTimestamp, + List customRequestHeaders, String description, Boolean enableCDN, String fingerprint, @@ -106,6 +109,7 @@ private BackendService( this.cdnPolicy = cdnPolicy; this.connectionDraining = connectionDraining; this.creationTimestamp = creationTimestamp; + this.customRequestHeaders = customRequestHeaders; this.description = description; this.enableCDN = enableCDN; this.fingerprint = fingerprint; @@ -142,6 +146,9 @@ public Object getFieldValue(String fieldName) { if ("creationTimestamp".equals(fieldName)) { return creationTimestamp; } + if ("customRequestHeaders".equals(fieldName)) { + return customRequestHeaders; + } if ("description".equals(fieldName)) { return description; } @@ -244,6 +251,11 @@ public String getCreationTimestamp() { return creationTimestamp; } + /** Headers that the HTTP/S load balancer should add to proxied requests. */ + public List getCustomRequestHeadersList() { + return customRequestHeaders; + } + /** * An optional description of this resource. Provide this property when you create the resource. */ @@ -422,6 +434,7 @@ public static class Builder { private BackendServiceCdnPolicy cdnPolicy; private ConnectionDraining connectionDraining; private String creationTimestamp; + private List customRequestHeaders; private String description; private Boolean enableCDN; private String fingerprint; @@ -459,6 +472,9 @@ public Builder mergeFrom(BackendService other) { if (other.getCreationTimestamp() != null) { this.creationTimestamp = other.creationTimestamp; } + if (other.getCustomRequestHeadersList() != null) { + this.customRequestHeaders = other.customRequestHeaders; + } if (other.getDescription() != null) { this.description = other.description; } @@ -519,6 +535,7 @@ public Builder mergeFrom(BackendService other) { this.cdnPolicy = source.cdnPolicy; this.connectionDraining = source.connectionDraining; this.creationTimestamp = source.creationTimestamp; + this.customRequestHeaders = source.customRequestHeaders; this.description = source.description; this.enableCDN = source.enableCDN; this.fingerprint = source.fingerprint; @@ -615,6 +632,29 @@ public Builder setCreationTimestamp(String creationTimestamp) { return this; } + /** Headers that the HTTP/S load balancer should add to proxied requests. */ + public List getCustomRequestHeadersList() { + return customRequestHeaders; + } + + /** Headers that the HTTP/S load balancer should add to proxied requests. */ + public Builder addAllCustomRequestHeaders(List customRequestHeaders) { + if (this.customRequestHeaders == null) { + this.customRequestHeaders = new LinkedList<>(); + } + this.customRequestHeaders.addAll(customRequestHeaders); + return this; + } + + /** Headers that the HTTP/S load balancer should add to proxied requests. */ + public Builder addCustomRequestHeaders(String customRequestHeaders) { + if (this.customRequestHeaders == null) { + this.customRequestHeaders = new LinkedList<>(); + } + this.customRequestHeaders.add(customRequestHeaders); + return this; + } + /** * An optional description of this resource. Provide this property when you create the resource. */ @@ -961,6 +1001,7 @@ public BackendService build() { cdnPolicy, connectionDraining, creationTimestamp, + customRequestHeaders, description, enableCDN, fingerprint, @@ -987,6 +1028,7 @@ public Builder clone() { newBuilder.setCdnPolicy(this.cdnPolicy); newBuilder.setConnectionDraining(this.connectionDraining); newBuilder.setCreationTimestamp(this.creationTimestamp); + newBuilder.addAllCustomRequestHeaders(this.customRequestHeaders); newBuilder.setDescription(this.description); newBuilder.setEnableCDN(this.enableCDN); newBuilder.setFingerprint(this.fingerprint); @@ -1026,6 +1068,9 @@ public String toString() { + "creationTimestamp=" + creationTimestamp + ", " + + "customRequestHeaders=" + + customRequestHeaders + + ", " + "description=" + description + ", " @@ -1091,6 +1136,7 @@ public boolean equals(Object o) { && Objects.equals(this.cdnPolicy, that.getCdnPolicy()) && Objects.equals(this.connectionDraining, that.getConnectionDraining()) && Objects.equals(this.creationTimestamp, that.getCreationTimestamp()) + && Objects.equals(this.customRequestHeaders, that.getCustomRequestHeadersList()) && Objects.equals(this.description, that.getDescription()) && Objects.equals(this.enableCDN, that.getEnableCDN()) && Objects.equals(this.fingerprint, that.getFingerprint()) @@ -1120,6 +1166,7 @@ public int hashCode() { cdnPolicy, connectionDraining, creationTimestamp, + customRequestHeaders, description, enableCDN, fingerprint, diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/Binding.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/Binding.java index 1941db6fb404..312c0f43108d 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/Binding.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/Binding.java @@ -103,7 +103,7 @@ public Expr getCondition() { *

* `group:{emailid}`: An email address that represents a Google group. For example, * `admins{@literal @}example.com`. * - *

* `domain:{domain}`: A Google Apps domain name that represents all the users of that + *

* `domain:{domain}`: The G Suite domain (primary) that represents all the users of that * domain. For example, `google.com` or `example.com`. */ public List getMembersList() { @@ -205,8 +205,8 @@ public Builder setCondition(Expr condition) { *

* `group:{emailid}`: An email address that represents a Google group. For example, * `admins{@literal @}example.com`. * - *

* `domain:{domain}`: A Google Apps domain name that represents all the users of that - * domain. For example, `google.com` or `example.com`. + *

* `domain:{domain}`: The G Suite domain (primary) that represents all the users of + * that domain. For example, `google.com` or `example.com`. */ public List getMembersList() { return members; @@ -231,8 +231,8 @@ public List getMembersList() { *

* `group:{emailid}`: An email address that represents a Google group. For example, * `admins{@literal @}example.com`. * - *

* `domain:{domain}`: A Google Apps domain name that represents all the users of that - * domain. For example, `google.com` or `example.com`. + *

* `domain:{domain}`: The G Suite domain (primary) that represents all the users of + * that domain. For example, `google.com` or `example.com`. */ public Builder addAllMembers(List members) { if (this.members == null) { @@ -261,8 +261,8 @@ public Builder addAllMembers(List members) { *

* `group:{emailid}`: An email address that represents a Google group. For example, * `admins{@literal @}example.com`. * - *

* `domain:{domain}`: A Google Apps domain name that represents all the users of that - * domain. For example, `google.com` or `example.com`. + *

* `domain:{domain}`: The G Suite domain (primary) that represents all the users of + * that domain. For example, `google.com` or `example.com`. */ public Builder addMembers(String members) { if (this.members == null) { diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/DeprecationStatus.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/DeprecationStatus.java index 54d3d506a193..d9320e00d7c6 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/DeprecationStatus.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/DeprecationStatus.java @@ -123,10 +123,11 @@ public String getReplacement() { } /** - * The deprecation state of this resource. This can be DEPRECATED, OBSOLETE, or DELETED. - * Operations which create a new resource using a DEPRECATED resource will return successfully, - * but with a warning indicating the deprecated resource and recommending its replacement. - * Operations which use OBSOLETE or DELETED resources will be rejected and result in an error. + * The deprecation state of this resource. This can be ACTIVE DEPRECATED, OBSOLETE, or DELETED. + * Operations which communicate the end of life date for an image, can use ACTIVE. Operations + * which create a new resource using a DEPRECATED resource will return successfully, but with a + * warning indicating the deprecated resource and recommending its replacement. Operations which + * use OBSOLETE or DELETED resources will be rejected and result in an error. */ public String getState() { return state; @@ -266,20 +267,22 @@ public Builder setReplacement(String replacement) { } /** - * The deprecation state of this resource. This can be DEPRECATED, OBSOLETE, or DELETED. - * Operations which create a new resource using a DEPRECATED resource will return successfully, - * but with a warning indicating the deprecated resource and recommending its replacement. - * Operations which use OBSOLETE or DELETED resources will be rejected and result in an error. + * The deprecation state of this resource. This can be ACTIVE DEPRECATED, OBSOLETE, or DELETED. + * Operations which communicate the end of life date for an image, can use ACTIVE. Operations + * which create a new resource using a DEPRECATED resource will return successfully, but with a + * warning indicating the deprecated resource and recommending its replacement. Operations which + * use OBSOLETE or DELETED resources will be rejected and result in an error. */ public String getState() { return state; } /** - * The deprecation state of this resource. This can be DEPRECATED, OBSOLETE, or DELETED. - * Operations which create a new resource using a DEPRECATED resource will return successfully, - * but with a warning indicating the deprecated resource and recommending its replacement. - * Operations which use OBSOLETE or DELETED resources will be rejected and result in an error. + * The deprecation state of this resource. This can be ACTIVE DEPRECATED, OBSOLETE, or DELETED. + * Operations which communicate the end of life date for an image, can use ACTIVE. Operations + * which create a new resource using a DEPRECATED resource will return successfully, but with a + * warning indicating the deprecated resource and recommending its replacement. Operations which + * use OBSOLETE or DELETED resources will be rejected and result in an error. */ public Builder setState(String state) { this.state = state; diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/HealthCheck.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/HealthCheck.java index 94c651277baf..3ecb6cd9ddf8 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/HealthCheck.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/HealthCheck.java @@ -33,6 +33,7 @@ public final class HealthCheck implements ApiMessage { private final String creationTimestamp; private final String description; private final Integer healthyThreshold; + private final Http2HealthCheck http2HealthCheck; private final HttpHealthCheck httpHealthCheck; private final HttpSHealthCheck httpsHealthCheck; private final String id; @@ -50,6 +51,7 @@ private HealthCheck() { this.creationTimestamp = null; this.description = null; this.healthyThreshold = null; + this.http2HealthCheck = null; this.httpHealthCheck = null; this.httpsHealthCheck = null; this.id = null; @@ -68,6 +70,7 @@ private HealthCheck( String creationTimestamp, String description, Integer healthyThreshold, + Http2HealthCheck http2HealthCheck, HttpHealthCheck httpHealthCheck, HttpSHealthCheck httpsHealthCheck, String id, @@ -83,6 +86,7 @@ private HealthCheck( this.creationTimestamp = creationTimestamp; this.description = description; this.healthyThreshold = healthyThreshold; + this.http2HealthCheck = http2HealthCheck; this.httpHealthCheck = httpHealthCheck; this.httpsHealthCheck = httpsHealthCheck; this.id = id; @@ -110,6 +114,9 @@ public Object getFieldValue(String fieldName) { if ("healthyThreshold".equals(fieldName)) { return healthyThreshold; } + if ("http2HealthCheck".equals(fieldName)) { + return http2HealthCheck; + } if ("httpHealthCheck".equals(fieldName)) { return httpHealthCheck; } @@ -189,6 +196,10 @@ public Integer getHealthyThreshold() { return healthyThreshold; } + public Http2HealthCheck getHttp2HealthCheck() { + return http2HealthCheck; + } + public HttpHealthCheck getHttpHealthCheck() { return httpHealthCheck; } @@ -285,6 +296,7 @@ public static class Builder { private String creationTimestamp; private String description; private Integer healthyThreshold; + private Http2HealthCheck http2HealthCheck; private HttpHealthCheck httpHealthCheck; private HttpSHealthCheck httpsHealthCheck; private String id; @@ -313,6 +325,9 @@ public Builder mergeFrom(HealthCheck other) { if (other.getHealthyThreshold() != null) { this.healthyThreshold = other.healthyThreshold; } + if (other.getHttp2HealthCheck() != null) { + this.http2HealthCheck = other.http2HealthCheck; + } if (other.getHttpHealthCheck() != null) { this.httpHealthCheck = other.httpHealthCheck; } @@ -354,6 +369,7 @@ public Builder mergeFrom(HealthCheck other) { this.creationTimestamp = source.creationTimestamp; this.description = source.description; this.healthyThreshold = source.healthyThreshold; + this.http2HealthCheck = source.http2HealthCheck; this.httpHealthCheck = source.httpHealthCheck; this.httpsHealthCheck = source.httpsHealthCheck; this.id = source.id; @@ -421,6 +437,15 @@ public Builder setHealthyThreshold(Integer healthyThreshold) { return this; } + public Http2HealthCheck getHttp2HealthCheck() { + return http2HealthCheck; + } + + public Builder setHttp2HealthCheck(Http2HealthCheck http2HealthCheck) { + this.http2HealthCheck = http2HealthCheck; + return this; + } + public HttpHealthCheck getHttpHealthCheck() { return httpHealthCheck; } @@ -579,6 +604,7 @@ public HealthCheck build() { creationTimestamp, description, healthyThreshold, + http2HealthCheck, httpHealthCheck, httpsHealthCheck, id, @@ -598,6 +624,7 @@ public Builder clone() { newBuilder.setCreationTimestamp(this.creationTimestamp); newBuilder.setDescription(this.description); newBuilder.setHealthyThreshold(this.healthyThreshold); + newBuilder.setHttp2HealthCheck(this.http2HealthCheck); newBuilder.setHttpHealthCheck(this.httpHealthCheck); newBuilder.setHttpsHealthCheck(this.httpsHealthCheck); newBuilder.setId(this.id); @@ -628,6 +655,9 @@ public String toString() { + "healthyThreshold=" + healthyThreshold + ", " + + "http2HealthCheck=" + + http2HealthCheck + + ", " + "httpHealthCheck=" + httpHealthCheck + ", " @@ -674,6 +704,7 @@ public boolean equals(Object o) { && Objects.equals(this.creationTimestamp, that.getCreationTimestamp()) && Objects.equals(this.description, that.getDescription()) && Objects.equals(this.healthyThreshold, that.getHealthyThreshold()) + && Objects.equals(this.http2HealthCheck, that.getHttp2HealthCheck()) && Objects.equals(this.httpHealthCheck, that.getHttpHealthCheck()) && Objects.equals(this.httpsHealthCheck, that.getHttpsHealthCheck()) && Objects.equals(this.id, that.getId()) @@ -696,6 +727,7 @@ public int hashCode() { creationTimestamp, description, healthyThreshold, + http2HealthCheck, httpHealthCheck, httpsHealthCheck, id, diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/Http2HealthCheck.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/Http2HealthCheck.java new file mode 100644 index 000000000000..6453d5d70ae7 --- /dev/null +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/Http2HealthCheck.java @@ -0,0 +1,366 @@ +/* + * Copyright 2019 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. + */ +package com.google.cloud.compute.v1; + +import com.google.api.core.BetaApi; +import com.google.api.gax.httpjson.ApiMessage; +import java.util.List; +import java.util.Objects; +import javax.annotation.Generated; +import javax.annotation.Nullable; + +@Generated("by GAPIC") +@BetaApi +public final class Http2HealthCheck implements ApiMessage { + private final String host; + private final Integer port; + private final String portName; + private final String proxyHeader; + private final String requestPath; + private final String response; + + private Http2HealthCheck() { + this.host = null; + this.port = null; + this.portName = null; + this.proxyHeader = null; + this.requestPath = null; + this.response = null; + } + + private Http2HealthCheck( + String host, + Integer port, + String portName, + String proxyHeader, + String requestPath, + String response) { + this.host = host; + this.port = port; + this.portName = portName; + this.proxyHeader = proxyHeader; + this.requestPath = requestPath; + this.response = response; + } + + @Override + public Object getFieldValue(String fieldName) { + if ("host".equals(fieldName)) { + return host; + } + if ("port".equals(fieldName)) { + return port; + } + if ("portName".equals(fieldName)) { + return portName; + } + if ("proxyHeader".equals(fieldName)) { + return proxyHeader; + } + if ("requestPath".equals(fieldName)) { + return requestPath; + } + if ("response".equals(fieldName)) { + return response; + } + return null; + } + + @Nullable + @Override + public ApiMessage getApiMessageRequestBody() { + return null; + } + + @Nullable + @Override + /** + * The fields that should be serialized (even if they have empty values). If the containing + * message object has a non-null fieldmask, then all the fields in the field mask (and only those + * fields in the field mask) will be serialized. If the containing object does not have a + * fieldmask, then only non-empty fields will be serialized. + */ + public List getFieldMask() { + return null; + } + + /** + * The value of the host header in the HTTP/2 health check request. If left empty (default value), + * the IP on behalf of which this health check is performed will be used. + */ + public String getHost() { + return host; + } + + /** + * The TCP port number for the health check request. The default value is 443. Valid values are 1 + * through 65535. + */ + public Integer getPort() { + return port; + } + + /** + * Port name as defined in InstanceGroup#NamedPort#name. If both port and port_name are defined, + * port takes precedence. + */ + public String getPortName() { + return portName; + } + + /** + * Specifies the type of proxy header to append before sending data to the backend, either NONE or + * PROXY_V1. The default is NONE. + */ + public String getProxyHeader() { + return proxyHeader; + } + + /** The request path of the HTTP/2 health check request. The default value is /. */ + public String getRequestPath() { + return requestPath; + } + + /** + * The string to match anywhere in the first 1024 bytes of the response body. If left empty (the + * default value), the status code determines health. The response data can only be ASCII. + */ + public String getResponse() { + return response; + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(Http2HealthCheck prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + public static Http2HealthCheck getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final Http2HealthCheck DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new Http2HealthCheck(); + } + + public static class Builder { + private String host; + private Integer port; + private String portName; + private String proxyHeader; + private String requestPath; + private String response; + + Builder() {} + + public Builder mergeFrom(Http2HealthCheck other) { + if (other == Http2HealthCheck.getDefaultInstance()) return this; + if (other.getHost() != null) { + this.host = other.host; + } + if (other.getPort() != null) { + this.port = other.port; + } + if (other.getPortName() != null) { + this.portName = other.portName; + } + if (other.getProxyHeader() != null) { + this.proxyHeader = other.proxyHeader; + } + if (other.getRequestPath() != null) { + this.requestPath = other.requestPath; + } + if (other.getResponse() != null) { + this.response = other.response; + } + return this; + } + + Builder(Http2HealthCheck source) { + this.host = source.host; + this.port = source.port; + this.portName = source.portName; + this.proxyHeader = source.proxyHeader; + this.requestPath = source.requestPath; + this.response = source.response; + } + + /** + * The value of the host header in the HTTP/2 health check request. If left empty (default + * value), the IP on behalf of which this health check is performed will be used. + */ + public String getHost() { + return host; + } + + /** + * The value of the host header in the HTTP/2 health check request. If left empty (default + * value), the IP on behalf of which this health check is performed will be used. + */ + public Builder setHost(String host) { + this.host = host; + return this; + } + + /** + * The TCP port number for the health check request. The default value is 443. Valid values are + * 1 through 65535. + */ + public Integer getPort() { + return port; + } + + /** + * The TCP port number for the health check request. The default value is 443. Valid values are + * 1 through 65535. + */ + public Builder setPort(Integer port) { + this.port = port; + return this; + } + + /** + * Port name as defined in InstanceGroup#NamedPort#name. If both port and port_name are defined, + * port takes precedence. + */ + public String getPortName() { + return portName; + } + + /** + * Port name as defined in InstanceGroup#NamedPort#name. If both port and port_name are defined, + * port takes precedence. + */ + public Builder setPortName(String portName) { + this.portName = portName; + return this; + } + + /** + * Specifies the type of proxy header to append before sending data to the backend, either NONE + * or PROXY_V1. The default is NONE. + */ + public String getProxyHeader() { + return proxyHeader; + } + + /** + * Specifies the type of proxy header to append before sending data to the backend, either NONE + * or PROXY_V1. The default is NONE. + */ + public Builder setProxyHeader(String proxyHeader) { + this.proxyHeader = proxyHeader; + return this; + } + + /** The request path of the HTTP/2 health check request. The default value is /. */ + public String getRequestPath() { + return requestPath; + } + + /** The request path of the HTTP/2 health check request. The default value is /. */ + public Builder setRequestPath(String requestPath) { + this.requestPath = requestPath; + return this; + } + + /** + * The string to match anywhere in the first 1024 bytes of the response body. If left empty (the + * default value), the status code determines health. The response data can only be ASCII. + */ + public String getResponse() { + return response; + } + + /** + * The string to match anywhere in the first 1024 bytes of the response body. If left empty (the + * default value), the status code determines health. The response data can only be ASCII. + */ + public Builder setResponse(String response) { + this.response = response; + return this; + } + + public Http2HealthCheck build() { + + return new Http2HealthCheck(host, port, portName, proxyHeader, requestPath, response); + } + + public Builder clone() { + Builder newBuilder = new Builder(); + newBuilder.setHost(this.host); + newBuilder.setPort(this.port); + newBuilder.setPortName(this.portName); + newBuilder.setProxyHeader(this.proxyHeader); + newBuilder.setRequestPath(this.requestPath); + newBuilder.setResponse(this.response); + return newBuilder; + } + } + + @Override + public String toString() { + return "Http2HealthCheck{" + + "host=" + + host + + ", " + + "port=" + + port + + ", " + + "portName=" + + portName + + ", " + + "proxyHeader=" + + proxyHeader + + ", " + + "requestPath=" + + requestPath + + ", " + + "response=" + + response + + "}"; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (o instanceof Http2HealthCheck) { + Http2HealthCheck that = (Http2HealthCheck) o; + return Objects.equals(this.host, that.getHost()) + && Objects.equals(this.port, that.getPort()) + && Objects.equals(this.portName, that.getPortName()) + && Objects.equals(this.proxyHeader, that.getProxyHeader()) + && Objects.equals(this.requestPath, that.getRequestPath()) + && Objects.equals(this.response, that.getResponse()); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(host, port, portName, proxyHeader, requestPath, response); + } +} diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/RouterStatusNatStatus.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/RouterStatusNatStatus.java index 566a76125fe0..29d0fe85cdb4 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/RouterStatusNatStatus.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/RouterStatusNatStatus.java @@ -25,7 +25,7 @@ @Generated("by GAPIC") @BetaApi -/** Status of a NAT contained in this router. */ +/** Status of a NAT contained in this router. Next tag: 9 */ public final class RouterStatusNatStatus implements ApiMessage { private final List autoAllocatedNatIps; private final Integer minExtraNatIpsNeeded; diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/TargetVpnGateway.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/TargetVpnGateway.java index e0ce790f65de..5d3e643b667e 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/TargetVpnGateway.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/TargetVpnGateway.java @@ -151,7 +151,7 @@ public String getDescription() { /** * [Output Only] A list of URLs to the ForwardingRule resources. ForwardingRules are created using - * compute.forwardingRules.insert and associated to a VPN gateway. + * compute.forwardingRules.insert and associated with a VPN gateway. */ public List getForwardingRulesList() { return forwardingRules; @@ -201,14 +201,17 @@ public String getSelfLink() { return selfLink; } - /** [Output Only] The status of the VPN gateway. */ + /** + * [Output Only] The status of the VPN gateway, which can be one of the following: CREATING, + * READY, FAILED, or DELETING. + */ public String getStatus() { return status; } /** - * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created using - * compute.vpntunnels.insert method and associated to a VPN gateway. + * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created using the + * compute.vpntunnels.insert method and associated with a VPN gateway. */ public List getTunnelsList() { return tunnels; @@ -331,7 +334,7 @@ public Builder setDescription(String description) { /** * [Output Only] A list of URLs to the ForwardingRule resources. ForwardingRules are created - * using compute.forwardingRules.insert and associated to a VPN gateway. + * using compute.forwardingRules.insert and associated with a VPN gateway. */ public List getForwardingRulesList() { return forwardingRules; @@ -339,7 +342,7 @@ public List getForwardingRulesList() { /** * [Output Only] A list of URLs to the ForwardingRule resources. ForwardingRules are created - * using compute.forwardingRules.insert and associated to a VPN gateway. + * using compute.forwardingRules.insert and associated with a VPN gateway. */ public Builder addAllForwardingRules(List forwardingRules) { if (this.forwardingRules == null) { @@ -351,7 +354,7 @@ public Builder addAllForwardingRules(List forwardingRules) { /** * [Output Only] A list of URLs to the ForwardingRule resources. ForwardingRules are created - * using compute.forwardingRules.insert and associated to a VPN gateway. + * using compute.forwardingRules.insert and associated with a VPN gateway. */ public Builder addForwardingRules(String forwardingRules) { if (this.forwardingRules == null) { @@ -457,28 +460,34 @@ public Builder setSelfLink(String selfLink) { return this; } - /** [Output Only] The status of the VPN gateway. */ + /** + * [Output Only] The status of the VPN gateway, which can be one of the following: CREATING, + * READY, FAILED, or DELETING. + */ public String getStatus() { return status; } - /** [Output Only] The status of the VPN gateway. */ + /** + * [Output Only] The status of the VPN gateway, which can be one of the following: CREATING, + * READY, FAILED, or DELETING. + */ public Builder setStatus(String status) { this.status = status; return this; } /** - * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created using - * compute.vpntunnels.insert method and associated to a VPN gateway. + * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created using the + * compute.vpntunnels.insert method and associated with a VPN gateway. */ public List getTunnelsList() { return tunnels; } /** - * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created using - * compute.vpntunnels.insert method and associated to a VPN gateway. + * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created using the + * compute.vpntunnels.insert method and associated with a VPN gateway. */ public Builder addAllTunnels(List tunnels) { if (this.tunnels == null) { @@ -489,8 +498,8 @@ public Builder addAllTunnels(List tunnels) { } /** - * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created using - * compute.vpntunnels.insert method and associated to a VPN gateway. + * [Output Only] A list of URLs to VpnTunnel resources. VpnTunnels are created using the + * compute.vpntunnels.insert method and associated with a VPN gateway. */ public Builder addTunnels(String tunnels) { if (this.tunnels == null) { diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/TargetVpnGatewaysScopedList.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/TargetVpnGatewaysScopedList.java index 0002eb4045ca..c180bd3d30f4 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/TargetVpnGatewaysScopedList.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/TargetVpnGatewaysScopedList.java @@ -68,7 +68,7 @@ public List getFieldMask() { return null; } - /** [Output Only] A list of target vpn gateways contained in this scope. */ + /** [Output Only] A list of target VPN gateways contained in this scope. */ public List getTargetVpnGatewaysList() { return targetVpnGateways; } @@ -125,12 +125,12 @@ public Builder mergeFrom(TargetVpnGatewaysScopedList other) { this.warning = source.warning; } - /** [Output Only] A list of target vpn gateways contained in this scope. */ + /** [Output Only] A list of target VPN gateways contained in this scope. */ public List getTargetVpnGatewaysList() { return targetVpnGateways; } - /** [Output Only] A list of target vpn gateways contained in this scope. */ + /** [Output Only] A list of target VPN gateways contained in this scope. */ public Builder addAllTargetVpnGateways(List targetVpnGateways) { if (this.targetVpnGateways == null) { this.targetVpnGateways = new LinkedList<>(); @@ -139,7 +139,7 @@ public Builder addAllTargetVpnGateways(List targetVpnGateways) return this; } - /** [Output Only] A list of target vpn gateways contained in this scope. */ + /** [Output Only] A list of target VPN gateways contained in this scope. */ public Builder addTargetVpnGateways(TargetVpnGateway targetVpnGateways) { if (this.targetVpnGateways == null) { this.targetVpnGateways = new LinkedList<>(); diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnel.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnel.java index 88f5508bc741..79e68732be70 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnel.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnel.java @@ -201,8 +201,8 @@ public String getId() { } /** - * IKE protocol version to use when establishing the VPN tunnel with peer VPN gateway. Acceptable - * IKE versions are 1 or 2. Default version is 2. + * IKE protocol version to use when establishing the VPN tunnel with the peer VPN gateway. + * Acceptable IKE versions are 1 or 2. The default version is 2. */ public Integer getIkeVersion() { return ikeVersion; @@ -214,9 +214,9 @@ public String getKind() { } /** - * Local traffic selector to use when establishing the VPN tunnel with peer VPN gateway. The value - * should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should be disjoint. - * Only IPv4 is supported. + * Local traffic selector to use when establishing the VPN tunnel with the peer VPN gateway. The + * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges must be + * disjoint. Only IPv4 is supported. */ public List getLocalTrafficSelectorList() { return localTrafficSelector; @@ -247,7 +247,7 @@ public String getRegion() { } /** - * Remote traffic selectors to use when establishing the VPN tunnel with peer VPN gateway. The + * Remote traffic selectors to use when establishing the VPN tunnel with the peer VPN gateway. The * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should be * disjoint. Only IPv4 is supported. */ @@ -255,7 +255,7 @@ public List getRemoteTrafficSelectorList() { return remoteTrafficSelector; } - /** URL of router resource to be used for dynamic routing. */ + /** URL of the router resource to be used for dynamic routing. */ public String getRouter() { return router; } @@ -278,7 +278,17 @@ public String getSharedSecretHash() { return sharedSecretHash; } - /** [Output Only] The status of the VPN tunnel. */ + /** + * [Output Only] The status of the VPN tunnel, which can be one of the following: - PROVISIONING: + * Resource is being allocated for the VPN tunnel. - WAITING_FOR_FULL_CONFIG: Waiting to receive + * all VPN-related configs from the user. Network, TargetVpnGateway, VpnTunnel, ForwardingRule, + * and Route resources are needed to setup the VPN tunnel. - FIRST_HANDSHAKE: Successful first + * handshake with the peer VPN. - ESTABLISHED: Secure session is successfully established with the + * peer VPN. - NETWORK_ERROR: Deprecated, replaced by NO_INCOMING_PACKETS - AUTHORIZATION_ERROR: + * Auth error (for example, bad shared secret). - NEGOTIATION_FAILURE: Handshake failed. - + * DEPROVISIONING: Resources are being deallocated for the VPN tunnel. - FAILED: Tunnel creation + * has failed and the tunnel is not ready to be used. + */ public String getStatus() { return status; } @@ -465,16 +475,16 @@ public Builder setId(String id) { } /** - * IKE protocol version to use when establishing the VPN tunnel with peer VPN gateway. - * Acceptable IKE versions are 1 or 2. Default version is 2. + * IKE protocol version to use when establishing the VPN tunnel with the peer VPN gateway. + * Acceptable IKE versions are 1 or 2. The default version is 2. */ public Integer getIkeVersion() { return ikeVersion; } /** - * IKE protocol version to use when establishing the VPN tunnel with peer VPN gateway. - * Acceptable IKE versions are 1 or 2. Default version is 2. + * IKE protocol version to use when establishing the VPN tunnel with the peer VPN gateway. + * Acceptable IKE versions are 1 or 2. The default version is 2. */ public Builder setIkeVersion(Integer ikeVersion) { this.ikeVersion = ikeVersion; @@ -493,8 +503,8 @@ public Builder setKind(String kind) { } /** - * Local traffic selector to use when establishing the VPN tunnel with peer VPN gateway. The - * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should be + * Local traffic selector to use when establishing the VPN tunnel with the peer VPN gateway. The + * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges must be * disjoint. Only IPv4 is supported. */ public List getLocalTrafficSelectorList() { @@ -502,8 +512,8 @@ public List getLocalTrafficSelectorList() { } /** - * Local traffic selector to use when establishing the VPN tunnel with peer VPN gateway. The - * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should be + * Local traffic selector to use when establishing the VPN tunnel with the peer VPN gateway. The + * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges must be * disjoint. Only IPv4 is supported. */ public Builder addAllLocalTrafficSelector(List localTrafficSelector) { @@ -515,8 +525,8 @@ public Builder addAllLocalTrafficSelector(List localTrafficSelector) { } /** - * Local traffic selector to use when establishing the VPN tunnel with peer VPN gateway. The - * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should be + * Local traffic selector to use when establishing the VPN tunnel with the peer VPN gateway. The + * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges must be * disjoint. Only IPv4 is supported. */ public Builder addLocalTrafficSelector(String localTrafficSelector) { @@ -579,18 +589,18 @@ public Builder setRegion(String region) { } /** - * Remote traffic selectors to use when establishing the VPN tunnel with peer VPN gateway. The - * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should be - * disjoint. Only IPv4 is supported. + * Remote traffic selectors to use when establishing the VPN tunnel with the peer VPN gateway. + * The value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should + * be disjoint. Only IPv4 is supported. */ public List getRemoteTrafficSelectorList() { return remoteTrafficSelector; } /** - * Remote traffic selectors to use when establishing the VPN tunnel with peer VPN gateway. The - * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should be - * disjoint. Only IPv4 is supported. + * Remote traffic selectors to use when establishing the VPN tunnel with the peer VPN gateway. + * The value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should + * be disjoint. Only IPv4 is supported. */ public Builder addAllRemoteTrafficSelector(List remoteTrafficSelector) { if (this.remoteTrafficSelector == null) { @@ -601,9 +611,9 @@ public Builder addAllRemoteTrafficSelector(List remoteTrafficSelector) { } /** - * Remote traffic selectors to use when establishing the VPN tunnel with peer VPN gateway. The - * value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should be - * disjoint. Only IPv4 is supported. + * Remote traffic selectors to use when establishing the VPN tunnel with the peer VPN gateway. + * The value should be a CIDR formatted string, for example: 192.168.0.0/16. The ranges should + * be disjoint. Only IPv4 is supported. */ public Builder addRemoteTrafficSelector(String remoteTrafficSelector) { if (this.remoteTrafficSelector == null) { @@ -613,12 +623,12 @@ public Builder addRemoteTrafficSelector(String remoteTrafficSelector) { return this; } - /** URL of router resource to be used for dynamic routing. */ + /** URL of the router resource to be used for dynamic routing. */ public String getRouter() { return router; } - /** URL of router resource to be used for dynamic routing. */ + /** URL of the router resource to be used for dynamic routing. */ public Builder setRouter(String router) { this.router = router; return this; @@ -663,12 +673,32 @@ public Builder setSharedSecretHash(String sharedSecretHash) { return this; } - /** [Output Only] The status of the VPN tunnel. */ + /** + * [Output Only] The status of the VPN tunnel, which can be one of the following: - + * PROVISIONING: Resource is being allocated for the VPN tunnel. - WAITING_FOR_FULL_CONFIG: + * Waiting to receive all VPN-related configs from the user. Network, TargetVpnGateway, + * VpnTunnel, ForwardingRule, and Route resources are needed to setup the VPN tunnel. - + * FIRST_HANDSHAKE: Successful first handshake with the peer VPN. - ESTABLISHED: Secure session + * is successfully established with the peer VPN. - NETWORK_ERROR: Deprecated, replaced by + * NO_INCOMING_PACKETS - AUTHORIZATION_ERROR: Auth error (for example, bad shared secret). - + * NEGOTIATION_FAILURE: Handshake failed. - DEPROVISIONING: Resources are being deallocated for + * the VPN tunnel. - FAILED: Tunnel creation has failed and the tunnel is not ready to be used. + */ public String getStatus() { return status; } - /** [Output Only] The status of the VPN tunnel. */ + /** + * [Output Only] The status of the VPN tunnel, which can be one of the following: - + * PROVISIONING: Resource is being allocated for the VPN tunnel. - WAITING_FOR_FULL_CONFIG: + * Waiting to receive all VPN-related configs from the user. Network, TargetVpnGateway, + * VpnTunnel, ForwardingRule, and Route resources are needed to setup the VPN tunnel. - + * FIRST_HANDSHAKE: Successful first handshake with the peer VPN. - ESTABLISHED: Secure session + * is successfully established with the peer VPN. - NETWORK_ERROR: Deprecated, replaced by + * NO_INCOMING_PACKETS - AUTHORIZATION_ERROR: Auth error (for example, bad shared secret). - + * NEGOTIATION_FAILURE: Handshake failed. - DEPROVISIONING: Resources are being deallocated for + * the VPN tunnel. - FAILED: Tunnel creation has failed and the tunnel is not ready to be used. + */ public Builder setStatus(String status) { this.status = status; return this; diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnelAggregatedList.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnelAggregatedList.java index 0fac4336cba3..3722604d215a 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnelAggregatedList.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnelAggregatedList.java @@ -105,7 +105,7 @@ public String getId() { /** * A list of VpnTunnelsScopedList resources. The key for the map is: Name of the scope containing - * this set of vpn tunnels. + * this set of VPN tunnels. */ public Map getItemsMap() { return items; @@ -213,7 +213,7 @@ public Builder setId(String id) { /** * A list of VpnTunnelsScopedList resources. The key for the map is: Name of the scope - * containing this set of vpn tunnels. + * containing this set of VPN tunnels. */ public Map getItemsMap() { return items; @@ -221,7 +221,7 @@ public Map getItemsMap() { /** * A list of VpnTunnelsScopedList resources. The key for the map is: Name of the scope - * containing this set of vpn tunnels. + * containing this set of VPN tunnels. */ public Builder putAllItems(Map items) { this.items = items; diff --git a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnelsScopedList.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnelsScopedList.java index ac11c8ed1f29..5d057bad9af9 100644 --- a/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnelsScopedList.java +++ b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/v1/VpnTunnelsScopedList.java @@ -68,7 +68,7 @@ public List getFieldMask() { return null; } - /** A list of vpn tunnels contained in this scope. */ + /** A list of VPN tunnels contained in this scope. */ public List getVpnTunnelsList() { return vpnTunnels; } @@ -122,12 +122,12 @@ public Builder mergeFrom(VpnTunnelsScopedList other) { this.warning = source.warning; } - /** A list of vpn tunnels contained in this scope. */ + /** A list of VPN tunnels contained in this scope. */ public List getVpnTunnelsList() { return vpnTunnels; } - /** A list of vpn tunnels contained in this scope. */ + /** A list of VPN tunnels contained in this scope. */ public Builder addAllVpnTunnels(List vpnTunnels) { if (this.vpnTunnels == null) { this.vpnTunnels = new LinkedList<>(); @@ -136,7 +136,7 @@ public Builder addAllVpnTunnels(List vpnTunnels) { return this; } - /** A list of vpn tunnels contained in this scope. */ + /** A list of VPN tunnels contained in this scope. */ public Builder addVpnTunnels(VpnTunnel vpnTunnels) { if (this.vpnTunnels == null) { this.vpnTunnels = new LinkedList<>(); diff --git a/google-cloud-clients/google-cloud-compute/synth.metadata b/google-cloud-clients/google-cloud-compute/synth.metadata index a0c420a5ba4d..1fbd06626d19 100644 --- a/google-cloud-clients/google-cloud-compute/synth.metadata +++ b/google-cloud-clients/google-cloud-compute/synth.metadata @@ -1,18 +1,18 @@ { - "updateTime": "2019-02-28T08:37:09.528246Z", + "updateTime": "2019-03-08T08:37:03.640656Z", "sources": [ { "git": { "name": "discovery-artifact-manager", "remote": "https://github.com/googleapis/discovery-artifact-manager.git", - "sha": "ab3567b03ec53c3affe70518e59df16ca9cc7bac" + "sha": "d6f22d5a41026993e91d51e896987968a392787d" } }, { "generator": { "name": "artman", - "version": "0.16.14", - "dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7" + "version": "0.16.15", + "dockerImage": "googleapis/artman@sha256:9caadfa59d48224cba5f3217eb9d61a155b78ccf31e628abef385bc5b7ed3bd2" } } ]