Skip to content

Commit a81f08f

Browse files
authored
cmd/.../genutil: verbose codegen by default (#1271)
* cmd/.../genutil: verbose codegen by default * test/e2e: remove explicit setting of verbosity * CHANGELOG.md: add generate verbosity change
1 parent f9d902f commit a81f08f

File tree

5 files changed

+5
-30
lines changed

5 files changed

+5
-30
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- Updated the helm-operator to store release state in kubernetes secrets in the same namespace of the custom resource that defines the release. ([#1102](https://github.com/operator-framework/operator-sdk/pull/1102))
1010
- **WARNING**: Users with active CRs and releases who are upgrading their helm-based operator should not skip this version. Future versions will not seamlessly transition release state to the persistent backend, and will instead uninstall and reinstall all managed releases.
1111
- Change `namespace-manifest` flag in scorecard subcommand to `namespaced-manifest` to match other subcommands
12+
- Subcommands of [`operator-sdk generate`](https://github.com/operator-framework/operator-sdk/blob/master/doc/sdk-cli-reference.md#generate) are now verbose by default. ([#1271](https://github.com/operator-framework/operator-sdk/pull/1271))
1213

1314
### Deprecated
1415

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ func runGoBuildCodegen(binDir, repoDir, genDir string) error {
4646
cmd.Env = append(os.Environ(), projutil.GoFlagsEnv+"="+gf)
4747
}
4848

49+
// Only print binary build info if verbosity is explicitly set.
4950
if projutil.IsGoVerbose() {
5051
return projutil.ExecCmd(cmd)
5152
}

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package genutil
1616

1717
import (
1818
"fmt"
19-
"io/ioutil"
2019
"os/exec"
2120
"path/filepath"
2221
"strings"
@@ -84,14 +83,7 @@ func deepcopyGen(binDir, repoPkg, hf string, gvMap map[string][]string) (err err
8483
"--go-header-file", hf,
8584
}
8685
cmd := exec.Command(filepath.Join(binDir, "deepcopy-gen"), args...)
87-
if projutil.IsGoVerbose() {
88-
err = projutil.ExecCmd(cmd)
89-
} else {
90-
cmd.Stdout = ioutil.Discard
91-
cmd.Stderr = ioutil.Discard
92-
err = cmd.Run()
93-
}
94-
if err != nil {
86+
if err = projutil.ExecCmd(cmd); err != nil {
9587
return fmt.Errorf("failed to perform deepcopy code-generation: %v", err)
9688
}
9789
return nil
@@ -107,14 +99,7 @@ func defaulterGen(binDir, repoPkg, hf string, gvMap map[string][]string) (err er
10799
"--go-header-file", hf,
108100
}
109101
cmd := exec.Command(filepath.Join(binDir, "defaulter-gen"), args...)
110-
if projutil.IsGoVerbose() {
111-
err = projutil.ExecCmd(cmd)
112-
} else {
113-
cmd.Stdout = ioutil.Discard
114-
cmd.Stderr = ioutil.Discard
115-
err = cmd.Run()
116-
}
117-
if err != nil {
102+
if err = projutil.ExecCmd(cmd); err != nil {
118103
return fmt.Errorf("failed to perform defaulter code-generation: %v", err)
119104
}
120105
return nil

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package genutil
1616

1717
import (
1818
"fmt"
19-
"io/ioutil"
2019
"os/exec"
2120
"path/filepath"
2221
"strings"
@@ -114,14 +113,7 @@ func openAPIGen(binDir, hf string, fqApis []string) (err error) {
114113
"--go-header-file", hf,
115114
}
116115
cmd := exec.Command(cgPath, args...)
117-
if projutil.IsGoVerbose() {
118-
err = projutil.ExecCmd(cmd)
119-
} else {
120-
cmd.Stdout = ioutil.Discard
121-
cmd.Stderr = ioutil.Discard
122-
err = cmd.Run()
123-
}
124-
if err != nil {
116+
if err = projutil.ExecCmd(cmd); err != nil {
125117
return fmt.Errorf("failed to perform openapi code-generation: %v", err)
126118
}
127119
}

test/e2e/memcached_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ func TestMemcached(t *testing.T) {
161161
"api",
162162
"--api-version=cache.example.com/v1alpha1",
163163
"--kind=Memcached")
164-
// Generators will print errors if -v is set.
165-
if !projutil.IsGoVerbose() {
166-
os.Setenv(projutil.GoFlagsEnv, os.Getenv(projutil.GoFlagsEnv)+" -v")
167-
}
168164
cmd.Env = os.Environ()
169165
cmdOut, err = cmd.CombinedOutput()
170166
if err != nil {

0 commit comments

Comments
 (0)