Remove ContextFile from RuntimeConfig

See lf-edge#827 Signed-off-by: Pavel Abramov <uncle.decart@gmail.com>
uncleDecart · Dec 9, 2022 · b100fab · b100fab
1 parent 96b7928
commit b100fab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cmd/edenConfig.go b/cmd/edenConfig.go
@@ -40,6 +40,7 @@ func newConfigCmd(configName, verbosity *string) *cobra.Command {
 
 func newConfigAddCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	var force bool
+	var contextFile string
 
 	var configAddCmd = &cobra.Command{
 		Use:   "add [name]",
@@ -58,7 +59,7 @@ func newConfigAddCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 			if len(args) > 0 {
 				configName = args[0]
 			}
-			if err := openevec.ConfigAdd(cfg, configName, force); err != nil {
+			if err := openevec.ConfigAdd(cfg, configName, contextFile, force); err != nil {
 				log.Fatal(err)
 			}
 		},
@@ -67,7 +68,7 @@ func newConfigAddCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	configAddCmd.Flags().StringVar(&cfg.Eve.DevModel, "devmodel", defaults.DefaultQemuModel,
 		fmt.Sprintf("device model (%s/%s/%s/%s)",
 			defaults.DefaultQemuModel, defaults.DefaultRPIModel, defaults.DefaultGCPModel, defaults.DefaultGeneralModel))
-	configAddCmd.Flags().StringVar(&cfg.Runtime.ContextFile, "file", "", "file with config to add")
+	configAddCmd.Flags().StringVar(&contextFile, "file", "", "file with config to add")
 	//not used in function
 	configAddCmd.Flags().StringVarP(&cfg.Eve.QemuFileToSave, "qemu-config", "", defaults.DefaultQemuFileToSave, "file to save config")
 	configAddCmd.Flags().IntVarP(&cfg.Eve.QemuCpus, "cpus", "", defaults.DefaultCpus, "cpus")

diff --git a/pkg/openevec/config.go b/pkg/openevec/config.go
@@ -147,7 +147,6 @@ type RegistryConfig struct {
 }
 
 type RuntimeConfig struct {
-	ContextFile       string   `cobraflag:"file"`
 	PodName           string   `cobraflag:"name"`
 	NoHyper           bool     `cobraflag:"no-hyper"`
 	PodMetadata       string   `cobraflag:"metadata"`

diff --git a/pkg/openevec/edenConfig.go b/pkg/openevec/edenConfig.go
@@ -55,7 +55,7 @@ func ReloadConfigDetails(cfg *EdenSetupArgs) error {
 	return nil
 }
 
-func ConfigAdd(cfg *EdenSetupArgs, currentContext string, force bool) error {
+func ConfigAdd(cfg *EdenSetupArgs, currentContext, contextFile string, force bool) error {
 	var err error
 	if cfg.ConfigFile == "" {
 		cfg.ConfigFile, err = utils.DefaultConfigPath()
@@ -97,11 +97,11 @@ func ConfigAdd(cfg *EdenSetupArgs, currentContext string, force bool) error {
 		context.Current = "default"
 	}
 	cfg.ConfigFile = context.GetCurrentConfig()
-	if cfg.Runtime.ContextFile != "" {
-		if err := utils.CopyFile(cfg.Runtime.ContextFile, cfg.ConfigFile); err != nil {
+	if contextFile != "" {
+		if err := utils.CopyFile(contextFile, cfg.ConfigFile); err != nil {
 			return fmt.Errorf("cannot copy file: %w", err)
 		}
-		log.Infof("Context file generated: %s", cfg.Runtime.ContextFile)
+		log.Infof("Context file generated: %s", contextFile)
 	} else {
 		if _, err := os.Stat(cfg.ConfigFile); os.IsNotExist(err) {
 			if err = utils.GenerateConfigFileDiff(cfg.ConfigFile, context); err != nil {