kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1431 from Alvise88/patch-2

Browse Source 
Fixes inconsistencies in dagger mod get, issue #1378
This commit is contained in:
Gerhard Lazu 2022-01-18 09:11:21 +00:00 committed by GitHub
commit 455beae762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mod/require.go
View File

@ -25,28 +25,24 @@ type Require struct {
func newRequire(repoName, versionConstraint string) (*Require, error) { func newRequire(repoName, versionConstraint string) (*Require, error) {
switch { switch {
case strings.HasPrefix(repoName, "github.com"):
return parseGithubRepoName(repoName, versionConstraint)
case strings.HasPrefix(repoName, pkg.AlphaModule): case strings.HasPrefix(repoName, pkg.AlphaModule):
return parseDaggerRepoName(repoName, versionConstraint) return parseDaggerRepoName(repoName, versionConstraint)
case strings.Contains(repoName, ".git"):
return parseGitRepoName(repoName, versionConstraint)
default: default:
return nil, fmt.Errorf("repo name does not match suported providers") return parseGitRepoName(repoName, versionConstraint)
} }
} }
var githubRepoNameRegex = regexp.MustCompile(`(github.com/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+)([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`) var gitRepoNameRegex = regexp.MustCompile(`([a-zA-Z0-9_.-]+(?::\d*)?/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+)([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`)
func parseGithubRepoName(repoName, versionConstraint string) (*Require, error) { func parseGitRepoName(repoName, versionConstraint string) (*Require, error) {
repoMatches := githubRepoNameRegex.FindStringSubmatch(repoName) repoMatches := gitRepoNameRegex.FindStringSubmatch(repoName)
if len(repoMatches) < 4 { if len(repoMatches) < 4 {
return nil, fmt.Errorf("issue when parsing github repo") return nil, fmt.Errorf("issue when parsing github repo")
} }
return &Require{ return &Require{
repo: repoMatches[1], repo: strings.TrimSuffix(repoMatches[1], ".git"),
path: repoMatches[2], path: repoMatches[2],
version: repoMatches[3], version: repoMatches[3],
versionConstraint: versionConstraint, versionConstraint: versionConstraint,
@ -76,27 +72,6 @@ func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) {
}, nil }, nil
} }
// TODO: Get real URL regex
var gitRepoNameRegex = regexp.MustCompile(`^([a-zA-Z0-9_.-]+\.[a-zA-Z0-9]+(?::\d*)?/[a-zA-Z0-9_.-/]+?\.git)([a-zA-Z0-9/_.-]*)?@?([0-9a-zA-Z.-]*)`)
func parseGitRepoName(repoName, versionConstraint string) (*Require, error) {
repoMatches := gitRepoNameRegex.FindStringSubmatch(repoName)
if len(repoMatches) < 3 {
return nil, fmt.Errorf("issue when parsing git repo")
}
return &Require{
repo: repoMatches[1],
path: repoMatches[2],
version: repoMatches[3],
versionConstraint: versionConstraint,
cloneRepo: repoMatches[1],
clonePath: repoMatches[2],
}, nil
}
func (r *Require) String() string { func (r *Require) String() string {
return fmt.Sprintf("%s@%s", r.fullPath(), r.version) return fmt.Sprintf("%s@%s", r.fullPath(), r.version)
} }

12
mod/require_test.go
View File

@ -98,7 +98,7 @@ func TestParseArgument(t *testing.T) {
name: "Custom git provider without folder", name: "Custom git provider without folder",
in: "git.blocklayer.com/dagger/test.git@main", in: "git.blocklayer.com/dagger/test.git@main",
want: &Require{ want: &Require{
repo: "git.blocklayer.com/dagger/test.git", repo: "git.blocklayer.com/dagger/test",
path: "", path: "",
version: "main", version: "main",
}, },
@ -107,7 +107,7 @@ func TestParseArgument(t *testing.T) {
name: "Custom git provider with folder and version", name: "Custom git provider with folder and version",
in: "git.blocklayer.com/dagger/test.git/test@v1.1.0", in: "git.blocklayer.com/dagger/test.git/test@v1.1.0",
want: &Require{ want: &Require{
repo: "git.blocklayer.com/dagger/test.git", repo: "git.blocklayer.com/dagger/test",
path: "/test", path: "/test",
version: "v1.1.0", version: "v1.1.0",
}, },
@ -116,7 +116,7 @@ func TestParseArgument(t *testing.T) {
name: "Custom git provider with folder and version", name: "Custom git provider with folder and version",
in: "git.blocklayer.com/dagger/test.git/test@v1.1.0", in: "git.blocklayer.com/dagger/test.git/test@v1.1.0",
want: &Require{ want: &Require{
repo: "git.blocklayer.com/dagger/test.git", repo: "git.blocklayer.com/dagger/test",
path: "/test", path: "/test",
version: "v1.1.0", version: "v1.1.0",
}, },
@ -125,7 +125,7 @@ func TestParseArgument(t *testing.T) {
name: "Custom git provider without folder", name: "Custom git provider without folder",
in: "git.blocklayer.com/dagger/test.git", in: "git.blocklayer.com/dagger/test.git",
want: &Require{ want: &Require{
repo: "git.blocklayer.com/dagger/test.git", repo: "git.blocklayer.com/dagger/test",
path: "", path: "",
version: "", version: "",
}, },
@ -134,7 +134,7 @@ func TestParseArgument(t *testing.T) {
name: "Custom git provider with folder, no version", name: "Custom git provider with folder, no version",
in: "git.blocklayer.com/dagger/test.git/test", in: "git.blocklayer.com/dagger/test.git/test",
want: &Require{ want: &Require{
repo: "git.blocklayer.com/dagger/test.git", repo: "git.blocklayer.com/dagger/test",
path: "/test", path: "/test",
version: "", version: "",
}, },
@ -143,7 +143,7 @@ func TestParseArgument(t *testing.T) {
name: "Custom git provider with custom port, folder, and version", name: "Custom git provider with custom port, folder, and version",
in: "git.blocklayer.com:7999/ops/dagger.git/stuff/here@v5", in: "git.blocklayer.com:7999/ops/dagger.git/stuff/here@v5",
want: &Require{ want: &Require{
repo: "git.blocklayer.com:7999/ops/dagger.git", repo: "git.blocklayer.com:7999/ops/dagger",
path: "/stuff/here", path: "/stuff/here",
version: "v5", version: "v5",
}, },