fix: Refresh ~/.finch/confg.json based on finch.yaml

cmd/finch/virtual_machine.go

@@ -36,19 +36,20 @@ func newVirtualMachineCommand(
 	fp path.Finch,
 	fs afero.Fs,
 	diskManager disk.UserDataDiskManager,
+	finchDir string,
 ) *cobra.Command {
 	virtualMachineCommand := &cobra.Command{
 		Use:   virtualMachineRootCmd,
 		Short: "Manage the virtual machine lifecycle",
 	}
 
 	virtualMachineCommand.AddCommand(
-		newStartVMCommand(limaCmdCreator, logger, optionalDepGroups, lca, nca, fs, fp.LimaSSHPrivateKeyPath(), diskManager),
+		newStartVMCommand(limaCmdCreator, logger, optionalDepGroups, lca, nca, fs, fp.LimaSSHPrivateKeyPath(), diskManager, finchDir),
 		newStopVMCommand(limaCmdCreator, diskManager, logger),
 		newRemoveVMCommand(limaCmdCreator, diskManager, logger),
 		newStatusVMCommand(limaCmdCreator, logger, os.Stdout),
 		newInitVMCommand(limaCmdCreator, logger, optionalDepGroups, lca, nca, fp.BaseYamlFilePath(), fs,
-			fp.LimaSSHPrivateKeyPath(), diskManager),
+			fp.LimaSSHPrivateKeyPath(), diskManager, finchDir),
 		newSettingsVMCommand(logger, lca, fs, os.Stdout),
 	)
 
@@ -106,10 +107,12 @@ func virtualMachineCommands(
 	home string,
 	finchRootPath string,
 ) *cobra.Command {
+	finchDir := fp.FinchDir(finchRootPath)
+
 	return newVirtualMachineCommand(
 		lcc,
 		logger,
-		dependencies(ecc, fc, fp, fs, lcc, logger, fp.FinchDir(finchRootPath)),
+		dependencies(ecc, fc, fp, fs, lcc, logger, finchDir),
 		config.NewLimaApplier(
 			fc,
 			ecc,
@@ -123,13 +126,14 @@ func virtualMachineCommands(
 			fssh.NewDialer(),
 			fs,
 			fp.LimaSSHPrivateKeyPath(),
-			fp.FinchDir(finchRootPath),
+			finchDir,
 			home,
 			fp.LimaInstancePath(),
 			fc,
 		),
 		fp,
 		fs,
 		disk.NewUserDataDiskManager(lcc, ecc, &afero.OsFs{}, fp, finchRootPath, fc, logger),
+		finchDir,
 	)
 }

cmd/finch/virtual_machine_init.go

@@ -5,7 +5,9 @@ package main
 
 import (
 	"fmt"
+	"path/filepath"
 
+	"github.com/runfinch/finch/pkg/dependency/credhelper"
 	"github.com/runfinch/finch/pkg/disk"
 
 	"github.com/runfinch/finch/pkg/command"
@@ -28,11 +30,12 @@ func newInitVMCommand(
 	fs afero.Fs,
 	privateKeyPath string,
 	diskManager disk.UserDataDiskManager,
+	finchDir string,
 ) *cobra.Command {
 	initVMCommand := &cobra.Command{
 		Use:      "init",
 		Short:    "Initialize the virtual machine",
-		RunE:     newInitVMAction(lcc, logger, optionalDepGroups, lca, baseYamlFilePath, diskManager).runAdapter,
+		RunE:     newInitVMAction(lcc, logger, optionalDepGroups, lca, baseYamlFilePath, fs, diskManager, finchDir).runAdapter,
 		PostRunE: newPostVMStartInitAction(logger, lcc, fs, privateKeyPath, nca).runAdapter,
 	}
 
@@ -45,7 +48,9 @@ type initVMAction struct {
 	logger            flog.Logger
 	optionalDepGroups []*dependency.Group
 	limaConfigApplier config.LimaConfigApplier
+	fs                afero.Fs
 	diskManager       disk.UserDataDiskManager
+	finchDir          string
 }
 
 func newInitVMAction(
@@ -54,15 +59,19 @@ func newInitVMAction(
 	optionalDepGroups []*dependency.Group,
 	lca config.LimaConfigApplier,
 	baseYamlFilePath string,
+	fs afero.Fs,
 	diskManager disk.UserDataDiskManager,
+	finchDir string,
 ) *initVMAction {
 	return &initVMAction{
 		creator:           creator,
 		logger:            logger,
 		optionalDepGroups: optionalDepGroups,
 		limaConfigApplier: lca,
 		baseYamlFilePath:  baseYamlFilePath,
+		fs:                fs,
 		diskManager:       diskManager,
+		finchDir:          finchDir,
 	}
 }
 
@@ -86,6 +95,13 @@ func (iva *initVMAction) run() error {
 		return err
 	}
 
+	finchConfigPath := filepath.Join(iva.finchDir, "finch.yaml")
+	configJSONPath := filepath.Join(iva.finchDir, "config.json")
+	err = credhelper.RefreshConfigFile(iva.fs, iva.logger, finchConfigPath, configJSONPath)
+	if err != nil {
+		return err
+	}
+
 	err = dependency.InstallOptionalDeps(iva.optionalDepGroups, iva.logger)
 	if err != nil {
 		iva.logger.Errorf("Dependency error: %v", err)