Skip to content

Commit

Permalink
refactoring: renamed package to valid name
Browse files Browse the repository at this point in the history
  • Loading branch information
mahendraintelops committed Mar 17, 2024
1 parent 05dd051 commit f703327
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 88 deletions.
28 changes: 4 additions & 24 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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*
7 changes: 2 additions & 5 deletions cmd/artifacts/oci-registry/pull.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package oci_registry
package ociregistry

import (
"context"
Expand Down Expand Up @@ -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
Expand Down
58 changes: 2 additions & 56 deletions cmd/artifacts/oci-registry/utils.go
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion cmd/artifacts/oci-registry/var.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package oci_registry
package ociregistry

var (
ociLatestTag = "latest"
Expand Down
4 changes: 2 additions & 2 deletions cmd/artifacts/puller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f703327

Please sign in to comment.