Skip to content

Revert "Support subnet_uuid in loadbalancers" #1892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DO-rrao wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −68
Open

Revert "Support subnet_uuid in loadbalancers" #1892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions args.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 0 additions & 3 deletions commands/displayers/load_balancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ func (lb *LoadBalancer) Cols() []string {
"Size",
"SizeUnit",
"VPCUUID",
"SubnetUUID",
"Tag",
"DropletIDs",
"RedirectHttpToHttps",
Expand All @@ -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",
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions commands/load_balancers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
53 changes: 0 additions & 53 deletions commands/load_balancers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Loading