Skip to content

Commit

Permalink
fix(autok3s): fix flag check bugs
Browse files Browse the repository at this point in the history 
Signed-off-by: Jason-ZW <zhenyang@rancher.com>
  • Loading branch information
@rancher-sy-bot
rancher-sy-bot committed Oct 15, 2020
1 parent 9b2930c commit 469f521
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 32 deletions.
37 changes: 18 additions & 19 deletions pkg/providers/alibaba/flag.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ func (p *Alibaba) GetCreateFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -155,9 +155,9 @@ func (p *Alibaba) GetStartFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required && f.Name == "name" {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -239,9 +239,9 @@ func (p *Alibaba) GetStopFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required && f.Name == "name" {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -323,9 +323,9 @@ func (p *Alibaba) GetDeleteFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required && f.Name == "name" {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -396,9 +396,9 @@ func (p *Alibaba) GetJoinFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -480,9 +480,9 @@ func (p *Alibaba) GetSSHFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required && f.Name == "name" {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -543,9 +543,9 @@ func (p *Alibaba) GetCredentialFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -674,11 +674,10 @@ func (p *Alibaba) sharedFlags() []types.Flag {
Usage: "Specify K3s master/lb ip",
},
{
Name: "k3s-version",
P: &p.K3sVersion,
V: p.K3sVersion,
Usage: "Used to specify the version of k3s cluster, overrides k3s-channel",
Required: true,
Name: "k3s-version",
P: &p.K3sVersion,
V: p.K3sVersion,
Usage: "Used to specify the version of k3s cluster, overrides k3s-channel",
},
{
Name: "k3s-channel",
Expand Down
25 changes: 12 additions & 13 deletions pkg/providers/native/flag.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ func (p *Native) GetCreateFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -124,9 +124,9 @@ func (p *Native) GetJoinFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -200,9 +200,9 @@ func (p *Native) GetSSHFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required && f.Name == "name" {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -283,9 +283,9 @@ func (p *Native) GetDeleteFlags(cmd *cobra.Command) *pflag.FlagSet {
errFlags := make([]string, 0)
for _, f := range fs {
if f.Required && f.Name == "name" {
p, ok := f.P.(string)
p, ok := f.P.(*string)
if ok {
if p == "" && f.V.(string) == "" {
if *p == "" && f.V.(string) == "" {
errFlags = append(errFlags, f.Name)
}
}
Expand Down Expand Up @@ -327,11 +327,10 @@ func (p *Native) sharedFlags() []types.Flag {
Usage: "Specify K3s master/lb ip",
},
{
Name: "k3s-version",
P: &p.K3sVersion,
V: p.K3sVersion,
Usage: "Used to specify the version of k3s cluster, overrides k3s-channel",
Required: true,
Name: "k3s-version",
P: &p.K3sVersion,
V: p.K3sVersion,
Usage: "Used to specify the version of k3s cluster, overrides k3s-channel",
},
{
Name: "k3s-channel",
Expand Down

0 comments on commit 469f521

Please sign in to comment.