Skip to content

Commit 56b59da

Browse files
committed
Adapt to new go-getter v2 api
1 parent d73887c commit 56b59da

1 file changed

Lines changed: 15 additions & 11 deletions

File tree

internal/bundlereader/loaddirectory.go

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -231,26 +231,30 @@ func GetContent(ctx context.Context, base, source, version string, auth Auth, di
231231
source += fmt.Sprintf("sshkey=%s", base64.StdEncoding.EncodeToString(auth.SSHPrivateKey))
232232
}
233233

234-
// copy getter.Getters before changing
235-
getters := map[string]getter.Getter{}
236-
for k, v := range getter.Getters {
237-
getters[k] = v
234+
customGetters := []getter.Getter{}
235+
for _, g := range getter.Getters {
236+
// Replace default HTTP(S) getter with our customized one
237+
if _, ok := g.(*getter.HttpGetter); ok {
238+
continue
239+
}
240+
customGetters = append(customGetters, g)
238241
}
239242

240243
httpGetter := newHttpGetter(auth)
241-
getters["http"] = httpGetter
242-
getters["https"] = httpGetter
244+
customGetters = append(customGetters, httpGetter)
245+
246+
client := &getter.Client{
247+
Getters: customGetters,
248+
}
243249

244-
c := getter.Client{
245-
Ctx: ctx,
250+
req := &getter.Request{
246251
Src: source,
247252
Dst: temp,
248253
Pwd: base,
249-
Mode: getter.ClientModeDir,
250-
Getters: getters,
254+
GetMode: getter.ModeDir,
251255
}
252256

253-
if err := c.Get(); err != nil {
257+
if _, err := client.Get(ctx, req); err != nil {
254258
return nil, err
255259
}
256260

0 commit comments

Comments
 (0)