Skip to content

Commit d3aaaf6

Browse files
committed
fix: use default group in flags instead of code
1 parent 88c7bbb commit d3aaaf6

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

pkg/cmd/registry/artifact/crud/create/create.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ rhoas service-registry artifact create --type=JSON my-artifact.json
129129
cmd.Flags().StringVarP(&opts.file, "file", "f", "", "File location of the artifact")
130130

131131
cmd.Flags().StringVarP(&opts.artifact, "artifact-id", "a", "", "Id of the artifact")
132-
cmd.Flags().StringVarP(&opts.group, "group", "g", "", "Group of the artifact")
132+
cmd.Flags().StringVarP(&opts.group, "group", "g", util.DefaultArtifactGroup, "Group of the artifact")
133133
cmd.Flags().StringVarP(&opts.artifactType, "type", "t", "", "Type of artifact. Choose from: "+util.GetAllowedArtifactTypeEnumValuesAsString())
134134
cmd.Flags().StringVarP(&opts.registryID, "instance-id", "", "", "Id of the registry to be used. By default uses currently selected registry")
135135

@@ -158,8 +158,8 @@ func runCreate(opts *Options) error {
158158
return err
159159
}
160160

161-
if opts.group == "" {
162-
logger.Info("Group was not specified. Using " + util.DefaultArtifactGroup + " artifacts group.")
161+
if opts.group == util.DefaultArtifactGroup {
162+
logger.Info("Group was not specified. Using ", util.DefaultArtifactGroup, " artifacts group.")
163163
opts.group = util.DefaultArtifactGroup
164164
}
165165

@@ -171,7 +171,7 @@ func runCreate(opts *Options) error {
171171
return err
172172
}
173173
} else {
174-
logger.Info("Reading file content from stdin")
174+
logger.Info("Reading file content from standard input")
175175
specifiedFile, err = util.CreateFileFromStdin()
176176
if err != nil {
177177
return err

pkg/cmd/registry/artifact/crud/delete/delete.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ rhoas service-registry artifact delete my-artifact
105105
cmd.Flags().StringVarP(&opts.outputFormat, "output", "o", "json", opts.localizer.MustLocalize("registry.cmd.flag.output.description"))
106106

107107
cmd.Flags().StringVarP(&opts.artifact, "artifact-id", "a", "", "Id of the artifact")
108-
cmd.Flags().StringVarP(&opts.group, "group", "g", "", "Group of the artifact")
108+
cmd.Flags().StringVarP(&opts.group, "group", "g", util.DefaultArtifactGroup, "Group of the artifact")
109109
cmd.Flags().StringVarP(&opts.registryID, "instance-id", "", "", "Id of the registry to be used. By default uses currently selected registry")
110110
flagutil.EnableOutputFlagCompletion(cmd)
111111

@@ -128,8 +128,8 @@ func runDelete(opts *Options) error {
128128
return err
129129
}
130130

131-
if opts.group == "" {
132-
logger.Info("Group was not specified. Using " + util.DefaultArtifactGroup + " artifacts group.")
131+
if opts.group == util.DefaultArtifactGroup {
132+
logger.Info("Group was not specified. Using ", util.DefaultArtifactGroup, " artifacts group.")
133133
opts.group = util.DefaultArtifactGroup
134134
}
135135

pkg/cmd/registry/artifact/crud/get/get.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ rhoas service-registry artifact get --group mygroup --instance-id=myregistry --a
101101
}
102102

103103
cmd.Flags().StringVarP(&opts.artifact, "artifact-id", "a", "", "Id of the artifact")
104-
cmd.Flags().StringVarP(&opts.group, "group", "g", "", "Group of the artifact")
104+
cmd.Flags().StringVarP(&opts.group, "group", "g", util.DefaultArtifactGroup, "Group of the artifact")
105105
cmd.Flags().StringVarP(&opts.registryID, "instance-id", "", "", "Id of the registry to be used. By default uses currently selected registry")
106106
cmd.Flags().StringVarP(&opts.outputFile, "output-file", "", "", "Filename of the output file")
107107
cmd.Flags().StringVarP(&opts.version, "version", "", "", "Version of the artifact")
@@ -127,8 +127,8 @@ func runGet(opts *Options) error {
127127
return err
128128
}
129129

130-
if opts.group == "" {
131-
logger.Info("Group was not specified. Using " + util.DefaultArtifactGroup + " artifacts group.")
130+
if opts.group == util.DefaultArtifactGroup {
131+
logger.Info("Group was not specified. Using ", util.DefaultArtifactGroup, " artifacts group.")
132132
opts.group = util.DefaultArtifactGroup
133133
}
134134

pkg/cmd/registry/artifact/crud/list/list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ func runList(opts *Options) error {
134134
return err
135135
}
136136

137-
if opts.group == "" {
138-
logger.Info("Group was not specified. Using " + util.DefaultArtifactGroup + " artifacts group.")
137+
if opts.group == util.DefaultArtifactGroup {
138+
logger.Info("Group was not specified. Using ", util.DefaultArtifactGroup, " artifacts group.")
139139
opts.group = util.DefaultArtifactGroup
140140
}
141141

pkg/cmd/registry/artifact/crud/update/update.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ rhoas service-registry artifact update my-artifact.json --artifact-id=my-artifac
106106
cmd.Flags().StringVarP(&opts.file, "file", "f", "", "File location of the artifact")
107107

108108
cmd.Flags().StringVarP(&opts.artifact, "artifact-id", "a", "", "Id of the artifact")
109-
cmd.Flags().StringVarP(&opts.group, "group", "g", "", "Group of the artifact")
109+
cmd.Flags().StringVarP(&opts.group, "group", "g", util.DefaultArtifactGroup, "Group of the artifact")
110110
cmd.Flags().StringVarP(&opts.registryID, "instance-id", "", "", "Id of the registry to be used. By default uses currently selected registry")
111111

112112
flagutil.EnableOutputFlagCompletion(cmd)
@@ -131,7 +131,7 @@ func runUpdate(opts *Options) error {
131131
return err
132132
}
133133

134-
if opts.group == "" {
134+
if opts.group == util.DefaultArtifactGroup {
135135
logger.Info("Group was not specified. Using", util.DefaultArtifactGroup, "artifacts group.")
136136
opts.group = util.DefaultArtifactGroup
137137
}

pkg/cmd/registry/artifact/download/download.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ rhoas service-registry artifact download --hash=c71d239df91726fc519c6eb72d318ec6
9898
},
9999
}
100100

101-
cmd.Flags().StringVarP(&opts.group, "group", "g", "", "Group of the artifact")
101+
cmd.Flags().StringVarP(&opts.group, "group", "g", util.DefaultArtifactGroup, "Group of the artifact")
102102
cmd.Flags().StringVarP(&opts.hash, "hash", "", "", "SHA-256 hash of the artifact")
103103
cmd.Flags().Int64VarP(&opts.globalId, "global-id", "", unusedFlagIdValue, "Global ID of the artifact")
104104
cmd.Flags().Int64VarP(&opts.contentId, "content-id", "", unusedFlagIdValue, "ContentId of the artifact")
@@ -127,7 +127,7 @@ func runGet(opts *Options) error {
127127
return err
128128
}
129129

130-
if opts.group == "" {
130+
if opts.group == util.DefaultArtifactGroup {
131131
logger.Info("Group was not specified. Using 'default' artifacts group.")
132132
opts.group = util.DefaultArtifactGroup
133133
}

pkg/cmd/registry/artifact/metadata/metadata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ rhoas service-registry artifact metadata my-artifact --group mygroup
8787
}
8888

8989
cmd.Flags().StringVarP(&opts.artifact, "artifact-id", "a", "", "Id of the artifact")
90-
cmd.Flags().StringVarP(&opts.group, "group", "g", "", "Group of the artifact")
90+
cmd.Flags().StringVarP(&opts.group, "group", "g", util.DefaultArtifactGroup, "Group of the artifact")
9191
cmd.Flags().StringVarP(&opts.registryID, "instance-id", "", "", "Id of the registry to be used. By default uses currently selected registry")
9292
cmd.Flags().StringVarP(&opts.outputFormat, "output", "o", "", "Output format (json, yaml, yml)")
9393

@@ -112,7 +112,7 @@ func runGet(opts *Options) error {
112112
return err
113113
}
114114

115-
if opts.group == "" {
115+
if opts.group == util.DefaultArtifactGroup {
116116
logger.Info("Group was not specified. Using 'default' artifacts group.")
117117
opts.group = util.DefaultArtifactGroup
118118
}

pkg/cmd/registry/artifact/versions/versions.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ rhoas service-registry artifact versions my-artifact --group mygroup
7979
}
8080

8181
cmd.Flags().StringVarP(&opts.artifact, "artifact-id", "a", "", "Id of the artifact")
82-
cmd.Flags().StringVarP(&opts.group, "group", "g", "", "Group of the artifact")
82+
cmd.Flags().StringVarP(&opts.group, "group", "g", util.DefaultArtifactGroup, "Group of the artifact")
8383
cmd.Flags().StringVarP(&opts.registryID, "instance-id", "", "", "Id of the registry to be used. By default uses currently selected registry")
8484
cmd.Flags().StringVarP(&opts.outputFormat, "output", "o", "", "Output format (json, yaml, yml)")
8585

@@ -104,7 +104,7 @@ func runGet(opts *Options) error {
104104
return err
105105
}
106106

107-
if opts.group == "" {
107+
if opts.group == util.DefaultArtifactGroup {
108108
logger.Info("Group was not specified. Using 'default' artifacts group.")
109109
opts.group = util.DefaultArtifactGroup
110110
}

0 commit comments

Comments
 (0)