Automated DCL import.

- 66f7afd2dbf9bf26c4e21685ee5fef56012df7b5 Automatic import from cloud_mmv2_dcl_20240624_1231_RC00 by DCL Team <[email protected]> GitOrigin-RevId: 66f7afd2dbf9bf26c4e21685ee5fef56012df7b5
GoogleCloudPlatform · Jun 24, 2024 · f567e1e · f567e1e
1 parent c3703a0
commit f567e1e
Show file tree

Hide file tree

Showing 27 changed files with 165 additions and 12 deletions.
diff --git a/python/proto/clouddeploy/alpha/target.proto b/python/proto/clouddeploy/alpha/target.proto
@@ -53,6 +53,7 @@ message ClouddeployAlphaTarget {
 message ClouddeployAlphaTargetGke {
   string cluster = 1;
   bool internal_ip = 2;
+  string proxy_url = 3;
 }
 
 message ClouddeployAlphaTargetAnthosCluster {

diff --git a/python/proto/clouddeploy/beta/target.proto b/python/proto/clouddeploy/beta/target.proto
@@ -53,6 +53,7 @@ message ClouddeployBetaTarget {
 message ClouddeployBetaTargetGke {
   string cluster = 1;
   bool internal_ip = 2;
+  string proxy_url = 3;
 }
 
 message ClouddeployBetaTargetAnthosCluster {

diff --git a/python/proto/clouddeploy/target.proto b/python/proto/clouddeploy/target.proto
@@ -53,6 +53,7 @@ message ClouddeployTarget {
 message ClouddeployTargetGke {
   string cluster = 1;
   bool internal_ip = 2;
+  string proxy_url = 3;
 }
 
 message ClouddeployTargetAnthosCluster {

diff --git a/python/services/clouddeploy/alpha/target.py b/python/services/clouddeploy/alpha/target.py
@@ -274,9 +274,12 @@ def to_proto(self):
 
 class TargetGke(object):
 
-    def __init__(self, cluster: str = None, internal_ip: bool = None):
+    def __init__(
+        self, cluster: str = None, internal_ip: bool = None, proxy_url: str = None
+    ):
         self.cluster = cluster
         self.internal_ip = internal_ip
+        self.proxy_url = proxy_url
 
     @classmethod
     def to_proto(self, resource):
@@ -288,6 +291,8 @@ def to_proto(self, resource):
             res.cluster = Primitive.to_proto(resource.cluster)
         if Primitive.to_proto(resource.internal_ip):
             res.internal_ip = Primitive.to_proto(resource.internal_ip)
+        if Primitive.to_proto(resource.proxy_url):
+            res.proxy_url = Primitive.to_proto(resource.proxy_url)
         return res
 
     @classmethod
@@ -298,6 +303,7 @@ def from_proto(self, resource):
         return TargetGke(
             cluster=Primitive.from_proto(resource.cluster),
             internal_ip=Primitive.from_proto(resource.internal_ip),
+            proxy_url=Primitive.from_proto(resource.proxy_url),
         )
 
 

diff --git a/python/services/clouddeploy/alpha/target_server.go b/python/services/clouddeploy/alpha/target_server.go
@@ -44,6 +44,7 @@ func ProtoToClouddeployAlphaTargetGke(p *alphapb.ClouddeployAlphaTargetGke) *alp
 	obj := &alpha.TargetGke{
 		Cluster:    dcl.StringOrNil(p.GetCluster()),
 		InternalIP: dcl.Bool(p.GetInternalIp()),
+		ProxyUrl:   dcl.StringOrNil(p.GetProxyUrl()),
 	}
 	return obj
 }
@@ -155,6 +156,7 @@ func ClouddeployAlphaTargetGkeToProto(o *alpha.TargetGke) *alphapb.ClouddeployAl
 	p := &alphapb.ClouddeployAlphaTargetGke{}
 	p.SetCluster(dcl.ValueOrEmptyString(o.Cluster))
 	p.SetInternalIp(dcl.ValueOrEmptyBool(o.InternalIP))
+	p.SetProxyUrl(dcl.ValueOrEmptyString(o.ProxyUrl))
 	return p
 }
 

diff --git a/python/services/clouddeploy/beta/target.py b/python/services/clouddeploy/beta/target.py
@@ -274,9 +274,12 @@ def to_proto(self):
 
 class TargetGke(object):
 
-    def __init__(self, cluster: str = None, internal_ip: bool = None):
+    def __init__(
+        self, cluster: str = None, internal_ip: bool = None, proxy_url: str = None
+    ):
         self.cluster = cluster
         self.internal_ip = internal_ip
+        self.proxy_url = proxy_url
 
     @classmethod
     def to_proto(self, resource):
@@ -288,6 +291,8 @@ def to_proto(self, resource):
             res.cluster = Primitive.to_proto(resource.cluster)
         if Primitive.to_proto(resource.internal_ip):
             res.internal_ip = Primitive.to_proto(resource.internal_ip)
+        if Primitive.to_proto(resource.proxy_url):
+            res.proxy_url = Primitive.to_proto(resource.proxy_url)
         return res
 
     @classmethod
@@ -298,6 +303,7 @@ def from_proto(self, resource):
         return TargetGke(
             cluster=Primitive.from_proto(resource.cluster),
             internal_ip=Primitive.from_proto(resource.internal_ip),
+            proxy_url=Primitive.from_proto(resource.proxy_url),
         )
 
 

diff --git a/python/services/clouddeploy/beta/target_server.go b/python/services/clouddeploy/beta/target_server.go
@@ -44,6 +44,7 @@ func ProtoToClouddeployBetaTargetGke(p *betapb.ClouddeployBetaTargetGke) *beta.T
 	obj := &beta.TargetGke{
 		Cluster:    dcl.StringOrNil(p.GetCluster()),
 		InternalIP: dcl.Bool(p.GetInternalIp()),
+		ProxyUrl:   dcl.StringOrNil(p.GetProxyUrl()),
 	}
 	return obj
 }
@@ -155,6 +156,7 @@ func ClouddeployBetaTargetGkeToProto(o *beta.TargetGke) *betapb.ClouddeployBetaT
 	p := &betapb.ClouddeployBetaTargetGke{}
 	p.SetCluster(dcl.ValueOrEmptyString(o.Cluster))
 	p.SetInternalIp(dcl.ValueOrEmptyBool(o.InternalIP))
+	p.SetProxyUrl(dcl.ValueOrEmptyString(o.ProxyUrl))
 	return p
 }
 

diff --git a/python/services/clouddeploy/target.py b/python/services/clouddeploy/target.py
@@ -274,9 +274,12 @@ def to_proto(self):
 
 class TargetGke(object):
 
-    def __init__(self, cluster: str = None, internal_ip: bool = None):
+    def __init__(
+        self, cluster: str = None, internal_ip: bool = None, proxy_url: str = None
+    ):
         self.cluster = cluster
         self.internal_ip = internal_ip
+        self.proxy_url = proxy_url
 
     @classmethod
     def to_proto(self, resource):
@@ -288,6 +291,8 @@ def to_proto(self, resource):
             res.cluster = Primitive.to_proto(resource.cluster)
         if Primitive.to_proto(resource.internal_ip):
             res.internal_ip = Primitive.to_proto(resource.internal_ip)
+        if Primitive.to_proto(resource.proxy_url):
+            res.proxy_url = Primitive.to_proto(resource.proxy_url)
         return res
 
     @classmethod
@@ -298,6 +303,7 @@ def from_proto(self, resource):
         return TargetGke(
             cluster=Primitive.from_proto(resource.cluster),
             internal_ip=Primitive.from_proto(resource.internal_ip),
+            proxy_url=Primitive.from_proto(resource.proxy_url),
         )
 
 

diff --git a/python/services/clouddeploy/target_server.go b/python/services/clouddeploy/target_server.go
@@ -44,6 +44,7 @@ func ProtoToClouddeployTargetGke(p *clouddeploypb.ClouddeployTargetGke) *cloudde
 	obj := &clouddeploy.TargetGke{
 		Cluster:    dcl.StringOrNil(p.GetCluster()),
 		InternalIP: dcl.Bool(p.GetInternalIp()),
+		ProxyUrl:   dcl.StringOrNil(p.GetProxyUrl()),
 	}
 	return obj
 }
@@ -155,6 +156,7 @@ func ClouddeployTargetGkeToProto(o *clouddeploy.TargetGke) *clouddeploypb.Cloudd
 	p := &clouddeploypb.ClouddeployTargetGke{}
 	p.SetCluster(dcl.ValueOrEmptyString(o.Cluster))
 	p.SetInternalIp(dcl.ValueOrEmptyBool(o.InternalIP))
+	p.SetProxyUrl(dcl.ValueOrEmptyString(o.ProxyUrl))
 	return p
 }
 

