Small updates based on feedback

Author: dymurray

commands/operator-sdk/cmd/new.go

@@ -55,7 +55,7 @@ generates a skeletal app-operator application in $GOPATH/src/github.com/example.
 	newCmd.MarkFlagRequired("kind")
 	newCmd.Flags().StringVar(&operatorType, "type", "go", "Type of operator to initialize (e.g \"ansible\")")
 	newCmd.Flags().BoolVar(&skipGit, "skip-git-init", false, "Do not init the directory as a git repository")
-	newCmd.Flags().BoolVar(&generatePlaybook, "generate-playbook", false, "Generate a playbook skeleton in watches.yaml. (Only used for --type ansible)")
+	newCmd.Flags().BoolVar(&generatePlaybook, "generate-playbook", false, "Generate a playbook skeleton. (Only used for --type ansible)")
 
 	return newCmd
 }
@@ -147,6 +147,9 @@ func verifyFlags() {
 	if operatorType != goOperatorType && operatorType != ansibleOperatorType {
 		cmdError.ExitWithError(cmdError.ExitBadArgs, errors.New("--type can only be `go` or `ansible`"))
 	}
+	if operatorType != ansibleOperatorType && generatePlaybook {
+		cmdError.ExitWithError(cmdError.ExitBadArgs, errors.New("--generate-playbook can only be used with --type `ansible`"))
+	}
 	kindFirstLetter := string(kind[0])
 	if kindFirstLetter != strings.ToUpper(kindFirstLetter) {
 		cmdError.ExitWithError(cmdError.ExitBadArgs, errors.New("--kind must start with an uppercase letter"))

pkg/generator/generator.go

@@ -16,7 +16,6 @@ package generator
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -163,7 +162,7 @@ func (g *Generator) Render() error {
 			return err
 		}
 	default:
-		return errors.New(fmt.Sprintf("unexpected operator type [%v]", g.operatorType))
+		return fmt.Errorf("unexpected operator type [%v]", g.operatorType)
 	}
 	return nil
 }
@@ -344,7 +343,7 @@ func RenderDeployCrdFile(apiVersion, kind string) error {
 		GroupName:    groupName(apiVersion),
 		Version:      version(apiVersion),
 	}
-	crdFilePath := filepath.Join(deployDir, strings.ToLower(kind) + "_crd.yaml")
+	crdFilePath := filepath.Join(deployDir, strings.ToLower(kind)+"_crd.yaml")
 	return renderWriteFile(crdFilePath, crdFilePath, crdYamlTmpl, crdTd)
 }