WIP: Extract package

Author: NautiluX

.gitignore

@@ -29,3 +29,4 @@ bin/
 oms-cli
 oms-service
 dist/
+oms-workdir/

cli/cmd/download_package.go

@@ -17,7 +17,7 @@ import (
 type DownloadPackageCmd struct {
 	cmd        *cobra.Command
 	Opts       DownloadPackageOpts
-	FileWriter util.FileWriter
+	FileWriter util.FileIO
 }
 
 type DownloadPackageOpts struct {

cli/cmd/download_package_test.go

@@ -23,14 +23,14 @@ var _ = Describe("ListPackages", func() {
 		version        string
 		build          portal.Build
 		mockPortal     *portal.MockPortal
-		mockFileWriter *util.MockFileWriter
+		mockFileWriter *util.MockFileIO
 	)
 
 	BeforeEach(func() {
 		filename = "installer.tar.gz"
 		version = "codesphere-1.42.0"
 		mockPortal = portal.NewMockPortal(GinkgoT())
-		mockFileWriter = util.NewMockFileWriter(GinkgoT())
+		mockFileWriter = util.NewMockFileIO(GinkgoT())
 
 		c = cmd.DownloadPackageCmd{
 			Opts: cmd.DownloadPackageOpts{

cli/cmd/extend.go

@@ -0,0 +1,49 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+// ExtendCmd represents the extend command
+type ExtendCmd struct {
+	cmd *cobra.Command
+}
+
+func (c *ExtendCmd) RunE(_ *cobra.Command, args []string) error {
+	//Command execution goes here
+
+	fmt.Printf("running %s", c.cmd.Use)
+
+	return nil
+}
+
+func AddExtendCmd(rootCmd *cobra.Command, opts *GlobalOptions) {
+	extend := ExtendCmd{
+		cmd: &cobra.Command{
+			Use:   "extend",
+			Short: "A brief description of your command",
+			Long: `A longer description that spans multiple lines and likely contains examples
+and usage of using your command. For example:
+
+Cobra is a CLI library for Go that empowers applications.
+This application is a tool to generate the needed files
+to quickly create a Cobra application.`,
+		},
+	}
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// extend.cmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// extend.cmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	rootCmd.AddCommand(extend.cmd)
+	extend.cmd.RunE = extend.RunE
+
+	// Add child commands here
+	AddExtendBaseimageCmd(extend.cmd, opts)
+}

cli/cmd/extend_baseimage.go

@@ -0,0 +1,57 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/codesphere-cloud/oms/internal/env"
+	"github.com/codesphere-cloud/oms/internal/installer"
+)
+
+// ExtendBaseimageCmd represents the baseimage command
+type ExtendBaseimageCmd struct {
+	cmd  *cobra.Command
+	Opts *ExtendBaseimageOpts
+}
+
+type ExtendBaseimageOpts struct {
+	*GlobalOptions
+	Package string
+	Force   bool
+}
+
+func (c *ExtendBaseimageCmd) RunE(_ *cobra.Command, args []string) error {
+	if c.Opts.Package == "" {
+		return errors.New("Required option package not set")
+	}
+
+	p := installer.NewPackage(c.Opts.Package)
+	err := p.Extract(env.NewEnv().GetOmsWorkdir(), c.Opts.Force)
+	if err != nil {
+		return fmt.Errorf("failed to extract package to workdir: %w", err)
+	}
+
+	return nil
+}
+
+func AddExtendBaseimageCmd(extend *cobra.Command, opts *GlobalOptions) {
+	baseimage := ExtendBaseimageCmd{
+		cmd: &cobra.Command{
+			Use:   "baseimage",
+			Short: "A brief description of your command",
+			Long: `A longer description that spans multiple lines and likely contains examples
+and usage of using your command. For example:
+
+Cobra is a CLI library for Go that empowers applications.
+This application is a tool to generate the needed files
+to quickly create a Cobra application.`,
+		},
+		Opts: &ExtendBaseimageOpts{GlobalOptions: opts},
+	}
+	baseimage.cmd.Flags().StringVarP(&baseimage.Opts.Package, "package", "p", "", "Package file (e.g. codesphere-v1.2.3-installer.tar.gz) to load base image from")
+	baseimage.cmd.Flags().BoolVarP(&baseimage.Opts.Force, "force", "f", false, "Enforce package extraction")
+	extend.AddCommand(baseimage.cmd)
+	baseimage.cmd.RunE = baseimage.RunE
+}

cli/cmd/root.go

@@ -4,6 +4,7 @@ Copyright © 2025 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
+	"log"
 	"os"
 
 	"github.com/codesphere-cloud/cs-go/pkg/io"
@@ -29,11 +30,15 @@ func GetRootCmd() *cobra.Command {
 	AddUpdateCmd(rootCmd)
 	AddListCmd(rootCmd, opts)
 	AddDownloadCmd(rootCmd, opts)
+	AddExtendCmd(rootCmd, &opts)
 	return rootCmd
 }
 
 // Execute executes the root command. This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
+	//Disable printing timestamps on log lines
+	log.SetFlags(0)
+
 	err := GetRootCmd().Execute()
 	if err != nil {
 		os.Exit(1)

cli/cmd/testdata/testcli.tar.gz

@@ -1,10 +1,11 @@
 /*
 Copyright © 2025 NAME HERE <EMAIL ADDRESS>
-
 */
 package main
 
-import "github.com/codesphere-cloud/oms/cli/cmd"
+import (
+	"github.com/codesphere-cloud/oms/cli/cmd"
+)
 
 func main() {
 	cmd.Execute()

cli/main.go

@@ -11,6 +11,7 @@ import (
 type Env interface {
 	GetOmsPortalApiKey() (string, error)
 	GetOmsPortalApi() string
+	GetOmsWorkdir() string
 }
 
 type Environment struct {
@@ -28,6 +29,14 @@ func (e *Environment) GetOmsPortalApiKey() (string, error) {
 	return apiToken, nil
 }
 
+func (e *Environment) GetOmsWorkdir() string {
+	workdir := os.Getenv("OMS_WORKDIR")
+	if workdir == "" {
+		return "./oms-workdir"
+	}
+	return workdir
+}
+
 func (e *Environment) GetOmsPortalApi() string {
 	apiUrl := os.Getenv("OMS_PORTAL_API")
 	if apiUrl == "" {