Skip to content

fix: reject -f flag combined with a resource kind on create #430

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
SaadAssaf merged 1 commit into from
Jul 15, 2026
Merged

fix: reject -f flag combined with a resource kind on create #430

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
10 changes: 1 addition & 9 deletions apply/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <file>" help:"Apply any resource from a yaml or json file."`
FromFile fromFile `cmd:"" default:"withargs" name:"-f <file>" help:"Apply any resource from a yaml or json file."`
}
9 changes: 6 additions & 3 deletions apply/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"io"
"math/rand"
"os"
"time"

runtimev1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
Expand All @@ -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 <file>" help:"Create any resource from a yaml or json file."`
FromFile fromFile `cmd:"" group:"create-general" default:"withargs" name:"-f <file>" help:"Create any resource from a yaml or json file."`
Comment thread
SaadAssaf marked this conversation as resolved.
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."`
Expand Down
6 changes: 4 additions & 2 deletions create/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package create

import (
"context"
"os"

"github.com/ninech/nctl/api"
"github.com/ninech/nctl/apply"
Expand All @@ -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)
}
4 changes: 1 addition & 3 deletions delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"os"
"time"

"github.com/crossplane/crossplane-runtime/pkg/resource"
Expand All @@ -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 <file>" help:"Delete any resource from a yaml or json file."`
FromFile fromFile `cmd:"" group:"delete-general" default:"withargs" name:"-f <file>" 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."`
Expand Down
6 changes: 4 additions & 2 deletions delete/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package delete

import (
"context"
"os"

"github.com/ninech/nctl/api"
"github.com/ninech/nctl/apply"
Expand All @@ -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())
}
Loading