code formatted

Author: Raj-StepSecurity

internal/check/helpers_test.go

@@ -4,9 +4,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/step-security/codeowners-validator/internal/check"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/step-security/codeowners-validator/internal/check"
 
 	"github.com/step-security/codeowners-validator/pkg/codeowners"
 )

internal/ctxutil/check_test.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	contextutil "github.com/step-security/codeowners-validator/internal/ctxutil"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestShouldExit(t *testing.T) {

main.go

@@ -50,47 +50,68 @@ func exitOnError(err error) {
 }
 
 func validateSubscription() {
-	upstream := "mszostok/codeowners-validator"
-	repoPrivate := os.Getenv("REPO_PRIVATE")
-
-	// Print StepSecurity banner
-	fmt.Println("\033[32m" + `
-  _____ _            _____                      _ _
- / ____| |          / ____|                    (_) |
-| (___ | |_ ___ _ _| (___   ___  ___ _   _ _ __ _| |_ _   _
- \___ \| __/ _ \ '_ \\___ \ / _ \/ __| | | | '__| | __| | | |
- ____) | ||  __/ |_) |___) |  __/ (__| |_| | |  | | |_| |_| |
-|_____/ \__\___| .__/_____/ \___|\___|\__,_|_|  |_|\__|\__, |
-               | |                                       __/ |
-               |_|                                      |___/
-` + "\033[0m")
-	fmt.Println("Maintained by StepSecurity. Learn more at https://stepsecurity.io")
+	eventPath := os.Getenv("GITHUB_EVENT_PATH")
+	var repoPrivate *bool
+
+	if eventPath != "" {
+		if eventData, err := os.ReadFile(eventPath); err == nil {
+			var event struct {
+				Repository struct {
+					Private *bool `json:"private"`
+				} `json:"repository"`
+			}
+			if err := json.Unmarshal(eventData, &event); err == nil {
+				repoPrivate = event.Repository.Private
+			}
+		}
+	}
+
+	upstream := "chuhlomin/render-template"
+	action := os.Getenv("GITHUB_ACTION_REPOSITORY")
+	docsURL := "https://docs.stepsecurity.io/actions/stepsecurity-maintained-actions"
+
+	fmt.Println()
+	fmt.Println("\x1b[1;36mStepSecurity Maintained Action\x1b[0m")
+	fmt.Printf("Secure drop-in replacement for %s\n", upstream)
+	if repoPrivate != nil && !*repoPrivate {
+		fmt.Println("\x1b[32m\u2713 Free for public repositories\x1b[0m")
+	}
+	fmt.Printf("\x1b[36mLearn more:\x1b[0m %s\n", docsURL)
 	fmt.Println()
 
-	if repoPrivate != "true" {
+	if repoPrivate != nil && !*repoPrivate {
 		return
 	}
 
-	githubRepo := os.Getenv("GITHUB_REPOSITORY")
-	url := fmt.Sprintf("https://agent.api.stepsecurity.io/v1/github/%s/actions/maintained-actions-subscription", githubRepo)
+	serverURL := os.Getenv("GITHUB_SERVER_URL")
+	if serverURL == "" {
+		serverURL = "https://github.com"
+	}
+
+	body := map[string]string{"action": action}
+	if serverURL != "https://github.com" {
+		body["ghes_server"] = serverURL
+	}
 
-	payload := map[string]string{"upstream": upstream}
-	body, err := json.Marshal(payload)
+	jsonBody, err := json.Marshal(body)
 	if err != nil {
-		fmt.Println("Info: Unable to validate subscription. Continuing...")
+		fmt.Println("Timeout or API not reachable. Continuing to next step.")
 		return
 	}
 
+	apiURL := fmt.Sprintf("https://agent.api.stepsecurity.io/v1/github/%s/actions/maintained-actions-subscription", os.Getenv("GITHUB_REPOSITORY"))
+
 	client := &http.Client{Timeout: 3 * time.Second}
-	resp, err := client.Post(url, "application/json", bytes.NewBuffer(body))
+	resp, err := client.Post(apiURL, "application/json", bytes.NewBuffer(jsonBody))
 	if err != nil {
-		fmt.Println("Info: Unable to validate subscription. Continuing...")
+		fmt.Println("Timeout or API not reachable. Continuing to next step.")
 		return
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode == http.StatusForbidden {
-		fmt.Fprintln(os.Stderr, "::error::This action requires a StepSecurity maintained actions subscription for private repositories. Visit https://stepsecurity.io for more details.")
+		fmt.Printf("::error::\x1b[1;31mThis action requires a StepSecurity subscription for private repositories.\x1b[0m\n")
+		fmt.Printf("::error::\x1b[31mLearn how to enable a subscription: %s\x1b[0m\n", docsURL)
 		os.Exit(1)
 	}
 }

pkg/codeowners/owners_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/spf13/afero"
+	"github.com/step-security/codeowners-validator/pkg/codeowners"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/step-security/codeowners-validator/pkg/codeowners"
 )
 
 const sampleCodeownerFile = `

pkg/url/canonical_test.go

@@ -3,8 +3,8 @@ package url_test
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/step-security/codeowners-validator/pkg/url"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCanonicalURLPath(t *testing.T) {

tests/integration/integration_test.go

@@ -187,7 +187,8 @@ func TestCheckSuccess(t *testing.T) {
 // to the golden file.
 //
 // To update golden file, run:
-//   TEST=TestCheckFailures UPDATE_GOLDEN=true make test-integration
+//
+//	TEST=TestCheckFailures UPDATE_GOLDEN=true make test-integration
 func TestCheckFailures(t *testing.T) {
 	type Envs map[string]string
 	tests := []struct {
@@ -274,7 +275,8 @@ func TestCheckFailures(t *testing.T) {
 }
 
 // To update golden file, run:
-//  TEST=TestOwnerCheckAuthZAndAuthN TOKEN_WITH_NO_SCOPES=<token_with_no_scopes> UPDATE_GOLDEN=true make test-integration
+//
+//	TEST=TestOwnerCheckAuthZAndAuthN TOKEN_WITH_NO_SCOPES=<token_with_no_scopes> UPDATE_GOLDEN=true make test-integration
 func TestOwnerCheckAuthZAndAuthN(t *testing.T) {
 	t.Parallel()