forked from docker/cli
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request docker#1912 from thaJeztah/19.03_backport_import_zip
[19.03 backport] Introduce .zip import for docker context
- Loading branch information
Showing
5 changed files
with
252 additions
and
17 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package store | ||
|
||
import ( | ||
"errors" | ||
"io" | ||
) | ||
|
||
// LimitedReader is a fork of io.LimitedReader to override Read. | ||
type LimitedReader struct { | ||
R io.Reader | ||
N int64 // max bytes remaining | ||
} | ||
|
||
// Read is a fork of io.LimitedReader.Read that returns an error when limit exceeded. | ||
func (l *LimitedReader) Read(p []byte) (n int, err error) { | ||
if l.N < 0 { | ||
return 0, errors.New("read exceeds the defined limit") | ||
} | ||
if l.N == 0 { | ||
return 0, io.EOF | ||
} | ||
// have to cap N + 1 otherwise we won't hit limit err | ||
if int64(len(p)) > l.N+1 { | ||
p = p[0 : l.N+1] | ||
} | ||
n, err = l.R.Read(p) | ||
l.N -= int64(n) | ||
return n, err | ||
} |
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,24 @@ | ||
package store | ||
|
||
import ( | ||
"io/ioutil" | ||
"strings" | ||
"testing" | ||
|
||
"gotest.tools/assert" | ||
) | ||
|
||
func TestLimitReaderReadAll(t *testing.T) { | ||
r := strings.NewReader("Reader") | ||
|
||
_, err := ioutil.ReadAll(r) | ||
assert.NilError(t, err) | ||
|
||
r = strings.NewReader("Test") | ||
_, err = ioutil.ReadAll(&LimitedReader{R: r, N: 4}) | ||
assert.NilError(t, err) | ||
|
||
r = strings.NewReader("Test") | ||
_, err = ioutil.ReadAll(&LimitedReader{R: r, N: 2}) | ||
assert.Error(t, err, "read exceeds the defined limit") | ||
} |
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