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

remove hardcoded stdlib path

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi
2021-12-01 12:03:41 -08:00
parent 5b7b1cab79
commit 337ed0d1cc
9 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mod/mod.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/gofrs/flock"
"github.com/rs/zerolog/log"
"go.dagger.io/dagger/stdlib"
)
const (
@@ -15,7 +16,7 @@ const (
)
func isUniverse(repoName string) bool {
return strings.HasPrefix(strings.ToLower(repoName), "alpha.dagger.io")
return strings.HasPrefix(strings.ToLower(repoName), stdlib.ModuleName)
}
func Install(ctx context.Context, workspace, repoName, versionConstraint string) (*Require, error) {

8
mod/require.go
View File

@@ -7,6 +7,8 @@ import (
"path/filepath"
"regexp"
"strings"
"go.dagger.io/dagger/stdlib"
)
type Require struct {
@@ -25,7 +27,7 @@ func newRequire(repoName, versionConstraint string) (*Require, error) {
switch {
case strings.HasPrefix(repoName, "github.com"):
return parseGithubRepoName(repoName, versionConstraint)
case strings.HasPrefix(repoName, "alpha.dagger.io"):
case strings.HasPrefix(repoName, stdlib.ModuleName):
return parseDaggerRepoName(repoName, versionConstraint)
default:
return nil, fmt.Errorf("repo name does not match suported providers")
@@ -52,7 +54,7 @@ func parseGithubRepoName(repoName, versionConstraint string) (*Require, error) {
}, nil
}
var daggerRepoNameRegex = regexp.MustCompile(`alpha.dagger.io([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`)
var daggerRepoNameRegex = regexp.MustCompile(stdlib.ModuleName + `([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`)
func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) {
repoMatches := daggerRepoNameRegex.FindStringSubmatch(repoName)
@@ -62,7 +64,7 @@ func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) {
}
return &Require{
repo: "alpha.dagger.io",
repo: stdlib.ModuleName,
path: repoMatches[1],
version: repoMatches[2],
versionConstraint: versionConstraint,