From 7beda281e0c756ac843e5b6126223a696bf784cb Mon Sep 17 00:00:00 2001 From: Andrew Woodlee Date: Fri, 28 Feb 2025 17:49:01 -0600 Subject: [PATCH] fixed constant typo --- pkg/backy/backy.go | 2 +- pkg/backy/packageoperation_enumer.go | 38 ++++++++++++++-------------- pkg/backy/ssh.go | 2 +- pkg/backy/types.go | 14 +++++----- pkg/backy/utils.go | 8 +++--- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkg/backy/backy.go b/pkg/backy/backy.go index 818f857..3fbdf09 100644 --- a/pkg/backy/backy.go +++ b/pkg/backy/backy.go @@ -68,7 +68,7 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([ } else { // Handle package operations - if command.Type == PackageCT && command.PackageOperation == PackOppCheckVersion { + if command.Type == PackageCT && command.PackageOperation == PackOpCheckVersion { cmdCtxLogger.Info().Str("package", command.PackageName).Msg("Checking package versions") // Execute the package version command diff --git a/pkg/backy/packageoperation_enumer.go b/pkg/backy/packageoperation_enumer.go index 6b62d6d..584a746 100644 --- a/pkg/backy/packageoperation_enumer.go +++ b/pkg/backy/packageoperation_enumer.go @@ -26,31 +26,31 @@ func (i PackageOperation) String() string { func _PackageOperationNoOp() { var x [1]struct{} _ = x[DefaultPO-(0)] - _ = x[PackOppInstall-(1)] - _ = x[PackOppUpgrade-(2)] - _ = x[PackOppPurge-(3)] - _ = x[PackOppRemove-(4)] - _ = x[PackOppCheckVersion-(5)] - _ = x[PackOppIsInstalled-(6)] + _ = x[PackOpInstall-(1)] + _ = x[PackOpUpgrade-(2)] + _ = x[PackOpPurge-(3)] + _ = x[PackOpRemove-(4)] + _ = x[PackOpCheckVersion-(5)] + _ = x[PackOpIsInstalled-(6)] } -var _PackageOperationValues = []PackageOperation{DefaultPO, PackOppInstall, PackOppUpgrade, PackOppPurge, PackOppRemove, PackOppCheckVersion, PackOppIsInstalled} +var _PackageOperationValues = []PackageOperation{DefaultPO, PackOpInstall, PackOpUpgrade, PackOpPurge, PackOpRemove, PackOpCheckVersion, PackOpIsInstalled} var _PackageOperationNameToValueMap = map[string]PackageOperation{ _PackageOperationName[0:0]: DefaultPO, _PackageOperationLowerName[0:0]: DefaultPO, - _PackageOperationName[0:7]: PackOppInstall, - _PackageOperationLowerName[0:7]: PackOppInstall, - _PackageOperationName[7:14]: PackOppUpgrade, - _PackageOperationLowerName[7:14]: PackOppUpgrade, - _PackageOperationName[14:19]: PackOppPurge, - _PackageOperationLowerName[14:19]: PackOppPurge, - _PackageOperationName[19:25]: PackOppRemove, - _PackageOperationLowerName[19:25]: PackOppRemove, - _PackageOperationName[25:37]: PackOppCheckVersion, - _PackageOperationLowerName[25:37]: PackOppCheckVersion, - _PackageOperationName[37:48]: PackOppIsInstalled, - _PackageOperationLowerName[37:48]: PackOppIsInstalled, + _PackageOperationName[0:7]: PackOpInstall, + _PackageOperationLowerName[0:7]: PackOpInstall, + _PackageOperationName[7:14]: PackOpUpgrade, + _PackageOperationLowerName[7:14]: PackOpUpgrade, + _PackageOperationName[14:19]: PackOpPurge, + _PackageOperationLowerName[14:19]: PackOpPurge, + _PackageOperationName[19:25]: PackOpRemove, + _PackageOperationLowerName[19:25]: PackOpRemove, + _PackageOperationName[25:37]: PackOpCheckVersion, + _PackageOperationLowerName[25:37]: PackOpCheckVersion, + _PackageOperationName[37:48]: PackOpIsInstalled, + _PackageOperationLowerName[37:48]: PackOpIsInstalled, } var _PackageOperationNames = []string{ diff --git a/pkg/backy/ssh.go b/pkg/backy/ssh.go index 81340d3..1472530 100644 --- a/pkg/backy/ssh.go +++ b/pkg/backy/ssh.go @@ -538,7 +538,7 @@ func (command *Command) RunCmdSSH(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) case ScriptFileCT: return command.runScriptFile(commandSession, cmdCtxLogger, &cmdOutBuf) case PackageCT: - if command.PackageOperation == PackOppCheckVersion { + if command.PackageOperation == PackOpCheckVersion { commandSession.Stderr = nil // Execute the package version command remotely // Parse the output of package version command diff --git a/pkg/backy/types.go b/pkg/backy/types.go index 938604e..8e0a442 100644 --- a/pkg/backy/types.go +++ b/pkg/backy/types.go @@ -311,11 +311,11 @@ const ( //go:generate go run github.com/dmarkham/enumer -linecomment -yaml -text -json -type=PackageOperation const ( - DefaultPO PackageOperation = iota // - PackOppInstall // install - PackOppUpgrade // upgrade - PackOppPurge // purge - PackOppRemove // remove - PackOppCheckVersion // checkVersion - PackOppIsInstalled // isInstalled + DefaultPO PackageOperation = iota // + PackOpInstall // install + PackOpUpgrade // upgrade + PackOpPurge // purge + PackOpRemove // remove + PackOpCheckVersion // checkVersion + PackOpIsInstalled // isInstalled ) diff --git a/pkg/backy/utils.go b/pkg/backy/utils.go index 2c87cca..78cfcf5 100644 --- a/pkg/backy/utils.go +++ b/pkg/backy/utils.go @@ -277,13 +277,13 @@ func getCommandTypeAndSetCommandInfo(command *Command) *Command { if command.Type == PackageCT && !command.packageCmdSet { command.packageCmdSet = true switch command.PackageOperation { - case PackOppInstall: + case PackOpInstall: command.Cmd, command.Args = command.pkgMan.Install(command.PackageName, command.PackageVersion, command.Args) - case PackOppRemove: + case PackOpRemove: command.Cmd, command.Args = command.pkgMan.Remove(command.PackageName, command.Args) - case PackOppUpgrade: + case PackOpUpgrade: command.Cmd, command.Args = command.pkgMan.Upgrade(command.PackageName, command.PackageVersion) - case PackOppCheckVersion: + case PackOpCheckVersion: command.Cmd, command.Args = command.pkgMan.CheckVersion(command.PackageName, command.PackageVersion) } }