Skip to content

Commit

Permalink
chore: golines (#224)
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Gianelloni <[email protected]>
  • Loading branch information
wolf31o2 authored May 22, 2024
1 parent c3a9c03 commit 6a703ce
Show file tree
Hide file tree
Showing 21 changed files with 335 additions and 76 deletions.
9 changes: 6 additions & 3 deletions cmd/cardano-up/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,10 @@ func contextCreateCommand() *cobra.Command {
}
},
}
cmd.Flags().StringVarP(&contextFlags.description, "description", "d", "", "specifies description for context")
cmd.Flags().StringVarP(&contextFlags.network, "network", "n", "", "specifies network for context. if not specified, it's set automatically on the first package install")
cmd.Flags().
StringVarP(&contextFlags.description, "description", "d", "", "specifies description for context")
cmd.Flags().
StringVarP(&contextFlags.network, "network", "n", "", "specifies network for context. if not specified, it's set automatically on the first package install")
return cmd
}

Expand Down Expand Up @@ -213,7 +215,8 @@ func contextDeleteCommand() *cobra.Command {
)
},
}
cmd.Flags().BoolVarP(&contextFlags.force, "force", "f", false, "force removal of context with packages installed")
cmd.Flags().
BoolVarP(&contextFlags.force, "force", "f", false, "force removal of context with packages installed")
return cmd
}

Expand Down
3 changes: 2 additions & 1 deletion cmd/cardano-up/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ func installCommand() *cobra.Command {
},
Run: installCommandRun,
}
installCmd.Flags().StringVarP(&installFlags.network, "network", "n", "", fmt.Sprintf("specifies network for package (defaults to %q for empty context)", defaultNetwork))
installCmd.Flags().
StringVarP(&installFlags.network, "network", "n", "", fmt.Sprintf("specifies network for package (defaults to %q for empty context)", defaultNetwork))
return installCmd
}

Expand Down
3 changes: 2 additions & 1 deletion cmd/cardano-up/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ func listCommand() *cobra.Command {
}
},
}
listCmd.Flags().BoolVarP(&listFlags.all, "all", "A", false, "show packages from all contexts (defaults to only active context)")
listCmd.Flags().
BoolVarP(&listFlags.all, "all", "A", false, "show packages from all contexts (defaults to only active context)")
return listCmd
}
6 changes: 4 additions & 2 deletions cmd/cardano-up/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ func logsCommand() *cobra.Command {
}
},
}
logsCmd.Flags().StringVarP(&logsFlags.tail, "tail", "n", "", "display at most X lines from the end of the log")
logsCmd.Flags().BoolVarP(&logsFlags.follow, "follow", "f", false, "follow log output")
logsCmd.Flags().
StringVarP(&logsFlags.tail, "tail", "n", "", "display at most X lines from the end of the log")
logsCmd.Flags().
BoolVarP(&logsFlags.follow, "follow", "f", false, "follow log output")
return logsCmd
}
3 changes: 2 additions & 1 deletion cmd/cardano-up/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ func main() {
}

// Global flags
rootCmd.PersistentFlags().BoolVarP(&globalFlags.debug, "debug", "D", false, "enable debug logging")
rootCmd.PersistentFlags().
BoolVarP(&globalFlags.debug, "debug", "D", false, "enable debug logging")

