stablecaps · deepsource-autofix · Dec 4, 2023
diff --git a/cmd/apiServerMain/apiServerMain.go b/cmd/apiServerMain/apiServerMain.go
@@ -22,28 +22,26 @@ import (
 //	@contact.url	http://www.swagger.io/support
 //	@contact.email	support@swagger.io
 
-//	@license.name	Apache 2.0
-//	@license.url	http://www.apache.org/licenses/LICENSE-2.0.html
+// @license.name	Apache 2.0
+// @license.url	http://www.apache.org/licenses/LICENSE-2.0.html
 func main() {
-
 	log.Println("Reading config..")
 
-
 	config, err := config.Readconfig("config_app_secrets", "env")
-    if err != nil {
-        fmt.Printf("Error: cannot read config: %s", err)
+	if err != nil {
+		fmt.Printf("Error: cannot read config: %s", err)
 		os.Exit(42)
-    }
+	}
 
 	log.Printf("Config: %s", config.DBUser)
 
 	log.Println("Starting up database..")
 	dataBase, err := models.NewPostgresDb(config.DBUser,
-										  config.DBName,
-										  config.DBPassword,
-										  config.DBSSLmode,
-										  config.DBMaxOpenConns,
-										  config.DBMaxOpenConns)
+		config.DBName,
+		config.DBPassword,
+		config.DBSSLmode,
+		config.DBMaxOpenConns,
+		config.DBMaxOpenConns)
 	if err != nil {
 		fmt.Printf("Error connecting to database: %s", err)
 		os.Exit(42)
@@ -55,9 +53,7 @@ func main() {
 	}
 
 	log.Println("Starting up server..")
-	port := fmt.Sprintf(":%s",  config.APIPort)
+	port := fmt.Sprintf(":%s", config.APIPort)
 	server := api.NewAPIServer(port, dataBase)
 	server.Run(port)
-
 }
-
diff --git a/cmd/paginateTest/paginateTest.go b/cmd/paginateTest/paginateTest.go
@@ -8,10 +8,9 @@ import (
 )
 
 type test_struct struct {
-    Test string
+	Test string
 }
 
-
 func main() {
 	baseURL := "http://localhost:8969/"
 	resource := "/services"
@@ -33,8 +32,7 @@ func main() {
 		urlStr := fmt.Sprintf("%v", u)
 
 		log.Printf("Listing services by using limit & offset to %s", urlStr)
-		page  = page + 1
+		page = page + 1
 
 	}
-
 }
diff --git a/cmd/patheticTester/patheticTester.go b/cmd/patheticTester/patheticTester.go
@@ -8,17 +8,19 @@ import (
 )
 
 // Declaring Global variables
-var baseURL string = "http://localhost:8969/"
-var testsPassed int = 0
-var testsFailed int = 0
+var (
+	baseURL     string = "http://localhost:8969/"
+	testsPassed int    = 0
+	testsFailed int    = 0
+)
 
 func scoreGlobalTestsPassedandFailes(testCode, wantedCode int) {
 	if testCode == wantedCode {
 		color.Green("Test passed: %d", testCode)
-		testsPassed ++
+		testsPassed++
 	} else {
 		color.Red("Error!! Wanted %d, but got unexpected status: %d", wantedCode, testCode)
-		testsFailed ++
+		testsFailed++
 	}
 }
 
@@ -28,8 +30,6 @@ func printTestSeperator(testCategory string) {
 }
 
 func main() {
-
-
 	// Run tests
 	printTestSeperator("testGetHealthendpoint")
 	testGetHealthendpoint()
@@ -55,5 +55,4 @@ func main() {
 	println("\n\n")
 	color.Red("Tests failed: %s", strconv.Itoa(testsFailed))
 	color.Green("Tests passed: %s", strconv.Itoa(testsPassed))
-
-}
+}
diff --git a/cmd/patheticTester/testDeleteServiceById.go b/cmd/patheticTester/testDeleteServiceById.go
@@ -6,8 +6,6 @@ import (
 	"github.com/stablecaps/services-api-go/internal/dbtools"
 )
 
-
-
 func testDeleteserviceById() {
 	postedServiceData := dbtools.CreateExplicitService(dbtools.MakeRandomName(), dbtools.MakeRandomDescription(4), "v1,v2,v3")
 
@@ -18,13 +16,12 @@ func testDeleteserviceById() {
 	paramMapList := map[string]string{}
 	resp, _ := dbtools.MakeHttpRequestWrapper(baseURL, fullEndpoint, "DELETE", paramMapList, nil)
 
-scoreGlobalTestsPassedandFailes(resp.StatusCode, 200)
+	scoreGlobalTestsPassedandFailes(resp.StatusCode, 200)
 }
 
 func testDeleteserviceByIdError() {
 	endpoint := "/services/id/"
 
-
 	testNameSlice := []string{
 		// Test serviceId 400s
 		"badServiceId", "outOfRangeServiceId",
@@ -35,7 +32,6 @@ func testDeleteserviceByIdError() {
 	paramMapList := map[string]string{}
 	serviceIdList := []string{"fake", "-10", "99999999"}
 
-
 	for idx, testName := range testNameSlice {
 		fmt.Println("\n~~~~~~~~~~~~~~~~~~~~")
 		fmt.Printf("Running test %d: -  %s\n", idx, testName)
@@ -47,4 +43,4 @@ func testDeleteserviceByIdError() {
 		scoreGlobalTestsPassedandFailes(resp.StatusCode, wantedCodes[idx])
 
 	}
-}
+}
diff --git a/cmd/patheticTester/testGetServiceById.go b/cmd/patheticTester/testGetServiceById.go
@@ -9,7 +9,6 @@ import (
 func testGetServiceById() {
 	endpoint := "/services/id/"
 
-
 	testNameSlice := []string{
 		// Test serviceId 400s
 		"badServiceId", "outOfRangeServiceId",
@@ -18,8 +17,7 @@ func testGetServiceById() {
 	}
 	wantedCodes := []int{404, 404, 200}
 	paramMapList := map[string]string{}
-	serviceIdList := []string{"fake", "-10", "5",}
-
+	serviceIdList := []string{"fake", "-10", "5"}
 
 	for idx, testName := range testNameSlice {
 		fmt.Println("\n~~~~~~~~~~~~~~~~~~~~")
@@ -30,4 +28,4 @@ func testGetServiceById() {
 		scoreGlobalTestsPassedandFailes(resp.StatusCode, wantedCodes[idx])
 
 	}
-}
+}
diff --git a/cmd/patheticTester/testGetServiceByName.go b/cmd/patheticTester/testGetServiceByName.go
@@ -21,7 +21,6 @@ func testGetServiceByName() {
 	paramMapList := map[string]string{}
 	serviceNameList := []string{"10", "NonExistantService", goodService.ServiceName}
 
-
 	for idx, testName := range testNameSlice {
 		fmt.Println("\n~~~~~~~~~~~~~~~~~~~~")
 		fmt.Printf("Running test %d: -  %s\n", idx, testName)
@@ -32,4 +31,4 @@ func testGetServiceByName() {
 		scoreGlobalTestsPassedandFailes(resp.StatusCode, wantedCodes[idx])
 
 	}
-}
+}
diff --git a/cmd/patheticTester/testGetServiceVersionsById.go b/cmd/patheticTester/testGetServiceVersionsById.go
@@ -23,7 +23,6 @@ func testGetServiceVersionsById() {
 	paramMapList := map[string]string{}
 	serviceIdList := []string{"9999999999999", strconv.Itoa(postedServiceData.ServiceId)}
 
-
 	for idx, testName := range testNameSlice {
 		fmt.Println("\n~~~~~~~~~~~~~~~~~~~~")
 		fmt.Printf("Running test %d: -  %s\n", idx, testName)
@@ -33,4 +32,4 @@ func testGetServiceVersionsById() {
 
 		scoreGlobalTestsPassedandFailes(resp.StatusCode, wantedCodes[idx])
 	}
-}
+}
diff --git a/cmd/patheticTester/testHealthEndpoint.go b/cmd/patheticTester/testHealthEndpoint.go
@@ -13,15 +13,13 @@ import (
 func testGetHealthendpoint() {
 	healthEndpoint := "/health"
 
-
 	testNameSlice := []string{
 		// Test health 200
 		"goodCall",
 	}
-	wantedCodes := []int{200,}
+	wantedCodes := []int{200}
 	paramMapList := map[string]string{}
 
-
 	for idx, testName := range testNameSlice {
 		fmt.Println("\n~~~~~~~~~~~~~~~~~~~~")
 		fmt.Printf("Running test %d: -  %s\n", idx, testName)
@@ -32,7 +30,6 @@ func testGetHealthendpoint() {
 }
 
 func TestHealthCheck(t *testing.T) {
-
 	response, err := http.Get("http://localhost:8969/health")
 	if err != nil {
 		t.Errorf("expected no errors, but got %v", err)

diff --git a/cmd/patheticTester/testListService.go b/cmd/patheticTester/testListService.go
@@ -6,12 +6,10 @@ import (
 	"github.com/stablecaps/services-api-go/internal/dbtools"
 )
 
-
 func testListServices() {
 	// list services pathetic tests
 	endpoint := "/services"
 
-
 	testNameSlice := []string{
 		// Test 400s
 		"badLimit", "outOfRangeLimit", "badOffset", "outOfRangeOffset", "badOrderColName", "badOrderDir",
@@ -24,88 +22,87 @@ func testListServices() {
 	paramMapList := []map[string]string{
 		// Test 400s
 		{
-			"limit": "fake",
-			"offset": "0",
+			"limit":        "fake",
+			"offset":       "0",
 			"orderColName": "serviceName",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		{
-			"limit": "-10",
-			"offset": "0",
+			"limit":        "-10",
+			"offset":       "0",
 			"orderColName": "serviceName",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		{
-			"limit": "4",
-			"offset": "fake",
+			"limit":        "4",
+			"offset":       "fake",
 			"orderColName": "serviceName",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		{
-			"limit": "4",
-			"offset": "-10",
+			"limit":        "4",
+			"offset":       "-10",
 			"orderColName": "serviceName",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "fake",
 		},
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "serviceName",
-			"orderDir": "fake",
+			"orderDir":     "fake",
 		},
 		// Test orderColName 200
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "serviceId",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "serviceName",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "serviceDescription",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "serviceVersions",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "createdAt",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 		// Test orderDir 200
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "serviceName",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 
 		{
-			"limit": "4",
-			"offset": "0",
+			"limit":        "4",
+			"offset":       "0",
 			"orderColName": "serviceName",
-			"orderDir": "asc",
+			"orderDir":     "asc",
 		},
 	}
 
-
 	for idx, testName := range testNameSlice {
 		fmt.Println("\n~~~~~~~~~~~~~~~~~~~~")
 		fmt.Printf("Running test %d: -  %s\n", idx, testName)

diff --git a/cmd/populateDb/populateDb.go b/cmd/populateDb/populateDb.go
@@ -9,7 +9,6 @@ import (
 // Declaring Global variables
 var baseURL string = "http://localhost:8969/"
 
-
 func main() {
 	endpoint := "/services/new"
 
@@ -18,14 +17,11 @@ func main() {
 	numServices := 500
 	paramMapList := map[string]string{}
 
-
 	for idx := 0; idx <= numServices; idx++ {
 		log.Printf("Creating service no %d", idx)
 
 		body := dbtools.MakeRandomService()
 		dbtools.MakeHttpRequestWrapper(baseURL, endpoint, "POST", paramMapList, body)
 
 	}
-
 }
-