diff --git a/args.go b/args.go index d052b22b8..345b78886 100644 --- a/args.go +++ b/args.go @@ -78,8 +78,6 @@ const ( ArgClusterVersionSlug = "version" // ArgVPCUUID is a VPC UUID argument. ArgVPCUUID = "vpc-uuid" - // ArgSubnetUUID is a VPC subnet UUID argument. - ArgSubnetUUID = "subnet-uuid" // ArgClusterVPCUUID is a cluster vpc-uuid argument. ArgClusterVPCUUID = "vpc-uuid" // ArgWorkerSubnetUUID is a cluster worker subnet UUID argument. diff --git a/commands/displayers/load_balancer.go b/commands/displayers/load_balancer.go index eca347244..5da6ceb2a 100644 --- a/commands/displayers/load_balancer.go +++ b/commands/displayers/load_balancer.go @@ -44,7 +44,6 @@ func (lb *LoadBalancer) Cols() []string { "Size", "SizeUnit", "VPCUUID", - "SubnetUUID", "Tag", "DropletIDs", "RedirectHttpToHttps", @@ -68,7 +67,6 @@ func (lb *LoadBalancer) ColMap() map[string]string { "Size": "Size", "SizeUnit": "Size Unit", "VPCUUID": "VPC UUID", - "SubnetUUID": "Subnet UUID", "Tag": "Tag", "DropletIDs": "Droplet IDs", "RedirectHttpToHttps": "SSL", @@ -97,7 +95,6 @@ func (lb *LoadBalancer) KV() []map[string]any { "Status": l.Status, "Created": l.Created, "VPCUUID": l.VPCUUID, - "SubnetUUID": l.VPCSubnetUUID, "Tag": l.Tag, "DropletIDs": strings.Trim(strings.Replace(fmt.Sprint(l.DropletIDs), " ", ",", -1), "[]"), "RedirectHttpToHttps": l.RedirectHttpToHttps, diff --git a/commands/load_balancers.go b/commands/load_balancers.go index 1ae87c573..2544be771 100644 --- a/commands/load_balancers.go +++ b/commands/load_balancers.go @@ -66,8 +66,6 @@ With the load-balancer command, you can list, create, or delete load balancers, fmt.Sprintf("The load balancer's size, e.g.: 1. Only one of %s and %s should be used", doctl.ArgSizeUnit, doctl.ArgSizeSlug)) AddStringFlag(cmdLoadBalancerCreate, doctl.ArgLoadBalancerType, "", "", "The type of load balancer, e.g.: `REGIONAL` or `GLOBAL`") AddStringFlag(cmdLoadBalancerCreate, doctl.ArgVPCUUID, "", "", "The UUID of the VPC to create the load balancer in") - AddStringFlag(cmdLoadBalancerCreate, doctl.ArgSubnetUUID, "", "", "The UUID of the subnet to create the load balancer in. Must be a valid subnet in the specified VPC."+ - " (NOTE: specifying a subnet UUID is in private preview, contact DigitalOcean support to review its public availability.)") AddStringFlag(cmdLoadBalancerCreate, doctl.ArgLoadBalancerAlgorithm, "", "round_robin", "This field has been deprecated. You can no longer specify an algorithm for load balancers.") AddBoolFlag(cmdLoadBalancerCreate, doctl.ArgRedirectHTTPToHTTPS, "", false, @@ -118,8 +116,6 @@ With the load-balancer command, you can list, create, or delete load balancers, AddIntFlag(cmdRecordUpdate, doctl.ArgSizeUnit, "", 0, fmt.Sprintf("The load balancer's size, e.g.: 1. Only one of %s and %s should be used", doctl.ArgSizeUnit, doctl.ArgSizeSlug)) AddStringFlag(cmdRecordUpdate, doctl.ArgVPCUUID, "", "", "The UUID of the VPC to create the load balancer in") - AddStringFlag(cmdRecordUpdate, doctl.ArgSubnetUUID, "", "", "The UUID of the subnet to create the load balancer in. Must be a valid subnet in the specified VPC."+ - " (NOTE: specifying a subnet UUID is in private preview, contact DigitalOcean support to review its public availability.)") AddStringFlag(cmdRecordUpdate, doctl.ArgLoadBalancerAlgorithm, "", "round_robin", "This field has been deprecated. You can no longer specify an algorithm for load balancers.") AddBoolFlag(cmdRecordUpdate, doctl.ArgRedirectHTTPToHTTPS, "", false, @@ -559,12 +555,6 @@ func buildRequestFromArgs(c *CmdConfig, r *godo.LoadBalancerRequest) error { } r.VPCUUID = vpcUUID - subnetUUID, err := c.Doit.GetString(c.NS, doctl.ArgSubnetUUID) - if err != nil { - return err - } - r.VPCSubnetUUID = subnetUUID - redirectHTTPToHTTPS, err := c.Doit.GetBool(c.NS, doctl.ArgRedirectHTTPToHTTPS) if err != nil { return err diff --git a/commands/load_balancers_test.go b/commands/load_balancers_test.go index a08395ab2..3819d9698 100644 --- a/commands/load_balancers_test.go +++ b/commands/load_balancers_test.go @@ -147,59 +147,6 @@ func TestLoadBalancerCreate(t *testing.T) { }) } -func TestLoadBalancerCreateWithSubnetUUID(t *testing.T) { - withTestClient(t, func(config *CmdConfig, tm *tcMocks) { - vpcUUID := "00000000-0000-4000-8000-000000000000" - subnetUUID := "3d6f6fdc-8b7e-49fd-a3c2-0d73ec4e40b4" - r := godo.LoadBalancerRequest{ - Name: "lb-name", - Region: "nyc1", - SizeSlug: "lb-small", - Type: "REGIONAL", - DropletIDs: []int{1, 2}, - StickySessions: &godo.StickySessions{ - Type: "none", - }, - HealthCheck: &godo.HealthCheck{ - Protocol: "http", - Port: 80, - CheckIntervalSeconds: 4, - ResponseTimeoutSeconds: 23, - HealthyThreshold: 5, - UnhealthyThreshold: 10, - }, - ForwardingRules: []godo.ForwardingRule{ - { - EntryProtocol: "tcp", - EntryPort: 3306, - TargetProtocol: "tcp", - TargetPort: 3306, - TlsPassthrough: true, - }, - }, - VPCUUID: vpcUUID, - VPCSubnetUUID: subnetUUID, - } - disableLetsEncryptDNSRecords := false - r.DisableLetsEncryptDNSRecords = &disableLetsEncryptDNSRecords - tm.loadBalancers.EXPECT().Create(&r).Return(&testLoadBalancer, nil) - - config.Doit.Set(config.NS, doctl.ArgRegionSlug, "nyc1") - config.Doit.Set(config.NS, doctl.ArgSizeSlug, "lb-small") - config.Doit.Set(config.NS, doctl.ArgLoadBalancerName, "lb-name") - config.Doit.Set(config.NS, doctl.ArgLoadBalancerType, "REGIONAL") - config.Doit.Set(config.NS, doctl.ArgVPCUUID, vpcUUID) - config.Doit.Set(config.NS, doctl.ArgSubnetUUID, subnetUUID) - config.Doit.Set(config.NS, doctl.ArgDropletIDs, []string{"1", "2"}) - config.Doit.Set(config.NS, doctl.ArgStickySessions, "type:none") - config.Doit.Set(config.NS, doctl.ArgHealthCheck, "protocol:http,port:80,check_interval_seconds:4,response_timeout_seconds:23,healthy_threshold:5,unhealthy_threshold:10") - config.Doit.Set(config.NS, doctl.ArgForwardingRules, "entry_protocol:tcp,entry_port:3306,target_protocol:tcp,target_port:3306,tls_passthrough:true") - - err := RunLoadBalancerCreate(config) - assert.NoError(t, err) - }) -} - func TestLoadBalancerCreateGLB(t *testing.T) { withTestClient(t, func(config *CmdConfig, tm *tcMocks) { r := godo.LoadBalancerRequest{