// Add subcommands
rootCmd.AddCommand(
Expand Down
3 changes: 2 additions & 1 deletion cmd/cardano-up/uninstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func uninstallCommand() *cobra.Command {
}
},
}
uninstallCmd.Flags().BoolVarP(&uninstallFlags.keepData, "keep-data", "k", false, "don't cleanup package data")
uninstallCmd.Flags().
BoolVarP(&uninstallFlags.keepData, "keep-data", "k", false, "don't cleanup package data")
return uninstallCmd
}
4 changes: 3 additions & 1 deletion cmd/cardano-up/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ func upCommand() *cobra.Command {
pm := createPackageManager()
installedPackages := pm.InstalledPackages()
if len(installedPackages) == 0 {
slog.Warn("no packages installed...automatically installing cardano-node")
slog.Warn(
"no packages installed...automatically installing cardano-node",
)
installCommandRun(cmd, []string{"cardano-node"})
} else {
if err := pm.Up(); err != nil {
Expand Down
12 changes: 9 additions & 3 deletions cmd/cardano-up/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ func validateCommand() *cobra.Command {
Short: "Validate package file(s) in the given directory",
Args: func(cmd *cobra.Command, args []string) error {
if len(args) > 1 {
return errors.New("only one package directory may be specified at a time")
return errors.New(
"only one package directory may be specified at a time",
)
}
return nil
},
Expand All @@ -47,14 +49,18 @@ func validateCommand() *cobra.Command {
}
cfg, err := pkgmgr.NewDefaultConfig()
if err != nil {
slog.Error(fmt.Sprintf("failed to create package manager: %s", err))
slog.Error(
fmt.Sprintf("failed to create package manager: %s", err),
)
os.Exit(1)
}
// Point at provided registry dir
cfg.RegistryDir = absPackagesDir
pm, err := pkgmgr.NewPackageManager(cfg)
if err != nil {
slog.Error(fmt.Sprintf("failed to create package manager: %s", err))
slog.Error(
fmt.Sprintf("failed to create package manager: %s", err),
)
os.Exit(1)
}
slog.Info(
Expand Down
4 changes: 3 additions & 1 deletion cmd/cardano-up/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ func versionCommand() *cobra.Command {
Use: "version",
Short: "Displays the version",
Run: func(cmd *cobra.Command, args []string) {
slog.Info(fmt.Sprintf("%s %s", programName, version.GetVersionString()))
slog.Info(
fmt.Sprintf("%s %s", programName, version.GetVersionString()),
)
},
}
}
10 changes: 8 additions & 2 deletions pkgmgr/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ func TestNewDefaultConfig(t *testing.T) {
expectedConfigDir = filepath.Join(testHome, ".config/cardano-up")
case "darwin":
expectedCacheDir = filepath.Join(testHome, "Library/Caches/cardano-up")
expectedConfigDir = filepath.Join(testHome, "Library/Application Support/cardano-up")
expectedConfigDir = filepath.Join(
testHome,
"Library/Application Support/cardano-up",
)
default:
t.Fatalf("unsupported OS: %s", runtime.GOOS)
}
Expand Down Expand Up @@ -63,7 +66,10 @@ func TestNewDefaultConfigXdgConfigCacheEnvVars(t *testing.T) {
expectedConfigDir = filepath.Join(testXdgConfigHome, "cardano-up")
case "darwin":
expectedCacheDir = filepath.Join(testHome, "Library/Caches/cardano-up")
expectedConfigDir = filepath.Join(testHome, "Library/Application Support/cardano-up")
expectedConfigDir = filepath.Join(
testHome,
"Library/Application Support/cardano-up",
)
default:
t.Fatalf("unsupported OS: %s", runtime.GOOS)
}
Expand Down
34 changes: 28 additions & 6 deletions pkgmgr/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ type DockerService struct {
Ports []string
}

func NewDockerServiceFromContainerName(containerName string, logger *slog.Logger) (*DockerService, error) {
func NewDockerServiceFromContainerName(
containerName string,
logger *slog.Logger,
) (*DockerService, error) {
ret := &DockerService{
logger: logger,
}
Expand Down Expand Up @@ -231,7 +234,12 @@ func (d *DockerService) Remove() error {
return nil
}

func (d *DockerService) Logs(follow bool, tail string, stdoutWriter io.Writer, stderrWriter io.Writer) error {
func (d *DockerService) Logs(
follow bool,
tail string,
stdoutWriter io.Writer,
stderrWriter io.Writer,
) error {
client, err := d.getClient()
if err != nil {
return err
Expand Down Expand Up @@ -263,7 +271,11 @@ func (d *DockerService) pullImage() error {
if err != nil {
return err
}
out, err := client.ImagePull(context.Background(), d.Image, image.PullOptions{})
out, err := client.ImagePull(
context.Background(),
d.Image,
image.PullOptions{},
)
if err != nil {
return err
}
Expand All @@ -279,7 +291,10 @@ func (d *DockerService) pullImage() error {
line := scanner.Text()
if err := json.Unmarshal([]byte(line), &tmpStatus); err != nil {
d.logger.Warn(
fmt.Sprintf("failed to unmarshal docker image pull status update: %s", err),
fmt.Sprintf(
"failed to unmarshal docker image pull status update: %s",
err,
),
)
}
// Skip progress update lines
Expand Down Expand Up @@ -309,7 +324,10 @@ func (d *DockerService) inspect() (types.ContainerJSON, error) {
if err != nil {
return types.ContainerJSON{}, err
}
container, err := client.ContainerInspect(context.Background(), d.ContainerId)
container, err := client.ContainerInspect(
context.Background(),
d.ContainerId,
)
if err != nil {
return types.ContainerJSON{}, err
}
Expand Down Expand Up @@ -434,7 +452,11 @@ func RemoveDockerImage(imageName string) error {
if err != nil {
return err
}
_, err = client.ImageRemove(context.Background(), imageName, image.RemoveOptions{})
_, err = client.ImageRemove(
context.Background(),
imageName,
image.RemoveOptions{},
)
if err != nil {
return err
}
Expand Down
25 changes: 20 additions & 5 deletions pkgmgr/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ var ErrOperationFailed = errors.New("the operation has failed")

// ErrMultipleInstallMethods is returned when a package's install steps specify more than one install method
// on a single install step
var ErrMultipleInstallMethods = errors.New("only one install method may be specified in an install step")
var ErrMultipleInstallMethods = errors.New(
"only one install method may be specified in an install step",
)

// ErrNoInstallMethods is returned when a package's install steps include an install step which has no
// recognized install method specified
var ErrNoInstallMethods = errors.New("no supported install method specified on install step")
var ErrNoInstallMethods = errors.New(
"no supported install method specified on install step",
)

// ErrContextNotExist is returned when trying to selecting/managing a context that does not exist
var ErrContextNotExist = errors.New("context does not exist")
Expand All @@ -39,7 +43,9 @@ var ErrContextNotExist = errors.New("context does not exist")
var ErrContextAlreadyExists = errors.New("specified context already exists")

// ErrContextNoChangeNetwork is returned when updating a context with a network different than what was previously configured
var ErrContextNoChangeNetwork = errors.New("cannot change the configured network for a context")
var ErrContextNoChangeNetwork = errors.New(
"cannot change the configured network for a context",
)

// ErrContextInstallNoNetwork is returned when performing an install with no network specified on the active context
var ErrContextInstallNoNetwork = errors.New("no network specified for context")
Expand Down Expand Up @@ -87,7 +93,11 @@ func NewResolverNoAvailablePackage(pkgSpec string) error {
)
}

func NewResolverInstalledPackageNoMatchVersionSpecError(pkgName string, pkgVersion string, depSpec string) error {
func NewResolverInstalledPackageNoMatchVersionSpecError(
pkgName string,
pkgVersion string,
depSpec string,
) error {
return fmt.Errorf(
"installed package \"%s = %s\" does not match dependency: %s",
pkgName,
Expand All @@ -104,7 +114,12 @@ func NewPackageNotInstalledError(pkgName string, context string) error {
)
}

func NewPackageUninstallWouldBreakDepsError(uninstallPkgName string, uninstallPkgVersion string, dependentPkgName string, dependentPkgVersion string) error {
func NewPackageUninstallWouldBreakDepsError(
uninstallPkgName string,
uninstallPkgVersion string,
dependentPkgName string,
dependentPkgVersion string,
) error {
return fmt.Errorf(
`uninstall of package "%s = %s" would break dependencies for package "%s = %s"`,
uninstallPkgName,
Expand Down
8 changes: 7 additions & 1 deletion pkgmgr/installed_package.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ type InstalledPackage struct {
Outputs map[string]string
}

func NewInstalledPackage(pkg Package, context string, postInstallNotes string, outputs map[string]string, options map[string]bool) InstalledPackage {
func NewInstalledPackage(
pkg Package,
context string,
postInstallNotes string,
outputs map[string]string,
options map[string]bool,
) InstalledPackage {
return InstalledPackage{
Package: pkg,
InstalledTime: time.Now(),
Expand Down
Loading

0 comments on commit 6a703ce

Please sign in to comment.