Revert "duplicate everything"

This reverts commit 827233c.

Author: ChristopherHX

apiserver/controllers/common.go

@@ -0,0 +1,57 @@
+package controllers
+
+import (
+	"encoding/json"
+	"log/slog"
+	"net/http"
+
+	apiParams "github.com/cloudbase/garm/apiserver/params"
+	"github.com/cloudbase/garm/params"
+	"github.com/gorilla/mux"
+)
+
+func (a *APIController) GetRepository(w http.ResponseWriter, r *http.Request) (params.Repository, bool) {
+	vars := mux.Vars(r)
+	owner, hasOwner := vars["owner"]
+	repo, hasRepo := vars["repo"]
+	if !(hasOwner && hasRepo) {
+		w.WriteHeader(http.StatusBadRequest)
+		if err := json.NewEncoder(w).Encode(apiParams.APIErrorResponse{
+			Error:   "Bad Request",
+			Details: "No repo ID specified",
+		}); err != nil {
+			slog.With(slog.Any("error", err)).ErrorContext(r.Context(), "failed to encode response")
+		}
+		return params.Repository{}, false
+	}
+	repoObj, err := a.r.ResolveRepository(r.Context(), owner, repo, r.URL.Query().Get("endpointName"))
+	if err != nil {
+		slog.With(slog.Any("error", err)).ErrorContext(r.Context(), "listing pools")
+		handleError(r.Context(), w, err)
+		return params.Repository{}, false
+	}
+	return repoObj, true
+}
+
+func (a *APIController) GetRepositoryID(w http.ResponseWriter, r *http.Request) (string, bool) {
+	vars := mux.Vars(r)
+	owner, hasOwner := vars["owner"]
+	repo, hasRepo := vars["repo"]
+	if !(hasOwner && hasRepo) {
+		w.WriteHeader(http.StatusBadRequest)
+		if err := json.NewEncoder(w).Encode(apiParams.APIErrorResponse{
+			Error:   "Bad Request",
+			Details: "No repo ID specified",
+		}); err != nil {
+			slog.With(slog.Any("error", err)).ErrorContext(r.Context(), "failed to encode response")
+		}
+		return "", false
+	}
+	repoObj, err := a.r.ResolveRepository(r.Context(), owner, repo, r.URL.Query().Get("endpointName"))
+	if err != nil {
+		slog.With(slog.Any("error", err)).ErrorContext(r.Context(), "listing pools")
+		handleError(r.Context(), w, err)
+		return "", false
+	}
+	return repoObj.ID, true
+}

apiserver/controllers/instances.go

@@ -24,7 +24,6 @@ import (
 
 	gErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/apiserver/params"
-	apiParams "github.com/cloudbase/garm/apiserver/params"
 	runnerParams "github.com/cloudbase/garm/params"
 )
 
@@ -283,26 +282,10 @@ func (a *APIController) ListRepoInstancesHandler(w http.ResponseWriter, r *http.
 func (a *APIController) ListRepoByNameInstancesHandler(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	vars := mux.Vars(r)
-	owner, hasOwner := vars["owner"]
-	repo, hasRepo := vars["repo"]
-	if !(hasOwner && hasRepo) {
-		w.WriteHeader(http.StatusBadRequest)
-		if err := json.NewEncoder(w).Encode(apiParams.APIErrorResponse{
-			Error:   "Bad Request",
-			Details: "No repo ID specified",
-		}); err != nil {
-			slog.With(slog.Any("error", err)).ErrorContext(r.Context(), "failed to encode response")
-		}
-		return
-	}
-	repoObj, err := a.r.ResolveRepository(r.Context(), owner, repo, r.URL.Query().Get("endpointName"))
-	if err != nil {
-		slog.With(slog.Any("error", err)).ErrorContext(r.Context(), "listing pools")
-		handleError(r.Context(), w, err)
+	repoID, ok := a.GetRepositoryID(w, r)
+	if !ok {
 		return
 	}
-	repoID := repoObj.ID
 
 	instances, err := a.r.ListRepoInstances(ctx, repoID)
 	if err != nil {