From c270b8f7b9c2bc76d2938b790c70aab77538f20c Mon Sep 17 00:00:00 2001
From: Johannes Batzill <johannes.batzill@harness.io>
Date: Thu, 1 Feb 2024 19:41:32 +0000
Subject: [PATCH] [CLI] move swagger+server under cli/operations (#1011)

---
 cli/operations/migrate/migrate.go          |  2 +-
 cli/{ => operations}/server/config.go      |  0
 cli/{ => operations}/server/config_test.go |  0
 cli/{ => operations}/server/redis.go       |  0
 cli/{ => operations}/server/server.go      |  0
 cli/{ => operations}/server/system.go      |  0
 cli/{ => operations/swagger}/swagger.go    | 19 +++++++++++--------
 cmd/gitness/main.go                        |  6 ++++--
 cmd/gitness/wire.go                        |  2 +-
 cmd/gitness/wire_gen.go                    |  2 +-
 10 files changed, 18 insertions(+), 13 deletions(-)
 rename cli/{ => operations}/server/config.go (100%)
 rename cli/{ => operations}/server/config_test.go (100%)
 rename cli/{ => operations}/server/redis.go (100%)
 rename cli/{ => operations}/server/server.go (100%)
 rename cli/{ => operations}/server/system.go (100%)
 rename cli/{ => operations/swagger}/swagger.go (76%)

diff --git a/cli/operations/migrate/migrate.go b/cli/operations/migrate/migrate.go
index 1321213b5..2635acf04 100644
--- a/cli/operations/migrate/migrate.go
+++ b/cli/operations/migrate/migrate.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/harness/gitness/cli/server"
+	"github.com/harness/gitness/cli/operations/server"
 	"github.com/harness/gitness/store/database"
 
 	"github.com/jmoiron/sqlx"
diff --git a/cli/server/config.go b/cli/operations/server/config.go
similarity index 100%
rename from cli/server/config.go
rename to cli/operations/server/config.go
diff --git a/cli/server/config_test.go b/cli/operations/server/config_test.go
similarity index 100%
rename from cli/server/config_test.go
rename to cli/operations/server/config_test.go
diff --git a/cli/server/redis.go b/cli/operations/server/redis.go
similarity index 100%
rename from cli/server/redis.go
rename to cli/operations/server/redis.go
diff --git a/cli/server/server.go b/cli/operations/server/server.go
similarity index 100%
rename from cli/server/server.go
rename to cli/operations/server/server.go
diff --git a/cli/server/system.go b/cli/operations/server/system.go
similarity index 100%
rename from cli/server/system.go
rename to cli/operations/server/system.go
diff --git a/cli/swagger.go b/cli/operations/swagger/swagger.go
similarity index 76%
rename from cli/swagger.go
rename to cli/operations/swagger/swagger.go
index efff6c5cb..683e54e0e 100644
--- a/cli/swagger.go
+++ b/cli/operations/swagger/swagger.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cli
+package swagger
 
 import (
 	"os"
@@ -22,24 +22,27 @@ import (
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
-type swaggerCommand struct {
-	path string
+type command struct {
+	openAPIService openapi.Service
+	path           string
 }
 
-func (c *swaggerCommand) run(*kingpin.ParseContext) error {
-	openAPIGenerator := openapi.NewOpenAPIService()
-	spec := openAPIGenerator.Generate()
+func (c *command) run(*kingpin.ParseContext) error {
+	spec := c.openAPIService.Generate()
 	data, _ := spec.MarshalYAML()
 	if c.path == "" {
 		os.Stdout.Write(data)
 		return nil
 	}
+
 	return os.WriteFile(c.path, data, 0o600)
 }
 
 // helper function to register the swagger command.
-func RegisterSwagger(app *kingpin.Application) {
-	c := new(swaggerCommand)
+func Register(app *kingpin.Application, openAPIService openapi.Service) {
+	c := &command{
+		openAPIService: openAPIService,
+	}
 
 	cmd := app.Command("swagger", "generate swagger file").
 		Hidden().
diff --git a/cmd/gitness/main.go b/cmd/gitness/main.go
index 104172a5a..4251a0b9a 100644
--- a/cmd/gitness/main.go
+++ b/cmd/gitness/main.go
@@ -15,13 +15,15 @@
 package main
 
 import (
+	"github.com/harness/gitness/app/api/openapi"
 	"github.com/harness/gitness/cli"
 	"github.com/harness/gitness/cli/operations/account"
 	"github.com/harness/gitness/cli/operations/hooks"
 	"github.com/harness/gitness/cli/operations/migrate"
+	"github.com/harness/gitness/cli/operations/server"
+	"github.com/harness/gitness/cli/operations/swagger"
 	"github.com/harness/gitness/cli/operations/user"
 	"github.com/harness/gitness/cli/operations/users"
-	"github.com/harness/gitness/cli/server"
 	"github.com/harness/gitness/version"
 
 	"gopkg.in/alecthomas/kingpin.v2"
@@ -49,7 +51,7 @@ func main() {
 
 	hooks.Register(app)
 
-	cli.RegisterSwagger(app)
+	swagger.Register(app, openapi.NewOpenAPIService())
 
 	kingpin.Version(version.Version.String())
 	kingpin.MustParse(app.Parse(args))
diff --git a/cmd/gitness/wire.go b/cmd/gitness/wire.go
index e31b69a4b..cba70c2b1 100644
--- a/cmd/gitness/wire.go
+++ b/cmd/gitness/wire.go
@@ -73,7 +73,7 @@ import (
 	"github.com/harness/gitness/app/store/logs"
 	"github.com/harness/gitness/app/url"
 	"github.com/harness/gitness/blob"
-	cliserver "github.com/harness/gitness/cli/server"
+	cliserver "github.com/harness/gitness/cli/operations/server"
 	"github.com/harness/gitness/encrypt"
 	"github.com/harness/gitness/events"
 	"github.com/harness/gitness/git"
diff --git a/cmd/gitness/wire_gen.go b/cmd/gitness/wire_gen.go
index 6c83fa293..c71cbd1b6 100644
--- a/cmd/gitness/wire_gen.go
+++ b/cmd/gitness/wire_gen.go
@@ -72,7 +72,7 @@ import (
 	"github.com/harness/gitness/app/store/logs"
 	"github.com/harness/gitness/app/url"
 	"github.com/harness/gitness/blob"
-	"github.com/harness/gitness/cli/server"
+	"github.com/harness/gitness/cli/operations/server"
 	"github.com/harness/gitness/encrypt"
 	"github.com/harness/gitness/events"
 	"github.com/harness/gitness/git"