BUILD/MEDIUM: specification: upgrade specification and client-native

Upgrade go-swagger to v0.32.3, and upgrade client-native

Author: mjuraga

cmd/dataplaneapi/main.go

@@ -127,7 +127,7 @@ func startServer(cfg *configuration.Configuration, cancelDebugServer context.Can
 		fmt.Printf("HAProxy Data Plane API %s %s%s\n\n", GitTag, GitCommit, GitDirty)
 		fmt.Printf("Build from: %s\n", GitRepo)
 		fmt.Printf("Build date: %s\n\n", BuildTime)
-		return
+		return reload
 	}
 
 	var loadMsg []string

configure_data_plane.go

@@ -36,7 +36,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
-	"github.com/go-openapi/swag"
+	"github.com/go-openapi/swag/cmdutils"
 	client_native "github.com/haproxytech/client-native/v6"
 	"github.com/haproxytech/client-native/v6/models"
 	"github.com/haproxytech/client-native/v6/options"
@@ -57,7 +57,7 @@ import (
 	"github.com/haproxytech/dataplaneapi/operations"
 	"github.com/haproxytech/dataplaneapi/operations/discovery"
 	"github.com/haproxytech/dataplaneapi/operations/specification"
-	"github.com/haproxytech/dataplaneapi/operations/version3"
+	"github.com/haproxytech/dataplaneapi/operations/specification_openapiv3"
 	"github.com/haproxytech/dataplaneapi/rate"
 	"github.com/haproxytech/dataplaneapi/resilient"
 	socket_runtime "github.com/haproxytech/dataplaneapi/runtime"
@@ -88,25 +88,25 @@ func SetServerStartedCallback(callFunc func()) {
 func configureFlags(api *operations.DataPlaneAPI) {
 	cfg := dataplaneapi_config.Get()
 
-	haproxyOptionsGroup := swag.CommandLineOptionsGroup{
+	haproxyOptionsGroup := cmdutils.CommandLineOptionsGroup{
 		ShortDescription: "HAProxy options",
 		LongDescription:  "Options for configuring haproxy locations.",
 		Options:          &cfg.HAProxy,
 	}
 
-	loggingOptionsGroup := swag.CommandLineOptionsGroup{
+	loggingOptionsGroup := cmdutils.CommandLineOptionsGroup{
 		ShortDescription: "Logging options",
 		LongDescription:  "Options for configuring logging.",
 		Options:          &cfg.Logging,
 	}
 
-	syslogOptionsGroup := swag.CommandLineOptionsGroup{
+	syslogOptionsGroup := cmdutils.CommandLineOptionsGroup{
 		ShortDescription: "Syslog options",
 		LongDescription:  "Options for configuring syslog logging.",
 		Options:          &cfg.Syslog,
 	}
 
-	api.CommandLineOptionsGroups = make([]swag.CommandLineOptionsGroup, 0, 1)
+	api.CommandLineOptionsGroups = make([]cmdutils.CommandLineOptionsGroup, 0, 1)
 	api.CommandLineOptionsGroups = append(api.CommandLineOptionsGroups, haproxyOptionsGroup)
 	api.CommandLineOptionsGroups = append(api.CommandLineOptionsGroups, loggingOptionsGroup)
 	api.CommandLineOptionsGroups = append(api.CommandLineOptionsGroups, syslogOptionsGroup)
@@ -949,7 +949,7 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler { //nolint:cyclop,m
 	api.StorageReplaceStorageGeneralFileHandler = &handlers.StorageReplaceStorageGeneralFileHandlerImpl{Client: client, ReloadAgent: ra}
 
 	// setup OpenAPI v3 specification handler
-	api.Version3GetOpenapiv3SpecificationHandler = version3.GetOpenapiv3SpecificationHandlerFunc(func(params version3.GetOpenapiv3SpecificationParams, principal interface{}) middleware.Responder {
+	api.SpecificationOpenapiv3GetOpenapiv3SpecificationHandler = specification_openapiv3.GetOpenapiv3SpecificationHandlerFunc(func(params specification_openapiv3.GetOpenapiv3SpecificationParams, principal interface{}) middleware.Responder {
 		v2 := openapi2.T{}
 		v2JSONString := string(SwaggerJSON)
 		v2JSONString = strings.ReplaceAll(v2JSONString, "#/definitions", "#/components/schemas")
@@ -958,7 +958,7 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler { //nolint:cyclop,m
 		err = v2.UnmarshalJSON(curatedV2)
 		if err != nil {
 			e := misc.HandleError(err)
-			return version3.NewGetOpenapiv3SpecificationDefault(int(*e.Code)).WithPayload(e)
+			return specification_openapiv3.NewGetOpenapiv3SpecificationDefault(int(*e.Code)).WithPayload(e)
 		}
 
 		// if host is empty(dynamic hosts), server prop is empty,
@@ -972,9 +972,9 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler { //nolint:cyclop,m
 		v3, err = openapi2conv.ToV3(&v2)
 		if err != nil {
 			e := misc.HandleError(err)
-			return version3.NewGetOpenapiv3SpecificationDefault(int(*e.Code)).WithPayload(e)
+			return specification_openapiv3.NewGetOpenapiv3SpecificationDefault(int(*e.Code)).WithPayload(e)
 		}
-		return version3.NewGetOpenapiv3SpecificationOK().WithPayload(v3)
+		return specification_openapiv3.NewGetOpenapiv3SpecificationOK().WithPayload(v3)
 	})
 
 	// TODO: do we need a ReloadAgent for SPOE

discovery/aws_service_discovery.go

@@ -50,23 +50,23 @@ func (a awsServiceDiscovery) AddNode(id string, params ServiceDiscoveryParams) (
 	var instance *awsInstance
 	instance, err = newAWSRegionInstance(a.context, aParams, a.client, a.reloadAgent)
 	if err != nil {
-		return
+		return err
 	}
 
 	if err = a.services.Create(id, instance); err != nil {
-		return
+		return err
 	}
 
 	if *aParams.Enabled {
 		instance.start()
 	}
-	return
+	return err
 }
 
 func (a awsServiceDiscovery) GetNode(id string) (params ServiceDiscoveryParams, err error) {
 	var i interface{}
 	if i, err = a.services.Read(id); err != nil {
-		return
+		return params, err
 	}
 	return i.(*awsInstance).params, nil
 }
@@ -112,6 +112,6 @@ func (a awsServiceDiscovery) UpdateNode(id string, params ServiceDiscoveryParams
 			ai.update <- struct{}{}
 		}
 
-		return
+		return err
 	})
 }

discovery/aws_service_discovery_instance.go

@@ -95,7 +95,7 @@ func (a awsService) GetServers() (servers []configuration.ServiceServer) {
 			Port:    port,
 		})
 	}
-	return
+	return servers
 }
 
 func newAWSRegionInstance(ctx context.Context, params *models.AwsRegion, client configuration.Configuration, reloadAgent haproxy.IReloadAgent) (*awsInstance, error) {
@@ -136,7 +136,7 @@ func (a *awsInstance) filterConverter(in []*models.AwsFilters) (out []types.Filt
 			Values: []string{aws.ToString(l.Value)},
 		}
 	}
-	return
+	return out
 }
 
 func (a *awsInstance) updateTimeout(timeoutSeconds int64) error {
@@ -245,7 +245,7 @@ func (a *awsInstance) updateServices(api *ec2.Client) (err error) {
 		}, a.filterConverter(a.params.Allowlist)...),
 	})
 	if err != nil {
-		return
+		return err
 	}
 
 	mapService := make(map[string]*awsService)
@@ -339,7 +339,7 @@ func (a *awsInstance) updateServices(api *ec2.Client) (err error) {
 				id := aws.ToString(instance.InstanceId)
 				hash[id] = aws.ToTime(instance.LaunchTime)
 			}
-			return
+			return hash
 		}(s.instances)
 	}
 
