@@ -17,7 +17,7 @@ const (
|
||||
)
|
||||
|
||||
func isUniverse(repoName string) bool {
|
||||
return strings.HasPrefix(strings.ToLower(repoName), pkg.AlphaModule)
|
||||
return strings.HasPrefix(strings.ToLower(repoName), pkg.UniverseModule)
|
||||
}
|
||||
|
||||
// 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(pkg.AlphaModule, UniverseVersionConstraint)
|
||||
req, err := newRequire(pkg.UniverseModule, UniverseVersionConstraint)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
@@ -25,7 +25,7 @@ type Require struct {
|
||||
|
||||
func newRequire(repoName, versionConstraint string) (*Require, error) {
|
||||
switch {
|
||||
case strings.HasPrefix(repoName, pkg.AlphaModule):
|
||||
case strings.HasPrefix(repoName, pkg.UniverseModule):
|
||||
return parseDaggerRepoName(repoName, versionConstraint)
|
||||
default:
|
||||
return parseGitRepoName(repoName, versionConstraint)
|
||||
@@ -52,7 +52,7 @@ func parseGitRepoName(repoName, versionConstraint string) (*Require, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
var daggerRepoNameRegex = regexp.MustCompile(pkg.AlphaModule + `([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`)
|
||||
var daggerRepoNameRegex = regexp.MustCompile(pkg.UniverseModule + `([a-zA-Z0-9/_.-]*)@?([0-9a-zA-Z.-]*)`)
|
||||
|
||||
func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) {
|
||||
repoMatches := daggerRepoNameRegex.FindStringSubmatch(repoName)
|
||||
@@ -62,7 +62,7 @@ func parseDaggerRepoName(repoName, versionConstraint string) (*Require, error) {
|
||||
}
|
||||
|
||||
return &Require{
|
||||
repo: pkg.AlphaModule,
|
||||
repo: pkg.UniverseModule,
|
||||
path: repoMatches[1],
|
||||
version: repoMatches[2],
|
||||
versionConstraint: versionConstraint,
|
||||
|
@@ -63,9 +63,9 @@ func TestParseArgument(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "Alpha Dagger repo with path",
|
||||
in: "alpha.dagger.io/gcp/gke@v0.1.0-alpha.20",
|
||||
in: "universe.dagger.io/gcp/gke@v0.1.0-alpha.20",
|
||||
want: &Require{
|
||||
repo: "alpha.dagger.io",
|
||||
repo: "universe.dagger.io",
|
||||
path: "/gcp/gke",
|
||||
version: "v0.1.0-alpha.20",
|
||||
|
||||
@@ -75,9 +75,9 @@ func TestParseArgument(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "Alpha Dagger repo",
|
||||
in: "alpha.dagger.io@v0.1.0-alpha.23",
|
||||
in: "universe.dagger.io@v0.1.0-alpha.23",
|
||||
want: &Require{
|
||||
repo: "alpha.dagger.io",
|
||||
repo: "universe.dagger.io",
|
||||
path: "",
|
||||
version: "v0.1.0-alpha.23",
|
||||
|
||||
|
Reference in New Issue
Block a user