From e25526cfc9f2504638ef4ec9dcd13a467b289157 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 17 Sep 2022 18:43:51 +0200 Subject: [PATCH] art: Rebranding (#130) See: https://github.com/c3os-io/c3os/issues/88 --- internal/agent/agent.go | 16 ++++++++-------- internal/agent/config.go | 13 +++++++------ internal/agent/hooks/gruboptions.go | 4 ++-- internal/agent/hooks/hook.go | 2 +- internal/agent/hooks/lifecycle.go | 4 ++-- internal/agent/hooks/runstage.go | 10 +++++----- internal/agent/install.go | 18 +++++++++--------- internal/agent/interactive_install.go | 14 +++++++------- internal/agent/notify.go | 6 +++--- internal/agent/recovery.go | 10 +++++----- internal/agent/reset.go | 6 +++--- internal/agent/upgrade.go | 8 ++++---- internal/bus/bus.go | 2 +- internal/c3os/branding.go | 7 ------- internal/cmd/utils.go | 7 ++++--- internal/kairos/branding.go | 7 +++++++ 16 files changed, 68 insertions(+), 66 deletions(-) delete mode 100644 internal/c3os/branding.go create mode 100644 internal/kairos/branding.go diff --git a/internal/agent/agent.go b/internal/agent/agent.go index 668a297..8a61c52 100644 --- a/internal/agent/agent.go +++ b/internal/agent/agent.go @@ -6,12 +6,12 @@ import ( "os" "path/filepath" - events "github.com/c3os-io/c3os/sdk/bus" + events "github.com/kairos-io/kairos/sdk/bus" - "github.com/c3os-io/c3os/internal/bus" - config "github.com/c3os-io/c3os/pkg/config" - machine "github.com/c3os-io/c3os/pkg/machine" - bundles "github.com/c3os-io/c3os/sdk/bundles" + "github.com/kairos-io/kairos/internal/bus" + config "github.com/kairos-io/kairos/pkg/config" + machine "github.com/kairos-io/kairos/pkg/machine" + bundles "github.com/kairos-io/kairos/sdk/bundles" "github.com/nxadm/tail" ) @@ -22,7 +22,7 @@ func Run(opts ...Option) error { return err } - os.MkdirAll("/usr/local/.c3os", 0600) //nolint:errcheck + os.MkdirAll("/usr/local/.kairos", 0600) //nolint:errcheck // Reads config c, err := config.Scan(config.Directories(o.Dir...)) @@ -36,9 +36,9 @@ func Run(opts ...Option) error { return nil } - os.MkdirAll("/var/log/c3os", 0600) //nolint:errcheck + os.MkdirAll("/var/log/kairos", 0600) //nolint:errcheck - fileName := filepath.Join("/var/log/c3os", "agent-provider.log") + fileName := filepath.Join("/var/log/kairos", "agent-provider.log") // Create if not exist if _, err := os.Stat(fileName); err != nil { diff --git a/internal/agent/config.go b/internal/agent/config.go index abec42a..876ea1c 100644 --- a/internal/agent/config.go +++ b/internal/agent/config.go @@ -3,7 +3,8 @@ package agent import ( "io/ioutil" - "github.com/c3os-io/c3os/internal/c3os" + "github.com/kairos-io/kairos/internal/kairos" + "gopkg.in/yaml.v2" ) @@ -20,7 +21,7 @@ type Config struct { func LoadConfig(path ...string) (*Config, error) { if len(path) == 0 { - path = append(path, "/etc/c3os/agent.yaml", "/etc/elemental/config.yaml") + path = append(path, "/etc/kairos/agent.yaml", "/etc/elemental/config.yaml") } cfg := &Config{} @@ -33,28 +34,28 @@ func LoadConfig(path ...string) (*Config, error) { } if cfg.Branding.InteractiveInstall == "" { - f, err := ioutil.ReadFile(c3os.BrandingFile("interactive_install_text")) + f, err := ioutil.ReadFile(kairos.BrandingFile("interactive_install_text")) if err == nil { cfg.Branding.InteractiveInstall = string(f) } } if cfg.Branding.Install == "" { - f, err := ioutil.ReadFile(c3os.BrandingFile("install_text")) + f, err := ioutil.ReadFile(kairos.BrandingFile("install_text")) if err == nil { cfg.Branding.Install = string(f) } } if cfg.Branding.Recovery == "" { - f, err := ioutil.ReadFile(c3os.BrandingFile("recovery_text")) + f, err := ioutil.ReadFile(kairos.BrandingFile("recovery_text")) if err == nil { cfg.Branding.Recovery = string(f) } } if cfg.Branding.Reset == "" { - f, err := ioutil.ReadFile(c3os.BrandingFile("reset_text")) + f, err := ioutil.ReadFile(kairos.BrandingFile("reset_text")) if err == nil { cfg.Branding.Reset = string(f) } diff --git a/internal/agent/hooks/gruboptions.go b/internal/agent/hooks/gruboptions.go index 2d0afaa..d3df2f0 100644 --- a/internal/agent/hooks/gruboptions.go +++ b/internal/agent/hooks/gruboptions.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - config "github.com/c3os-io/c3os/pkg/config" - "github.com/c3os-io/c3os/pkg/utils" + config "github.com/kairos-io/kairos/pkg/config" + "github.com/kairos-io/kairos/pkg/utils" ) type GrubOptions struct{} diff --git a/internal/agent/hooks/hook.go b/internal/agent/hooks/hook.go index b914c60..3be002a 100644 --- a/internal/agent/hooks/hook.go +++ b/internal/agent/hooks/hook.go @@ -1,7 +1,7 @@ package hook import ( - config "github.com/c3os-io/c3os/pkg/config" + config "github.com/kairos-io/kairos/pkg/config" ) type Interface interface { diff --git a/internal/agent/hooks/lifecycle.go b/internal/agent/hooks/lifecycle.go index 0f15a57..e1aa65a 100644 --- a/internal/agent/hooks/lifecycle.go +++ b/internal/agent/hooks/lifecycle.go @@ -1,8 +1,8 @@ package hook import ( - config "github.com/c3os-io/c3os/pkg/config" - "github.com/c3os-io/c3os/pkg/utils" + config "github.com/kairos-io/kairos/pkg/config" + "github.com/kairos-io/kairos/pkg/utils" ) type Lifecycle struct{} diff --git a/internal/agent/hooks/runstage.go b/internal/agent/hooks/runstage.go index e20a253..47aafb3 100644 --- a/internal/agent/hooks/runstage.go +++ b/internal/agent/hooks/runstage.go @@ -1,16 +1,16 @@ package hook import ( - config "github.com/c3os-io/c3os/pkg/config" - "github.com/c3os-io/c3os/pkg/utils" + config "github.com/kairos-io/kairos/pkg/config" + "github.com/kairos-io/kairos/pkg/utils" - events "github.com/c3os-io/c3os/sdk/bus" + events "github.com/kairos-io/kairos/sdk/bus" ) type RunStage struct{} func (r RunStage) Run(c config.Config) error { - utils.SH("elemental run-stage c3os-install.after") //nolint:errcheck - events.RunHookScript("/usr/bin/c3os-agent.install.after.hook") //nolint:errcheck + utils.SH("elemental run-stage kairos-install.after") //nolint:errcheck + events.RunHookScript("/usr/bin/kairos-agent.install.after.hook") //nolint:errcheck return nil } diff --git a/internal/agent/install.go b/internal/agent/install.go index b3b965c..c5d6e28 100644 --- a/internal/agent/install.go +++ b/internal/agent/install.go @@ -10,17 +10,17 @@ import ( "syscall" "time" - events "github.com/c3os-io/c3os/sdk/bus" + events "github.com/kairos-io/kairos/sdk/bus" - config "github.com/c3os-io/c3os/pkg/config" + config "github.com/kairos-io/kairos/pkg/config" - hook "github.com/c3os-io/c3os/internal/agent/hooks" - "github.com/c3os-io/c3os/internal/bus" + hook "github.com/kairos-io/kairos/internal/agent/hooks" + "github.com/kairos-io/kairos/internal/bus" - "github.com/c3os-io/c3os/internal/cmd" - "github.com/c3os-io/c3os/pkg/utils" + "github.com/kairos-io/kairos/internal/cmd" + "github.com/kairos-io/kairos/pkg/utils" - machine "github.com/c3os-io/c3os/pkg/machine" + machine "github.com/kairos-io/kairos/pkg/machine" qr "github.com/mudler/go-nodepair/qrcode" "github.com/mudler/go-pluggable" "github.com/pterm/pterm" @@ -185,8 +185,8 @@ func Install(dir ...string) error { } func RunInstall(options map[string]string) error { - utils.SH("elemental run-stage c3os-install.pre") //nolint:errcheck - events.RunHookScript("/usr/bin/c3os-agent.install.pre.hook") //nolint:errcheck + utils.SH("elemental run-stage kairos-install.pre") //nolint:errcheck + events.RunHookScript("/usr/bin/kairos-agent.install.pre.hook") //nolint:errcheck f, _ := ioutil.TempFile("", "xxxx") defer os.RemoveAll(f.Name()) diff --git a/internal/agent/interactive_install.go b/internal/agent/interactive_install.go index e1488f2..19b10a8 100644 --- a/internal/agent/interactive_install.go +++ b/internal/agent/interactive_install.go @@ -5,16 +5,16 @@ import ( "fmt" "strings" - "github.com/c3os-io/c3os/internal/bus" - "github.com/c3os-io/c3os/internal/cmd" - config "github.com/c3os-io/c3os/pkg/config" + "github.com/kairos-io/kairos/internal/bus" + "github.com/kairos-io/kairos/internal/cmd" + config "github.com/kairos-io/kairos/pkg/config" - events "github.com/c3os-io/c3os/sdk/bus" - "github.com/c3os-io/c3os/sdk/unstructured" + events "github.com/kairos-io/kairos/sdk/bus" + "github.com/kairos-io/kairos/sdk/unstructured" - "github.com/c3os-io/c3os/pkg/utils" "github.com/erikgeiser/promptkit/textinput" "github.com/jaypipes/ghw" + "github.com/kairos-io/kairos/pkg/utils" "github.com/mudler/go-pluggable" "github.com/mudler/yip/pkg/schema" "github.com/pterm/pterm" @@ -165,7 +165,7 @@ func InteractiveInstall(spawnShell bool) error { return err } - userName, err := prompt("User to setup", "c3os", canBeEmpty, true, false) + userName, err := prompt("User to setup", "kairos", canBeEmpty, true, false) if err != nil { return err } diff --git a/internal/agent/notify.go b/internal/agent/notify.go index fe11497..73ce3c1 100644 --- a/internal/agent/notify.go +++ b/internal/agent/notify.go @@ -3,9 +3,9 @@ package agent import ( "fmt" - "github.com/c3os-io/c3os/internal/bus" - "github.com/c3os-io/c3os/pkg/config" - events "github.com/c3os-io/c3os/sdk/bus" + "github.com/kairos-io/kairos/internal/bus" + "github.com/kairos-io/kairos/pkg/config" + events "github.com/kairos-io/kairos/sdk/bus" "github.com/mudler/go-pluggable" ) diff --git a/internal/agent/recovery.go b/internal/agent/recovery.go index 63763ac..6a1f6c4 100644 --- a/internal/agent/recovery.go +++ b/internal/agent/recovery.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - "github.com/c3os-io/c3os/internal/bus" - "github.com/c3os-io/c3os/internal/cmd" - "github.com/c3os-io/c3os/pkg/utils" - events "github.com/c3os-io/c3os/sdk/bus" + "github.com/kairos-io/kairos/internal/bus" + "github.com/kairos-io/kairos/internal/cmd" + "github.com/kairos-io/kairos/pkg/utils" + events "github.com/kairos-io/kairos/sdk/bus" - machine "github.com/c3os-io/c3os/pkg/machine" + machine "github.com/kairos-io/kairos/pkg/machine" qr "github.com/mudler/go-nodepair/qrcode" "github.com/mudler/go-pluggable" "github.com/pterm/pterm" diff --git a/internal/agent/reset.go b/internal/agent/reset.go index b4949dc..473bddc 100644 --- a/internal/agent/reset.go +++ b/internal/agent/reset.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/c3os-io/c3os/internal/cmd" - "github.com/c3os-io/c3os/pkg/machine" - "github.com/c3os-io/c3os/pkg/utils" + "github.com/kairos-io/kairos/internal/cmd" + "github.com/kairos-io/kairos/pkg/machine" + "github.com/kairos-io/kairos/pkg/utils" "github.com/pterm/pterm" ) diff --git a/internal/agent/upgrade.go b/internal/agent/upgrade.go index 00e27a4..2b1bff0 100644 --- a/internal/agent/upgrade.go +++ b/internal/agent/upgrade.go @@ -8,11 +8,11 @@ import ( "os/exec" "strings" - events "github.com/c3os-io/c3os/sdk/bus" + events "github.com/kairos-io/kairos/sdk/bus" - "github.com/c3os-io/c3os/internal/bus" - "github.com/c3os-io/c3os/pkg/github" - "github.com/c3os-io/c3os/pkg/utils" + "github.com/kairos-io/kairos/internal/bus" + "github.com/kairos-io/kairos/pkg/github" + "github.com/kairos-io/kairos/pkg/utils" "github.com/mudler/go-pluggable" ) diff --git a/internal/bus/bus.go b/internal/bus/bus.go index 7beae44..f102a77 100644 --- a/internal/bus/bus.go +++ b/internal/bus/bus.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/c3os-io/c3os/sdk/bus" + "github.com/kairos-io/kairos/sdk/bus" "github.com/mudler/go-pluggable" ) diff --git a/internal/c3os/branding.go b/internal/c3os/branding.go deleted file mode 100644 index f34cd8a..0000000 --- a/internal/c3os/branding.go +++ /dev/null @@ -1,7 +0,0 @@ -package c3os - -import "path" - -func BrandingFile(s string) string { - return path.Join("/etc", "c3os", "branding", s) -} diff --git a/internal/cmd/utils.go b/internal/cmd/utils.go index ffc7663..39fd2af 100644 --- a/internal/cmd/utils.go +++ b/internal/cmd/utils.go @@ -5,8 +5,9 @@ import ( "io/ioutil" "os" - "github.com/c3os-io/c3os/internal/c3os" - "github.com/c3os-io/c3os/pkg/utils" + "github.com/kairos-io/kairos/internal/kairos" + + "github.com/kairos-io/kairos/pkg/utils" "github.com/pterm/pterm" ) @@ -16,7 +17,7 @@ func PrintText(f string, banner string) { } func PrintBranding(b []byte) { - brandingFile := c3os.BrandingFile("banner") + brandingFile := kairos.BrandingFile("banner") if _, err := os.Stat(brandingFile); err == nil { f, err := ioutil.ReadFile(brandingFile) if err == nil { diff --git a/internal/kairos/branding.go b/internal/kairos/branding.go new file mode 100644 index 0000000..7614d93 --- /dev/null +++ b/internal/kairos/branding.go @@ -0,0 +1,7 @@ +package kairos + +import "path" + +func BrandingFile(s string) string { + return path.Join("/etc", "kairos", "branding", s) +}