Merge branch 'master' into feature/issue-107

cmd/common.go

@@ -137,6 +137,8 @@ func colorPrint(state check.State, s string) {
 
 // prettyPrint outputs the results to stdout in human-readable format
 func prettyPrint(r *check.Controls, summary check.Summary) {
+	// Print check results.
+	if !noResults {
 		colorPrint(check.INFO, fmt.Sprintf("%s %s\n", r.ID, r.Text))
 		for _, g := range r.Groups {
 			colorPrint(check.INFO, fmt.Sprintf("%s %s\n", g.ID, g.Text))
@@ -146,8 +148,10 @@ func prettyPrint(r *check.Controls, summary check.Summary) {
 		}
 
 		fmt.Println()
+	}
 
 	// Print remediations.
+	if !noRemediations {
 		if summary.Fail > 0 || summary.Warn > 0 {
 			colors[check.WARN].Printf("== Remediations ==\n")
 			for _, g := range r.Groups {
@@ -159,8 +163,10 @@ func prettyPrint(r *check.Controls, summary check.Summary) {
 			}
 			fmt.Println()
 		}
+	}
 
 	// Print summary setting output color to highest severity.
+	if !noSummary {
 		var res check.State
 		if summary.Fail > 0 {
 			res = check.FAIL
@@ -175,3 +181,4 @@ func prettyPrint(r *check.Controls, summary check.Summary) {
 			summary.Pass, summary.Fail, summary.Warn,
 		)
 	}
+}

cmd/root.go

@@ -37,6 +37,9 @@ var (
 	masterFile         string
 	nodeFile           string
 	federatedFile      string
+	noResults          bool
+	noSummary          bool
+	noRemediations     bool
 )
 
 // RootCmd represents the base command when called without any subcommands
@@ -61,8 +64,13 @@ func Execute() {
 func init() {
 	cobra.OnInitialize(initConfig)
 
+	// Output control
+	RootCmd.PersistentFlags().BoolVar(&noResults, "noresults", false, "Disable prints of results section")
+	RootCmd.PersistentFlags().BoolVar(&noSummary, "nosummary", false, "Disable printing of summary section")
+	RootCmd.PersistentFlags().BoolVar(&noRemediations, "noremediations", false, "Disable printing of remediations section")
 	RootCmd.PersistentFlags().BoolVar(&jsonFmt, "json", false, "Prints the results as JSON")
 	RootCmd.PersistentFlags().BoolVar(&pgSQL, "pgsql", false, "Save the results to PostgreSQL")
+
 	RootCmd.PersistentFlags().StringVarP(
 		&checkList,
 		"check",