Merge pull request #1 from mcncl/test/secretname_added

Test/secretname added

Author: mcncl

.buildkite/pipeline.yml

@@ -19,10 +19,3 @@ steps:
           run: golangci-lint
           tty: true
           mount-buildkite-agent: true
-  - wait: ~
-
-  - label: "Test plugin"
-    command: echo "Sweet plugin!"
-    plugins:
-      - ssh://git@github.com/mcncl/pr-commenter-buildkite-plugin: ~
-          

internal/repo/repo.go

@@ -6,13 +6,22 @@ import (
 )
 
 const (
-	GitHubBaseURL = "https://github.com/"
-	GitHubGitExt  = ".git"
+	GitHubBaseHTTPS = "https://github.com/"
+	GitHubBaseSSH   = "git@github.com:"
+	GitHubGitExt    = ".git"
 )
 
 func ParseRepo(url string) (string, string, error) {
-	path := strings.TrimPrefix(url, GitHubBaseURL)
-	path = strings.TrimSuffix(path, GitHubGitExt)
+	var path string
+	if strings.HasPrefix(url, GitHubBaseHTTPS) {
+		path = strings.TrimPrefix(url, GitHubBaseHTTPS)
+		path = strings.TrimSuffix(path, GitHubGitExt)
+	} else if strings.HasPrefix(url, GitHubBaseSSH) {
+		path = strings.TrimPrefix(url, GitHubBaseSSH)
+		path = strings.TrimSuffix(path, GitHubGitExt)
+	} else {
+		return "", "", fmt.Errorf("invalid repo URL format")
+	}
 
 	parts := strings.Split(path, "/")
 	if len(parts) != 2 {

internal/repo/repo_test.go

@@ -28,6 +28,20 @@ func TestParseRepoInfo(t *testing.T) {
 			wantRepo:  "",
 			wantErr:   true,
 		},
+		{
+			name:      "Valid GitHub SSH URL",
+			repoURL:   "git@github.com:mcncl/repo.git",
+			wantOwner: "mcncl",
+			wantRepo:  "repo",
+			wantErr:   false,
+		},
+		{
+			name:      "Invalid GitHub SSH URL",
+			repoURL:   "git@github.com/mcncl/repo.git",
+			wantOwner: "",
+			wantRepo:  "",
+			wantErr:   true,
+		},
 	}
 
 	for _, tt := range tests {

internal/secret/secret.go

@@ -2,20 +2,13 @@ package secret
 
 import (
 	"fmt"
-	"os"
 	"os/exec"
 	"strings"
 )
 
 var ExecCommand = exec.Command
 
 func GetSecret(name string) (string, error) {
-	if name == "GITHUB_TOKEN" {
-		_, found := os.LookupEnv(name)
-		if !found {
-			return "", fmt.Errorf("could not use %s, secret does not exist on cluster", name)
-		}
-	}
 	cmd := ExecCommand("buildkite-agent", "secret", "get", name)
 	output, err := cmd.Output()
 	if err != nil {

main.go

@@ -46,7 +46,6 @@ func run() exitCode {
 
 	token, err := secret.GetSecret(secretName)
 	if err != nil {
-		fmt.Print(secretName)
 		fmt.Fprintf(os.Stderr, "Error retrieving secret: %s\n", err)
 		return exitError
 	}