Merge branch 'main' into i4k-release-v0.10.4

Author: i4ki

CHANGELOG.md

@@ -26,6 +26,11 @@ Given a version number `MAJOR.MINOR.PATCH`, we increment the:
 
 - Add `tm_hclencode()` and `tm_hcldecode()` functions for encoding and decoding HCL content.
 
+### Fixed
+
+- Fix `go install` by removing a not needed `replace` directive in the `go.mod`.
+- Fix `git` URI normalization in case the project path component begins with a number.
+
 ## v0.10.3
 
 ### Changed

e2etests/cmd/helper/main.go

@@ -17,6 +17,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/terramate-io/terramate/git"
 	"github.com/terramate-io/terramate/project"
 	"github.com/terramate-io/tfjson"
 	"github.com/terramate-io/tfjson/sanitize"
@@ -69,6 +70,8 @@ func main() {
 		tfPlanSanitize(os.Args[2])
 	case "fibonacci":
 		fibonacci()
+	case "git-normalization":
+		gitnorm(os.Args[2])
 	default:
 		log.Fatalf("unknown command %s", os.Args[1])
 	}
@@ -222,6 +225,18 @@ func tfPlanSanitize(fname string) {
 	fmt.Print(string(newPlanData))
 }
 
+func gitnorm(rawURL string) {
+	repo, err := git.NormalizeGitURI(rawURL)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		os.Exit(1)
+	}
+	fmt.Printf("host:  %s\n", repo.Host)
+	fmt.Printf("owner: %s\n", repo.Owner)
+	fmt.Printf("name:  %s\n", repo.Name)
+	fmt.Printf("normalized repository: %s\n", repo.Repo)
+}
+
 func checkerr(err error) {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)

git/url.go

@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"os"
 	"strings"
-	"unicode"
 
 	"github.com/terramate-io/terramate/errors"
+	"github.com/terramate-io/terramate/strconv"
 )
 
 // ErrInvalidGitURL indicates is an error kind indicating the git URL is not valid.
@@ -69,7 +69,12 @@ func NormalizeGitURI(raw string) (Repository, error) {
 
 // IsURL tells if the u URL is a supported git remote URL.
 func IsURL(u string) bool {
-	return strings.HasPrefix(u, "git@") || isSupportedProtocol(u)
+	if strings.HasPrefix(u, "git@") || isSupportedProtocol(u) {
+		return true
+	}
+	index := strings.Index(u, ":")
+	// any other <schema>:// is not supported
+	return index > 0 && !strings.HasPrefix(u[:index], "://")
 }
 
 func isSupportedProtocol(u string) bool {
@@ -95,20 +100,26 @@ func ParseURL(rawURL string) (u *url.URL, err error) {
 		// Not a Windows path.
 		!strings.ContainsRune(rawURL, '\\') {
 		// Support scp-like syntax for ssh protocol.
+		// We convert SCP syntax into ssh://<uri>
+		// Examples below:
+		// [email protected]:some/path.git -> ssh://github.com/some/path.git
+		// [email protected]:2222/some/path.git -> ssh://github.com:2222/some/path.git
 		index := strings.Index(rawURL, ":")
-		if index >= 0 && len(rawURL) > index && unicode.IsDigit(rune(rawURL[index+1])) {
-			next := strings.Index(rawURL[index+1:], ":")
-			if next >= 0 {
-				index = index + 1 + next
-			} else {
-				index = -1
+		if index > 0 {
+			next := strings.Index(rawURL[index+1:], "/")
+			if next > 0 {
+				// check if port is present
+				_, err := strconv.Atoi64(rawURL[index+1 : index+1+next])
+				if err == nil {
+					index = -1
+				}
 			}
 		}
-		if index != -1 {
-			strRunes := []rune(rawURL)
+		strRunes := []rune(rawURL)
+		if index > 0 {
 			strRunes[index] = '/'
-			rawURL = "ssh://" + string(strRunes)
 		}
+		rawURL = "ssh://" + string(strRunes)
 	}
 	u, err = url.Parse(rawURL)
 	if err != nil {

git/url_test.go

@@ -82,6 +82,17 @@ func TestNormalizeGitURL(t *testing.T) {
 				Name:   "terramate",
 			},
 		},
+		{
+			name: "github url with org name starting with number",
+			raw:  "[email protected]:123terramate-io/terramate.git",
+			normalized: git.Repository{
+				RawURL: "[email protected]:123terramate-io/terramate.git",
+				Repo:   "github.com/123terramate-io/terramate",
+				Host:   "github.com",
+				Owner:  "123terramate-io",
+				Name:   "terramate",
+			},
+		},
 		{
 			name: "basic gitlab ssh url",
 			raw:  "[email protected]:terramate-io/terramate.git",
@@ -162,9 +173,9 @@ func TestNormalizeGitURL(t *testing.T) {
 		},
 		{
 			name: "vcs provider URL with port",
-			raw:  "[email protected]:8888:terramate-io/terramate.git",
+			raw:  "[email protected]:8888/terramate-io/terramate.git",
 			normalized: git.Repository{
-				RawURL: "[email protected]:8888:terramate-io/terramate.git",
+				RawURL: "[email protected]:8888/terramate-io/terramate.git",
 				Repo:   "github.com:8888/terramate-io/terramate",
 				Host:   "github.com:8888",
 				Owner:  "terramate-io",
@@ -223,7 +234,7 @@ func TestIsURL(t *testing.T) {
 		{
 			name: "scp-like with no user",
 			url:  "example.com:owner/repo",
-			want: false,
+			want: true,
 		},
 		{
 			name: "ssh",

go.mod

@@ -203,5 +203,3 @@ require (
 	golang.org/x/sys v0.21.0
 	golang.org/x/text v0.16.0 // indirect
 )
-
-replace github.com/hashicorp/hcl/v2 v2.20.1 => github.com/opentofu/hcl/v2 v2.0.0-20240814143621-8048794c5c52