Merge pull request #466 from MUzairS15/MUzairS15/url-utils

utility functions for `URL`
meshery · Feb 26, 2024 · 339076f · 339076f
2 parents 9ac6328 + 979a8c2
commit 339076f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/generators/github/git_repo.go b/generators/github/git_repo.go
@@ -85,7 +85,7 @@ func (gr GitRepo) extractRepoDetailsFromSourceURL() (owner, repo, branch, root s
 		root = parts[3]
 
 	} else {
-		err = ErrInvalidGitHubSourceURL(fmt.Errorf("Source URL $s is invalid, specify owner, repo, branch and filepath in the url according to the specified source url format", gr.URL.String()))
+		err = ErrInvalidGitHubSourceURL(fmt.Errorf("Source URL %s is invalid, specify owner, repo, branch and filepath in the url according to the specified source url format", gr.URL.String()))
 	}
 	return
 }

diff --git a/models/events/events.go b/models/events/events.go
diff --git a/utils/utils.go b/utils/utils.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	mathrand "math/rand"
 	"net/http"
+	"net/url"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -357,7 +358,7 @@ func WriteJSONToFile[K any](outputPath string, data K) error {
 	return nil
 }
 
-func CreateDirectory(path string) error{
+func CreateDirectory(path string) error {
 	err := os.MkdirAll(path, 0755)
 	if err != nil {
 		err = ErrCreateDir(err, path)
@@ -370,3 +371,12 @@ func CreateDirectory(path string) error{
 func ReplaceSpacesAndConvertToLowercase(s string) string {
 	return strings.ToLower(strings.ReplaceAll(s, " ", ""))
 }
+
+func ExtractDomainFromURL(location string) string {
+	parsedURL, err := url.Parse(location)
+	// If unable to extract domain return the location as is.
+	if err != nil {
+		return location
+	}
+	return regexp.MustCompile(`(([a-zA-Z0-9]+\.)([a-zA-Z0-9]+))$`).FindString(parsedURL.Hostname())
+}