@@ -360,7 +360,7 @@ func (a *awsService) instancePortFromEC2(instance types.Instance) (port int, err
 			return strconv.Atoi(*t.Value)
 		}
 	}
-	return
+	return port, err
 }
 
 func (a *awsInstance) serviceNameFromEC2(instance types.Instance) (string, error) {

discovery/consul_service_discovery.go

@@ -74,7 +74,7 @@ func (c *consulServiceDiscovery) AddNode(id string, params ServiceDiscoveryParam
 	}
 
 	if err = c.consulServices.Create(id, instance); err != nil {
-		return
+		return err
 	}
 
 	instance.prevEnabled = *cParams.Enabled
@@ -88,10 +88,10 @@ func (c *consulServiceDiscovery) AddNode(id string, params ServiceDiscoveryParam
 func (c *consulServiceDiscovery) GetNode(id string) (p ServiceDiscoveryParams, err error) {
 	var i interface{}
 	if i, err = c.consulServices.Read(id); err != nil {
-		return
+		return p, err
 	}
 	p = i.(*consulInstance).params
-	return
+	return p, err
 }
 
 func (c *consulServiceDiscovery) GetNodes() (ServiceDiscoveryParams, error) {

discovery/service_discovery_instance_test.go

@@ -191,7 +191,7 @@ func createLaunchConfiguration(name *string, client *autoscaling.Client) (err er
 		ImageId:                  aws.String(ami),
 		InstanceType:             aws.String("t2.micro"),
 	})
-	return
+	return err
 }
 
 func createAutoScalingGroup(instanceId *string, client *autoscaling.Client) (err error) {
@@ -220,7 +220,7 @@ func createAutoScalingGroup(instanceId *string, client *autoscaling.Client) (err
 			},
 		},
 	})
