Skip to content
This repository has been archived by the owner on Jul 25, 2022. It is now read-only.

remove double dash when using gardenctl aws/gcloud/az/openstack/kubectl #428

Merged
merged 1 commit into from
Nov 10, 2020
Merged

remove double dash when using gardenctl aws/gcloud/az/openstack/kubectl #428

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
8 changes: 5 additions & 3 deletions pkg/cmd/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ import (
// NewAwsCmd returns a new aws command.
func NewAwsCmd(targetReader TargetReader) *cobra.Command {
return &cobra.Command{
Use: "aws <args>",
SilenceUsage: true,
Use: "aws <args>",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
target := targetReader.ReadTarget(pathTarget)
if !CheckShootIsTargeted(target) {
Expand All @@ -37,7 +38,8 @@ func NewAwsCmd(targetReader TargetReader) *cobra.Command {
fmt.Println("Please go to https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html for how to install aws cli")
os.Exit(2)
}
arguments := strings.Join(args[:], " ")

arguments := strings.Join(os.Args[2:], " ")
fmt.Println(operate("aws", arguments))

return nil
Expand Down
8 changes: 5 additions & 3 deletions pkg/cmd/az.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ import (
// NewAzCmd returns a new az command.
func NewAzCmd(targetReader TargetReader) *cobra.Command {
return &cobra.Command{
Use: "az <args>",
SilenceUsage: true,
Use: "az <args>",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
target := targetReader.ReadTarget(pathTarget)
if !CheckShootIsTargeted(target) {
Expand All @@ -37,7 +38,8 @@ func NewAzCmd(targetReader TargetReader) *cobra.Command {
fmt.Println("Please go to https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest for how to install az cli")
os.Exit(2)
}
arguments := strings.Join(args[:], " ")

arguments := strings.Join(os.Args[2:], " ")
fmt.Println(operate("az", arguments))

return nil
Expand Down
7 changes: 4 additions & 3 deletions pkg/cmd/gcloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ import (
// NewGcloudCmd return a new gcloud command.
func NewGcloudCmd(targetReader TargetReader) *cobra.Command {
return &cobra.Command{
Use: "gcloud <args>",
SilenceUsage: true,
Use: "gcloud <args>",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
target := targetReader.ReadTarget(pathTarget)
if !CheckShootIsTargeted(target) {
Expand All @@ -38,7 +39,7 @@ func NewGcloudCmd(targetReader TargetReader) *cobra.Command {
os.Exit(2)
}

arguments := strings.Join(args[:], " ")
arguments := strings.Join(os.Args[2:], " ")
fmt.Println(operate("gcp", arguments))

return nil
Expand Down
37 changes: 21 additions & 16 deletions pkg/cmd/kubectl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ import (
// NewKubectlCmd returns a new kubectl command.
func NewKubectlCmd() *cobra.Command {
return &cobra.Command{
Use: "kubectl <args>",
Aliases: []string{"k"},
Short: "",
Use: "kubectl <args>",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
Aliases: []string{"k"},
Short: "",
Run: func(cmd *cobra.Command, args []string) {
arguments := "kubectl " + strings.Join(args[:], " ")
arguments := "kubectl " + strings.Join(os.Args[2:], " ")
kube(arguments)
},
}
Expand All @@ -39,10 +40,11 @@ func NewKubectlCmd() *cobra.Command {
// NewKaCmd returns a new 'kubectl --all-namespaces' command.
func NewKaCmd() *cobra.Command {
return &cobra.Command{
Use: "ka",
Hidden: true,
Use: "ka",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
Hidden: true,
Run: func(cmd *cobra.Command, args []string) {
arguments := "kubectl " + strings.Join(args[:], " ") + " --all-namespaces=true"
arguments := "kubectl " + strings.Join(os.Args[2:], " ") + " --all-namespaces=true"
kube(arguments)
},
}
Expand All @@ -51,10 +53,11 @@ func NewKaCmd() *cobra.Command {
// NewKsCmd returns a new 'kubectl --namespace=kube-system' command.
func NewKsCmd() *cobra.Command {
return &cobra.Command{
Use: "ks",
Hidden: true,
Use: "ks",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
Hidden: true,
Run: func(cmd *cobra.Command, args []string) {
arguments := "kubectl " + strings.Join(args[:], " ") + " --namespace=kube-system"
arguments := "kubectl " + strings.Join(os.Args[2:], " ") + " --namespace=kube-system"
kube(arguments)
},
}
Expand All @@ -63,10 +66,11 @@ func NewKsCmd() *cobra.Command {
// NewKgCmd returns a new 'kubectl --namespace=garden' command.
func NewKgCmd() *cobra.Command {
return &cobra.Command{
Use: "kg",
Hidden: true,
Use: "kg",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
Hidden: true,
Run: func(cmd *cobra.Command, args []string) {
arguments := "kubectl " + strings.Join(args[:], " ") + " --namespace=garden"
arguments := "kubectl " + strings.Join(os.Args[2:], " ") + " --namespace=garden"
kube(arguments)
},
}
Expand All @@ -75,10 +79,11 @@ func NewKgCmd() *cobra.Command {
// NewKnCmd returns a new 'kubectl --namespace=<arg>' command.
func NewKnCmd() *cobra.Command {
return &cobra.Command{
Use: "kn",
Hidden: true,
Use: "kn",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
Hidden: true,
Run: func(cmd *cobra.Command, args []string) {
arguments := "kubectl --namespace=" + strings.Join(args[:], " ")
arguments := "kubectl --namespace=" + strings.Join(os.Args[2:], " ")
kube(arguments)
},
}
Expand Down
7 changes: 4 additions & 3 deletions pkg/cmd/openstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ import (
// NewOpenstackCmd returns a new openstack cmd.
func NewOpenstackCmd(targetReader TargetReader) *cobra.Command {
cmd := &cobra.Command{
Use: "openstack <args>",
SilenceUsage: true,
Use: "openstack <args>",
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
target := targetReader.ReadTarget(pathTarget)
if !CheckShootIsTargeted(target) {
Expand All @@ -37,7 +38,7 @@ func NewOpenstackCmd(targetReader TargetReader) *cobra.Command {
fmt.Println("Please go to https://docs.openstack.org/newton/user-guide/common/cli-install-openstack-command-line-clients.html for how to install openstack cli")
os.Exit(2)
}
arguments := strings.Join(args[:], " ")
arguments := strings.Join(os.Args[2:], " ")
fmt.Println(operate("openstack", arguments))

return nil
Expand Down