dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: update oras error format (#2282) 

Signed-off-by: Jim Ma <majinjing3@gmail.com>
This commit is contained in:
Jim Ma 2023-04-19 15:41:58 +08:00 committed by Gaius
parent af50aa073b
commit 4c6814600f
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/source/clients/orasprotocol/oras_source_client.go
View File

@ -76,10 +76,17 @@ func Builder(optionYaml []byte) (source.ResourceClient, source.RequestAdapter, [
} }
func Director(rawURL *url.URL, urlMeta *commonv1.UrlMeta) error { func Director(rawURL *url.URL, urlMeta *commonv1.UrlMeta) error {
if err := director(rawURL, urlMeta); err != nil {
return fmt.Errorf("While pulling image from oci registry: %s", err.Error())
}
return nil
}
func director(rawURL *url.URL, urlMeta *commonv1.UrlMeta) error {
// 1. fetch auth info from local user // 1. fetch auth info from local user
auth, err := fetchAuthInfo(rawURL.Host, false) auth, err := fetchAuthInfo(rawURL.Host, false)
if err != nil { if err != nil {
return err return fmt.Errorf("error fetch auth info: %s", err.Error())
} }
var authHdr string var authHdr string
if auth != "" { if auth != "" {
@ -88,7 +95,7 @@ func Director(rawURL *url.URL, urlMeta *commonv1.UrlMeta) error {
path, tag, err := parseURL(rawURL.Path) path, tag, err := parseURL(rawURL.Path)
if err != nil { if err != nil {
return err return fmt.Errorf("error parse url: %s", err.Error())
} }
ctx := context.TODO() ctx := context.TODO()
@ -98,13 +105,13 @@ func Director(rawURL *url.URL, urlMeta *commonv1.UrlMeta) error {
tokenFetchURL := formatTokenURL(host, path) tokenFetchURL := formatTokenURL(host, path)
token, err := client.fetchTokenWithHeader(ctx, authHdr, tokenFetchURL) token, err := client.fetchTokenWithHeader(ctx, authHdr, tokenFetchURL)
if err != nil { if err != nil {
return err return fmt.Errorf("error fetch token: %s", err.Error())
} }
// 3. fetch manifest digest, normal is sha256 // 3. fetch manifest digest, normal is sha256
digest, err := client.fetchManifest(ctx, host, token, path, tag) digest, err := client.fetchManifest(ctx, host, token, path, tag)
if err != nil { if err != nil {
return err return fmt.Errorf("error fetch manifest: %s", err.Error())
} }
// 4. update unique blob digest in url // 4. update unique blob digest in url
@ -143,12 +150,20 @@ func (client *orasSourceClient) IsExpired(request *source.Request, info *source.
} }
func (client *orasSourceClient) Download(request *source.Request) (*source.Response, error) { func (client *orasSourceClient) Download(request *source.Request) (*source.Response, error) {
resp, err := client.download(request)
if err != nil {
return resp, fmt.Errorf("While pulling image from oci registry: %s", err.Error())
}
return resp, nil
}
func (client *orasSourceClient) download(request *source.Request) (*source.Response, error) {
ctx := request.Context() ctx := request.Context()
host := request.URL.Host host := request.URL.Host
path, tag, err := parseURL(request.URL.Path) path, tag, err := parseURL(request.URL.Path)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("error parse url: %s", err.Error())
} }
var ( var (
@ -167,18 +182,18 @@ func (client *orasSourceClient) Download(request *source.Request) (*source.Respo
token, err = client.fetchToken(request, path) token, err = client.fetchToken(request, path)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("error fetch token: %s", err.Error())
} }
digest, err = client.fetchManifest(ctx, host, token, path, tag) digest, err = client.fetchManifest(ctx, host, token, path, tag)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("error fetch manifest: %s", err.Error())
} }
fetch: fetch:
imageFetchResponse, err := client.fetchImage(ctx, host, token, path, digest) imageFetchResponse, err := client.fetchImage(ctx, host, token, path, digest)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("error fetch image: %s", err.Error())
} }
return imageFetchResponse, nil return imageFetchResponse, nil
} }