enable endpoint refactoring (#834)

openziti · Feb 3, 2025 · 9f63b91 · 9f63b91
1 parent fc45d4b
commit 9f63b91
Show file tree

Hide file tree

Showing 19 changed files with 379 additions and 123 deletions.
diff --git a/cmd/zrok/enable.go b/cmd/zrok/enable.go
@@ -8,7 +8,6 @@ import (
 	"github.com/openziti/zrok/environment"
 	"github.com/openziti/zrok/environment/env_core"
 	restEnvironment "github.com/openziti/zrok/rest_client_zrok/environment"
-	"github.com/openziti/zrok/rest_model_zrok"
 	"github.com/openziti/zrok/tui"
 	"github.com/shirou/gopsutil/v3/host"
 	"github.com/sirupsen/logrus"
@@ -77,10 +76,8 @@ func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
 	}
 	auth := httptransport.APIKeyAuth("X-TOKEN", "header", token)
 	req := restEnvironment.NewEnableParams()
-	req.Body = &rest_model_zrok.EnableRequest{
-		Description: cmd.description,
-		Host:        hostDetail,
-	}
+	req.Body.Description = cmd.description
+	req.Body.Host = hostDetail
 
 	var prg *tea.Program
 	var done = make(chan struct{})

diff --git a/controller/enable.go b/controller/enable.go
@@ -81,9 +81,7 @@ func (h *enableHandler) Handle(params environment.EnableParams, principal *rest_
 	}
 	logrus.Infof("created environment for '%v', with ziti identity '%v', and database id '%v'", principal.Email, ident.Payload.Data.ID, envId)
 
-	resp := environment.NewEnableCreated().WithPayload(&rest_model_zrok.EnableResponse{
-		Identity: envZId,
-	})
+	resp := environment.NewEnableCreated().WithPayload(&environment.EnableCreatedBody{Identity: envZId})
 
 	var out bytes.Buffer
 	enc := json.NewEncoder(&out)

diff --git a/rest_client_zrok/environment/enable_parameters.go b/rest_client_zrok/environment/enable_parameters.go
diff --git a/rest_client_zrok/environment/enable_responses.go b/rest_client_zrok/environment/enable_responses.go
diff --git a/rest_server_zrok/embedded_spec.go b/rest_server_zrok/embedded_spec.go