Skip to content

[Refactor] Reorder the method argument ordering in pkg/cmd #1900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 1 commit into from
Jan 23, 2023
Merged

[Refactor] Reorder the method argument ordering in pkg/cmd #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmd/nerdctl/apparmor_inspect_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package main
import (
"fmt"

"github.com/containerd/nerdctl/pkg/api/types"

"github.com/containerd/nerdctl/pkg/cmd/apparmor"
"github.com/containerd/nerdctl/pkg/defaults"
"github.com/spf13/cobra"
Expand All @@ -37,5 +39,7 @@ func newApparmorInspectCommand() *cobra.Command {
}

func apparmorInspectAction(cmd *cobra.Command, args []string) error {
return apparmor.Inspect(cmd.OutOrStdout())
return apparmor.Inspect(types.ApparmorInspectOptions{
Stdout: cmd.OutOrStdout(),
})
}
13 changes: 7 additions & 6 deletions cmd/nerdctl/apparmor_ls_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,26 @@ func newApparmorLsCommand() *cobra.Command {
return cmd
}

func processApparmorListCommandOptions(cmd *cobra.Command) (types.ApparmorListCommandOptions, error) {
func processApparmorListOptions(cmd *cobra.Command) (types.ApparmorListOptions, error) {
quiet, err := cmd.Flags().GetBool("quiet")
if err != nil {
return types.ApparmorListCommandOptions{}, err
return types.ApparmorListOptions{}, err
}
format, err := cmd.Flags().GetString("format")
if err != nil {
return types.ApparmorListCommandOptions{}, err
return types.ApparmorListOptions{}, err
}
return types.ApparmorListCommandOptions{
return types.ApparmorListOptions{
Quiet: quiet,
Format: format,
Stdout: cmd.OutOrStdout(),
}, nil
}

func apparmorLsAction(cmd *cobra.Command, args []string) error {
options, err := processApparmorListCommandOptions(cmd)
options, err := processApparmorListOptions(cmd)
if err != nil {
return err
}
return apparmor.List(options, cmd.OutOrStdout())
return apparmor.List(options)
}
54 changes: 28 additions & 26 deletions cmd/nerdctl/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,91 +68,91 @@ If Dockerfile is not present and -f is not specified, it will look for Container
return buildCommand
}

func processBuildCommandFlag(cmd *cobra.Command, args []string) (*types.BuildCommandOptions, error) {
func processBuildCommandFlag(cmd *cobra.Command, args []string) (types.BuilderBuildOptions, error) {
globalOptions, err := processRootCmdFlags(cmd)
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
buildKitHost, err := getBuildkitHost(cmd, globalOptions.Namespace)
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
platform, err := cmd.Flags().GetStringSlice("platform")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
platform = strutil.DedupeStrSlice(platform)
if len(args) < 1 {
return nil, errors.New("context needs to be specified")
return types.BuilderBuildOptions{}, errors.New("context needs to be specified")
}
buildContext := args[0]
if buildContext == "-" || strings.Contains(buildContext, "://") {
return nil, fmt.Errorf("unsupported build context: %q", buildContext)
return types.BuilderBuildOptions{}, fmt.Errorf("unsupported build context: %q", buildContext)
}
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
output, err := cmd.Flags().GetString("output")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
tagValue, err := cmd.Flags().GetStringArray("tag")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
progress, err := cmd.Flags().GetString("progress")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
filename, err := cmd.Flags().GetString("file")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
target, err := cmd.Flags().GetString("target")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
buildArgs, err := cmd.Flags().GetStringArray("build-arg")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
label, err := cmd.Flags().GetStringArray("label")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
noCache, err := cmd.Flags().GetBool("no-cache")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
secret, err := cmd.Flags().GetStringArray("secret")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
ssh, err := cmd.Flags().GetStringArray("ssh")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
cacheFrom, err := cmd.Flags().GetStringArray("cache-from")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
cacheTo, err := cmd.Flags().GetStringArray("cache-to")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
rm, err := cmd.Flags().GetBool("rm")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
iidfile, err := cmd.Flags().GetString("iidfile")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
quiet, err := cmd.Flags().GetBool("quiet")
if err != nil {
return nil, err
return types.BuilderBuildOptions{}, err
}
result := &types.BuildCommandOptions{
return types.BuilderBuildOptions{
GOptions: globalOptions,
BuildKitHost: buildKitHost,
BuildContext: buildContext,
Expand All @@ -172,8 +172,10 @@ func processBuildCommandFlag(cmd *cobra.Command, args []string) (*types.BuildCom
IidFile: iidfile,
Quiet: quiet,
Platform: platform,
}
return result, nil
Stdout: cmd.OutOrStdout(),
Stderr: cmd.OutOrStderr(),
Stdin: cmd.InOrStdin(),
}, nil
}

func getBuildkitHost(cmd *cobra.Command, namespace string) (string, error) {
Expand All @@ -196,7 +198,7 @@ func buildAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
if err := builder.Build(cmd.Context(), options, cmd.InOrStdin(), cmd.OutOrStdout(), cmd.ErrOrStderr()); err != nil {
if err := builder.Build(cmd.Context(), options); err != nil {
return err
}
return nil
Expand Down
5 changes: 3 additions & 2 deletions cmd/nerdctl/container_inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,13 @@ func containerInspectAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
return container.Inspect(cmd.Context(), types.ContainerInspectCommandOptions{
return container.Inspect(cmd.Context(), types.ContainerInspectOptions{
GOptions: globalOptions,
Format: format,
Mode: mode,
Containers: args,
}, cmd.OutOrStdout())
Stdout: cmd.OutOrStdout(),
})
}

func containerInspectShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
Expand Down
60 changes: 30 additions & 30 deletions cmd/nerdctl/image_convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,127 +95,126 @@ func newImageConvertCommand() *cobra.Command {
return imageConvertCommand
}

func processImageConvertCommandOptions(cmd *cobra.Command) (types.ImageConvertCommandOptions, error) {
func processImageConvertOptions(cmd *cobra.Command) (types.ImageConvertOptions, error) {
globalOptions, err := processRootCmdFlags(cmd)
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
format, err := cmd.Flags().GetString("format")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}

// #region estargz flags
estargz, err := cmd.Flags().GetBool("estargz")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
estargzRecordIn, err := cmd.Flags().GetString("estargz-record-in")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
estargzCompressionLevel, err := cmd.Flags().GetInt("estargz-compression-level")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
estargzChunkSize, err := cmd.Flags().GetInt("estargz-chunk-size")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
estargzMinChunkSize, err := cmd.Flags().GetInt("estargz-min-chunk-size")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
estargzExternalTOC, err := cmd.Flags().GetBool("estargz-external-toc")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
estargzKeepDiffID, err := cmd.Flags().GetBool("estargz-keep-diff-id")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
// #endregion

// #region zstd:chunked flags
zstdchunked, err := cmd.Flags().GetBool("zstdchunked")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
zstdChunkedCompressionLevel, err := cmd.Flags().GetInt("zstdchunked-compression-level")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
zstdChunkedChunkSize, err := cmd.Flags().GetInt("zstdchunked-chunk-size")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
zstdChunkedRecordIn, err := cmd.Flags().GetString("zstdchunked-record-in")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
// #endregion

// #region nydus flags
nydus, err := cmd.Flags().GetBool("nydus")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
nydusBuilderPath, err := cmd.Flags().GetString("nydus-builder-path")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
nydusWorkDir, err := cmd.Flags().GetString("nydus-work-dir")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
nydusPrefetchPatterns, err := cmd.Flags().GetString("nydus-prefetch-patterns")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
nydusCompressor, err := cmd.Flags().GetString("nydus-compressor")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
// #endregion

// #region overlaybd flags
overlaybd, err := cmd.Flags().GetBool("overlaybd")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
overlaybdFsType, err := cmd.Flags().GetString("overlaybd-fs-type")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
overlaybdDbstr, err := cmd.Flags().GetString("overlaybd-dbstr")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
// #endregion

// #region generic flags
uncompress, err := cmd.Flags().GetBool("uncompress")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
oci, err := cmd.Flags().GetBool("oci")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
// #endregion

// #region platform flags
platforms, err := cmd.Flags().GetStringSlice("platform")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
allPlatforms, err := cmd.Flags().GetBool("all-platforms")
if err != nil {
return types.ImageConvertCommandOptions{}, err
return types.ImageConvertOptions{}, err
}
// #endregion

return types.ImageConvertCommandOptions{
return types.ImageConvertOptions{
GOptions: globalOptions,
Format: format,
// #region estargz flags
Expand Down Expand Up @@ -253,17 +252,18 @@ func processImageConvertCommandOptions(cmd *cobra.Command) (types.ImageConvertCo
Platforms: platforms,
AllPlatforms: allPlatforms,
// #endregion
Stdout: cmd.OutOrStdout(),
}, nil
}

func imageConvertAction(cmd *cobra.Command, args []string) error {
options, err := processImageConvertCommandOptions(cmd)
options, err := processImageConvertOptions(cmd)
if err != nil {
return err
}
srcRawRef := args[0]
destRawRef := args[1]
return image.Convert(cmd.Context(), srcRawRef, destRawRef, options, cmd.OutOrStdout())
return image.Convert(cmd.Context(), srcRawRef, destRawRef, options)
}

func imageConvertShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
Expand Down
Loading