Improve UI handling of recommendtns

Signed-off-by: Adolfo García Veytia (Puerco) <puerco@carabiner.dev>

Author: puerco

sourcetool/internal/cmd/setup.go

@@ -151,7 +151,7 @@ sourcetool is about to perform the following actions on your behalf:
   - %s.
 
 `,
-					srctool.ControlConfigurationDescr(opts.GetBranch(), models.CONFIG_POLICY),
+					srctool.ControlConfigurationDescr(opts.GetBranch(), models.CONFIG_TAG_RULES),
 					srctool.ControlConfigurationDescr(opts.GetBranch(), models.CONFIG_GEN_PROVENANCE),
 					srctool.ControlConfigurationDescr(opts.GetBranch(), models.CONFIG_BRANCH_RULES),
 				)
@@ -322,6 +322,11 @@ a fork of the repository you want to protect.
 				opts.GetBranch().Repository, []*models.Branch{opts.GetBranch()}, cs,
 			)
 			if err != nil {
+				// if strings.Contains(err.Error(), models.ErrProtectionAlreadyInPlace.Error()) {
+				if errors.Is(err, models.ErrProtectionAlreadyInPlace) {
+					fmt.Printf("\n   ℹ️  Controls already enabled on %s\n\n", opts.GetRepository().Path)
+					return nil
+				}
 				return fmt.Errorf("configuring controls: %w", err)
 			}
 

sourcetool/internal/cmd/status.go

@@ -165,13 +165,22 @@ sourcetool status myorg/myrepo@mybranch
 
 			fmt.Println(w("Current SLSA Source level: " + toplevel))
 			fmt.Println("")
-
-			fmt.Println("Recommended actions:")
-
+			titled := false
 			for _, status := range controls.Controls {
 				if status.RecommendedAction == nil {
 					continue
 				}
+
+				// Suggest creating the policy but only on the higher levels
+				if status.Name == slsa.PolicyAvailable && toplevel == slsa.SlsaSourceLevel1 {
+					continue
+				}
+
+				if !titled {
+					fmt.Println(w2("✨ Recommended actions:"))
+					titled = true
+				}
+
 				fmt.Printf(" - %s\n", status.RecommendedAction.Message)
 				if status.RecommendedAction.Command != "" {
 					fmt.Printf("   > %s\n", status.RecommendedAction.Command)

sourcetool/pkg/sourcetool/tool.go

@@ -20,7 +20,7 @@ import (
 )
 
 var ControlConfigurations = []models.ControlConfiguration{
-	models.CONFIG_POLICY, models.CONFIG_GEN_PROVENANCE, models.CONFIG_BRANCH_RULES,
+	models.CONFIG_POLICY, models.CONFIG_GEN_PROVENANCE, models.CONFIG_BRANCH_RULES, models.CONFIG_TAG_RULES,
 }
 
 // New initializes a new source tool instance.