Skip to content

Commit f703327

Browse files
refactoring: renamed package to valid name
1 parent 05dd051 commit f703327

File tree

5 files changed

+11
-88
lines changed

5 files changed

+11
-88
lines changed

.gitignore

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,7 @@ compage
1717
dist/
1818
/cosign.key
1919
/cosign.pub
20-
/myproject/.github/workflows/user-service-ci.yml
21-
/myproject/.github/workflows/user-service-release.yml
22-
/myproject/user-service/.devcontainer/devcontainer.json
23-
/myproject/user-service/.devcontainer/Dockerfile
24-
/myproject/user-service/config/rest-opentel-config.go
25-
/myproject/user-service/kubernetes/deployment.yaml
26-
/myproject/user-service/kubernetes/service.yaml
27-
/myproject/user-service/pkg/rest/server/controllers/user-controller.go
28-
/myproject/user-service/pkg/rest/server/daos/clients/sqls/map.go
29-
/myproject/user-service/pkg/rest/server/daos/user-dao.go
30-
/myproject/user-service/pkg/rest/server/models/user-model.go
31-
/myproject/user-service/pkg/rest/server/services/user-service.go
32-
/myproject/user-service/.gitignore
33-
/myproject/user-service/devspace.yaml
34-
/myproject/user-service/devspace_start.sh
35-
/myproject/user-service/Dockerfile
36-
/myproject/user-service/go.mod
37-
/myproject/user-service/go.sum
38-
/myproject/user-service/main.go
39-
/myproject/user-service/README.md
40-
/myproject/user-service/useful-commands
41-
/myproject/.deepsource.toml
42-
/myproject/LICENSE
43-
/myproject/README.md
20+
/myproject/*
21+
myproject/*
22+
cmd/artifacts/.DS_Store
23+
/__debug_bin*

cmd/artifacts/oci-registry/pull.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package oci_registry
1+
package ociregistry
22

33
import (
44
"context"
@@ -40,10 +40,7 @@ func Pull(requestCtx context.Context, disableTLS bool) (template *string, err er
4040
}
4141

4242
if ref.Reference == ociLatestTag || ref.Reference == "" {
43-
ref.Reference, err = getLatestTagSortedBySemver(ref.Registry+"/"+ref.Repository, disableTLS)
44-
if err != nil {
45-
return nil, fmt.Errorf("get latest tag sorted by semver: %w", err)
46-
}
43+
return nil, fmt.Errorf("please don't use latest tag but specific version")
4744
}
4845

4946
// Connect to a remote repository

cmd/artifacts/oci-registry/utils.go

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,13 @@
1-
package oci_registry
1+
package ociregistry
22

33
import (
4-
"context"
54
"fmt"
6-
"github.com/Masterminds/semver/v3"
7-
"oras.land/oras-go/v2/registry/remote/credentials"
8-
"sort"
9-
10-
"github.com/sirupsen/logrus"
11-
"oras.land/oras-go/v2/registry"
125
"oras.land/oras-go/v2/registry/remote"
136
"oras.land/oras-go/v2/registry/remote/auth"
7+
"oras.land/oras-go/v2/registry/remote/credentials"
148
"oras.land/oras-go/v2/registry/remote/retry"
159
)
1610

17-
// getLatestTagSortedBySemver returns the latest tag sorted by semver
18-
func getLatestTagSortedBySemver(refName string, disableTLS bool) (string, error) {
19-
20-
repo, err := remote.NewRepository(refName)
21-
if err != nil {
22-
return "", fmt.Errorf("query repository: %w", err)
23-
}
24-
25-
if disableTLS {
26-
repo.PlainHTTP = true
27-
}
28-
29-
if err = getCredentialsFromDockerStore(repo); err != nil {
30-
return "", fmt.Errorf("credstore from docker: %w", err)
31-
}
32-
33-
ctx := context.Background()
34-
35-
tags, err := registry.Tags(ctx, repo)
36-
37-
if err != nil {
38-
return "", fmt.Errorf("get tags: %w", err)
39-
}
40-
41-
result := []*semver.Version{}
42-
for i := range tags {
43-
s, err := semver.NewVersion(tags[i])
44-
if err != nil {
45-
logrus.Warningf("Ignoring tag %q - %q", tags[i], err)
46-
continue
47-
}
48-
49-
result = append(result, s)
50-
}
51-
52-
if len(result) == 0 {
53-
return "", fmt.Errorf("no valid semver tags found")
54-
}
55-
56-
sort.Sort(semver.Collection(result))
57-
sort.Sort(sort.Reverse(semver.Collection(result)))
58-
59-
latestTag := result[0].Original()
60-
logrus.Debugf("latest tag identified %q", latestTag)
61-
62-
return latestTag, nil
63-
}
64-
6511
// getCredentialsFromDockerStore get the credentials from the docker credential store
6612
func getCredentialsFromDockerStore(repository *remote.Repository) error {
6713

cmd/artifacts/oci-registry/var.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package oci_registry
1+
package ociregistry
22

33
var (
44
ociLatestTag = "latest"

cmd/artifacts/puller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
)
1212

1313
func PullOCIArtifact(language, version string) error {
14-
artifactURL, artifactPath, err := oci_registry.GetOCIArtifactURLAndPathByLanguage(language, version)
14+
artifactURL, artifactPath, err := ociregistry.GetOCIArtifactURLAndPathByLanguage(language, version)
1515
if err != nil {
1616
log.Errorf("error:%v", err)
1717
return err
@@ -58,7 +58,7 @@ func PullOCIArtifact(language, version string) error {
5858
}
5959

6060
log.Infof("pulling artifact %s into %s\n", artifactURL, artifactPath)
61-
_, err = oci_registry.Pull(ctx, false)
61+
_, err = ociregistry.Pull(ctx, false)
6262
if err != nil {
6363
log.Errorf("error:%v", err)
6464
return err

0 commit comments

Comments
 (0)