CyberShell/backy
1
1
Fork 0
Code Issues 5 Pull Requests Packages Projects 1 Releases 18 Wiki Activity

v0.9.0

Browse Source
This commit is contained in:
Andrew Woodlee 2025-02-23 21:02:23 -06:00
parent a0bf51636c
commit 4fa5efa5b6
6 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/backy/backy.go
View File

@ -54,7 +54,7 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
ArgsStr += fmt.Sprintf(" %s", v) ArgsStr += fmt.Sprintf(" %s", v)
} }
if command.Type == User { if command.Type == UserCT {
if command.UserOperation == "password" { if command.UserOperation == "password" {
cmdCtxLogger.Info().Str("password", command.UserPassword).Msg("user password to be updated") cmdCtxLogger.Info().Str("password", command.UserPassword).Msg("user password to be updated")
} }
@ -68,7 +68,7 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
} else { } else {
// Handle package operations // Handle package operations
if command.Type == Package && command.PackageOperation == "checkVersion" { if command.Type == PackageCT && command.PackageOperation == "checkVersion" {
cmdCtxLogger.Info().Str("package", command.PackageName).Msg("Checking package versions") cmdCtxLogger.Info().Str("package", command.PackageName).Msg("Checking package versions")
// Execute the package version command // Execute the package version command
@ -85,7 +85,7 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
} }
var localCMD *exec.Cmd var localCMD *exec.Cmd
if command.Type == RemoteScript { if command.Type == RemoteScriptCT {
script, err := command.Fetcher.Fetch(command.Cmd) script, err := command.Fetcher.Fetch(command.Cmd)
if err != nil { if err != nil {
return nil, err return nil, err
@ -156,7 +156,7 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
cmdCtxLogger.Info().Str("Command", fmt.Sprintf("Running command %s on local machine", command.Name)).Send() cmdCtxLogger.Info().Str("Command", fmt.Sprintf("Running command %s on local machine", command.Name)).Send()
// execute package commands in a shell // execute package commands in a shell
if command.Type == Package { if command.Type == PackageCT {
cmdCtxLogger.Info().Str("package", command.PackageName).Msg("Executing package command") cmdCtxLogger.Info().Str("package", command.PackageName).Msg("Executing package command")
ArgsStr = fmt.Sprintf("%s %s", command.Cmd, ArgsStr) ArgsStr = fmt.Sprintf("%s %s", command.Cmd, ArgsStr)
localCMD = exec.Command("/bin/sh", "-c", ArgsStr) localCMD = exec.Command("/bin/sh", "-c", ArgsStr)

38
pkg/backy/commandtype_enumer.go
View File

@ -25,29 +25,29 @@ func (i CommandType) String() string {
// Re-run the stringer command to generate them again. // Re-run the stringer command to generate them again.
func _CommandTypeNoOp() { func _CommandTypeNoOp() {
var x [1]struct{} var x [1]struct{}
_ = x[Default-(0)] _ = x[DefaultCT-(0)]
_ = x[Script-(1)] _ = x[ScriptCT-(1)]
_ = x[ScriptFile-(2)] _ = x[ScriptFileCT-(2)]
_ = x[RemoteScript-(3)] _ = x[RemoteScriptCT-(3)]
_ = x[Package-(4)] _ = x[PackageCT-(4)]
_ = x[User-(5)] _ = x[UserCT-(5)]
} }
var _CommandTypeValues = []CommandType{Default, Script, ScriptFile, RemoteScript, Package, User} var _CommandTypeValues = []CommandType{DefaultCT, ScriptCT, ScriptFileCT, RemoteScriptCT, PackageCT, UserCT}
var _CommandTypeNameToValueMap = map[string]CommandType{ var _CommandTypeNameToValueMap = map[string]CommandType{
_CommandTypeName[0:0]: Default, _CommandTypeName[0:0]: DefaultCT,
_CommandTypeLowerName[0:0]: Default, _CommandTypeLowerName[0:0]: DefaultCT,
_CommandTypeName[0:6]: Script, _CommandTypeName[0:6]: ScriptCT,
_CommandTypeLowerName[0:6]: Script, _CommandTypeLowerName[0:6]: ScriptCT,
_CommandTypeName[6:16]: ScriptFile, _CommandTypeName[6:16]: ScriptFileCT,
_CommandTypeLowerName[6:16]: ScriptFile, _CommandTypeLowerName[6:16]: ScriptFileCT,
_CommandTypeName[16:28]: RemoteScript, _CommandTypeName[16:28]: RemoteScriptCT,
_CommandTypeLowerName[16:28]: RemoteScript, _CommandTypeLowerName[16:28]: RemoteScriptCT,
_CommandTypeName[28:35]: Package, _CommandTypeName[28:35]: PackageCT,
_CommandTypeLowerName[28:35]: Package, _CommandTypeLowerName[28:35]: PackageCT,
_CommandTypeName[35:39]: User, _CommandTypeName[35:39]: UserCT,
_CommandTypeLowerName[35:39]: User, _CommandTypeLowerName[35:39]: UserCT,
} }
var _CommandTypeNames = []string{ var _CommandTypeNames = []string{

6
pkg/backy/config.go
View File

@ -578,7 +578,7 @@ func processCmds(opts *ConfigOpts) error {
} }
// Parse package commands // Parse package commands
if cmd.Type == Package { if cmd.Type == PackageCT {
if cmd.PackageManager == "" { if cmd.PackageManager == "" {
return fmt.Errorf("package manager is required for package command %s", cmd.PackageName) return fmt.Errorf("package manager is required for package command %s", cmd.PackageName)
} }
@ -603,7 +603,7 @@ func processCmds(opts *ConfigOpts) error {
} }
// Parse user commands // Parse user commands
if cmd.Type == User { if cmd.Type == UserCT {
if cmd.Username == "" { if cmd.Username == "" {
return fmt.Errorf("username is required for user command %s", cmd.Name) return fmt.Errorf("username is required for user command %s", cmd.Name)
} }
@ -630,7 +630,7 @@ func processCmds(opts *ConfigOpts) error {
} }
if cmd.Type == RemoteScript { if cmd.Type == RemoteScriptCT {
var fetchErr error var fetchErr error
if !isRemoteURL(cmd.Cmd) { if !isRemoteURL(cmd.Cmd) {
return fmt.Errorf("remoteScript command %s must be a remote resource", cmdName) return fmt.Errorf("remoteScript command %s must be a remote resource", cmdName)

8
pkg/backy/ssh.go
View File

@ -531,13 +531,13 @@ func (command *Command) RunCmdSSH(cmdCtxLogger zerolog.Logger, opts *ConfigOpts)
// Handle command execution based on type // Handle command execution based on type
switch command.Type { switch command.Type {
case Script: case ScriptCT:
return command.runScript(commandSession, cmdCtxLogger, &cmdOutBuf) return command.runScript(commandSession, cmdCtxLogger, &cmdOutBuf)
case RemoteScript: case RemoteScriptCT:
return command.runRemoteScript(commandSession, cmdCtxLogger, &cmdOutBuf) return command.runRemoteScript(commandSession, cmdCtxLogger, &cmdOutBuf)
case ScriptFile: case ScriptFileCT:
return command.runScriptFile(commandSession, cmdCtxLogger, &cmdOutBuf) return command.runScriptFile(commandSession, cmdCtxLogger, &cmdOutBuf)
case Package: case PackageCT:
if command.PackageOperation == "checkVersion" { if command.PackageOperation == "checkVersion" {
commandSession.Stderr = nil commandSession.Stderr = nil
// Execute the package version command remotely // Execute the package version command remotely

12
pkg/backy/types.go
View File

@ -299,10 +299,10 @@ type (
//go:generate go run github.com/dmarkham/enumer -linecomment -yaml -text -json -type=CommandType //go:generate go run github.com/dmarkham/enumer -linecomment -yaml -text -json -type=CommandType
const ( const (
Default CommandType = iota // DefaultCT CommandType = iota //
Script // script ScriptCT // script
ScriptFile // scriptFile ScriptFileCT // scriptFile
RemoteScript // remoteScript RemoteScriptCT // remoteScript
Package // package PackageCT // package
User // user UserCT // user
) )

4
pkg/backy/utils.go
View File

@ -256,7 +256,7 @@ func expandEnvVars(backyEnv map[string]string, envVars []string) {
// Returns the modified Command with the package- or userManager command as Cmd and the package- or userOperation as args, plus any additional Args // Returns the modified Command with the package- or userManager command as Cmd and the package- or userOperation as args, plus any additional Args
func getCommandTypeAndSetCommandInfo(command *Command) *Command { func getCommandTypeAndSetCommandInfo(command *Command) *Command {
if command.Type == Package && !command.packageCmdSet { if command.Type == PackageCT && !command.packageCmdSet {
command.packageCmdSet = true command.packageCmdSet = true
switch command.PackageOperation { switch command.PackageOperation {
case "install": case "install":
@ -270,7 +270,7 @@ func getCommandTypeAndSetCommandInfo(command *Command) *Command {
} }
} }
if command.Type == User && !command.userCmdSet { if command.Type == UserCT && !command.userCmdSet {
command.userCmdSet = true command.userCmdSet = true
switch command.UserOperation { switch command.UserOperation {
case "add": case "add":