run go fmt

Signed-off-by: Stephanie <[email protected]>

Author: yangcao77

pkg/validation/components.go

@@ -82,7 +82,7 @@ func ValidateComponents(components []v1alpha2.Component) error {
 			}
 		} else if component.Openshift != nil {
 			if component.Openshift.Uri != "" {
-				err:= ValidateURI(component.Openshift.Uri)
+				err := ValidateURI(component.Openshift.Uri)
 				if err != nil {
 					return err
 				}
@@ -95,7 +95,7 @@ func ValidateComponents(components []v1alpha2.Component) error {
 
 		} else if component.Kubernetes != nil {
 			if component.Kubernetes.Uri != "" {
-				err:= ValidateURI(component.Kubernetes.Uri)
+				err := ValidateURI(component.Kubernetes.Uri)
 				if err != nil {
 					return err
 				}

pkg/validation/components_test.go

@@ -52,7 +52,7 @@ func generateDummyOpenshiftComponent(name string, endpoints []v1alpha2.Endpoint,
 					K8sLikeComponentLocation: v1alpha2.K8sLikeComponentLocation{
 						Uri: uri,
 					},
-					Endpoints : endpoints,
+					Endpoints: endpoints,
 				},
 			},
 		},
@@ -70,7 +70,7 @@ func generateDummyKubernetesComponent(name string, endpoints []v1alpha2.Endpoint
 					K8sLikeComponentLocation: v1alpha2.K8sLikeComponentLocation{
 						Uri: uri,
 					},
-					Endpoints : endpoints,
+					Endpoints: endpoints,
 				},
 			},
 		},

pkg/validation/endpoints.go

@@ -4,7 +4,7 @@ import "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 
 // validateEndpoints validates that the endpoints
 
-func validateEndpoints(endpoints []v1alpha2.Endpoint, processedEndPointPort map[int]bool,  processedEndPointName map[string]bool) error {
+func validateEndpoints(endpoints []v1alpha2.Endpoint, processedEndPointPort map[int]bool, processedEndPointName map[string]bool) error {
 	currentComponentEndPointPort := make(map[int]bool)
 
 	for _, endPoint := range endpoints {
@@ -19,7 +19,7 @@ func validateEndpoints(endpoints []v1alpha2.Endpoint, processedEndPointPort map[
 	}
 
 	for targetPort := range currentComponentEndPointPort {
-		if _, ok :=processedEndPointPort[targetPort]; ok {
+		if _, ok := processedEndPointPort[targetPort]; ok {
 			return &InvalidEndpointError{port: targetPort}
 		}
 		processedEndPointPort[targetPort] = true

pkg/validation/endpoints_test.go

@@ -8,11 +8,11 @@ import (
 func TestValidateEndpoints(t *testing.T) {
 
 	tests := []struct {
-		name        string
-		endpoints  []v1alpha2.Endpoint
+		name                  string
+		endpoints             []v1alpha2.Endpoint
 		processedEndpointName map[string]bool
 		processedEndpointPort map[int]bool
-		wantErr     bool
+		wantErr               bool
 	}{
 		{
 			name: "Case 1: Duplicate endpoint name within same component",
@@ -22,7 +22,7 @@ func TestValidateEndpoints(t *testing.T) {
 			},
 			processedEndpointName: map[string]bool{},
 			processedEndpointPort: map[int]bool{},
-			wantErr: true,
+			wantErr:               true,
 		},
 		{
 			name: "Case 2:  Duplicate endpoint name across components",
@@ -33,7 +33,7 @@ func TestValidateEndpoints(t *testing.T) {
 				"url1": true,
 			},
 			processedEndpointPort: map[int]bool{},
-			wantErr: true,
+			wantErr:               true,
 		},
 		{
 			name: "Case 3:  Duplicate endpoint port within same component",
@@ -43,7 +43,7 @@ func TestValidateEndpoints(t *testing.T) {
 			},
 			processedEndpointName: map[string]bool{},
 			processedEndpointPort: map[int]bool{},
-			wantErr: false,
+			wantErr:               false,
 		},
 		{
 			name: "Case 4:  Duplicate endpoint port across components",
@@ -64,9 +64,8 @@ func TestValidateEndpoints(t *testing.T) {
 			},
 			processedEndpointName: map[string]bool{},
 			processedEndpointPort: map[int]bool{},
-			wantErr: true,
+			wantErr:               true,
 		},
-
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -87,4 +86,4 @@ func generateDummyEndpoint(name string, port int) v1alpha2.Endpoint {
 		Name:       name,
 		TargetPort: port,
 	}
-}
+}

pkg/validation/errors.go

@@ -79,8 +79,8 @@ func (e *InvalidComponentError) Error() string {
 
 // InvalidNameOrIdError returns an error if the name or is is invalid
 type InvalidNameOrIdError struct {
-	name string
-	id string
+	name         string
+	id           string
 	resourceType string
 }
 
@@ -93,4 +93,3 @@ func (e *InvalidNameOrIdError) Error() string {
 	}
 	return errMsg
 }
-

pkg/validation/utils_test.go

@@ -7,23 +7,23 @@ import (
 func TestIsInt(t *testing.T) {
 
 	tests := []struct {
-		name string
-		arg       string
+		name       string
+		arg        string
 		wantResult bool
 	}{
 		{
-			name: "Case 1: numeric string",
-			arg: "1234",
+			name:       "Case 1: numeric string",
+			arg:        "1234",
 			wantResult: true,
 		},
 		{
-			name: "Case 2: alphanumeric string",
-			arg: "1234abc",
+			name:       "Case 2: alphanumeric string",
+			arg:        "1234abc",
 			wantResult: false,
 		},
 		{
-			name: "Case 3: string with numbers and character",
-			arg: "12_34",
+			name:       "Case 3: string with numbers and character",
+			arg:        "12_34",
 			wantResult: false,
 		},
 	}
@@ -40,23 +40,23 @@ func TestIsInt(t *testing.T) {
 func TestValidateURI(t *testing.T) {
 
 	tests := []struct {
-		name string
-		uri       string
+		name    string
+		uri     string
 		wantErr bool
 	}{
 		{
-			name: "Case 1: valid uri format starts with http",
-			uri: "http://devfile.yaml",
+			name:    "Case 1: valid uri format starts with http",
+			uri:     "http://devfile.yaml",
 			wantErr: false,
 		},
 		{
-			name: "Case 2: invalid uri format starts with http",
-			uri: "http//devfile.yaml",
+			name:    "Case 2: invalid uri format starts with http",
+			uri:     "http//devfile.yaml",
 			wantErr: true,
 		},
 		{
-			name: "Case 3: invalid uri format does not start with http",
-			uri: "./devfile.yaml",
+			name:    "Case 3: invalid uri format does not start with http",
+			uri:     "./devfile.yaml",
 			wantErr: false,
 		},
 	}
@@ -68,4 +68,4 @@ func TestValidateURI(t *testing.T) {
 			}
 		})
 	}
-}
+}