diff --git a/src/cmd/root.go b/src/cmd/root.go index b846a141..63c28b9c 100644 --- a/src/cmd/root.go +++ b/src/cmd/root.go @@ -6,7 +6,7 @@ import ( "github.com/zeropsio/zcli/src/cmdBuilder" "github.com/zeropsio/zcli/src/constants" - repository2 "github.com/zeropsio/zcli/src/entity/repository" + "github.com/zeropsio/zcli/src/entity/repository" "github.com/zeropsio/zcli/src/errorsx" "github.com/zeropsio/zcli/src/i18n" "github.com/zeropsio/zcli/src/uxBlock" @@ -61,7 +61,7 @@ func rootCmd() *cmdBuilder.Cmd { if cmdData.CliStorage.Data().ScopeProjectId.Filled() { // project scope is set projectId, _ := cmdData.CliStorage.Data().ScopeProjectId.Get() - project, err := repository2.GetProjectById(ctx, cmdData.RestApiClient, projectId) + project, err := repository.GetProjectById(ctx, cmdData.RestApiClient, projectId) if err != nil { if errorsx.IsUserError(err) { cmdData.UxBlocks.PrintWarning(styles.WarningLine(i18n.T(i18n.ScopedProjectNotFound))) diff --git a/src/cmd/vpnDown.go b/src/cmd/vpnDown.go index cce1db00..15f4df4a 100644 --- a/src/cmd/vpnDown.go +++ b/src/cmd/vpnDown.go @@ -2,10 +2,12 @@ package cmd import ( "context" + "os" "os/exec" "github.com/zeropsio/zcli/src/cmdBuilder" "github.com/zeropsio/zcli/src/cmdRunner" + "github.com/zeropsio/zcli/src/constants" "github.com/zeropsio/zcli/src/i18n" "github.com/zeropsio/zcli/src/uxBlock/styles" ) @@ -18,12 +20,24 @@ func vpnDownCmd() *cmdBuilder.Cmd { LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error { uxBlocks := cmdData.UxBlocks + filePath, err := constants.WgConfigFilePath() + if err != nil { + return err + } + + // create empty file if not exists, only thing wg-quick needs is a proper file name + f, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, 0666) + if err != nil { + return err + } + defer f.Close() + // TODO - janhajek check if vpn is connected // TODO - janhajek get somehow a meaningful output // TODO - janhajek check if wg-quick is installed // TODO - janhajek a configurable path to wg-quick - c := exec.CommandContext(ctx, "wg-quick", "down", "zerops") - _, err := cmdRunner.Run(c) + c := exec.CommandContext(ctx, "wg-quick", "down", filePath) + _, err = cmdRunner.Run(c) if err != nil { return err }