cli: pass config structure to Snapshots structure instead of one spec…

…ific option Signed-off-by: Jérôme Jutteau <[email protected]>
outscale · Mar 16, 2022 · efa7bb5 · efa7bb5
1 parent 761f0bf
commit efa7bb5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/cmd/frieza/cli_clean.go b/cmd/frieza/cli_clean.go
@@ -31,7 +31,7 @@ func clean(customConfigPath string, snapshotName *string, plan bool, autoApprove
 	if err != nil {
 		log.Fatalf("Cannot load configuration: %s", err.Error())
 	}
-	snapshot, err := SnapshotLoad(*snapshotName, config.SnapshotFolderPath)
+	snapshot, err := SnapshotLoad(*snapshotName, config)
 	if err != nil {
 		log.Fatalf("Error load snapshot %s: %s", *snapshotName, err.Error())
 	}

diff --git a/cmd/frieza/cli_snapshot.go b/cmd/frieza/cli_snapshot.go
@@ -85,7 +85,7 @@ func snapshotNew(customConfigPath string, args []string) {
 	if err != nil {
 		log.Fatalf("Cannot load configuration: %s", err.Error())
 	}
-	if _, err = SnapshotLoad(snapshotName, config.SnapshotFolderPath); err == nil {
+	if _, err = SnapshotLoad(snapshotName, config); err == nil {
 		log.Fatalf("Snapshot %s already exist", snapshotName)
 	}
 
@@ -121,6 +121,7 @@ func snapshotNew(customConfigPath string, args []string) {
 		Version: SnapshotVersion(),
 		Name:    snapshotName,
 		Date:    date,
+		Config:  config,
 	}
 	for i, provider := range providers {
 		snapshot.Data = append(snapshot.Data, SnapshotData{
@@ -151,7 +152,7 @@ func snapshotLs(customConfigPath string) {
 			continue
 		}
 		snapshotName := strings.TrimSuffix(file.Name(), ".json")
-		if snapshot, err := SnapshotLoad(snapshotName, config.SnapshotFolderPath); err == nil {
+		if snapshot, err := SnapshotLoad(snapshotName, config); err == nil {
 			fmt.Println(snapshot.Name)
 		}
 	}
@@ -169,7 +170,7 @@ func snapshotDescribe(customConfigPath string, snapshotName *string) {
 	if err != nil {
 		log.Fatalf("Error while reading snapshots: %s", err.Error())
 	}
-	snapshot, err := SnapshotLoad(*snapshotName, config.SnapshotFolderPath)
+	snapshot, err := SnapshotLoad(*snapshotName, config)
 	if err != nil {
 		log.Fatalf("Cannot load snapshot %s: %s", *snapshotName, err.Error())
 	}
@@ -185,7 +186,7 @@ func snapshotRm(customConfigPath string, snapshotName *string) {
 	if err != nil {
 		log.Fatalf("Cannot load configuration: %s", err.Error())
 	}
-	snapshot, err := SnapshotLoad(*snapshotName, config.SnapshotFolderPath)
+	snapshot, err := SnapshotLoad(*snapshotName, config)
 	if err != nil {
 		log.Fatalf("Error while deleting snapshot %s: %s", *snapshotName, err.Error())
 	}

diff --git a/internal/common/snapshot.go b/internal/common/snapshot.go
@@ -12,11 +12,11 @@ import (
 type Objects = map[ObjectType][]Object
 
 type Snapshot struct {
-	Version    int            `json:"version"`
-	Name       string         `json:"name"`
-	Date       string         `json:"date"`
-	Data       []SnapshotData `json:"data"`
-	FolderPath string         `json:"-"`
+	Version int            `json:"version"`
+	Name    string         `json:"name"`
+	Date    string         `json:"date"`
+	Data    []SnapshotData `json:"data"`
+	Config  *Config        `json:"-"`
 }
 
 type SnapshotData struct {
@@ -130,7 +130,7 @@ func ObjectsPrint(provider *Provider, objects *Objects) string {
 }
 
 func (snapshot *Snapshot) Write() error {
-	if err := os.MkdirAll(snapshot.FolderPath, os.ModePerm); err != nil {
+	if err := os.MkdirAll(snapshot.Config.SnapshotFolderPath, os.ModePerm); err != nil {
 		return err
 	}
 	json_bytes, err := json.MarshalIndent(snapshot, "", "  ")
@@ -144,13 +144,13 @@ func (snapshot *Snapshot) Write() error {
 }
 
 func (snapshot *Snapshot) Path() string {
-	return path.Join(snapshot.FolderPath, snapshot.Name+".json")
+	return path.Join(snapshot.Config.SnapshotFolderPath, snapshot.Name+".json")
 }
 
-func SnapshotLoad(name string, snapshotFolderPath string) (*Snapshot, error) {
+func SnapshotLoad(name string, config *Config) (*Snapshot, error) {
 	snapshot := &Snapshot{
-		Name:       name,
-		FolderPath: snapshotFolderPath,
+		Name:   name,
+		Config: config,
 	}
 	snapshot_json, err := ioutil.ReadFile(snapshot.Path())
 	if err != nil {