refactor bootstrap gcp

.mockery.yml

@@ -14,6 +14,10 @@ require-template-schema-exists: true
 template: testify
 template-schema: "{{.Template}}.schema.json"
 packages:
+  github.com/codesphere-cloud/oms/internal/bootstrap/gcp:
+    config:
+      all: true
+    interfaces:
   github.com/codesphere-cloud/oms/internal/env:
     config:
       all: true
@@ -22,6 +26,10 @@ packages:
     config:
       all: true
     interfaces:
+  github.com/codesphere-cloud/oms/internal/installer/node:
+    config:
+      all: true
+    interfaces:
   github.com/codesphere-cloud/oms/internal/portal:
     config:
       all: true

cli/cmd/bootstrap_gcp.go

@@ -13,21 +13,22 @@ import (
 
 	"github.com/codesphere-cloud/cs-go/pkg/io"
 	"github.com/codesphere-cloud/oms/internal/bootstrap"
+	"github.com/codesphere-cloud/oms/internal/bootstrap/gcp"
 	"github.com/codesphere-cloud/oms/internal/env"
+	"github.com/codesphere-cloud/oms/internal/installer"
+	"github.com/codesphere-cloud/oms/internal/installer/node"
 	"github.com/codesphere-cloud/oms/internal/util"
 )
 
 type BootstrapGcpCmd struct {
-	cmd           *cobra.Command
-	Opts          *GlobalOptions
-	Env           env.Env
-	CodesphereEnv *bootstrap.CodesphereEnvironment
-
+	cmd               *cobra.Command
+	Opts              *GlobalOptions
+	Env               env.Env
+	CodesphereEnv     *gcp.CodesphereEnvironment
 	InputRegistryType string
 }
 
 func (c *BootstrapGcpCmd) RunE(_ *cobra.Command, args []string) error {
-
 	err := c.BootstrapGcp()
 	if err != nil {
 		return fmt.Errorf("failed to bootstrap: %w", err)
@@ -49,7 +50,7 @@ func AddBootstrapGcpCmd(root *cobra.Command, opts *GlobalOptions) {
 		},
 		Opts:          opts,
 		Env:           env.NewEnv(),
-		CodesphereEnv: &bootstrap.CodesphereEnvironment{},
+		CodesphereEnv: &gcp.CodesphereEnvironment{},
 	}
 
 	flags := bootstrapGcpCmd.cmd.Flags()
@@ -65,8 +66,8 @@ func AddBootstrapGcpCmd(root *cobra.Command, opts *GlobalOptions) {
 	flags.BoolVar(&bootstrapGcpCmd.CodesphereEnv.Preemptible, "preemptible", false, "Use preemptible VMs for Codesphere infrastructure (default: false)")
 	flags.IntVar(&bootstrapGcpCmd.CodesphereEnv.DatacenterID, "datacenter-id", 1, "Datacenter ID (default: 1)")
 	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.CustomPgIP, "custom-pg-ip", "", "Custom PostgreSQL IP (optional)")
-	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.InstallConfig, "install-config", "config.yaml", "Path to install config file (optional)")
-	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.SecretsFile, "secrets-file", "prod.vault.yaml", "Path to secrets files (optional)")
+	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.InstallConfigPath, "install-config", "config.yaml", "Path to install config file (optional)")
+	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.SecretsFilePath, "secrets-file", "prod.vault.yaml", "Path to secrets files (optional)")
 	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.Region, "region", "europe-west4", "GCP Region (default: europe-west4)")
 	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.Zone, "zone", "europe-west4-a", "GCP Zone (default: europe-west4-a)")
 	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.DNSProjectID, "dns-project-id", "", "GCP Project ID for Cloud DNS (optional)")
