Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
246dc654
"vscode:/vscode.git/clone" did not exist on "867e0c919e1aa7ef8b03c8eb1460f4f875a683ae"
Commit
246dc654
authored
Aug 26, 2023
by
Michael Yang
Browse files
loosen http status code checks
parent
865fceb7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
17 deletions
+16
-17
api/client.go
api/client.go
+2
-2
server/auth.go
server/auth.go
+1
-1
server/download.go
server/download.go
+1
-1
server/images.go
server/images.go
+8
-8
server/upload.go
server/upload.go
+4
-5
No files found.
api/client.go
View file @
246dc654
...
...
@@ -29,7 +29,7 @@ type Client struct {
}
func
checkError
(
resp
*
http
.
Response
,
body
[]
byte
)
error
{
if
resp
.
StatusCode
>=
200
&&
resp
.
StatusCode
<
400
{
if
resp
.
StatusCode
<
http
.
StatusBadRequest
{
return
nil
}
...
...
@@ -165,7 +165,7 @@ func (c *Client) stream(ctx context.Context, method, path string, data any, fn f
return
fmt
.
Errorf
(
errorResponse
.
Error
)
}
if
response
.
StatusCode
>=
400
{
if
response
.
StatusCode
>=
http
.
StatusBadRequest
{
return
StatusError
{
StatusCode
:
response
.
StatusCode
,
Status
:
response
.
Status
,
...
...
server/auth.go
View file @
246dc654
...
...
@@ -109,7 +109,7 @@ func getAuthToken(ctx context.Context, redirData AuthRedirect, regOpts *Registry
}
defer
resp
.
Body
.
Close
()
if
resp
.
StatusCode
!
=
http
.
Status
OK
{
if
resp
.
StatusCode
>
=
http
.
Status
BadRequest
{
body
,
_
:=
io
.
ReadAll
(
resp
.
Body
)
return
""
,
fmt
.
Errorf
(
"on pull registry responded with code %d: %s"
,
resp
.
StatusCode
,
body
)
}
...
...
server/download.go
View file @
246dc654
...
...
@@ -168,7 +168,7 @@ func doDownload(ctx context.Context, opts downloadOpts, f *FileDownload) error {
}
defer
resp
.
Body
.
Close
()
if
resp
.
StatusCode
!
=
http
.
Status
OK
&&
resp
.
StatusCode
!=
http
.
StatusPartialConten
t
{
if
resp
.
StatusCode
>
=
http
.
Status
BadReques
t
{
body
,
_
:=
io
.
ReadAll
(
resp
.
Body
)
return
fmt
.
Errorf
(
"%w: on download registry responded with code %d: %v"
,
errDownload
,
resp
.
StatusCode
,
string
(
body
))
}
...
...
server/images.go
View file @
246dc654
...
...
@@ -1086,11 +1086,11 @@ func pullModelManifest(ctx context.Context, mp ModelPath, regOpts *RegistryOptio
}
defer
resp
.
Body
.
Close
()
// Check for success: For a successful upload, the Docker registry will respond with a 201 Created
if
resp
.
StatusCode
!=
http
.
StatusOK
{
if
resp
.
StatusCode
>=
http
.
StatusBadRequest
{
if
resp
.
StatusCode
==
http
.
StatusNotFound
{
return
nil
,
fmt
.
Errorf
(
"model not found"
)
}
body
,
_
:=
io
.
ReadAll
(
resp
.
Body
)
return
nil
,
fmt
.
Errorf
(
"on pull registry responded with code %d: %s"
,
resp
.
StatusCode
,
body
)
}
...
...
@@ -1151,7 +1151,7 @@ func checkBlobExistence(ctx context.Context, mp ModelPath, digest string, regOpt
defer
resp
.
Body
.
Close
()
// Check for success: If the blob exists, the Docker registry will respond with a 200 OK
return
resp
.
StatusCode
==
http
.
Status
OK
,
nil
return
resp
.
StatusCode
<
http
.
Status
BadRequest
,
nil
}
func
makeRequestWithRetry
(
ctx
context
.
Context
,
method
string
,
requestURL
*
url
.
URL
,
headers
http
.
Header
,
body
io
.
ReadSeeker
,
regOpts
*
RegistryOptions
)
(
*
http
.
Response
,
error
)
{
...
...
@@ -1165,10 +1165,8 @@ func makeRequestWithRetry(ctx context.Context, method string, requestURL *url.UR
status
=
resp
.
Status
switch
resp
.
StatusCode
{
case
http
.
StatusAccepted
,
http
.
StatusCreated
:
return
resp
,
nil
case
http
.
StatusUnauthorized
:
switch
{
case
resp
.
StatusCode
==
http
.
StatusUnauthorized
:
auth
:=
resp
.
Header
.
Get
(
"www-authenticate"
)
authRedir
:=
ParseAuthRedirectString
(
auth
)
token
,
err
:=
getAuthToken
(
ctx
,
authRedir
,
regOpts
)
...
...
@@ -1184,9 +1182,11 @@ func makeRequestWithRetry(ctx context.Context, method string, requestURL *url.UR
}
continue
defaul
t
:
case
resp
.
StatusCode
>=
http
.
StatusBadReques
t
:
body
,
_
:=
io
.
ReadAll
(
resp
.
Body
)
return
nil
,
fmt
.
Errorf
(
"on upload registry responded with code %d: %s"
,
resp
.
StatusCode
,
body
)
default
:
return
resp
,
nil
}
}
...
...
server/upload.go
View file @
246dc654
...
...
@@ -111,9 +111,8 @@ func uploadBlobChunked(ctx context.Context, mp ModelPath, requestURL *url.URL, l
}
defer
resp
.
Body
.
Close
()
switch
resp
.
StatusCode
{
case
http
.
StatusAccepted
,
http
.
StatusCreated
:
case
http
.
StatusUnauthorized
:
switch
{
case
resp
.
StatusCode
==
http
.
StatusUnauthorized
:
auth
:=
resp
.
Header
.
Get
(
"www-authenticate"
)
authRedir
:=
ParseAuthRedirectString
(
auth
)
token
,
err
:=
getAuthToken
(
ctx
,
authRedir
,
regOpts
)
...
...
@@ -127,7 +126,7 @@ func uploadBlobChunked(ctx context.Context, mp ModelPath, requestURL *url.URL, l
}
continue
defaul
t
:
case
resp
.
StatusCode
>=
http
.
StatusBadReques
t
:
body
,
_
:=
io
.
ReadAll
(
resp
.
Body
)
return
fmt
.
Errorf
(
"on upload registry responded with code %d: %s"
,
resp
.
StatusCode
,
body
)
}
...
...
@@ -158,7 +157,7 @@ func uploadBlobChunked(ctx context.Context, mp ModelPath, requestURL *url.URL, l
}
defer
resp
.
Body
.
Close
()
if
resp
.
StatusCode
!
=
http
.
Status
Created
{
if
resp
.
StatusCode
>
=
http
.
Status
BadRequest
{
body
,
_
:=
io
.
ReadAll
(
resp
.
Body
)
return
fmt
.
Errorf
(
"on finish upload registry responded with code %d: %v"
,
resp
.
StatusCode
,
string
(
body
))
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment