vbatts
/
registry
forked from mirrors/docker-distribution
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

manifest: rename variables that collided with imports 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-11-26 13:15:07 +01:00
parent b9f9073d1a
commit 0e3efe749b
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifest/ocischema/manifest.go
View File

@ -93,17 +93,17 @@ func (m *DeserializedManifest) UnmarshalJSON(b []byte) error {
copy(m.canonical, b)
// Unmarshal canonical JSON into Manifest object
var manifest Manifest
if err := json.Unmarshal(m.canonical, &manifest); err != nil {
var mfst Manifest
if err := json.Unmarshal(m.canonical, &mfst); err != nil {
return err
}
if manifest.MediaType != "" && manifest.MediaType != v1.MediaTypeImageManifest {
if mfst.MediaType != "" && mfst.MediaType != v1.MediaTypeImageManifest {
return fmt.Errorf("if present, mediaType in manifest should be '%s' not '%s'",
v1.MediaTypeImageManifest, manifest.MediaType)
v1.MediaTypeImageManifest, mfst.MediaType)
}
m.Manifest = manifest
m.Manifest = mfst
return nil
}

14
manifest/ocischema/manifest_test.go
View File

@ -64,9 +64,9 @@ func makeTestManifest(mediaType string) Manifest {
}
func TestManifest(t *testing.T) {
manifest := makeTestManifest(v1.MediaTypeImageManifest)
mfst := makeTestManifest(v1.MediaTypeImageManifest)
deserialized, err := FromStruct(manifest)
deserialized, err := FromStruct(mfst)
if err != nil {
t.Fatalf("error creating DeserializedManifest: %v", err)
}
@ -79,7 +79,7 @@ func TestManifest(t *testing.T) {
// Check that the canonical field is the same as json.MarshalIndent
// with these parameters.
p, err := json.MarshalIndent(&manifest, "", " ")
p, err := json.MarshalIndent(&mfst, "", " ")
if err != nil {
t.Fatalf("error marshaling manifest: %v", err)
}
@ -143,9 +143,9 @@ func TestManifest(t *testing.T) {
}
func mediaTypeTest(t *testing.T, mediaType string, shouldError bool) {
manifest := makeTestManifest(mediaType)
mfst := makeTestManifest(mediaType)
deserialized, err := FromStruct(manifest)
deserialized, err := FromStruct(mfst)
if err != nil {
t.Fatalf("error creating DeserializedManifest: %v", err)
}
@ -186,7 +186,7 @@ func TestMediaTypes(t *testing.T) {
}
func TestValidateManifest(t *testing.T) {
manifest := Manifest{
mfst := Manifest{
Config: distribution.Descriptor{Size: 1},
Layers: []distribution.Descriptor{{Size: 2}},
}
@ -196,7 +196,7 @@ func TestValidateManifest(t *testing.T) {
},
}
t.Run("valid", func(t *testing.T) {
b, err := json.Marshal(manifest)
b, err := json.Marshal(mfst)
if err != nil {
t.Fatal("unexpected error marshaling manifest", err)
}

6
manifest/schema1/manifest.go
View File

@ -126,12 +126,12 @@ func (sm *SignedManifest) UnmarshalJSON(b []byte) error {
copy(sm.Canonical, bytes)
// Unmarshal canonical JSON into Manifest object
var manifest Manifest
if err := json.Unmarshal(sm.Canonical, &manifest); err != nil {
var mfst Manifest
if err := json.Unmarshal(sm.Canonical, &mfst); err != nil {
return err
}
sm.Manifest = manifest
sm.Manifest = mfst
return nil
}

10
manifest/schema2/manifest.go
View File

@ -109,17 +109,17 @@ func (m *DeserializedManifest) UnmarshalJSON(b []byte) error {
copy(m.canonical, b)
// Unmarshal canonical JSON into Manifest object
var manifest Manifest
if err := json.Unmarshal(m.canonical, &manifest); err != nil {
var mfst Manifest
if err := json.Unmarshal(m.canonical, &mfst); err != nil {
return err
}
if manifest.MediaType != MediaTypeManifest {
if mfst.MediaType != MediaTypeManifest {
return fmt.Errorf("mediaType in manifest should be '%s' not '%s'",
MediaTypeManifest, manifest.MediaType)
MediaTypeManifest, mfst.MediaType)
}
m.Manifest = manifest
m.Manifest = mfst
return nil
}

10
manifest/schema2/manifest_test.go
View File

@ -49,9 +49,9 @@ func makeTestManifest(mediaType string) Manifest {
}
func TestManifest(t *testing.T) {
manifest := makeTestManifest(MediaTypeManifest)
mfst := makeTestManifest(MediaTypeManifest)
deserialized, err := FromStruct(manifest)
deserialized, err := FromStruct(mfst)
if err != nil {
t.Fatalf("error creating DeserializedManifest: %v", err)
}
@ -64,7 +64,7 @@ func TestManifest(t *testing.T) {
// Check that the canonical field is the same as json.MarshalIndent
// with these parameters.
p, err := json.MarshalIndent(&manifest, "", " ")
p, err := json.MarshalIndent(&mfst, "", " ")
if err != nil {
t.Fatalf("error marshaling manifest: %v", err)
}
@ -119,9 +119,9 @@ func TestManifest(t *testing.T) {
}
func mediaTypeTest(t *testing.T, mediaType string, shouldError bool) {
manifest := makeTestManifest(mediaType)
mfst := makeTestManifest(mediaType)
deserialized, err := FromStruct(manifest)
deserialized, err := FromStruct(mfst)
if err != nil {
t.Fatalf("error creating DeserializedManifest: %v", err)
}