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

cue modules: move stdlib to pkg/alpha.dagger.io

Browse Source 
In preparation for Europa, we will vendor multiple CUE modules:

- `pkg/alpha.dagger.io`: legacy non-europa packages
- `pkg/dagger.io`: core Europa packages
- `pkg/universe.dagger.io`: Europa universe

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi
2022-01-11 12:40:02 -08:00
parent e5316f3a1e
commit 282759c0e5
277 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mod/mod.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/gofrs/flock"
"github.com/rs/zerolog/log"
"go.dagger.io/dagger/stdlib"
"go.dagger.io/dagger/pkg"
)
const (
@@ -17,7 +17,7 @@ const (
)
func isUniverse(repoName string) bool {
return strings.HasPrefix(strings.ToLower(repoName), stdlib.ModuleName)
return strings.HasPrefix(strings.ToLower(repoName), pkg.AlphaModule)
}
// IsUniverseLatest check that current universe is up-to-date or no
@@ -32,7 +32,7 @@ func IsUniverseLatest(ctx context.Context, workspace string) (bool, error) {
return false, err
}
req, err := newRequire("alpha.dagger.io", UniverseVersionConstraint)
req, err := newRequire(pkg.AlphaModule, UniverseVersionConstraint)
if err != nil {
return false, err
}

8
mod/require.go
View File

@@ -8,7 +8,7 @@ import (
"regexp"
"strings"
"go.dagger.io/dagger/stdlib"
"go.dagger.io/dagger/pkg"
)
type Require struct {
@@ -27,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, stdlib.ModuleName):
case strings.HasPrefix(repoName, pkg.AlphaModule):
return parseDaggerRepoName(repoName, versionConstraint)
case strings.Contains(repoName, ".git"):
return parseGitRepoName(repoName, versionConstraint)
@@ -56,7 +56,7 @@ func parseGithubRepoName(repoName, versionConstraint string) (*Require, error) {
}, nil
}
var daggerRepoNameRegex = regexp.MustCompile(stdlib.ModuleName + `([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`)
var daggerRepoNameRegex = regexp.MustCompile(pkg.AlphaModule + `([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`)
func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) {
repoMatches := daggerRepoNameRegex.FindStringSubmatch(repoName)
@@ -66,7 +66,7 @@ func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) {
}
return &Require{
repo: stdlib.ModuleName,
repo: pkg.AlphaModule,
path: repoMatches[1],
version: repoMatches[2],
versionConstraint: versionConstraint,