Skip to content

Commit f12a52f

Browse files
nrchakradharnrchakradhar
committed
Incorporating all review comments
1 parent 7231eea commit f12a52f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+198
-199
lines changed

‎cmd/operator-sdk/add/api.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func apiRun(cmd *cobra.Command, args []string) error {
114114
// scaffold a group.go to prevent erroneous gengo parse errors.
115115
group := &scaffold.Group{Resource: r}
116116
if err := scaffoldIfNoPkgFileExists(s, cfg, group); err != nil {
117-
return fmt.Errorf("scaffold group file: %w", err)
117+
return fmt.Errorf("scaffold group file: %v", err)
118118
}
119119

120120
err = s.Execute(cfg,
@@ -126,12 +126,12 @@ func apiRun(cmd *cobra.Command, args []string) error {
126126
&scaffold.CRD{Resource: r, IsOperatorGo: projutil.IsOperatorGo()},
127127
)
128128
if err != nil {
129-
return fmt.Errorf("api scaffold failed: %w", err)
129+
return fmt.Errorf("api scaffold failed: %v", err)
130130
}
131131

132132
// update deploy/role.yaml for the given resource r.
133133
if err := scaffold.UpdateRoleForResource(r, absProjectPath); err != nil {
134-
return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): %w", r.APIVersion, r.Kind, err)
134+
return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): %v", r.APIVersion, r.Kind, err)
135135
}
136136

