Merge pull request #105 from fanminshi/improve_commands_output

*: operator-sdk new now outputs progress

Author: fanminshi

commands/operator-sdk/cmd/new.go

@@ -137,13 +137,14 @@ func verifyFlags() {
 }
 
 func pullDep() {
+	fmt.Fprintln(os.Stdout, "Run dep ensure ...")
 	dc := exec.Command(dep, ensureCmd)
 	dc.Dir = filepath.Join(mustGetwd(), projectName)
 	o, err := dc.CombinedOutput()
 	if err != nil {
 		cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to ensure dependencies: (%v)", string(o)))
 	}
-	fmt.Fprintln(os.Stdout, string(o))
+	fmt.Fprintln(os.Stdout, "Run dep ensure done")
 }
 
 func mustGetwd() string {

pkg/generator/generator.go

@@ -16,6 +16,7 @@ package generator
 
 import (
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -110,15 +111,15 @@ func (g *Generator) renderGoDep() error {
 	if err := renderGopkgTomlFile(buf); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(g.projectName, gopkgtoml), buf.Bytes(), defaultFileMode); err != nil {
+	if err := writeFileAndPrint(filepath.Join(g.projectName, gopkgtoml), buf.Bytes(), defaultFileMode); err != nil {
 		return err
 	}
 
 	buf = &bytes.Buffer{}
 	if err := renderGopkgLockFile(buf); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(g.projectName, gopkglock), buf.Bytes(), defaultFileMode)
+	return writeFileAndPrint(filepath.Join(g.projectName, gopkglock), buf.Bytes(), defaultFileMode)
 }
 
 func (g *Generator) renderCmd() error {
@@ -134,7 +135,7 @@ func renderCmdFiles(cmdProjectDir, repoPath string) error {
 	if err := renderMainFile(buf, repoPath); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(cmdProjectDir, main), buf.Bytes(), defaultFileMode)
+	return writeFileAndPrint(filepath.Join(cmdProjectDir, main), buf.Bytes(), defaultFileMode)
 }
 
 func (g *Generator) renderConfig() error {
@@ -150,7 +151,7 @@ func renderConfigFiles(configDir, apiVersion, kind, projectName string) error {
 	if err := renderConfigFile(buf, apiVersion, kind, projectName); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(configDir, config), buf.Bytes(), defaultFileMode)
+	return writeFileAndPrint(filepath.Join(configDir, config), buf.Bytes(), defaultFileMode)
 }
 
 func (g *Generator) renderDeploy() error {
@@ -166,7 +167,7 @@ func renderRBAC(deployDir, projectName string) error {
 	if err := renderRBACYaml(buf, projectName); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(deployDir, rbacYaml), buf.Bytes(), defaultFileMode)
+	return writeFileAndPrint(filepath.Join(deployDir, rbacYaml), buf.Bytes(), defaultFileMode)
 }
 
 // RenderDeployFiles generates "deploy/operator.yaml"
@@ -200,39 +201,39 @@ func renderBuildFiles(buildDir, repoPath, projectName string) error {
 	if err := renderBuildFile(buf, repoPath, projectName); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(buildDir, build), buf.Bytes(), defaultExecFileMode); err != nil {
+	if err := writeFileAndPrint(filepath.Join(buildDir, build), buf.Bytes(), defaultExecFileMode); err != nil {
 		return err
 	}
 
 	buf = &bytes.Buffer{}
 	if err := renderDockerBuildFile(buf); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(buildDir, dockerBuild), buf.Bytes(), defaultExecFileMode); err != nil {
+	if err := writeFileAndPrint(filepath.Join(buildDir, dockerBuild), buf.Bytes(), defaultExecFileMode); err != nil {
 		return err
 	}
 
 	buf = &bytes.Buffer{}
 	if err := renderDockerFile(buf, projectName); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(buildDir, dockerfile), buf.Bytes(), defaultFileMode)
+	return writeFileAndPrint(filepath.Join(buildDir, dockerfile), buf.Bytes(), defaultFileMode)
 }
 
 func renderCodegenFiles(codegenDir, repoPath, apiDirName, version, projectName string) error {
 	buf := &bytes.Buffer{}
 	if err := renderBoilerplateFile(buf, projectName); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(codegenDir, boilerplate), buf.Bytes(), defaultFileMode); err != nil {
+	if err := writeFileAndPrint(filepath.Join(codegenDir, boilerplate), buf.Bytes(), defaultFileMode); err != nil {
 		return err
 	}
 
 	buf = &bytes.Buffer{}
 	if err := renderUpdateGeneratedFile(buf, repoPath, apiDirName, version); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(codegenDir, updateGenerated), buf.Bytes(), defaultExecFileMode)
+	return writeFileAndPrint(filepath.Join(codegenDir, updateGenerated), buf.Bytes(), defaultExecFileMode)
 }
 
 func (g *Generator) renderPkg() error {
@@ -257,31 +258,31 @@ func renderAPIFiles(apiDir, groupName, version, kind string) error {
 	if err := renderAPIDocFile(buf, groupName, version); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(apiDir, doc), buf.Bytes(), defaultFileMode); err != nil {
+	if err := writeFileAndPrint(filepath.Join(apiDir, doc), buf.Bytes(), defaultFileMode); err != nil {
 		return err
 	}
 
 	buf = &bytes.Buffer{}
 	if err := renderAPIRegisterFile(buf, kind, groupName, version); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(apiDir, register), buf.Bytes(), defaultFileMode); err != nil {
+	if err := writeFileAndPrint(filepath.Join(apiDir, register), buf.Bytes(), defaultFileMode); err != nil {
 		return err
 	}
 
 	buf = &bytes.Buffer{}
 	if err := renderAPITypesFile(buf, kind, version); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(apiDir, types), buf.Bytes(), defaultFileMode)
+	return writeFileAndPrint(filepath.Join(apiDir, types), buf.Bytes(), defaultFileMode)
 }
 
 func renderStubFiles(stubDir string) error {
 	buf := &bytes.Buffer{}
 	if err := renderHandlerFile(buf); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(stubDir, handler), buf.Bytes(), defaultFileMode)
+	return writeFileAndPrint(filepath.Join(stubDir, handler), buf.Bytes(), defaultFileMode)
 }
 
 // version extracts the VERSION from the given apiVersion ($GROUP_NAME/$VERSION).
@@ -302,3 +303,11 @@ func groupName(apiVersion string) string {
 func apiDirName(apiVersion string) string {
 	return strings.Split(groupName(apiVersion), ".")[0]
 }
+
+func writeFileAndPrint(filePath string, data []byte, fileMode os.FileMode) error {
+	if err := ioutil.WriteFile(filePath, data, fileMode); err != nil {
+		return err
+	}
+	fmt.Printf("Create %v \n", filePath)
+	return nil
+}