mirror of
https://github.com/kairos-io/kairos-agent.git
synced 2025-08-24 11:02:55 +00:00
bug: Fix manual install not supporting configuration url (#963)
* fixed manual install not supporting configuration url Signed-off-by: Jacob Payne <jacob@spectrocloud.com> * break out url logic and add testing. Signed-off-by: Jacob Payne <jacob@spectrocloud.com> --------- Signed-off-by: Jacob Payne <jacob@spectrocloud.com> Co-authored-by: Ettore Di Giacinto <mudler@users.noreply.github.com>
This commit is contained in:
parent
d8d97097a7
commit
e57ef905a4
@ -1,12 +1,13 @@
|
|||||||
package agent
|
package agent
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
@ -63,28 +64,24 @@ func displayInfo(agentConfig *Config) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func ManualInstall(c string, options map[string]string, strictValidations bool) error {
|
func ManualInstall(c string, options map[string]string, strictValidations bool) error {
|
||||||
dat, err := os.ReadFile(c)
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
source, err := prepareConfiguration(ctx, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
dir, err := os.MkdirTemp("", "kairos-install")
|
cc, err := config.Scan(config.Directories(source), config.MergeBootLine, config.StrictValidation(strictValidations))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer os.RemoveAll(dir)
|
|
||||||
|
|
||||||
if err := os.WriteFile(filepath.Join(dir, "config.yaml"), dat, 0600); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
cc, err := config.Scan(config.Directories(dir), config.MergeBootLine, config.StrictValidation(strictValidations))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
options["cc"] = cc.String()
|
options["cc"] = cc.String()
|
||||||
|
|
||||||
|
if options["device"] == "" {
|
||||||
|
options["device"] = cc.Install.Device
|
||||||
|
}
|
||||||
|
|
||||||
return RunInstall(options)
|
return RunInstall(options)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -325,3 +322,31 @@ func ensureDataSourceReady() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func prepareConfiguration(ctx context.Context, source string) (string, error) {
|
||||||
|
// if the source is not an url it is already a configuration path
|
||||||
|
if u, err := url.Parse(source); err != nil || u.Scheme == "" {
|
||||||
|
return source, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// create a configuration file with the source referenced
|
||||||
|
f, err := os.CreateTemp(os.TempDir(), "kairos-install-*.yaml")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// defer cleanup until after parent is done
|
||||||
|
go func() {
|
||||||
|
<-ctx.Done()
|
||||||
|
_ = os.RemoveAll(f.Name())
|
||||||
|
}()
|
||||||
|
|
||||||
|
cfg := config.Config{
|
||||||
|
ConfigURL: source,
|
||||||
|
}
|
||||||
|
if err = yaml.NewEncoder(f).Encode(cfg); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return f.Name(), nil
|
||||||
|
}
|
||||||
|
54
internal/agent/install_test.go
Normal file
54
internal/agent/install_test.go
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
package agent
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"github.com/kairos-io/kairos/pkg/config"
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
. "github.com/onsi/ginkgo/v2"
|
||||||
|
. "github.com/onsi/gomega"
|
||||||
|
)
|
||||||
|
|
||||||
|
var _ = Describe("prepareConfiguration", func() {
|
||||||
|
path := "/foo/bar"
|
||||||
|
url := "https://example.com"
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
|
||||||
|
It("returns a file path with no modifications", func() {
|
||||||
|
source, err := prepareConfiguration(ctx, path)
|
||||||
|
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
Expect(source).To(Equal(path))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("creates a configuration file containing the given url", func() {
|
||||||
|
source, err := prepareConfiguration(ctx, url)
|
||||||
|
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
Expect(source).ToNot(Equal(path))
|
||||||
|
|
||||||
|
f, err := os.Open(source)
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
|
||||||
|
var cfg config.Config
|
||||||
|
err = yaml.NewDecoder(f).Decode(&cfg)
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
|
||||||
|
Expect(cfg.ConfigURL).To(Equal(url))
|
||||||
|
})
|
||||||
|
|
||||||
|
It("cleans up the configuration file after context is done", func() {
|
||||||
|
source, err := prepareConfiguration(ctx, url)
|
||||||
|
cancel()
|
||||||
|
|
||||||
|
_, err = os.Stat(source)
|
||||||
|
Expect(os.IsNotExist(err))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
func TestPrepareConfiguration(t *testing.T) {
|
||||||
|
RegisterFailHandler(Fail)
|
||||||
|
RunSpecs(t, "prepareConfiguration Suite")
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user