Making swctl as library

Signed-off-by: Daniel Béreš <daniel.beres@pantheon.tech>
PANTHEONtech · Aug 23, 2023 · 75dc091 · 75dc091
1 parent c7dc515
commit 75dc091
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 23 deletions.
diff --git a/cmd/swctl/all_imports.go → cmd/swctl/app/all_imports.go b/cmd/swctl/all_imports.go → cmd/swctl/app/all_imports.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	_ "go.ligato.io/vpp-agent/v3/proto/ligato/linux"

diff --git a/cmd/swctl/cli.go → cmd/swctl/app/cli.go b/cmd/swctl/cli.go → cmd/swctl/app/cli.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"errors"
@@ -76,6 +76,10 @@ func (cli *CLI) Initialize(opts *GlobalOptions) (err error) {
 
 	// load entity files
 	cli.entities, err = loadEntityFiles(opts.EntityFiles)
+	if cli.entities == nil {
+		cli.entities, err = loadEmbeddedEntities(opts.EmbeddedEntityByte)
+
+	}
 	if err != nil {
 		return fmt.Errorf("loading entity files failed: %v", err)
 	}

diff --git a/cmd/swctl/cli_options.go → cmd/swctl/app/cli_options.go b/cmd/swctl/cli_options.go → cmd/swctl/app/cli_options.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"io"

diff --git a/cmd/swctl/cmd.go → cmd/swctl/app/cmd.go b/cmd/swctl/cmd.go → cmd/swctl/app/cmd.go
@@ -1,8 +1,7 @@
-package main
+package app
 
 import (
 	"fmt"
-
 	"github.com/gookit/color"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -57,7 +56,7 @@ func NewRootCmd(cli Cli) *cobra.Command {
 	cmd.InitDefaultHelpFlag()
 	cmd.Flags().Lookup("help").Hidden = true
 
-	cmd.AddCommand(newVersionCmd())
+	cmd.AddCommand(NewVersionCmd())
 	cmd.AddCommand(
 		NewConfigCmd(cli),
 		NewDeploymentCmd(cli),
@@ -77,7 +76,7 @@ func NewRootCmd(cli Cli) *cobra.Command {
 	return cmd
 }
 
-func newVersionCmd() *cobra.Command {
+func NewVersionCmd() *cobra.Command {
 	var (
 		short bool
 	)

diff --git a/cmd/swctl/cmd_config.go → cmd/swctl/app/cmd_config.go b/cmd/swctl/cmd_config.go → cmd/swctl/app/cmd_config.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"

diff --git a/cmd/swctl/cmd_deploy.go → cmd/swctl/app/cmd_deploy.go b/cmd/swctl/cmd_deploy.go → cmd/swctl/app/cmd_deploy.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"

diff --git a/cmd/swctl/cmd_manage.go → cmd/swctl/app/cmd_manage.go b/cmd/swctl/cmd_manage.go → cmd/swctl/app/cmd_manage.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"

diff --git a/cmd/swctl/cmd_status.go → cmd/swctl/app/cmd_status.go b/cmd/swctl/cmd_status.go → cmd/swctl/app/cmd_status.go
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package app
 
 import (
 	"fmt"

diff --git a/cmd/swctl/cmd_support.go → cmd/swctl/app/cmd_support.go b/cmd/swctl/cmd_support.go → cmd/swctl/app/cmd_support.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"archive/zip"

diff --git a/cmd/swctl/cmd_trace.go → cmd/swctl/app/cmd_trace.go b/cmd/swctl/cmd_trace.go → cmd/swctl/app/cmd_trace.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"

diff --git a/cmd/swctl/entity.go → cmd/swctl/app/entity.go b/cmd/swctl/entity.go → cmd/swctl/app/entity.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"
@@ -77,6 +77,23 @@ func loadEntityFiles(files []string) ([]Entity, error) {
 	return entities, nil
 }
 
+func loadEmbeddedEntities(embeddedEntities []byte) ([]Entity, error) {
+	var entities []Entity
+	var entityFile EntityFile
+	if err := yaml.Unmarshal(embeddedEntities, &entityFile); err != nil {
+		return nil, err
+	}
+	for _, entity := range entityFile.Entities {
+		if err := validateEntity(&entity); err != nil {
+			return nil, fmt.Errorf("invalid entity %v: %w", entity.Name, err)
+		}
+
+		logrus.Tracef("loaded entity: %v", entity.Name)
+		entities = append(entities, entity)
+	}
+	return entities, nil
+}
+
 // EntityVar is a variable of an entity defined with a template to render its value.
 type EntityVar struct {
 	Index int `json:"-"`

diff --git a/cmd/swctl/exec.go → cmd/swctl/app/exec.go b/cmd/swctl/exec.go → cmd/swctl/app/exec.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"bytes"

diff --git a/cmd/swctl/formatter.go → cmd/swctl/app/formatter.go b/cmd/swctl/formatter.go → cmd/swctl/app/formatter.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"bytes"

diff --git a/cmd/swctl/log.go → cmd/swctl/app/log.go b/cmd/swctl/log.go → cmd/swctl/app/log.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"bytes"

diff --git a/cmd/swctl/options.go → cmd/swctl/app/options.go b/cmd/swctl/options.go → cmd/swctl/app/options.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"os"
@@ -21,8 +21,9 @@ type GlobalOptions struct {
 	LogLevel string
 	Color    string
 
-	ComposeFiles []string
-	EntityFiles  []string
+	ComposeFiles       []string
+	EntityFiles        []string
+	EmbeddedEntityByte []byte
 
 	// TODO: support config file
 	// Config string

diff --git a/cmd/swctl/util.go → cmd/swctl/app/util.go b/cmd/swctl/util.go → cmd/swctl/app/util.go
@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"archive/tar"

diff --git a/cmd/swctl/main.go b/cmd/swctl/main.go
@@ -2,6 +2,8 @@ package main
 
 import (
 	"github.com/sirupsen/logrus"
+
+	"go.pantheon.tech/stonework/cmd/swctl/app"
 )
 
 func main() {
@@ -10,12 +12,12 @@ func main() {
 
 // Execute executes a root command using default behavior
 func Execute() {
-	cli, err := NewCli()
+	cli, err := app.NewCli()
 	if err != nil {
 		logrus.Fatalf("ERROR: %v", err)
 	}
 
-	root := NewRootCmd(cli)
+	root := app.NewRootCmd(cli)
 
 	if err := root.Execute(); err != nil {
 		logrus.Fatalf("ERROR: %v", err)