refactor: worker gateway

Signed-off-by: thxCode <thxcode0824@gmail.com>

Author: thxCode

pkg/workergateway/service/service.go

@@ -161,20 +161,20 @@ func (s *Service) handleListInstanceTypes(w http.ResponseWriter, r *http.Request
 
 // handleListInstances handles the list instances request.
 //
-// GET /instances?cluster=cluster1&cluster=cluster2[&organization=foo&watch=true]
+// GET /instances?cluster=cluster1&cluster=cluster2[&namespace=foo&watch=true]
 func (s *Service) handleListInstances(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	logger := s.Logger.WithValues("method", r.Method, "path", r.URL.Path).V(2)
 
 	var req struct {
-		Clusters     []string `query:"cluster"`
-		Organization string   `query:"organization"`
-		Watch        bool     `query:"watch"`
+		Clusters  []string `query:"cluster"`
+		Namespace string   `query:"namespace"`
+		Watch     bool     `query:"watch"`
 	}
 	_ = httpx.BindWith(r, &req, httpx.BindQuery)
 
 	gvk := worker.SchemeGroupVersionKind("Instance")
-	iterOpts := manager.IteratorOptions{Namespace: req.Organization}
+	iterOpts := manager.IteratorOptions{Namespace: req.Namespace}
 
 	if !req.Watch {
 		listOp := OpListClusterInstances()
@@ -189,7 +189,7 @@ func (s *Service) handleListInstances(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	watchOp := OpHandleClusterInstance(req.Organization)
+	watchOp := OpHandleClusterInstance(req.Namespace)
 	s.streamResponse(w, r, req.Clusters, gvk, watchOp.Handle)
 }
 
@@ -227,20 +227,20 @@ func (s *Service) handleListInstancePersistentVolumeTypes(w http.ResponseWriter,
 
 // handleListInstancePersistentVolumes handles the list instance persistent volumes request.
 //
-// GET /instancepersistentvolumes?cluster=cluster1&cluster=cluster2[&organization=foo&watch=true]
+// GET /instancepersistentvolumes?cluster=cluster1&cluster=cluster2[&namespace=foo&watch=true]
 func (s *Service) handleListInstancePersistentVolumes(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	logger := s.Logger.WithValues("method", r.Method, "path", r.URL.Path).V(2)
 
 	var req struct {
-		Clusters     []string `query:"cluster"`
-		Organization string   `query:"organization"`
-		Watch        bool     `query:"watch"`
+		Clusters  []string `query:"cluster"`
+		Namespace string   `query:"namespace"`
+		Watch     bool     `query:"watch"`
 	}
 	_ = httpx.BindWith(r, &req, httpx.BindQuery)
 
 	gvk := worker.SchemeGroupVersionKind("InstancePersistentVolume")
-	iterOpts := manager.IteratorOptions{Namespace: req.Organization}
+	iterOpts := manager.IteratorOptions{Namespace: req.Namespace}
 
 	if !req.Watch {
 		listOp := OpListClusterInstancePersistentVolumes()
@@ -255,26 +255,26 @@ func (s *Service) handleListInstancePersistentVolumes(w http.ResponseWriter, r *
 		return
 	}
 
-	watchOp := OpHandleClusterInstancePersistentVolume(req.Organization)
+	watchOp := OpHandleClusterInstancePersistentVolume(req.Namespace)
 	s.streamResponse(w, r, req.Clusters, gvk, watchOp.Handle)
 }
 
 // handleListInstanceImagePullSecrets handles the list instance image pull secrets request.
 //
-// GET /instanceimagepullsecrets?cluster=cluster1&cluster=cluster2[&organization=foo&watch=true]
+// GET /instanceimagepullsecrets?cluster=cluster1&cluster=cluster2[&namespace=foo&watch=true]
 func (s *Service) handleListInstanceImagePullSecrets(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	logger := s.Logger.WithValues("method", r.Method, "path", r.URL.Path).V(2)
 
 	var req struct {
-		Clusters     []string `query:"cluster"`
-		Organization string   `query:"organization"`
-		Watch        bool     `query:"watch"`
+		Clusters  []string `query:"cluster"`
+		Namespace string   `query:"namespace"`
+		Watch     bool     `query:"watch"`
 	}
 	_ = httpx.BindWith(r, &req, httpx.BindQuery)
 
 	gvk := worker.SchemeGroupVersionKind("InstanceImagePullSecret")
-	iterOpts := manager.IteratorOptions{Namespace: req.Organization}
+	iterOpts := manager.IteratorOptions{Namespace: req.Namespace}
 
 	if !req.Watch {
 		listOp := OpListClusterInstanceImagePullSecrets()
@@ -289,26 +289,26 @@ func (s *Service) handleListInstanceImagePullSecrets(w http.ResponseWriter, r *h
 		return
 	}
 
-	watchOp := OpHandleClusterInstanceImagePullSecret(req.Organization)
+	watchOp := OpHandleClusterInstanceImagePullSecret(req.Namespace)
 	s.streamResponse(w, r, req.Clusters, gvk, watchOp.Handle)
 }
 
 // handleListInstanceSSHPublicKeys handles the list instance SSH public keys request.
 //
-// GET /instancesshpublickeys?cluster=cluster1&cluster=cluster2[&organization=foo&watch=true]
+// GET /instancesshpublickeys?cluster=cluster1&cluster=cluster2[&namespace=foo&watch=true]
 func (s *Service) handleListInstanceSSHPublicKeys(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	logger := s.Logger.WithValues("method", r.Method, "path", r.URL.Path).V(2)
 
 	var req struct {
-		Clusters     []string `query:"cluster"`
-		Organization string   `query:"organization"`
-		Watch        bool     `query:"watch"`
+		Clusters  []string `query:"cluster"`
+		Namespace string   `query:"namespace"`
+		Watch     bool     `query:"watch"`
 	}
 	_ = httpx.BindWith(r, &req, httpx.BindQuery)
 
 	gvk := worker.SchemeGroupVersionKind("InstanceSSHPublicKey")
-	iterOpts := manager.IteratorOptions{Namespace: req.Organization}
+	iterOpts := manager.IteratorOptions{Namespace: req.Namespace}
 
 	if !req.Watch {
 		listOp := OpListClusterInstanceSSHPublicKeys()
@@ -323,7 +323,7 @@ func (s *Service) handleListInstanceSSHPublicKeys(w http.ResponseWriter, r *http
 		return
 	}
 
-	watchOp := OpHandleClusterInstanceSSHPublicKey(req.Organization)
+	watchOp := OpHandleClusterInstanceSSHPublicKey(req.Namespace)
 	s.streamResponse(w, r, req.Clusters, gvk, watchOp.Handle)
 }