137137
if !skipGeneration {
@@ -155,12 +155,12 @@ func apiRun(cmd *cobra.Command, args []string) error {
155155
func scaffoldIfNoPkgFileExists(s *scaffold.Scaffold, cfg *input.Config, f input.File) error {
156156
i, err := f.GetInput()
157157
if err != nil {
158-
return fmt.Errorf("error getting file %s input: %w", i.Path, err)
158+
return fmt.Errorf("error getting file %s input: %v", i.Path, err)
159159
}
160160
groupDir := filepath.Dir(i.Path)
161161
gdInfos, err := ioutil.ReadDir(groupDir)
162162
if err != nil && !os.IsNotExist(err) {
163-
return fmt.Errorf("error reading dir %s: %w", groupDir, err)
163+
return fmt.Errorf("error reading dir %s: %v", groupDir, err)
164164
}
165165
if err == nil {
166166
for _, info := range gdInfos {

‎cmd/operator-sdk/add/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func controllerRun(cmd *cobra.Command, args []string) error {
9292
&scaffold.AddController{Resource: r},
9393
)
9494
if err != nil {
95-
return fmt.Errorf("controller scaffold failed: %w", err)
95+
return fmt.Errorf("controller scaffold failed: %v", err)
9696
}
9797

9898
log.Info("Controller generation complete.")

‎cmd/operator-sdk/add/crd.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ func crdFunc(cmd *cobra.Command, args []string) error {
9595
},
9696
)
9797
if err != nil {
98-
return fmt.Errorf("crd scaffold failed: %w", err)
98+
return fmt.Errorf("crd scaffold failed: %v", err)
9999
}
100100

101101
// update deploy/role.yaml for the given resource r.
102102
if err := scaffold.UpdateRoleForResource(resource, cfg.AbsProjectPath); err != nil {
103-
return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): %w", resource.APIVersion, resource.Kind, err)
103+
return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): %v", resource.APIVersion, resource.Kind, err)
104104
}
105105

106106
log.Info("CRD generation complete.")
@@ -128,7 +128,7 @@ func verifyCRDFlags() error {
128128
func verifyCRDDeployPath() error {
129129
wd, err := os.Getwd()
130130
if err != nil {
131-
return fmt.Errorf("failed to determine the full path of the current directory: %w", err)
131+
return fmt.Errorf("failed to determine the full path of the current directory: %v", err)
132132
}
133133
// check if the deploy sub-directory exist
134134
_, err = os.Stat(filepath.Join(wd, scaffold.DeployDir))

‎cmd/operator-sdk/build/cmd.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func createBuildCommand(imageBuilder, context, dockerFile, image string, imageBu
7676
if bargs != "" {
7777
splitArgs, err := shlex.Split(bargs)
7878
if err != nil {
79-
return nil, fmt.Errorf("image-build-args is not parseable: %w", err)
79+
return nil, fmt.Errorf("image-build-args is not parseable: %v", err)
8080
}
8181
args = append(args, splitArgs...)
8282
}
@@ -120,7 +120,7 @@ func buildFunc(cmd *cobra.Command, args []string) error {
120120
Env: goBuildEnv,
121121
}
122122
if err := projutil.GoBuild(opts); err != nil {
123-
return fmt.Errorf("failed to build operator binary: %w", err)
123+
return fmt.Errorf("failed to build operator binary: %v", err)
124124
}
125125
}
126126

@@ -134,7 +134,7 @@ func buildFunc(cmd *cobra.Command, args []string) error {
134134
}
135135

136136
if err := projutil.ExecCmd(buildCmd); err != nil {
137-
return fmt.Errorf("failed to output build image %s: %w", image, err)
137+
return fmt.Errorf("failed to output build image %s: %v", image, err)
138138
}
139139

140140
log.Info("Operator build complete.")

‎cmd/operator-sdk/internal/genutil/crds.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func CRDGen() error {
3636

3737
gvMap, err := k8sutil.ParseGroupSubpackages(scaffold.ApisDir)
3838
if err != nil {
39-
return fmt.Errorf("failed to parse group versions: %w", err)
39+
return fmt.Errorf("failed to parse group versions: %v", err)
4040
}
4141
gvb := &strings.Builder{}
4242
for g, vs := range gvMap {

‎cmd/operator-sdk/internal/genutil/k8s.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func K8sCodegen() error {
3939

4040
gvMap, err := k8sutil.ParseGroupSubpackages(scaffold.ApisDir)
4141
if err != nil {
42-
return fmt.Errorf("failed to parse group versions: %w", err)
42+
return fmt.Errorf("failed to parse group versions: %v", err)
4343
}
4444
gvb := &strings.Builder{}
4545
for g, vs := range gvMap {
@@ -90,7 +90,7 @@ func deepcopyGen(hf string, fqApis []string) error {
9090
}
9191

9292
if err := generatorargs.Validate(args); err != nil {
93-
return fmt.Errorf("deepcopy-gen argument validation error: %w", err)
93+
return fmt.Errorf("deepcopy-gen argument validation error: %v", err)
9494
}
9595

9696
err = args.Execute(
@@ -99,7 +99,7 @@ func deepcopyGen(hf string, fqApis []string) error {
9999
generators.Packages,
100100
)
101101
if err != nil {
102-
return fmt.Errorf("deepcopy-gen generator error: %w", err)
102+
return fmt.Errorf("deepcopy-gen generator error: %v", err)
103103
}
104104
}
105105
return nil

‎cmd/operator-sdk/internal/genutil/openapi.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func OpenAPIGen() error {
3838

3939
gvMap, err := k8sutil.ParseGroupSubpackages(scaffold.ApisDir)
4040
if err != nil {
41-
return fmt.Errorf("failed to parse group versions: %w", err)
41+
return fmt.Errorf("failed to parse group versions: %v", err)
4242
}
4343
gvb := &strings.Builder{}
4444
for g, vs := range gvMap {
@@ -82,7 +82,7 @@ func openAPIGen(hf string, fqApis []string) error {
8282
// Print API rule violations to stdout
8383
cargs.ReportFilename = "-"
8484
if err := generatorargs.Validate(args); err != nil {
85-
return fmt.Errorf("openapi-gen argument validation error: %w", err)
85+
return fmt.Errorf("openapi-gen argument validation error: %v", err)
8686
}
8787

8888
err := args.Execute(
@@ -91,7 +91,7 @@ func openAPIGen(hf string, fqApis []string) error {
9191
generators.Packages,
9292
)
9393
if err != nil {
94-
return fmt.Errorf("openapi-gen generator error: %w", err)
94+
return fmt.Errorf("openapi-gen generator error: %v", err)
9595
}
9696
}
9797
return nil

‎cmd/operator-sdk/migrate/cmd.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func migrateAnsible() error {
101101
case os.IsNotExist(err):
102102
log.Info("No playbook was found, so not including it in the new Dockerfile")
103103
default:
104-
return fmt.Errorf("error trying to stat %s: %w", ansible.PlaybookYamlFile, err)
104+
return fmt.Errorf("error trying to stat %s: %v", ansible.PlaybookYamlFile, err)
105105
}
106106
if err := renameDockerfile(); err != nil {
107107
return err
@@ -111,7 +111,7 @@ func migrateAnsible() error {
111111
if headerFile != "" {
112112
err = s.Execute(cfg, &scaffold.Boilerplate{BoilerplateSrcPath: headerFile})
113113
if err != nil {
114-
return fmt.Errorf("boilerplate scaffold failed: %w", err)
114+
return fmt.Errorf("boilerplate scaffold failed: %v", err)
115115
}
116116
s.BoilerplatePath = headerFile
117117
}
@@ -126,7 +126,7 @@ func migrateAnsible() error {
126126
&ansible.AoLogs{},
127127
)
128128
if err != nil {
129-
return fmt.Errorf("migrate ansible scaffold failed: %w", err)
129+
return fmt.Errorf("migrate ansible scaffold failed: %v", err)
130130
}
131131
return nil
132132
}
@@ -149,7 +149,7 @@ func migrateHelm() error {
149149
if headerFile != "" {
150150
err := s.Execute(cfg, &scaffold.Boilerplate{BoilerplateSrcPath: headerFile})
151151
if err != nil {
152-
return fmt.Errorf("boilerplate scaffold failed: %w", err)
152+
return fmt.Errorf("boilerplate scaffold failed: %v", err)
153153
}
154154
s.BoilerplatePath = headerFile
155155
}
@@ -166,7 +166,7 @@ func migrateHelm() error {
166166
&helm.UserSetup{},
167167
)
168168
if err != nil {
169-
return fmt.Errorf("migrate helm scaffold failed: %w", err)
169+
return fmt.Errorf("migrate helm scaffold failed: %v", err)
170170
}
171171
return nil
172172
}
@@ -176,7 +176,7 @@ func renameDockerfile() error {
176176
newDockerfilePath := dockerfilePath + ".sdkold"
177177
err := os.Rename(dockerfilePath, newDockerfilePath)
178178
if err != nil {
179-
return fmt.Errorf("failed to rename Dockerfile: %w", err)
179+
return fmt.Errorf("failed to rename Dockerfile: %v", err)
180180
}
181181
log.Infof("Renamed Dockerfile to %s and replaced with newer version. Compare the new Dockerfile to your old one and manually migrate any customizations", newDockerfilePath)
182182
return nil

‎cmd/operator-sdk/new/cmd.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func doGoScaffold() error {
180180
if headerFile != "" {
181181
err := s.Execute(cfg, &scaffold.Boilerplate{BoilerplateSrcPath: headerFile})
182182
if err != nil {
183-
return fmt.Errorf("boilerplate scaffold failed: %w", err)
183+
return fmt.Errorf("boilerplate scaffold failed: %v", err)
184184
}
185185
s.BoilerplatePath = headerFile
186186
}
@@ -206,7 +206,7 @@ func doGoScaffold() error {
206206
&scaffold.Gitignore{},
207207
)
208208
if err != nil {
209-
return fmt.Errorf("new Go scaffold failed: %w", err)
209+
return fmt.Errorf("new Go scaffold failed: %v", err)
210210
}
211211
return nil
212212
}
@@ -219,7 +219,7 @@ func doAnsibleScaffold() error {
219219

220220
resource, err := scaffold.NewResource(apiVersion, kind)
221221
if err != nil {
222-
return fmt.Errorf("invalid apiVersion and kind: %w", err)
222+
return fmt.Errorf("invalid apiVersion and kind: %v", err)
223223
}
224224

225225
roleFiles := ansible.RolesFiles{Resource: *resource}
@@ -263,17 +263,17 @@ func doAnsibleScaffold() error {
263263
&ansible.MoleculeTestLocalPrepare{Resource: *resource},
264264
)
265265
if err != nil {
266-
return fmt.Errorf("new ansible scaffold failed: %w", err)
266+
return fmt.Errorf("new ansible scaffold failed: %v", err)
267267
}
268268

269269
// Remove placeholders from empty directories
270270
err = os.Remove(filepath.Join(s.AbsProjectPath, roleFiles.Path))
271271
if err != nil {
272-
return fmt.Errorf("new ansible scaffold failed: %w", err)
272+
return fmt.Errorf("new ansible scaffold failed: %v", err)
273273
}
274274
err = os.Remove(filepath.Join(s.AbsProjectPath, roleTemplates.Path))
275275
if err != nil {
276-
return fmt.Errorf("new ansible scaffold failed: %w", err)
276+
return fmt.Errorf("new ansible scaffold failed: %v", err)
277277
}
278278

279279
// Decide on playbook.
@@ -284,13 +284,13 @@ func doAnsibleScaffold() error {
284284
&ansible.Playbook{Resource: *resource},
285285
)
286286
if err != nil {
287-
return fmt.Errorf("new ansible playbook scaffold failed: %w", err)
287+
return fmt.Errorf("new ansible playbook scaffold failed: %v", err)
288288
}
289289
}
290290

291291
// update deploy/role.yaml for the given resource r.
292292
if err := scaffold.UpdateRoleForResource(resource, cfg.AbsProjectPath); err != nil {
293-
return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): %w", resource.APIVersion, resource.Kind, err)
293+
return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): %v", resource.APIVersion, resource.Kind, err)
294294
}
295295
return nil
296296
}
@@ -311,14 +311,14 @@ func doHelmScaffold() error {
311311

312312
resource, chart, err := helm.CreateChart(cfg.AbsProjectPath, createOpts)
313313
if err != nil {
314-
return fmt.Errorf("failed to create helm chart: %w", err)
314+
return fmt.Errorf("failed to create helm chart: %v", err)
315315
}
316316

317317
valuesPath := filepath.Join("<project_dir>", helm.HelmChartsDir, chart.Name(), "values.yaml")
318318

319319
rawValues, err := yaml.Marshal(chart.Values)
320320
if err != nil {
321-
return fmt.Errorf("failed to get raw chart values: %w", err)
321+
return fmt.Errorf("failed to get raw chart values: %v", err)
322322
}
323323
crSpec := fmt.Sprintf("# Default values copied from %s\n\n%s", valuesPath, rawValues)
324324

@@ -349,18 +349,18 @@ func doHelmScaffold() error {
349349
},
350350
)
351351
if err != nil {
352-
return fmt.Errorf("new helm scaffold failed: %w", err)
352+
return fmt.Errorf("new helm scaffold failed: %v", err)
353353
}
354354

355355
if err := scaffold.UpdateRoleForResource(resource, cfg.AbsProjectPath); err != nil {
356-
return fmt.Errorf("failed to update the RBAC manifest for resource (%v, %v): %w", resource.APIVersion, resource.Kind, err)
356+
return fmt.Errorf("failed to update the RBAC manifest for resource (%v, %v): %v", resource.APIVersion, resource.Kind, err)
357357
}
358358
return nil
359359
}
360360

361361
func verifyFlags() error {
362362
if operatorType != projutil.OperatorTypeGo && operatorType != projutil.OperatorTypeAnsible && operatorType != projutil.OperatorTypeHelm {
363-
return fmt.Errorf("value of --type can only be `go`, `ansible`, or `helm`: %w", projutil.ErrUnknownOperatorType{Type: operatorType})
363+
return fmt.Errorf("value of --type can only be `go`, `ansible`, or `helm`: %v", projutil.ErrUnknownOperatorType{Type: operatorType})
364364
}
365365
if operatorType != projutil.OperatorTypeAnsible && generatePlaybook {
366366
return fmt.Errorf("value of --generate-playbook can only be used with --type `ansible`")
@@ -438,7 +438,7 @@ func getDeps() error {
438438
func initGit() error {
439439
log.Info("Running git init")
440440
if err := execProjCmd("git", "init"); err != nil {
441-
return fmt.Errorf("failed to run git init: %w", err)
441+
return fmt.Errorf("failed to run git init: %v", err)
442442
}
443443
log.Info("Run git init done")
444444
return nil

‎cmd/operator-sdk/olmcatalog/gen-csv.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func genCSVFunc(cmd *cobra.Command, args []string) error {
124124
},
125125
)
126126
if err != nil {
127-
return fmt.Errorf("catalog scaffold failed: %w", err)
127+
return fmt.Errorf("catalog scaffold failed: %v", err)
128128
}
129129

130130
// Write CRD's to the new or updated CSV package dir.
@@ -165,7 +165,7 @@ func verifyGenCSVFlags() error {
165165
func verifyCSVVersion(version string) error {
166166
v, err := semver.NewVersion(version)
167167
if err != nil {
168-
return fmt.Errorf("%s is not a valid semantic version: %w", version, err)
168+
return fmt.Errorf("%s is not a valid semantic version: %v", version, err)
169169
}
170170
// Ensures numerical values composing csvVersion don't contain leading 0's,
171171
// ex. 01.01.01

‎cmd/operator-sdk/printdeps/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func printDepsFunc(cmd *cobra.Command, args []string) error {
4444
projutil.MustInProjectRoot()
4545

4646
if err := printDeps(); err != nil {
47-
return fmt.Errorf("print deps failed: %w", err)
47+
return fmt.Errorf("print deps failed: %v", err)
4848
}
4949
return nil
5050
}

0 commit comments

Comments
 (0)