FWI-5332 - CI plugin - Remove .git suffix from repo name (#833)

* fix removing git suffix * bump version and changelog * trigger-ci * fix go mod * bump version.txt * add more tests
FairwindsOps · Nov 14, 2023 · 9a9042b · 9a9042b
1 parent 3e310e6
commit 9a9042b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/plugins/ci/CHANGELOG.md b/plugins/ci/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 5.2.5
+* Fix removing `.git` from repository name
+
 ## 5.2.4
 * Update to go 1.21
 

diff --git a/plugins/ci/pkg/ci/git.go b/plugins/ci/pkg/ci/git.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 
 	"github.com/fairwindsops/insights-plugins/plugins/ci/pkg/models"
@@ -134,7 +135,7 @@ func extractRepoNameFromOrigin(origin string) string {
 		repoNameSplit := strings.Split(repoName, ":")
 		repoName = repoNameSplit[len(repoNameSplit)-1]
 	}
-	return strings.TrimSuffix(repoName, ".git")
+	return strings.TrimSuffix(repoName, filepath.Ext(repoName))
 }
 
 type hint struct {

diff --git a/plugins/ci/pkg/ci/git_test.go b/plugins/ci/pkg/ci/git_test.go
@@ -11,7 +11,9 @@ import (
 )
 
 func TestExtractRepoNameFromOrigin(t *testing.T) {
+	assert.Equal(t, "FairwindsOps/insights-plugins", extractRepoNameFromOrigin("[email protected]:FairwindsOps/insights-plugins"))
 	assert.Equal(t, "FairwindsOps/insights-plugins", extractRepoNameFromOrigin("[email protected]:FairwindsOps/insights-plugins.git"))
+	assert.Equal(t, "FairwindsOps/insights-plugins", extractRepoNameFromOrigin("[email protected]:FairwindsOps/insights-plugins.git\n"))
 	assert.Equal(t, "", extractRepoNameFromOrigin(""))
 }
 

diff --git a/plugins/ci/version.txt b/plugins/ci/version.txt
@@ -1 +1 @@
-5.2.4
+5.2.5