mirror of https://github.com/helm/helm
Merge pull request #12690 from TerryHowe/oci-install-digest
feat: OCI install by digestpull/13587/merge
Matt Farina
2 weeks ago
committed by
GitHub
commit
f65eaf35ce
@ -0,0 +1,78 @@
|
|||||||
|
/*
|
||||||
|
Copyright The Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package registry
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
orasregistry "oras.land/oras-go/pkg/registry"
|
||||||
|
)
|
||||||
|
|
||||||
|
type reference struct {
|
||||||
|
orasReference orasregistry.Reference
|
||||||
|
Registry string
|
||||||
|
Repository string
|
||||||
|
Tag string
|
||||||
|
Digest string
|
||||||
|
}
|
||||||
|
|
||||||
|
// newReference will parse and validate the reference, and clean tags when
|
||||||
|
// applicable tags are only cleaned when plus (+) signs are present, and are
|
||||||
|
// converted to underscores (_) before pushing
|
||||||
|
// See https://github.com/helm/helm/issues/10166
|
||||||
|
func newReference(raw string) (result reference, err error) {
|
||||||
|
// Remove oci:// prefix if it is there
|
||||||
|
raw = strings.TrimPrefix(raw, OCIScheme+"://")
|
||||||
|
|
||||||
|
// The sole possible reference modification is replacing plus (+) signs
|
||||||
|
// present in tags with underscores (_). To do this properly, we first
|
||||||
|
// need to identify a tag, and then pass it on to the reference parser
|
||||||
|
// NOTE: Passing immediately to the reference parser will fail since (+)
|
||||||
|
// signs are an invalid tag character, and simply replacing all plus (+)
|
||||||
|
// occurrences could invalidate other portions of the URI
|
||||||
|
lastIndex := strings.LastIndex(raw, "@")
|
||||||
|
if lastIndex >= 0 {
|
||||||
|
result.Digest = raw[(lastIndex + 1):]
|
||||||
|
raw = raw[:lastIndex]
|
||||||
|
}
|
||||||
|
parts := strings.Split(raw, ":")
|
||||||
|
if len(parts) > 1 && !strings.Contains(parts[len(parts)-1], "/") {
|
||||||
|
tag := parts[len(parts)-1]
|
||||||
|
|
||||||
|
if tag != "" {
|
||||||
|
// Replace any plus (+) signs with known underscore (_) conversion
|
||||||
|
newTag := strings.ReplaceAll(tag, "+", "_")
|
||||||
|
raw = strings.ReplaceAll(raw, tag, newTag)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.orasReference, err = orasregistry.ParseReference(raw)
|
||||||
|
if err != nil {
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
result.Registry = result.orasReference.Registry
|
||||||
|
result.Repository = result.orasReference.Repository
|
||||||
|
result.Tag = result.orasReference.Reference
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *reference) String() string {
|
||||||
|
if r.Tag == "" {
|
||||||
|
return r.orasReference.String() + "@" + r.Digest
|
||||||
|
}
|
||||||
|
return r.orasReference.String()
|
||||||
|
}
|
||||||
@ -0,0 +1,99 @@
|
|||||||
|
/*
|
||||||
|
Copyright The Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package registry
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func verify(t *testing.T, actual reference, registry, repository, tag, digest string) {
|
||||||
|
if registry != actual.orasReference.Registry {
|
||||||
|
t.Errorf("Oras reference registry expected %v actual %v", registry, actual.Registry)
|
||||||
|
}
|
||||||
|
if repository != actual.orasReference.Repository {
|
||||||
|
t.Errorf("Oras reference repository expected %v actual %v", repository, actual.Repository)
|
||||||
|
}
|
||||||
|
if tag != actual.orasReference.Reference {
|
||||||
|
t.Errorf("Oras reference reference expected %v actual %v", tag, actual.Tag)
|
||||||
|
}
|
||||||
|
if registry != actual.Registry {
|
||||||
|
t.Errorf("Registry expected %v actual %v", registry, actual.Registry)
|
||||||
|
}
|
||||||
|
if repository != actual.Repository {
|
||||||
|
t.Errorf("Repository expected %v actual %v", repository, actual.Repository)
|
||||||
|
}
|
||||||
|
if tag != actual.Tag {
|
||||||
|
t.Errorf("Tag expected %v actual %v", tag, actual.Tag)
|
||||||
|
}
|
||||||
|
if digest != actual.Digest {
|
||||||
|
t.Errorf("Digest expected %v actual %v", digest, actual.Digest)
|
||||||
|
}
|
||||||
|
expectedString := registry
|
||||||
|
if repository != "" {
|
||||||
|
expectedString = expectedString + "/" + repository
|
||||||
|
}
|
||||||
|
if tag != "" {
|
||||||
|
expectedString = expectedString + ":" + tag
|
||||||
|
} else {
|
||||||
|
expectedString = expectedString + "@" + digest
|
||||||
|
}
|
||||||
|
if actual.String() != expectedString {
|
||||||
|
t.Errorf("String expected %s actual %s", expectedString, actual.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewReference(t *testing.T) {
|
||||||
|
actual, err := newReference("registry.example.com/repository:1.0@sha256:c6841b3a895f1444a6738b5d04564a57e860ce42f8519c3be807fb6d9bee7888")
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error %v", err)
|
||||||
|
}
|
||||||
|
verify(t, actual, "registry.example.com", "repository", "1.0", "sha256:c6841b3a895f1444a6738b5d04564a57e860ce42f8519c3be807fb6d9bee7888")
|
||||||
|
|
||||||
|
actual, err = newReference("oci://registry.example.com/repository:1.0@sha256:c6841b3a895f1444a6738b5d04564a57e860ce42f8519c3be807fb6d9bee7888")
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error %v", err)
|
||||||
|
}
|
||||||
|
verify(t, actual, "registry.example.com", "repository", "1.0", "sha256:c6841b3a895f1444a6738b5d04564a57e860ce42f8519c3be807fb6d9bee7888")
|
||||||
|
|
||||||
|
actual, err = newReference("a/b:1@c")
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error %v", err)
|
||||||
|
}
|
||||||
|
verify(t, actual, "a", "b", "1", "c")
|
||||||
|
|
||||||
|
actual, err = newReference("a/b:@")
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error %v", err)
|
||||||
|
}
|
||||||
|
verify(t, actual, "a", "b", "", "")
|
||||||
|
|
||||||
|
actual, err = newReference("registry.example.com/repository:1.0+001")
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error %v", err)
|
||||||
|
}
|
||||||
|
verify(t, actual, "registry.example.com", "repository", "1.0_001", "")
|
||||||
|
|
||||||
|
actual, err = newReference("thing:1.0")
|
||||||
|
if err == nil {
|
||||||
|
t.Errorf("Expect error error %v", err)
|
||||||
|
}
|
||||||
|
verify(t, actual, "", "", "", "")
|
||||||
|
|
||||||
|
actual, err = newReference("registry.example.com/the/repository@sha256:c6841b3a895f1444a6738b5d04564a57e860ce42f8519c3be807fb6d9bee7888")
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unexpected error %v", err)
|
||||||
|
}
|
||||||
|
verify(t, actual, "registry.example.com", "the/repository", "", "sha256:c6841b3a895f1444a6738b5d04564a57e860ce42f8519c3be807fb6d9bee7888")
|
||||||
|
}
|
||||||
Loading…
Reference in new issue