Skip to content

Commit 2a55815

Browse files
wtrockiwtrocki
committed
fix: restore delete codebase
1 parent 292949e commit 2a55815

File tree

2 files changed

+149
-37
lines changed

2 files changed

+149
-37
lines changed

‎pkg/cmd/kafka/acl/delete/delete.go‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command {
5656

5757
var errorCollection []error
5858

59-
// if opts.Operation == "" {
60-
// errorCollection = append(errorCollection, opts.Localizer.MustLocalizeError("kafka.acl.common.flag.operation.required"))
61-
// }
59+
if opts.Operation == "" {
60+
errorCollection = append(errorCollection, opts.Localizer.MustLocalizeError("kafka.acl.common.flag.operation.required"))
61+
}
6262

63-
// if resourceErrors := aclcmdutil.ValidateAndSetResources(opts, aclFlagUtil.ResourceTypeFlagEntries); resourceErrors != nil {
64-
// errorCollection = append(errorCollection, resourceErrors)
65-
// }
63+
if resourceErrors := aclcmdutil.ValidateAndSetResources(opts, aclFlagUtil.ResourceTypeFlagEntries); resourceErrors != nil {
64+
errorCollection = append(errorCollection, resourceErrors)
65+
}
6666

6767
if principalErrors := validateAndSetOpts(opts); principalErrors != nil {
6868
errorCollection = append(errorCollection, principalErrors)
@@ -205,37 +205,37 @@ func getRequestParams(opts *aclcmdutil.CrudOptions) *requestParams {
205205

206206
func validateAndSetOpts(opts *aclcmdutil.CrudOptions) error {
207207

208-
// // user and service account should not be provided together
209-
// if userID != "" && serviceAccount != "" {
210-
// return opts.Localizer.MustLocalizeError("kafka.acl.common.error.bothPrincipalsSelected")
211-
// }
212-
213-
// if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias {
214-
// return opts.Localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag")
215-
// }
216-
217-
// if allAccounts {
218-
// if userID != "" || serviceAccount != "" {
219-
// return opts.Localizer.MustLocalizeError("kafka.acl.common.error.allAccountsCannotBeUsedWithUserFlag")
220-
// }
221-
// opts.Principal = aclcmdutil.Wildcard
222-
// }
223-
224-
// // check if principal is provided
225-
// if !allAccounts && (userID == "" && serviceAccount == "") {
226-
// return opts.Localizer.MustLocalizeError("kafka.acl.common.error.noPrincipalsSelected")
227-
// }
228-
229-
// opts.PatternType = aclcmdutil.PatternTypeLITERAL
230-
// if prefix {
231-
// opts.PatternType = aclcmdutil.PatternTypePREFIX
232-
// }
233-
234-
// if userID != "" {
235-
// opts.Principal = userID
236-
// } else if serviceAccount != "" {
237-
// opts.Principal = serviceAccount
238-
// }
208+
// user and service account should not be provided together
209+
if userID != "" && serviceAccount != "" {
210+
return opts.Localizer.MustLocalizeError("kafka.acl.common.error.bothPrincipalsSelected")
211+
}
212+
213+
if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias {
214+
return opts.Localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag")
215+
}
216+
217+
if allAccounts {
218+
if userID != "" || serviceAccount != "" {
219+
return opts.Localizer.MustLocalizeError("kafka.acl.common.error.allAccountsCannotBeUsedWithUserFlag")
220+
}
221+
opts.Principal = aclcmdutil.Wildcard
222+
}
223+
224+
// check if principal is provided
225+
if !allAccounts && (userID == "" && serviceAccount == "") {
226+
return opts.Localizer.MustLocalizeError("kafka.acl.common.error.noPrincipalsSelected")
227+
}
228+
229+
opts.PatternType = aclcmdutil.PatternTypeLITERAL
230+
if prefix {
231+
opts.PatternType = aclcmdutil.PatternTypePREFIX
232+
}
233+
234+
if userID != "" {
235+
opts.Principal = userID
236+
} else if serviceAccount != "" {
237+
opts.Principal = serviceAccount
238+
}
239239

240240
if opts.InstanceID == "" {
241241
cfg, err := opts.Config.Load()

‎pkg/cmd/registry/rule/rulecmdutil/flagset.go‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
package rulecmdutil
2+
3+
import (
4+
artifactutil "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util"
5+
"github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil"
6+
"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil"
7+
"github.com/redhat-developer/app-services-cli/pkg/shared/factory"
8+
"github.com/spf13/cobra"
9+
)
10+
11+
type flagSet struct {
12+
cmd *cobra.Command
13+
factory *factory.Factory
14+
*registrycmdutil.FlagSet
15+
}
16+
17+
// NewFlagSet returns a new flag set with common Service Registry rule flags
18+
func NewFlagSet(cmd *cobra.Command, f *factory.Factory) *flagSet {
19+
return &flagSet{
20+
cmd: cmd,
21+
factory: f,
22+
FlagSet: registrycmdutil.NewFlagSet(cmd, f),
23+
}
24+
}
25+
26+
// AddArtifactID adds a flag for setting the artifact ID
27+
func (fs *flagSet) AddArtifactID(artifactID *string) {
28+
flagName := "artifact-id"
29+
30+
fs.StringVar(
31+
artifactID,
32+
flagName,
33+
"",
34+
fs.factory.Localizer.MustLocalize("artifact.common.id"),
35+
)
36+
37+
}
38+
39+
// AddGroup adds a flag for setting the artifact group
40+
func (fs *flagSet) AddGroup(artifactID *string) {
41+
flagName := "group"
42+
43+
fs.StringVarP(
44+
artifactID,
45+
flagName,
46+
"g",
47+
artifactutil.DefaultArtifactGroup,
48+
fs.factory.Localizer.MustLocalize("artifact.common.group"),
49+
)
50+
51+
}
52+
53+
// AddRuleType adds a flag for setting the rule type
54+
func (fs *flagSet) AddRuleType(ruleType *string) *flagutil.FlagOptions {
55+
flagName := "rule-type"
56+
57+
ruleTypeMap := GetRuleTypeMap()
58+
59+
ruleTypes := make([]string, 0, len(ruleTypeMap))
60+
for i := range ruleTypeMap {
61+
ruleTypes = append(ruleTypes, i)
62+
}
63+
64+
fs.StringVar(
65+
ruleType,
66+
flagName,
67+
"",
68+
fs.factory.Localizer.MustLocalize("registry.rule.common.flag.ruleType"),
69+
)
70+
_ = fs.cmd.RegisterFlagCompletionFunc(flagName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
71+
return ruleTypes, cobra.ShellCompDirectiveNoSpace
72+
})
73+
74+
return flagutil.WithFlagOptions(fs.cmd, flagName)
75+
76+
}
77+
78+
// AddConfig adds a flag for setting the configuration value for a rule
79+
func (fs *flagSet) AddConfig(config *string, ruleType *string) *flagutil.FlagOptions {
80+
flagName := "config"
81+
82+
// if ruleType!=""{
83+
// ruleType ===
84+
// }
85+
86+
validityConfigMap := GetConfigMap()
87+
compatibilityConfigMap := GetConfigMap()
88+
89+
configs := make([]string, 0, len(validityConfigMap)+len(compatibilityConfigMap))
90+
91+
var i string
92+
for i = range validityConfigMap {
93+
configs = append(configs, i)
94+
}
95+
for i = range compatibilityConfigMap {
96+
configs = append(configs, i)
97+
}
98+
99+
fs.StringVar(
100+
config,
101+
flagName,
102+
"",
103+
fs.factory.Localizer.MustLocalize("registry.rule.common.flag.config"),
104+
)
105+
106+
_ = fs.cmd.RegisterFlagCompletionFunc(flagName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
107+
return configs, cobra.ShellCompDirectiveNoSpace
108+
})
109+
110+
return flagutil.WithFlagOptions(fs.cmd, flagName)
111+
112+
}

0 commit comments

Comments
 (0)