From 5752fb0c3102f738cc6f6f6d75dfcc8bbf034627 Mon Sep 17 00:00:00 2001
From: mohamedch7 <121046693+mohamedch7@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:43:14 +0100
Subject: [PATCH] fix(ws): Fix lint errors and typo

Signed-off-by: mohamedch7 <121046693+mohamedch7@users.noreply.github.com>
---
 workspaces/backend/api/app.go                 |  4 +--
 .../backend/api/workspace_yaml_handler.go     | 18 +++++++++++--
 .../api/workspace_yaml_handler_test.go        | 25 +++++++++++++++----
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/workspaces/backend/api/app.go b/workspaces/backend/api/app.go
index 06918104..5c3d35e6 100644
--- a/workspaces/backend/api/app.go
+++ b/workspaces/backend/api/app.go
@@ -99,11 +99,11 @@ func (a *App) Routes() http.Handler {
 	router.GET(WorkspacesByNamePath, a.GetWorkspaceHandler)
 	router.POST(WorkspacesByNamespacePath, a.CreateWorkspaceHandler)
 	router.DELETE(WorkspacesByNamePath, a.DeleteWorkspaceHandler)
-  router.GET(WorkspaceYAMLPath, a.GetWorkspaceYAMLHandler)
+	router.GET(WorkspaceYAMLPath, a.GetWorkspaceYAMLHandler)
 
 	// workspacekinds
 	router.GET(AllWorkspaceKindsPath, a.GetWorkspaceKindsHandler)
 	router.GET(WorkspaceKindsByNamePath, a.GetWorkspaceKindHandler)
 
-	return a.RecoverPanic(a.enableCORS(router))
+	return a.recoverPanic(a.enableCORS(router))
 }
diff --git a/workspaces/backend/api/workspace_yaml_handler.go b/workspaces/backend/api/workspace_yaml_handler.go
index b1dad403..40d85d5f 100644
--- a/workspaces/backend/api/workspace_yaml_handler.go
+++ b/workspaces/backend/api/workspace_yaml_handler.go
@@ -1,3 +1,17 @@
+// Copyright 2024.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package api
 
 import (
@@ -8,7 +22,7 @@ import (
 
 	"errors"
 
-	"github.com/kubeflow/notebooks/workspaces/backend/internal/repositories"
+	"github.com/kubeflow/notebooks/workspaces/backend/internal/repositories/workspaces"
 
 	"sigs.k8s.io/yaml"
 )
@@ -28,7 +42,7 @@ func (a *App) GetWorkspaceYAMLHandler(w http.ResponseWriter, r *http.Request, ps
 
 	workspace, err := a.repositories.Workspace.GetWorkspace(r.Context(), namespace, workspaceName)
 	if err != nil {
-		if errors.Is(err, repositories.ErrWorkspaceNotFound) {
+		if errors.Is(err, workspaces.ErrWorkspaceNotFound) {
 			a.notFoundResponse(w, r)
 			return
 		}
diff --git a/workspaces/backend/api/workspace_yaml_handler_test.go b/workspaces/backend/api/workspace_yaml_handler_test.go
index f3d3d351..bb34bd23 100644
--- a/workspaces/backend/api/workspace_yaml_handler_test.go
+++ b/workspaces/backend/api/workspace_yaml_handler_test.go
@@ -1,3 +1,17 @@
+// Copyright 2024.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package api
 
 import (
@@ -9,8 +23,6 @@ import (
 	"os"
 
 	"github.com/julienschmidt/httprouter"
-	"github.com/kubeflow/notebooks/workspaces/backend/internal/config"
-	"github.com/kubeflow/notebooks/workspaces/backend/internal/repositories"
 	kubefloworgv1beta1 "github.com/kubeflow/notebooks/workspaces/controller/api/v1beta1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -18,6 +30,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/kubeflow/notebooks/workspaces/backend/internal/config"
+	"github.com/kubeflow/notebooks/workspaces/backend/internal/repositories"
 )
 
 var _ = Describe("Workspace YAML Handler", Ordered, func() {
@@ -38,7 +53,7 @@ var _ = Describe("Workspace YAML Handler", Ordered, func() {
 		logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
 		repos := repositories.NewRepositories(k8sClient)
 		a = &App{
-			Config: config.EnvConfig{
+			Config: &config.EnvConfig{
 				Port: 4000,
 			},
 			repositories: repos,
@@ -90,7 +105,7 @@ var _ = Describe("Workspace YAML Handler", Ordered, func() {
 	})
 
 	It("should retrieve the workspace YAML successfully", func() {
-		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/api/v1/workspaces/%s/%s/details/yaml", namespaceName, workspaceKey.Name), nil)
+		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/api/v1/workspaces/%s/%s/details/yaml", namespaceName, workspaceKey.Name), http.NoBody)
 		rr := httptest.NewRecorder()
 
 		ps := httprouter.Params{
@@ -110,7 +125,7 @@ var _ = Describe("Workspace YAML Handler", Ordered, func() {
 	})
 
 	It("should return 404 when workspace doesn't exist", func() {
-		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/api/v1/workspaces/%s/non-existent/details/yaml", namespaceName), nil)
+		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/api/v1/workspaces/%s/non-existent/details/yaml", namespaceName), http.NoBody)
 		rr := httptest.NewRecorder()
 
 		ps := httprouter.Params{