@@ -84,33 +85,37 @@ func AddBootstrapGcpCmd(root *cobra.Command, opts *GlobalOptions) {
 }
 
 func (c *BootstrapGcpCmd) BootstrapGcp() error {
-	c.CodesphereEnv.RegistryType = bootstrap.RegistryType(c.InputRegistryType)
-
-	gcpClient := bootstrap.NewGCPClient(os.Getenv("GOOGLE_APPLICATION_CREDENTIALS"))
-	bootstrapper, err := bootstrap.NewGCPBootstrapper(c.Env, c.CodesphereEnv, gcpClient)
+	ctx := c.cmd.Context()
+	stlog := bootstrap.NewStepLogger(false)
+	icg := installer.NewInstallConfigManager()
+	gcpClient := gcp.NewGCPClient(ctx, stlog, os.Getenv("GOOGLE_APPLICATION_CREDENTIALS"))
+	fw := util.NewFilesystemWriter()
+	nm := node.NewNode(fw, c.CodesphereEnv.SSHPrivateKeyPath)
+
+	bs, err := gcp.NewGCPBootstrapper(ctx, c.Env, stlog, c.CodesphereEnv, icg, gcpClient, nm, fw)
 	if err != nil {
 		return err
 	}
 
-	env, err := bootstrapper.Bootstrap()
-	envBytes, err2 := json.MarshalIndent(env, "", "  ")
+	c.CodesphereEnv.RegistryType = gcp.RegistryType(c.InputRegistryType)
+
+	err = bs.Bootstrap()
+	envBytes, err2 := json.MarshalIndent(bs.Env, "", "  ")
 	envString := string(envBytes)
 	if err2 != nil {
 		envString = ""
 	}
 	if err != nil {
-		if env.Jumpbox.ExternalIP != "" {
-			log.Printf("To debug on the jumpbox host:\nssh-add $SSH_KEY_PATH; ssh -o StrictHostKeyChecking=no -o ForwardAgent=yes -o SendEnv=OMS_PORTAL_API_KEY root@%s", env.Jumpbox.ExternalIP)
+		if bs.Env.Jumpbox != nil && bs.Env.Jumpbox.GetExternalIP() != "" {
+			log.Printf("To debug on the jumpbox host:\nssh-add $SSH_KEY_PATH; ssh -o StrictHostKeyChecking=no -o ForwardAgent=yes -o SendEnv=OMS_PORTAL_API_KEY root@%s", bs.Env.Jumpbox.GetExternalIP())
 		}
 		return fmt.Errorf("failed to bootstrap GCP: %w, env: %s", err, envString)
 	}
-	log.Println("GCP infrastructure bootstrapped:")
 
+	log.Println("\nGCP infrastructure bootstrapped:")
 	log.Println(envString)
-
-	log.Printf("Start the Codesphere installation using OMS from the jumpbox host:\nssh-add $SSH_KEY_PATH; ssh -o StrictHostKeyChecking=no -o ForwardAgent=yes -o SendEnv=OMS_PORTAL_API_KEY root@%s", env.Jumpbox.ExternalIP)
-
-	log.Printf("When the installation is done, run the k0s configuration script generated at the k0s-1 host %s /root/configure-k0s.sh.", env.ControlPlaneNodes[0].InternalIP)
+	log.Printf("Start the Codesphere installation using OMS from the jumpbox host:\nssh-add $SSH_KEY_PATH; ssh -o StrictHostKeyChecking=no -o ForwardAgent=yes -o SendEnv=OMS_PORTAL_API_KEY root@%s", bs.Env.Jumpbox.GetExternalIP())
+	log.Printf("When the installation is done, run the k0s configuration script generated at the k0s-1 host %s /root/configure-k0s.sh.", bs.Env.ControlPlaneNodes[0].GetInternalIP())
 
 	return err
 }

internal/bootstrap/bootstrap_stepper.go

@@ -0,0 +1,84 @@
+package bootstrap
+
+import (
+	"fmt"
+)
+
+const (
+	LINE_RESET         = "\r\033[2K"
+	MOVE_UP            = "\033[1A"
+	MOVE_UP_CLEAR_LINE = "\033[1A\033[K"
+	RESET_TEXT         = "\033[0m"
+	RED_TEXT           = "\033[31m"
+	GREEN_TEXT         = "\033[32m"
+)
+
+type StepLogger struct {
+	silent      bool
+	subSteps    int
+	currentStep string
+}
+
+func NewStepLogger(silent bool) *StepLogger {
+	return &StepLogger{
+		silent: silent,
+	}
+}
+
+func (b *StepLogger) Step(name string, fn func() error) error {
+	if b.silent {
+		return fn()
+	}
+
+	b.subSteps = 0
+	b.currentStep = name
+
+	fmt.Printf("%s%s%s...", LINE_RESET, RESET_TEXT, name)
+	err := fn()
+	if err != nil {
+		fmt.Printf("%s%s%s failed: %v%s\n", LINE_RESET, RED_TEXT, name, err, RESET_TEXT)
+	} else {
+		for i := 0; i < b.subSteps; i++ {
+			fmt.Printf("%s", MOVE_UP_CLEAR_LINE)
+		}
+		fmt.Printf("%s%s%s %s✓%s\n", LINE_RESET, RESET_TEXT, name, GREEN_TEXT, RESET_TEXT)
+	}
+	return err
+}
+
+func (b *StepLogger) Substep(name string, fn func() error) error {
+	if b.silent {
+		return fn()
+	}
+
+	b.subSteps += 1
+	b.currentStep = name
+
+	fmt.Printf("%s%s   %s...", LINE_RESET, RESET_TEXT, name)
+	err := fn()
+	if err != nil {
+		fmt.Printf("%s%s   %s failed: %v%s\n", LINE_RESET, RED_TEXT, name, err, RESET_TEXT)
+	} else {
+		fmt.Printf("%s%s   %s %s✓%s\n", LINE_RESET, RESET_TEXT, name, GREEN_TEXT, RESET_TEXT)
+	}
+	return err
+}
+
+// LogRetry prints a retry message for the current step.
+func (b *StepLogger) LogRetry() {
+	if b.subSteps > 0 {
+		fmt.Printf("%s%s   Retrying: %s...%s", LINE_RESET, RESET_TEXT, b.currentStep, RESET_TEXT)
+	} else {
+		fmt.Printf("%s%sRetrying: %s...%s", LINE_RESET, RESET_TEXT, b.currentStep, RESET_TEXT)
+	}
+}
+
+// Logf prints a log message for the current step.
+func (b *StepLogger) Logf(message string, args ...interface{}) {
+	if b.silent {
+		return
+	}
+
+	b.subSteps += 1
+	fmt.Printf("%s%s      %s%s\n", LINE_RESET, RESET_TEXT, fmt.Sprintf(message, args...), RESET_TEXT)
+}