update: staticcheck findings, pipeline

Author: aschmidt75

.github/workflows/ci.yml

@@ -31,8 +31,12 @@ jobs:
 
       - name: Run staticcheck
         run: |
-          staticcheck ./...
-          golint ./...
+          echo "::group::Running staticcheck"
+          staticcheck ./... || true
+          echo "::endgroup::"
+          echo "::group::Running lint"
+          golint ./... || true
+          echo "::endgroup::"
  
       - name: Build
         run: 	GOOS=linux go build -o dist/${BINARY_NAME} ipvsctl.go

cmd/apply.go

@@ -28,7 +28,7 @@ func parseAllowedActions(actionSpec *string) (integration.ApplyActions, error) {
 		res := make(integration.ApplyActions, len(actions))
 		for _, action := range actions {
 			_, ex := all[integration.ApplyActionType(action)]
-			if ex == false {
+			if !ex {
 				// no such action
 				return integration.ApplyActions{}, fmt.Errorf("Invalid action: %s", action)
 			}

cmd/common.go

@@ -97,7 +97,7 @@ func resolveParams(ipvsconfig *integration.IPVSConfig) (*integration.IPVSConfig,
 	cfg := config.Config()
 
 	intfAddrMap := make(map[string]string)
-	if cfg.ParamsHostNetwork == true {
+	if cfg.ParamsHostNetwork {
 		intfs, err := net.Interfaces()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Specified dynamic parameter from local network interfaces, but unable to query them: %s\n", err)
@@ -126,7 +126,7 @@ func resolveParams(ipvsconfig *integration.IPVSConfig) (*integration.IPVSConfig,
 	}
 
 	envMap := make(map[string]string)
-	if cfg.ParamsHostEnv == true {
+	if cfg.ParamsHostEnv {
 		for _, e := range os.Environ() {
 			a := strings.Split(e, "=")
 			if len(a) == 2 {

integration/changeset.go

@@ -20,12 +20,12 @@ func (ipvsconfig *IPVSConfig) ChangeSet(newconfig *IPVSConfig, opts ApplyOpts) (
 			if err != nil {
 				return res, err
 			}
-			if equal == true {
+			if equal {
 				found = true
 			}
 		}
 
-		if found == false {
+		if !found {
 			var adr string
 			if service.service != nil {
 				adr = MakeAdressStringFromIpvsService(service.service)
@@ -53,12 +53,12 @@ func (ipvsconfig *IPVSConfig) ChangeSet(newconfig *IPVSConfig, opts ApplyOpts) (
 			if err != nil {
 				return res, err
 			}
-			if equal == true {
+			if equal {
 				found = true
 			}
 		}
 
-		if found == false {
+		if !found {
 			res.AddChange(ChangeSetItem{
 				Type:        AddService,
 				Description: fmt.Sprintf("Adding new service %s because it does not yet exist", newService.Address),
@@ -77,7 +77,7 @@ func (ipvsconfig *IPVSConfig) ChangeSet(newconfig *IPVSConfig, opts ApplyOpts) (
 			if err != nil {
 				return res, err
 			}
-			if equal == true {
+			if equal {
 				newSched := newService.SchedName
 				if newSched == "" {
 					// default given?
@@ -111,12 +111,12 @@ func (ipvsconfig *IPVSConfig) ChangeSet(newconfig *IPVSConfig, opts ApplyOpts) (
 						if err != nil {
 							return res, err
 						}
-						if equal == true {
+						if equal {
 							found = true
 						}
 					}
 
-					if found == false {
+					if !found {
 						var adrService, adrDestination string
 						if service.service != nil {
 							adrService = MakeAdressStringFromIpvsService(service.service)
@@ -147,11 +147,11 @@ func (ipvsconfig *IPVSConfig) ChangeSet(newconfig *IPVSConfig, opts ApplyOpts) (
 						if err != nil {
 							return res, err
 						}
-						if equal == true {
+						if equal {
 							found = true
 						}
 					}
-					if found == false {
+					if !found {
 						var adrService string
 						if service.service != nil {
 							adrService = MakeAdressStringFromIpvsService(service.service)
@@ -178,7 +178,7 @@ func (ipvsconfig *IPVSConfig) ChangeSet(newconfig *IPVSConfig, opts ApplyOpts) (
 							if err != nil {
 								return res, err
 							}
-							if equal == false {
+							if !equal {
 								var adrService string
 								if service.service != nil {
 									adrService = MakeAdressStringFromIpvsService(service.service)

integration/model.go

@@ -339,7 +339,7 @@ func CompareServicesEquality(ca *IPVSConfig, a *Service, cb *IPVSConfig, b *Serv
 	if err != nil {
 		return false, err
 	}
-	if ident == false {
+	if !ident {
 		return false, nil
 	}
 
@@ -444,7 +444,7 @@ func CompareDestinationsEquality(ca *IPVSConfig, a *Destination, cb *IPVSConfig,
 		return false, nil
 	}
 
-	if opts.KeepWeights == false {
+	if !opts.KeepWeights {
 		// compare weight
 		aw := a.Weight
 		bw := b.Weight

integration/validate_test.go

@@ -102,11 +102,11 @@ services:
 		t.Run(test.model, func(t *testing.T) {
 			err := validate(t, test.model)
 			if err == nil {
-				if test.ok == false {
+				if !test.ok {
 					t.Error("Should have returned a validation error, but did not")
 				}
 			} else {
-				if test.ok == true {
+				if test.ok {
 					t.Error("Should have passed but returned a validation error: %w", err)
 
 				}
@@ -166,11 +166,11 @@ defaults:
 		t.Run(test.model, func(t *testing.T) {
 			err := validate(t, test.model)
 			if err == nil {
-				if test.ok == false {
+				if !test.ok {
 					t.Error("Should have returned a validation error, but did not")
 				}
 			} else {
-				if test.ok == true {
+				if test.ok {
 					t.Error("Should have passed but returned a validation error: %w", err)
 
 				}