-
Notifications
You must be signed in to change notification settings - Fork 183
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into pass-through-writer
Signed-off-by: Avi Deitcher <avi@deitcher.net>
- Loading branch information
Showing
4 changed files
with
129 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package content_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io" | ||
| "testing" | ||
|
|
||
| ctrcontent "github.com/containerd/containerd/content" | ||
| "github.com/deislabs/oras/pkg/content" | ||
| digest "github.com/opencontainers/go-digest" | ||
| ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||
| ) | ||
|
|
||
| var ( | ||
| testRef = "abc123" | ||
| testContent = []byte("Hello World!") | ||
| appendText = "1" | ||
| modifiedContent = fmt.Sprintf("%s%s", testContent, appendText) | ||
| testDescriptor = ocispec.Descriptor{ | ||
| MediaType: ocispec.MediaTypeImageConfig, | ||
| Digest: digest.FromBytes(testContent), | ||
| Size: int64(len(testContent)), | ||
| Annotations: map[string]string{ | ||
| ocispec.AnnotationTitle: testRef, | ||
| }, | ||
| } | ||
| modifiedDescriptor = ocispec.Descriptor{ | ||
| MediaType: ocispec.MediaTypeImageConfig, | ||
| Digest: digest.FromBytes([]byte(modifiedContent)), | ||
| Size: int64(len(modifiedContent)), | ||
| Annotations: map[string]string{ | ||
| ocispec.AnnotationTitle: testRef, | ||
| }, | ||
| } | ||
| ) | ||
|
|
||
| func TestPassthroughWriter(t *testing.T) { | ||
| // simple pass through function that modifies the data just slightly | ||
| f := func(pw *content.PassthroughWriter) { | ||
| var ( | ||
| err error | ||
| n int | ||
| ) | ||
| for { | ||
| b := make([]byte, 1024) | ||
| n, err = pw.Reader.Read(b) | ||
| if err != nil && err != io.EOF { | ||
| t.Fatalf("data read error: %v", err) | ||
| break | ||
| } | ||
| l := n | ||
| if n > len(b) { | ||
| l = len(b) | ||
| } | ||
|
|
||
| // we change it just slightly | ||
| b = b[:l] | ||
| if l > 0 { | ||
| b = append(b, 0x31) | ||
| } | ||
| if err := pw.UnderlyingWrite(b); err != nil { | ||
| t.Fatalf("error writing to underlying writer: %v", err) | ||
| break | ||
| } | ||
| if err == io.EOF { | ||
| break | ||
| } | ||
| } | ||
| pw.Done <- err | ||
| } | ||
| ctx := context.Background() | ||
| mem := content.NewMemoryStore() | ||
| memw, err := mem.Writer(ctx, ctrcontent.WithDescriptor(modifiedDescriptor)) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error getting the memory store writer: %v", err) | ||
| } | ||
| writer := content.NewPassthroughWriter(memw, f) | ||
| n, err := writer.Write(testContent) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error on Write: %v", err) | ||
| } | ||
| if n != len(testContent) { | ||
| t.Fatalf("wrote %d bytes instead of %d", n, len(testContent)) | ||
| } | ||
| if err := writer.Commit(ctx, testDescriptor.Size, testDescriptor.Digest); err != nil { | ||
| t.Errorf("unexpected error on Commit: %v", err) | ||
| } | ||
| if digest := writer.Digest(); digest != testDescriptor.Digest { | ||
| t.Errorf("mismatched digest: actual %v, expected %v", digest, testDescriptor.Digest) | ||
| } | ||
|
|
||
| // make sure the data is what we expected | ||
| _, b, found := mem.Get(modifiedDescriptor) | ||
| if !found { | ||
| t.Fatalf("target descriptor not found in underlying memory store") | ||
| } | ||
| if len(b) != len(modifiedContent) { | ||
| t.Errorf("unexpectedly got %d bytes instead of expected %d", len(b), len(modifiedContent)) | ||
| } | ||
| if string(b) != modifiedContent { | ||
| t.Errorf("mismatched content, expected '%s', got '%s'", modifiedContent, string(b)) | ||
| } | ||
| } |