feat: add errorz package to combine errors as enum in there

src/jetstream/datastore/datastore.go

@@ -2,13 +2,16 @@ package datastore
 
 import (
 	"database/sql"
+	"errors"
 	"fmt"
 	"os"
 	"path"
 	"regexp"
 	"strings"
 	"time"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
+
 	goosedbversion "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version"
 	"github.com/govau/cf-common/env"
 	log "github.com/sirupsen/logrus"
@@ -301,9 +304,9 @@ func WaitForMigrations(db *sql.DB) error {
 		databaseVersionRec, err := dbVersionRepo.GetCurrentVersion()
 		if err != nil {
 			var errorMsg = err.Error()
-			if strings.Contains(err.Error(), "no such table") {
+			if strings.Contains(err.Error(), errorz.ERR_NO_SUCH_TABLE) {
 				errorMsg = "Waiting for versions table to be created"
-			} else if strings.Contains(err.Error(), "No database versions found") {
+			} else if errors.Is(err, errorz.ErrNoDatabaseVersionsFound) {
 				errorMsg = "Versions table is empty - waiting for migrations"
 			}
 			log.Infof("Database schema check: %s", errorMsg)

src/jetstream/errorz/errorz.go

@@ -0,0 +1,15 @@
+package errorz
+
+import "errors"
+
+const (
+	ERR_DIAL_TCP                   = "dial"
+	ERR_NO_DATABASE_VERSIONS_FOUND = "no database versions found"
+	ERR_NO_SUCH_TABLE              = "no such table"
+	ERR_X509_CERTIFICATE           = "x509: certificate"
+)
+
+var ErrDialTcp = errors.New(ERR_DIAL_TCP)
+var ErrNoDatabaseVersionsFound = errors.New(ERR_NO_DATABASE_VERSIONS_FOUND)
+var ErrNoSuchTable = errors.New(ERR_NO_SUCH_TABLE)
+var Err509Certificate = errors.New(ERR_X509_CERTIFICATE)

src/jetstream/middleware.go

@@ -5,11 +5,14 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"net"
 	"net/http"
 	"os"
 	"strings"
 	"time"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
+
 	"github.com/gorilla/context"
 	"github.com/govau/cf-common/env"
 	"github.com/labstack/echo/v4"
@@ -39,12 +42,15 @@ const APIKeyAuthScheme = "Bearer"
 func handleSessionError(config api.PortalConfig, c echo.Context, err error, doNotLog bool, msg string) error {
 	log.Debug("handleSessionError")
 
-	if strings.Contains(err.Error(), "dial tcp") {
-		return api.NewHTTPShadowError(
-			http.StatusServiceUnavailable,
-			"Service is currently unavailable",
-			"Service is currently unavailable: %v", err,
-		)
+	var netOpErr *net.OpError
+	if errors.As(err, &netOpErr) {
+		if netOpErr.Op == errorz.ERR_DIAL_TCP {
+			return api.NewHTTPShadowError(
+				http.StatusServiceUnavailable,
+				"Service is currently unavailable",
+				"Service is currently unavailable: %v", err,
+			)
+		}
 	}
 
 	if doNotLog {

src/jetstream/plugins/kubernetes/main.go

@@ -12,6 +12,7 @@ import (
 	"errors"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/api"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
 	"github.com/labstack/echo/v4"
 	log "github.com/sirupsen/logrus"
 
@@ -288,7 +289,7 @@ func (c *KubernetesSpecification) RequiresCert(ec echo.Context) error {
 		Message  string
 	}
 	if err != nil {
-		if strings.Contains(err.Error(), "x509: certificate") {
+		if strings.Contains(err.Error(), errorz.ERR_X509_CERTIFICATE) {
 			response.Status = http.StatusOK
 			response.Required = true
 		} else {

src/jetstream/repository/goose-db-version/pgsql_goose_db_version.go

@@ -2,12 +2,12 @@ package goosedbversion
 
 import (
 	"database/sql"
-	"errors"
 	"fmt"
 
 	log "github.com/sirupsen/logrus"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/api"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
 )
 
 const (
@@ -37,7 +37,7 @@ func (p *PostgresGooseDBVersionRepository) GetCurrentVersion() (api.GooseDBVersi
 
 	switch {
 	case err == sql.ErrNoRows:
-		return api.GooseDBVersionRecord{}, errors.New("No database versions found")
+		return api.GooseDBVersionRecord{}, errorz.ErrNoDatabaseVersionsFound
 	case err != nil:
 		return api.GooseDBVersionRecord{}, fmt.Errorf("Error trying to get current database version: %v", err)
 	default:

src/jetstream/repository/goose-db-version/pgsql_goose_db_version_test.go

@@ -10,6 +10,7 @@ import (
 	. "github.com/smartystreets/goconvey/convey"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/api"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
 )
 
 func TestPgSQLGooseDB(t *testing.T) {
@@ -63,9 +64,6 @@ func TestPgSQLGooseDB(t *testing.T) {
 		})
 
 		Convey("if one doesn't exist", func() {
-
-			expectedErrorMessage := "No database versions found"
-
 			// Database setup
 			rs := sqlmock.NewRows(rowFieldsForVersionID)
 			mock.ExpectQuery(selectFromDBVersionWhere).
@@ -74,7 +72,7 @@ func TestPgSQLGooseDB(t *testing.T) {
 			Convey("there should be an error", func() {
 				repository, _ := NewPostgresGooseDBVersionRepository(db)
 				_, err := repository.GetCurrentVersion()
-				So(err, ShouldResemble, errors.New(expectedErrorMessage))
+				So(err, ShouldResemble, errorz.ErrNoDatabaseVersionsFound)
 
 				dberr := mock.ExpectationsWereMet()
 				So(dberr, ShouldBeNil)

src/jetstream/setup_console.go

@@ -17,6 +17,7 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/api"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/console_config"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers"
 )
@@ -93,7 +94,7 @@ func (p *portalProxy) setupGetAvailableScopes(c echo.Context) error {
 		errInfo, ok := err.(api.ErrHTTPRequest)
 		if ok {
 			if errInfo.Status == 0 {
-				if strings.Contains(errInfo.Error(), "x509: certificate") {
+				if strings.Contains(errInfo.Error(), errorz.ERR_X509_CERTIFICATE) {
 					return api.NewHTTPShadowError(
 						http.StatusBadRequest,
 						"Could not connect to the UAA - Certificate error - check Skip SSL validation setting",