Skip to content

Commit b62e7d1

Browse files
estrozestroz
committed
*: use logrus instead of std log
1 parent fc9b6b1 commit b62e7d1

File tree

18 files changed

+91
-86
lines changed

18 files changed

+91
-86
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
package add
1616

1717
import (
18-
"log"
19-
2018
"github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd/generate"
2119
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2220
"github.com/operator-framework/operator-sdk/pkg/scaffold"
2321
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
2422

23+
log "github.com/sirupsen/logrus"
2524
"github.com/spf13/cobra"
2625
)
2726

@@ -92,7 +91,7 @@ func apiRun(cmd *cobra.Command, args []string) {
9291

9392
// update deploy/role.yaml for the given resource r.
9493
if err := scaffold.UpdateRoleForResource(r, absProjectPath); err != nil {
95-
log.Fatalf("failed to update the RBAC manifest for the resource (%v, %v): %v", r.APIVersion, r.Kind, err)
94+
log.Fatalf("failed to update the RBAC manifest for the resource (%v, %v): (%v)", r.APIVersion, r.Kind, err)
9695
}
9796

9897
// Run k8s codegen for deepcopy

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
package add
1616

1717
import (
18-
"log"
19-
2018
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2119
"github.com/operator-framework/operator-sdk/pkg/scaffold"
2220
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
2321

22+
log "github.com/sirupsen/logrus"
2423
"github.com/spf13/cobra"
2524
)
2625

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

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

1717
import (
1818
"fmt"
19-
"log"
2019
"os"
2120
"path/filepath"
2221
"strings"
@@ -25,6 +24,7 @@ import (
2524
"github.com/operator-framework/operator-sdk/pkg/scaffold"
2625
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
2726

27+
log "github.com/sirupsen/logrus"
2828
"github.com/spf13/cobra"
2929
)
3030

@@ -60,26 +60,26 @@ func crdFunc(cmd *cobra.Command, args []string) {
6060
verifyCrdFlags()
6161
verifyCrdDeployPath()
6262

63-
fmt.Fprintln(os.Stdout, "Generating custom resource definition (CRD) file")
63+
fmt.Println("Generating custom resource definition (CRD) file")
6464

6565
// generate CR/CRD file
6666
resource, err := scaffold.NewResource(apiVersion, kind)
6767
if err != nil {
68-
log.Fatalf("%v", err)
68+
log.Fatal(err)
6969
}
70+
7071
s := scaffold.Scaffold{}
7172
err = s.Execute(cfg,
7273
&scaffold.Crd{Resource: resource},
7374
&scaffold.Cr{Resource: resource},
7475
)
75-
7676
if err != nil {
7777
log.Fatalf("add scaffold failed: (%v)", err)
7878
}
7979

8080
// update deploy/role.yaml for the given resource r.
8181
if err := scaffold.UpdateRoleForResource(resource, cfg.AbsProjectPath); err != nil {
82-
log.Fatalf("failed to update the RBAC manifest for the resource (%v, %v): %v", resource.APIVersion, resource.Kind, err)
82+
log.Fatalf("failed to update the RBAC manifest for the resource (%v, %v): (%v)", resource.APIVersion, resource.Kind, err)
8383
}
8484
}
8585

@@ -103,7 +103,7 @@ func verifyCrdFlags() {
103103
func verifyCrdDeployPath() {
104104
wd, err := os.Getwd()
105105
if err != nil {
106-
log.Fatalf("failed to determine the full path of the current directory: %v", err)
106+
log.Fatalf("failed to determine the full path of the current directory: (%v)", err)
107107
}
108108
// check if the deploy sub-directory exist
109109
_, err = os.Stat(filepath.Join(wd, scaffold.DeployDir))

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"errors"
2020
"fmt"
2121
"io/ioutil"
22-
"log"
2322
"os"
2423
"os/exec"
2524
"path/filepath"
@@ -30,6 +29,7 @@ import (
3029
"github.com/operator-framework/operator-sdk/pkg/test"
3130

3231
"github.com/ghodss/yaml"
32+
log "github.com/sirupsen/logrus"
3333
"github.com/spf13/cobra"
3434
)
3535

@@ -122,13 +122,13 @@ func verifyDeploymentImage(yamlFile []byte, imageName string) error {
122122
func verifyTestManifest(image string) {
123123
namespacedBytes, err := ioutil.ReadFile(namespacedManBuild)
124124
if err != nil {
125-
log.Fatalf("could not read namespaced manifest: %v", err)
125+
log.Fatalf("could not read namespaced manifest: (%v)", err)
126126
}
127127

128128
err = verifyDeploymentImage(namespacedBytes, image)
129129
// the error from verifyDeploymentImage is just a warning, not fatal error
130130
if err != nil {
131-
fmt.Printf("%v\n", err)
131+
log.Warn(err)
132132
}
133133
}
134134

@@ -141,7 +141,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
141141
goBuildEnv := append(os.Environ(), "GOOS=linux", "GOARCH=amd64", "CGO_ENABLED=0")
142142
wd, err := os.Getwd()
143143
if err != nil {
144-
log.Fatalf("could not identify current working directory: %v", err)
144+
log.Fatalf("could not identify current working directory: (%v)", err)
145145
}
146146

147147
// Don't need to build go code if Ansible Operator
@@ -154,7 +154,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
154154
buildCmd.Stderr = os.Stderr
155155
err = buildCmd.Run()
156156
if err != nil {
157-
log.Fatalf("failed to build operator binary: %v", err)
157+
log.Fatalf("failed to build operator binary: (%v)", err)
158158
}
159159
}
160160

@@ -169,9 +169,9 @@ func buildFunc(cmd *cobra.Command, args []string) {
169169
err = dbcmd.Run()
170170
if err != nil {
171171
if enableTests {
172-
log.Fatalf("failed to build intermediate image for %s image: %v", image, err)
172+
log.Fatalf("failed to output intermediate image %s: (%v)", image, err)
173173
} else {
174-
log.Fatalf("failed to output build image %s: %v", image, err)
174+
log.Fatalf("failed to output build image %s: (%v)", image, err)
175175
}
176176
}
177177

@@ -183,7 +183,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
183183
buildTestCmd.Stderr = os.Stderr
184184
err = buildTestCmd.Run()
185185
if err != nil {
186-
log.Fatalf("failed to build test binary: %v", err)
186+
log.Fatalf("failed to build test binary: (%v)", err)
187187
}
188188
// if a user is using an older sdk repo as their library, make sure they have required build files
189189
testDockerfile := filepath.Join(scaffold.BuildTestDir, scaffold.DockerfileFile)
@@ -204,7 +204,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
204204
&scaffold.TestPod{Image: image, TestNamespaceEnv: test.TestNamespaceEnv},
205205
)
206206
if err != nil {
207-
log.Fatalf("build scaffold failed: (%v)", err)
207+
log.Fatalf("test scaffold failed: (%v)", err)
208208
}
209209
}
210210

@@ -213,7 +213,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
213213
testDbcmd.Stderr = os.Stderr
214214
err = testDbcmd.Run()
215215
if err != nil {
216-
log.Fatalf("failed to output build image %s: %v", image, err)
216+
log.Fatalf("failed to output test image %s: (%v)", image, err)
217217
}
218218
// Check image name of deployments in namespaced manifest
219219
verifyTestManifest(image)

‎commands/operator-sdk/cmd/generate/k8s.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ package generate
1717
import (
1818
"fmt"
1919
"io/ioutil"
20-
"log"
2120
"os"
2221
"os/exec"
2322
"path/filepath"
2423

2524
"github.com/operator-framework/operator-sdk/internal/util/projutil"
2625
"github.com/operator-framework/operator-sdk/pkg/scaffold"
2726

27+
log "github.com/sirupsen/logrus"
2828
"github.com/spf13/cobra"
2929
)
3030

@@ -41,7 +41,7 @@ to comply with kube-API requirements.
4141

4242
func k8sFunc(cmd *cobra.Command, args []string) {
4343
if len(args) != 0 {
44-
log.Fatalf("k8s command doesn't accept any arguments.")
44+
log.Fatal("k8s command doesn't accept any arguments.")
4545
}
4646
K8sCodegen()
4747
}
@@ -57,7 +57,7 @@ func K8sCodegen() {
5757
log.Fatalf("failed to parse group versions: (%v)", err)
5858
}
5959

60-
fmt.Fprintf(os.Stdout, "Running code-generation for custom resource group versions: [%s]\n", groupVersions)
60+
log.Printf("Running code-generation for custom resource group versions: [%s]\n", groupVersions)
6161
// TODO: Replace generate-groups.sh by building the vendored generators(deepcopy, lister etc)
6262
// and running them directly
6363
// TODO: remove dependency on boilerplate.go.txt
@@ -68,11 +68,13 @@ func K8sCodegen() {
6868
apisPkg,
6969
groupVersions,
7070
}
71-
out, err := exec.Command(genGroupsCmd, args...).CombinedOutput()
71+
cgCmd := exec.Command(genGroupsCmd, args...)
72+
cgCmd.Stdout = os.Stdout
73+
cgCmd.Stderr = os.Stderr
74+
err = cgCmd.Run()
7275
if err != nil {
7376
log.Fatalf("failed to perform code-generation: (%v)", err)
7477
}
75-
fmt.Fprintln(os.Stdout, string(out))
7678
}
7779

7880
// getGroupVersions parses the layout of pkg/apis to return the API groups and versions

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package cmd
1717
import (
1818
"fmt"
1919
"io/ioutil"
20-
"log"
2120
"os"
2221
"os/exec"
2322
"path/filepath"
@@ -28,6 +27,7 @@ import (
2827
"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
2928
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
3029

30+
log "github.com/sirupsen/logrus"
3131
"github.com/spf13/cobra"
3232
)
3333

@@ -198,7 +198,7 @@ func doAnsibleScaffold() {
198198
},
199199
)
200200
if err != nil {
201-
log.Fatalf("new scaffold failed: (%v)", err)
201+
log.Fatalf("new playbook scaffold failed: (%v)", err)
202202
}
203203
}
204204

@@ -212,12 +212,12 @@ func doAnsibleScaffold() {
212212
// everything.
213213
tmpDirectorySlice := strings.Split(os.TempDir(), "/")
214214
if err = os.RemoveAll(filepath.Join(galaxyInit.AbsProjectPath, tmpDirectorySlice[1])); err != nil {
215-
log.Fatalf("failed to remove the galaxy init script")
215+
log.Fatalf("failed to remove the galaxy init script: (%v)", err)
216216
}
217217

218218
// update deploy/role.yaml for the given resource r.
219219
if err := scaffold.UpdateRoleForResource(resource, cfg.AbsProjectPath); err != nil {
220-
log.Fatalf("failed to update the RBAC manifest for the resource (%v, %v): %v", resource.APIVersion, resource.Kind, err)
220+
log.Fatalf("failed to update the RBAC manifest for the resource (%v, %v): (%v)", resource.APIVersion, resource.Kind, err)
221221
}
222222
}
223223

@@ -278,14 +278,14 @@ func execCmd(stdout *os.File, cmd string, args ...string) {
278278
dc.Stderr = os.Stderr
279279
err := dc.Run()
280280
if err != nil {
281-
log.Fatalf("failed to exec %s %#v: %v", cmd, args, err)
281+
log.Fatalf("failed to exec %s %#v: (%v)", cmd, args, err)
282282
}
283283
}
284284

285285
func pullDep() {
286286
_, err := exec.LookPath(dep)
287287
if err != nil {
288-
log.Fatalf("looking for dep in $PATH: %v", err)
288+
log.Fatalf("looking for dep in $PATH: (%v)", err)
289289
}
290290
fmt.Fprintln(os.Stdout, "Run dep ensure ...")
291291
execCmd(os.Stdout, dep, ensureCmd, "-v")

‎commands/operator-sdk/cmd/test/cluster.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"github.com/operator-framework/operator-sdk/pkg/scaffold"
2525
"github.com/operator-framework/operator-sdk/pkg/test"
2626

27+
log "github.com/sirupsen/logrus"
2728
"github.com/spf13/cobra"
2829
v1 "k8s.io/api/core/v1"
2930
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -113,7 +114,7 @@ func testClusterFunc(cmd *cobra.Command, args []string) error {
113114
defer func() {
114115
err = kubeclient.CoreV1().Pods(tcConfig.namespace).Delete(testPod.Name, &metav1.DeleteOptions{})
115116
if err != nil {
116-
fmt.Printf("Warning: failed to delete test pod")
117+
log.Warn("failed to delete test pod")
117118
}
118119
}()
119120
err = wait.Poll(time.Second*5, time.Second*time.Duration(tcConfig.pendingTimeout), func() (bool, error) {
@@ -143,7 +144,7 @@ func testClusterFunc(cmd *cobra.Command, args []string) error {
143144
time.Sleep(time.Second * 5)
144145
continue
145146
} else if testPod.Status.Phase == v1.PodSucceeded {
146-
fmt.Printf("Test Successfully Completed\n")
147+
fmt.Println("Test Successfully Completed")
147148
return nil
148149
} else if testPod.Status.Phase == v1.PodFailed {
149150
req := kubeclient.CoreV1().Pods(tcConfig.namespace).GetLogs(testPod.Name, &v1.PodLogOptions{})

0 commit comments

Comments
 (0)