Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Commit

Permalink
move cmd/ignite/run/runutil to pkg/metadata/loader for code reuse
Browse files Browse the repository at this point in the history
  • Loading branch information
@luxas
luxas committed Jul 1, 2019
1 parent be7cc08 commit f39433e
Show file tree
Hide file tree
Showing 35 changed files with 68 additions and 69 deletions.
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/spf13/cobra"
"github.com/weaveworks/ignite/cmd/ignite/run"
Expand All @@ -19,7 +19,7 @@ func NewCmdContainer(out io.Writer) *cobra.Command {
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
var err error
co, err := run.NewContainerOptions(runutil.NewResLoader(), args[0])
co, err := run.NewContainerOptions(loader.NewResLoader(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/imgcmd/image.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package imgcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -25,7 +25,7 @@ func NewCmdImage(out io.Writer) *cobra.Command {
Aliases: []string{"images"},
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
i, err := run.NewImagesOptions(runutil.NewResLoader())
i, err := run.NewImagesOptions(loader.NewResLoader())
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/imgcmd/import.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package imgcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand Down Expand Up @@ -37,7 +37,7 @@ func NewCmdImport(out io.Writer) *cobra.Command {
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
i, err := ifs.NewImportOptions(runutil.NewResLoader(), args[0])
i, err := ifs.NewImportOptions(loader.NewResLoader(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/imgcmd/rm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package imgcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -29,7 +29,7 @@ func NewCmdRm(out io.Writer) *cobra.Command {
Args: cobra.MinimumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
ro, err := rf.NewRmiOptions(runutil.NewResLoader(), args)
ro, err := rf.NewRmiOptions(loader.NewResLoader(), args)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/kerncmd/kernel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package kerncmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -25,7 +25,7 @@ func NewCmdKernel(out io.Writer) *cobra.Command {
Aliases: []string{"kernels"},
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
ko, err := run.NewKernelsOptions(runutil.NewResLoader())
ko, err := run.NewKernelsOptions(loader.NewResLoader())
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/kerncmd/rm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package kerncmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -29,7 +29,7 @@ func NewCmdRm(out io.Writer) *cobra.Command {
Args: cobra.MinimumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
ro, err := rf.NewRmkOptions(runutil.NewResLoader(), args)
ro, err := rf.NewRmkOptions(loader.NewResLoader(), args)
if err != nil {
return err
}
Expand Down
1 change: 0 additions & 1 deletion cmd/ignite/cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ func NewIgniteCommand(in io.Reader, out, err io.Writer) *cobra.Command {

root.AddCommand(NewCmdAttach(os.Stdout))
root.AddCommand(NewCmdCompletion(os.Stdout, root))
root.AddCommand(NewCmdContainer(os.Stdout))
root.AddCommand(NewCmdCreate(os.Stdout))
root.AddCommand(NewCmdKill(os.Stdout))
root.AddCommand(NewCmdLogs(os.Stdout))
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/attach.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vmcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -25,7 +25,7 @@ func NewCmdAttach(out io.Writer) *cobra.Command {
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
ao, err := run.NewAttachOptions(runutil.NewResLoader(), args[0])
ao, err := run.NewAttachOptions(loader.NewResLoader(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vmcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand Down Expand Up @@ -43,7 +43,7 @@ func NewCmdCreate(out io.Writer) *cobra.Command {
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
co, err := cf.NewCreateOptions(runutil.NewResLoader(), args[0])
co, err := cf.NewCreateOptions(loader.NewResLoader(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/kill.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vmcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -25,7 +25,7 @@ func NewCmdKill(out io.Writer) *cobra.Command {
Args: cobra.MinimumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
so, err := (&run.StopFlags{Kill: true}).NewStopOptions(runutil.NewResLoader(), args)
so, err := (&run.StopFlags{Kill: true}).NewStopOptions(loader.NewResLoader(), args)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vmcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -25,7 +25,7 @@ func NewCmdLogs(out io.Writer) *cobra.Command {
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
lo, err := run.NewLogsOptions(runutil.NewResLoader(), args[0])
lo, err := run.NewLogsOptions(loader.NewResLoader(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/ps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vmcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -27,7 +27,7 @@ func NewCmdPs(out io.Writer) *cobra.Command {
`),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
po, err := pf.NewPsOptions(runutil.NewResLoader())
po, err := pf.NewPsOptions(loader.NewResLoader())
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/rm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vmcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -30,7 +30,7 @@ func NewCmdRm(out io.Writer) *cobra.Command {
Args: cobra.MinimumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
ro, err := rf.NewRmOptions(runutil.NewResLoader(), args)
ro, err := rf.NewRmOptions(loader.NewResLoader(), args)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package vmcmd
import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand Down Expand Up @@ -41,7 +41,7 @@ func NewCmdRun(out io.Writer) *cobra.Command {
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
ro, err := rf.NewRunOptions(runutil.NewResLoader(), args[0])
ro, err := rf.NewRunOptions(loader.NewResLoader(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/ssh.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"

"github.com/spf13/pflag"
"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -29,7 +29,7 @@ func NewCmdSSH(out io.Writer) *cobra.Command {
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
so, err := sf.NewSSHOptions(runutil.NewResLoader(), args[0])
so, err := sf.NewSSHOptions(loader.NewResLoader(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/start.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"

Expand All @@ -30,7 +30,7 @@ func NewCmdStart(out io.Writer) *cobra.Command {
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
so, err := sf.NewStartOptions(runutil.NewResLoader(), args[0])
so, err := sf.NewStartOptions(loader.NewResLoader(), args[0])
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/stop.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"io"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/lithammer/dedent"
"github.com/weaveworks/ignite/pkg/constants"
Expand Down Expand Up @@ -34,7 +34,7 @@ func NewCmdStop(out io.Writer) *cobra.Command {
Args: cobra.MinimumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
so, err := sf.NewStopOptions(runutil.NewResLoader(), args)
so, err := sf.NewStopOptions(loader.NewResLoader(), args)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/cmd/vmcmd/vm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"

"github.com/weaveworks/ignite/cmd/ignite/run"
"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"
"github.com/weaveworks/ignite/pkg/errutils"

"github.com/lithammer/dedent"
Expand All @@ -22,7 +22,7 @@ func NewCmdVM(out io.Writer) *cobra.Command {
Aliases: []string{"vms"},
Run: func(cmd *cobra.Command, args []string) {
errutils.Check(func() error {
po, err := (&run.PsFlags{All: true}).NewPsOptions(runutil.NewResLoader())
po, err := (&run.PsFlags{All: true}).NewPsOptions(loader.NewResLoader())
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/run/attach.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package run
import (
"fmt"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/weaveworks/ignite/pkg/constants"
"github.com/weaveworks/ignite/pkg/metadata/vmmd"
Expand All @@ -17,7 +17,7 @@ type attachOptions struct {
vm *vmmd.VMMetadata
}

func NewAttachOptions(l *runutil.ResLoader, vmMatch string) (*attachOptions, error) {
func NewAttachOptions(l *loader.ResLoader, vmMatch string) (*attachOptions, error) {
ao := &attachOptions{checkRunning: true}

if allVMs, err := l.VMs(); err == nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/run/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/miekg/dns"
"github.com/weaveworks/ignite/pkg/container"
Expand All @@ -16,7 +16,7 @@ type containerOptions struct {
vm *vmmd.VMMetadata
}

func NewContainerOptions(l *runutil.ResLoader, vmMatch string) (*containerOptions, error) {
func NewContainerOptions(l *loader.ResLoader, vmMatch string) (*containerOptions, error) {
co := &containerOptions{}

if allVMS, err := l.VMs(); err == nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/run/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path"
"strings"

"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"

"github.com/spf13/pflag"

Expand Down Expand Up @@ -76,7 +76,7 @@ type createOptions struct {
fileMappings map[string]string
}

func (cf *CreateFlags) NewCreateOptions(l *runutil.ResLoader, imageMatch string) (*createOptions, error) {
func (cf *CreateFlags) NewCreateOptions(l *loader.ResLoader, imageMatch string) (*createOptions, error) {
var err error
co := &createOptions{CreateFlags: cf}

Expand Down
4 changes: 2 additions & 2 deletions cmd/ignite/run/images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/c2h5oh/datasize"
"github.com/weaveworks/ignite/cmd/ignite/run/runutil"
"github.com/weaveworks/ignite/pkg/metadata/loader"
"github.com/weaveworks/ignite/pkg/metadata/imgmd"
"github.com/weaveworks/ignite/pkg/util"
)
Expand All @@ -13,7 +13,7 @@ type imagesOptions struct {
allImages []*imgmd.ImageMetadata
}

func NewImagesOptions(l *runutil.ResLoader) (*imagesOptions, error) {
func NewImagesOptions(l *loader.ResLoader) (*imagesOptions, error) {
io := &imagesOptions{}

if allImages, err := l.Images(); err == nil {
Expand Down
Loading

0 comments on commit f39433e

Please sign in to comment.