installer: orginize bootstrapper, improve service IP handling
diff --git a/core/installer/cmd/env_manager.go b/core/installer/cmd/env_manager.go
index a74369d..a77061a 100644
--- a/core/installer/cmd/env_manager.go
+++ b/core/installer/cmd/env_manager.go
@@ -2,6 +2,7 @@
import (
"log"
+ "net/netip"
"os"
"github.com/spf13/cobra"
@@ -12,8 +13,8 @@
)
var envManagerFlags struct {
- repoIP string
- repoPort int
+ repoAddr string
+ repoName string
sshKey string
port int
}
@@ -24,15 +25,15 @@
RunE: envManagerCmdRun,
}
cmd.Flags().StringVar(
- &envManagerFlags.repoIP,
- "repo-ip",
+ &envManagerFlags.repoAddr,
+ "repo-addr",
"",
"",
)
- cmd.Flags().IntVar(
- &envManagerFlags.repoPort,
- "repo-port",
- 22,
+ cmd.Flags().StringVar(
+ &envManagerFlags.repoName,
+ "repo-name",
+ "",
"",
)
cmd.Flags().StringVar(
@@ -55,11 +56,15 @@
if err != nil {
return err
}
- ss, err := soft.NewClient(envManagerFlags.repoIP, envManagerFlags.repoPort, sshKey, log.Default())
+ repoAddr, err := netip.ParseAddrPort(envManagerFlags.repoAddr)
if err != nil {
return err
}
- repo, err := ss.GetRepo("pcloud")
+ ss, err := soft.NewClient(repoAddr, sshKey, log.Default())
+ if err != nil {
+ return err
+ }
+ repo, err := ss.GetRepo(envManagerFlags.repoName)
if err != nil {
return err
}