-	return
+	return err
 }
 
 func checkBackendServers(asgName *string, backendName string, asg *autoscaling.Client, ec2Client *ec2.Client, confClient *configuration.Client) (ok bool) {
@@ -280,7 +280,7 @@ func scaleAutoScalingGroup(asgName *string, desiredCapacity int32, asg *autoscal
 		AutoScalingGroupName: asgName,
 		DesiredCapacity:      aws.Int32(desiredCapacity),
 	})
-	return
+	return err
 }
 
 func checkAutoScalingGroupCapacity(asgName *string, desiredCapacity int32, asg *autoscaling.Client) (err error) {
@@ -301,7 +301,7 @@ func checkAutoScalingGroupCapacity(asgName *string, desiredCapacity int32, asg *
 			if len(out.AutoScalingGroups[0].Instances) != int(desiredCapacity) {
 				continue
 			}
-			return
+			return err
 		}
 	}
 }

discovery/store.go

@@ -48,7 +48,7 @@ func (s *instanceStore) Update(name string, mutateFn func(obj interface{}) error
 	}
 
 	s.store[name] = o
-	return
+	return err
 }
 
 func (s *instanceStore) List() (list []interface{}) {
@@ -58,7 +58,7 @@ func (s *instanceStore) List() (list []interface{}) {
 	for _, i := range s.store {
 		list = append(list, i)
 	}
-	return
+	return list
 }
 
 func NewInstanceStore() Store {
@@ -85,7 +85,7 @@ func (s *instanceStore) Delete(name string) (err error) {
 	defer s.mu.Unlock()
 
 	if _, err = s.get(name); err != nil {
-		return
+		return err
 	}
 
 	delete(s.store, name)
@@ -105,5 +105,5 @@ func (s *instanceStore) get(name string) (sd interface{}, err error) {
 	if !ok {
 		return nil, errors.New("instance not found")
 	}
-	return
+	return sd, err
 }