cmd/operator-sdk/olmcatalog: ensure gen-csv is run in the project root

estroz · estroz · commit 630dce103ee7 · 2019-12-11T15:57:29.000-08:00
diff --git a/cmd/operator-sdk/olmcatalog/gen-csv.go b/cmd/operator-sdk/olmcatalog/gen-csv.go
@@ -71,6 +71,10 @@ Configure CSV generation by writing a config file 'deploy/olm-catalog/csv-config
 }
 
 func genCSVFunc(cmd *cobra.Command, args []string) error {
+	// The CSV generator assumes that the deploy and pkg directories are present
+	// at runtime, so this command must be run in a project's root.
+	projutil.MustInProjectRoot()
+
 	if len(args) != 0 {
 		return fmt.Errorf("command %s doesn't accept any arguments", cmd.CommandPath())
 	}

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ Configure CSV generation by writing a config file 'deploy/olm-catalog/csv-config`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`func genCSVFunc(cmd *cobra.Command, args []string) error {`
	`74`	`+ // The CSV generator assumes that the deploy and pkg directories are present`
	`75`	`+ // at runtime, so this command must be run in a project's root.`
	`76`	`+ projutil.MustInProjectRoot()`
	`77`	`+`
`74`	`78`	`if len(args) != 0 {`
`75`	`79`	`return fmt.Errorf("command %s doesn't accept any arguments", cmd.CommandPath())`
`76`	`80`	`}`