diff --git a/services/google/clouddeploy/alpha/target.go b/services/google/clouddeploy/alpha/target.go
@@ -82,6 +82,7 @@ type TargetGke struct {
 	empty      bool    `json:"-"`
 	Cluster    *string `json:"cluster"`
 	InternalIP *bool   `json:"internalIP"`
+	ProxyUrl   *string `json:"proxyUrl"`
 }
 
 type jsonTargetGke TargetGke
@@ -103,6 +104,8 @@ func (r *TargetGke) UnmarshalJSON(data []byte) error {
 
 		r.InternalIP = res.InternalIP
 
+		r.ProxyUrl = res.ProxyUrl
+
 	}
 	return nil
 }

diff --git a/services/google/clouddeploy/alpha/target.yaml b/services/google/clouddeploy/alpha/target.yaml
@@ -245,6 +245,11 @@ components:
                 is the private IP address for clusters with private control-plane
                 endpoints and the public IP address otherwise. Only specify this option
                 when `cluster` is a [private GKE cluster](https://cloud.google.com/kubernetes-engine/docs/concepts/private-cluster-concept).
+            proxyUrl:
+              type: string
+              x-dcl-go-name: ProxyUrl
+              description: Optional. If set, used to configure a [proxy](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/#proxy)
+                to the Kubernetes server.
         labels:
           type: object
           additionalProperties:

diff --git a/services/google/clouddeploy/alpha/target_alpha_yaml_embed.go b/services/google/clouddeploy/alpha/target_alpha_yaml_embed.go
diff --git a/services/google/clouddeploy/alpha/target_internal.go b/services/google/clouddeploy/alpha/target_internal.go
@@ -841,6 +841,11 @@ func canonicalizeTargetGke(des, initial *TargetGke, opts ...dcl.ApplyOption) *Ta
 	} else {
 		cDes.InternalIP = des.InternalIP
 	}
+	if dcl.StringCanonicalize(des.ProxyUrl, initial.ProxyUrl) || dcl.IsZeroValue(des.ProxyUrl) {
+		cDes.ProxyUrl = initial.ProxyUrl
+	} else {
+		cDes.ProxyUrl = des.ProxyUrl
+	}
 
 	return cDes
 }
