diff --git a/apply/apply.go b/apply/apply.go index 98d4ae90..9b8394f8 100644 --- a/apply/apply.go +++ b/apply/apply.go @@ -2,14 +2,6 @@ // allowing users to apply resources from files. package apply -import ( - "os" - - "github.com/ninech/nctl/internal/format" -) - type Cmd struct { - format.Writer `hidden:""` - Filename *os.File `short:"f" completion-predictor:"file"` - FromFile fromFile `cmd:"" default:"1" name:"-f " help:"Apply any resource from a yaml or json file."` + FromFile fromFile `cmd:"" default:"withargs" name:"-f " help:"Apply any resource from a yaml or json file."` } diff --git a/apply/file.go b/apply/file.go index 00038177..5e9a615c 100644 --- a/apply/file.go +++ b/apply/file.go @@ -15,10 +15,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ) -type fromFile struct{} +type fromFile struct { + format.Writer `hidden:""` + Filename *os.File `short:"f" completion-predictor:"file"` +} -func (cmd *Cmd) Run(ctx context.Context, client *api.Client, apply *Cmd) error { - return File(ctx, cmd.Writer, client, apply.Filename, UpdateOnExists()) +func (cmd *fromFile) Run(ctx context.Context, client *api.Client) error { + return File(ctx, cmd.Writer, client, cmd.Filename, UpdateOnExists()) } type Option func(*config) diff --git a/create/create.go b/create/create.go index 3fdd8201..9b7296bc 100644 --- a/create/create.go +++ b/create/create.go @@ -6,7 +6,6 @@ import ( "fmt" "io" "math/rand" - "os" "time" runtimev1 "github.com/crossplane/crossplane-runtime/apis/common/v1" @@ -24,8 +23,7 @@ import ( ) type Cmd struct { - Filename *os.File `short:"f" help:"Create any resource from a yaml or json file." completion-predictor:"file"` - FromFile fromFile `cmd:"" group:"create-general" default:"1" name:"-f " help:"Create any resource from a yaml or json file."` + FromFile fromFile `cmd:"" group:"create-general" default:"withargs" name:"-f " help:"Create any resource from a yaml or json file."` VCluster vclusterCmd `cmd:"" group:"create-infra" name:"vcluster" help:"Create a new vcluster."` APIServiceAccount apiServiceAccountCmd `cmd:"" group:"create-access" name:"apiserviceaccount" aliases:"asa" help:"Create a new API Service Account."` Project projectCmd `cmd:"" group:"create-access" name:"project" help:"Create a new project."` diff --git a/create/file.go b/create/file.go index 4b437a3d..5733f5ef 100644 --- a/create/file.go +++ b/create/file.go @@ -2,6 +2,7 @@ package create import ( "context" + "os" "github.com/ninech/nctl/api" "github.com/ninech/nctl/apply" @@ -10,8 +11,9 @@ import ( type fromFile struct { format.Writer + Filename *os.File `short:"f" help:"Create any resource from a yaml or json file." completion-predictor:"file"` } -func (cmd *fromFile) Run(ctx context.Context, client *api.Client, create *Cmd) error { - return apply.File(ctx, cmd.Writer, client, create.Filename) +func (cmd *fromFile) Run(ctx context.Context, client *api.Client) error { + return apply.File(ctx, cmd.Writer, client, cmd.Filename) } diff --git a/delete/delete.go b/delete/delete.go index 0d7b0c13..fbc22449 100644 --- a/delete/delete.go +++ b/delete/delete.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "os" "time" "github.com/crossplane/crossplane-runtime/pkg/resource" @@ -16,8 +15,7 @@ import ( ) type Cmd struct { - Filename *os.File `short:"f" completion-predictor:"file"` - FromFile fromFile `cmd:"" group:"delete-general" default:"1" name:"-f " help:"Delete any resource from a yaml or json file."` + FromFile fromFile `cmd:"" group:"delete-general" default:"withargs" name:"-f " help:"Delete any resource from a yaml or json file."` VCluster vclusterCmd `cmd:"" group:"delete-infra" name:"vcluster" help:"Delete a vcluster."` APIServiceAccount apiServiceAccountCmd `cmd:"" group:"delete-access" name:"apiserviceaccount" aliases:"asa" help:"Delete an API Service Account."` Project projectCmd `cmd:"" group:"delete-access" name:"project" aliases:"proj" help:"Delete a Project."` diff --git a/delete/file.go b/delete/file.go index 1fc58065..c133295c 100644 --- a/delete/file.go +++ b/delete/file.go @@ -2,6 +2,7 @@ package delete import ( "context" + "os" "github.com/ninech/nctl/api" "github.com/ninech/nctl/apply" @@ -10,8 +11,9 @@ import ( type fromFile struct { format.Writer + Filename *os.File `short:"f" completion-predictor:"file"` } -func (cmd *fromFile) Run(ctx context.Context, client *api.Client, delete *Cmd) error { - return apply.File(ctx, cmd.Writer, client, delete.Filename, apply.Delete()) +func (cmd *fromFile) Run(ctx context.Context, client *api.Client) error { + return apply.File(ctx, cmd.Writer, client, cmd.Filename, apply.Delete()) }