diff --git a/.gitignore b/.gitignore index ac71ce6ab..ed7b6be87 100644 --- a/.gitignore +++ b/.gitignore @@ -17,27 +17,7 @@ compage dist/ /cosign.key /cosign.pub -/myproject/.github/workflows/user-service-ci.yml -/myproject/.github/workflows/user-service-release.yml -/myproject/user-service/.devcontainer/devcontainer.json -/myproject/user-service/.devcontainer/Dockerfile -/myproject/user-service/config/rest-opentel-config.go -/myproject/user-service/kubernetes/deployment.yaml -/myproject/user-service/kubernetes/service.yaml -/myproject/user-service/pkg/rest/server/controllers/user-controller.go -/myproject/user-service/pkg/rest/server/daos/clients/sqls/map.go -/myproject/user-service/pkg/rest/server/daos/user-dao.go -/myproject/user-service/pkg/rest/server/models/user-model.go -/myproject/user-service/pkg/rest/server/services/user-service.go -/myproject/user-service/.gitignore -/myproject/user-service/devspace.yaml -/myproject/user-service/devspace_start.sh -/myproject/user-service/Dockerfile -/myproject/user-service/go.mod -/myproject/user-service/go.sum -/myproject/user-service/main.go -/myproject/user-service/README.md -/myproject/user-service/useful-commands -/myproject/.deepsource.toml -/myproject/LICENSE -/myproject/README.md +/myproject/* +myproject/* +cmd/artifacts/.DS_Store +/__debug_bin* diff --git a/cmd/artifacts/oci-registry/pull.go b/cmd/artifacts/oci-registry/pull.go index 21121b868..19cc386f6 100644 --- a/cmd/artifacts/oci-registry/pull.go +++ b/cmd/artifacts/oci-registry/pull.go @@ -1,4 +1,4 @@ -package oci_registry +package ociregistry import ( "context" @@ -40,10 +40,7 @@ func Pull(requestCtx context.Context, disableTLS bool) (template *string, err er } if ref.Reference == ociLatestTag || ref.Reference == "" { - ref.Reference, err = getLatestTagSortedBySemver(ref.Registry+"/"+ref.Repository, disableTLS) - if err != nil { - return nil, fmt.Errorf("get latest tag sorted by semver: %w", err) - } + return nil, fmt.Errorf("please don't use latest tag but specific version") } // Connect to a remote repository diff --git a/cmd/artifacts/oci-registry/utils.go b/cmd/artifacts/oci-registry/utils.go index d96bc35d3..84fde7401 100644 --- a/cmd/artifacts/oci-registry/utils.go +++ b/cmd/artifacts/oci-registry/utils.go @@ -1,67 +1,13 @@ -package oci_registry +package ociregistry import ( - "context" "fmt" - "github.com/Masterminds/semver/v3" - "oras.land/oras-go/v2/registry/remote/credentials" - "sort" - - "github.com/sirupsen/logrus" - "oras.land/oras-go/v2/registry" "oras.land/oras-go/v2/registry/remote" "oras.land/oras-go/v2/registry/remote/auth" + "oras.land/oras-go/v2/registry/remote/credentials" "oras.land/oras-go/v2/registry/remote/retry" ) -// getLatestTagSortedBySemver returns the latest tag sorted by semver -func getLatestTagSortedBySemver(refName string, disableTLS bool) (string, error) { - - repo, err := remote.NewRepository(refName) - if err != nil { - return "", fmt.Errorf("query repository: %w", err) - } - - if disableTLS { - repo.PlainHTTP = true - } - - if err = getCredentialsFromDockerStore(repo); err != nil { - return "", fmt.Errorf("credstore from docker: %w", err) - } - - ctx := context.Background() - - tags, err := registry.Tags(ctx, repo) - - if err != nil { - return "", fmt.Errorf("get tags: %w", err) - } - - result := []*semver.Version{} - for i := range tags { - s, err := semver.NewVersion(tags[i]) - if err != nil { - logrus.Warningf("Ignoring tag %q - %q", tags[i], err) - continue - } - - result = append(result, s) - } - - if len(result) == 0 { - return "", fmt.Errorf("no valid semver tags found") - } - - sort.Sort(semver.Collection(result)) - sort.Sort(sort.Reverse(semver.Collection(result))) - - latestTag := result[0].Original() - logrus.Debugf("latest tag identified %q", latestTag) - - return latestTag, nil -} - // getCredentialsFromDockerStore get the credentials from the docker credential store func getCredentialsFromDockerStore(repository *remote.Repository) error { diff --git a/cmd/artifacts/oci-registry/var.go b/cmd/artifacts/oci-registry/var.go index a51c88d9e..c0a932217 100644 --- a/cmd/artifacts/oci-registry/var.go +++ b/cmd/artifacts/oci-registry/var.go @@ -1,4 +1,4 @@ -package oci_registry +package ociregistry var ( ociLatestTag = "latest" diff --git a/cmd/artifacts/puller.go b/cmd/artifacts/puller.go index 2f504812a..bc8aa27fa 100644 --- a/cmd/artifacts/puller.go +++ b/cmd/artifacts/puller.go @@ -11,7 +11,7 @@ import ( ) func PullOCIArtifact(language, version string) error { - artifactURL, artifactPath, err := oci_registry.GetOCIArtifactURLAndPathByLanguage(language, version) + artifactURL, artifactPath, err := ociregistry.GetOCIArtifactURLAndPathByLanguage(language, version) if err != nil { log.Errorf("error:%v", err) return err @@ -58,7 +58,7 @@ func PullOCIArtifact(language, version string) error { } log.Infof("pulling artifact %s into %s\n", artifactURL, artifactPath) - _, err = oci_registry.Pull(ctx, false) + _, err = ociregistry.Pull(ctx, false) if err != nil { log.Errorf("error:%v", err) return err