@@ -890,6 +895,9 @@ func canonicalizeNewTargetGke(c *Client, des, nw *TargetGke) *TargetGke {
 	if dcl.BoolCanonicalize(des.InternalIP, nw.InternalIP) {
 		nw.InternalIP = des.InternalIP
 	}
+	if dcl.StringCanonicalize(des.ProxyUrl, nw.ProxyUrl) {
+		nw.ProxyUrl = des.ProxyUrl
+	}
 
 	return nw
 }
@@ -1749,6 +1757,13 @@ func compareTargetGkeNewStyle(d, a interface{}, fn dcl.FieldName) ([]*dcl.FieldD
 		}
 		diffs = append(diffs, ds...)
 	}
+
+	if ds, err := dcl.Diff(desired.ProxyUrl, actual.ProxyUrl, dcl.DiffInfo{OperationSelector: dcl.TriggersOperation("updateTargetUpdateTargetOperation")}, fn.AddNest("ProxyUrl")); len(ds) != 0 || err != nil {
+		if err != nil {
+			return nil, err
+		}
+		diffs = append(diffs, ds...)
+	}
 	return diffs, nil
 }
 
@@ -2191,6 +2206,9 @@ func expandTargetGke(c *Client, f *TargetGke, res *Target) (map[string]interface
 	if v := f.InternalIP; !dcl.IsEmptyValueIndirect(v) {
 		m["internalIp"] = v
 	}
+	if v := f.ProxyUrl; !dcl.IsEmptyValueIndirect(v) {
+		m["proxyUrl"] = v
+	}
 
 	return m, nil
 }
@@ -2210,6 +2228,7 @@ func flattenTargetGke(c *Client, i interface{}, res *Target) *TargetGke {
 	}
 	r.Cluster = dcl.FlattenString(m["cluster"])
 	r.InternalIP = dcl.FlattenBool(m["internalIp"])
+	r.ProxyUrl = dcl.FlattenString(m["proxyUrl"])
 
 	return r
 }

diff --git a/services/google/clouddeploy/alpha/target_schema.go b/services/google/clouddeploy/alpha/target_schema.go
@@ -297,6 +297,11 @@ func DCLTargetSchema() *dcl.Schema {
 										GoName:      "InternalIP",
 										Description: "Optional. If true, `cluster` is accessed using the private IP address of the control plane endpoint. Otherwise, the default IP address of the control plane endpoint is used. The default IP address is the private IP address for clusters with private control-plane endpoints and the public IP address otherwise. Only specify this option when `cluster` is a [private GKE cluster](https://cloud.google.com/kubernetes-engine/docs/concepts/private-cluster-concept).",
 									},
+									"proxyUrl": &dcl.Property{
+										Type:        "string",
+										GoName:      "ProxyUrl",
+										Description: "Optional. If set, used to configure a [proxy](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/#proxy) to the Kubernetes server.",
+									},
 								},
 							},
 							"labels": &dcl.Property{

diff --git a/services/google/clouddeploy/beta/target.go b/services/google/clouddeploy/beta/target.go
@@ -82,6 +82,7 @@ type TargetGke struct {
 	empty      bool    `json:"-"`
 	Cluster    *string `json:"cluster"`
 	InternalIP *bool   `json:"internalIP"`
+	ProxyUrl   *string `json:"proxyUrl"`
 }
 
 type jsonTargetGke TargetGke
@@ -103,6 +104,8 @@ func (r *TargetGke) UnmarshalJSON(data []byte) error {
 
 		r.InternalIP = res.InternalIP
 
+		r.ProxyUrl = res.ProxyUrl
+
 	}
 	return nil
 }

diff --git a/services/google/clouddeploy/beta/target.yaml b/services/google/clouddeploy/beta/target.yaml
@@ -245,6 +245,11 @@ components:
                 is the private IP address for clusters with private control-plane
                 endpoints and the public IP address otherwise. Only specify this option
                 when `cluster` is a [private GKE cluster](https://cloud.google.com/kubernetes-engine/docs/concepts/private-cluster-concept).
+            proxyUrl:
+              type: string
+              x-dcl-go-name: ProxyUrl
+              description: Optional. If set, used to configure a [proxy](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/#proxy)
+                to the Kubernetes server.
         labels:
           type: object
           additionalProperties: