Skip to content

Apply improvements from go fix #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tianon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Apply improvements from go fix #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ociregistry/ociauth/authfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,10 @@ func decodeConfigFile(data []byte) (configData, error) {
// to keep the logic the same as that.
func urlHost(url string) string {
stripped := url
if strings.HasPrefix(url, "http://") {
stripped = strings.TrimPrefix(url, "http://")
} else if strings.HasPrefix(url, "https://") {
stripped = strings.TrimPrefix(url, "https://")
if after, ok := strings.CutPrefix(url, "http://"); ok {
stripped = after
} else if after, ok := strings.CutPrefix(url, "https://"); ok {
stripped = after
}

hostName, _, _ := strings.Cut(stripped, "/")
Expand Down
4 changes: 2 additions & 2 deletions ociregistry/ociauth/scope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func ParseScope(s string) Scope {
})
continue
}
for _, action := range strings.Split(parts[2], ",") {
for action := range strings.SplitSeq(parts[2], ",") {
rscopes = append(rscopes, ResourceScope{
ResourceType: parts[0],
Resource: parts[1],
Expand Down Expand Up @@ -252,7 +252,7 @@ func (s Scope) Iter() func(yield func(ResourceScope) bool) {
continue
}
acts := s.actions[i]
for k := knownAction(0); k < numActions; k++ {
for k := range numActions {
if acts&(1<<k) == 0 {
continue
}
Expand Down
2 changes: 1 addition & 1 deletion ociregistry/ociserver/range.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func parseRange(s string) ([]httpRange, error) {
return nil, errors.New("invalid range")
}
ranges := make([]httpRange, 0, 1)
for _, ra := range strings.Split(s[len(b):], ",") {
for ra := range strings.SplitSeq(s[len(b):], ",") {
ra = textproto.TrimString(ra)
if ra == "" {
continue
Expand Down