msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Add debug logging for helm pull command

Browse Source 
Implemented debug output feature for HTTP-level logs
in the helm pull command. This addresses the issue
where the --debug flag was ignored during helm pull.

Fixes #31098

Signed-off-by: Sowmith Kuppa <soumith.odu@gmail.com>
pull/31108/head
Sowmith Kuppa 2 months ago
parent 89f391e674
commit df457d5c56
3 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File

97
pkg/downloader/chart_downloader.go
Unescape View File

@ -20,9 +20,9 @@ import (
"fmt"
"io"
"io/fs"
"net/url"
"net/http"
"net/http/httputil"
"net/url"
"os"
"path/filepath"
"strings"
@ -71,7 +71,7 @@ type ChartDownloader struct {
Getters getter.Providers
// Options provide parameters to be passed along to the Getter being initialized.
Options []getter.Option
Debug bool //Added to capture the --debug flag
Debug bool //Added to capture the --debug flag
RegistryClient *registry.Client
RepositoryConfig string
RepositoryCache string
@ -79,33 +79,38 @@ type ChartDownloader struct {
type debugTransport struct {
*http.Transport
out io.Writer
out io.Writer
debug bool
}
func (t *debugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
fmt.Fprintf(t.out, "DEBUG: HTTP request to %s\n", req.URL.String())
// Log the request
reqDump, err := httputil.DumpRequestOut(req, false)
if err == nil {
fmt.Fprintf(t.out, "%s\n", reqDump)
if t.debug {
fmt.Fprintf(t.out, "DEBUG: HTTP request to %s\n", req.URL.String())
// Log the request
reqDump, err := httputil.DumpRequestOut(req, false)
if err == nil {
fmt.Fprintf(t.out, "%s\n", reqDump)
}
}
// Perform the request
resp, err := t.Transport.RoundTrip(req)
if err != nil {
fmt.Fprintf(t.out, "HTTP request failed: %v\n", err)
if t.debug {
fmt.Fprintf(t.out, "HTTP request failed: %v\n", err)
}
return nil, err
}
// Log the response
respDump, err := httputil.DumpResponse(resp, false)
if err == nil {
fmt.Fprintf(t.out, "HTTP Response: \n%s\n", respDump)
if t.debug {
respDump, err := httputil.DumpResponse(resp, false)
if err == nil {
fmt.Fprintf(t.out, "HTTP Response: \n%s\n", respDump)
}
if resp.StatusCode >= 300 && resp.StatusCode < 400 {
location := resp.Header["Location"]
fmt.Fprintf(t.out, "DEBUG: Redirect to: %v\n", location)
}
}
if resp.StatusCode >= 300 && resp.StatusCode < 400 {
location, _ := resp.Header["Location"]
fmt.Fprintf(t.out, "DEBUG: Redirect to: %v\n", location)
}
return resp, err
}
@ -123,17 +128,24 @@ func (t *debugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *provenance.Verification, error) {
u, err := c.ResolveChartVersion(ref, version)
if err != nil {
fmt.Fprintf(c.Out, "DEBUG: Failed to resolve chart version: %v\n", err)
if c.Debug {
fmt.Fprintf(c.Out, "DEBUG: Failed to resolve chart version: %v\n", err)
}
return "", nil, err
}
fmt.Fprintf(c.Out, "DEBUG: Resolved chart URL: %s\n", u.String())
if c.Debug {
fmt.Fprintf(c.Out, "DEBUG: Resolved chart URL: %s\n", u.String())
}
g, err := c.Getters.ByScheme(u.Scheme)
if err != nil {
fmt.Fprintf(c.Out, "DEBUG: Failed to get getter for scheme %s: %v\n", u.Scheme, err)
if c.Debug {
fmt.Fprintf(c.Out, "DEBUG: Failed to get getter for scheme %s: %v\n", u.Scheme, err)
}
return "", nil, err
}
fmt.Fprintf(c.Out, "DEBUG: Using getter for scheme: %s\n", u.Scheme)
if c.Debug {
fmt.Fprintf(c.Out, "DEBUG: Using getter for scheme: %s\n", u.Scheme)
}
c.Options = append(c.Options, getter.WithAcceptHeader("application/gzip,application/octet-stream"))
// If debug is enabled, wrap the getter's HTTP client with a debug transport
@ -141,19 +153,24 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
dt := &debugTransport{
Transport: http.DefaultTransport.(*http.Transport).Clone(),
out: c.Out,
debug: c.Debug,
}
dt.Transport.DisableKeepAlives = true
dt.DisableKeepAlives = true
c.Options = append(c.Options, getter.WithClient(&http.Client{
Transport: dt,
CheckRedirect: func(req *http.Request, via []*http.Request) error {
fmt.Fprintf(c.Out, "DEBUG: Following redirect to %s\n", req.URL.String())
return nil
},
}))
Transport: dt,
CheckRedirect: func(req *http.Request, _ []*http.Request) error {
if c.Debug {
fmt.Fprintf(c.Out, "DEBUG: Following redirect to %s\n", req.URL.String())
}
return nil
},
}))
}
data, err := g.Get(u.String(), c.Options...)
if err != nil {
fmt.Fprintf(c.Out, "DEBUG: Failed to fetch chart: %v\n", err)
if c.Debug {
fmt.Fprintf(c.Out, "DEBUG: Failed to fetch chart: %v\n", err)
}
return "", nil, err
}
@ -175,16 +192,18 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
if c.Debug {
dt := &debugTransport{
Transport: http.DefaultTransport.(*http.Transport).Clone(),
out: c.Out,
out: c.Out,
}
dt.Transport.DisableKeepAlives = true
dt.DisableKeepAlives = true
c.Options = append(c.Options, getter.WithClient(&http.Client{
Transport: dt,
CheckRedirect: func(req *http.Request, via []*http.Request) error {
fmt.Fprintf(c.Out, "DEBUG: Following redirect to %s\n", req.URL.String())
return nil
},
}))
Transport: dt,
CheckRedirect: func(req *http.Request, _ []*http.Request) error {
if c.Debug {
fmt.Fprintf(c.Out, "DEBUG: Following redirect to %s\n", req.URL.String())
}
return nil
},
}))
}
body, err := g.Get(u.String() + ".prov")
if err != nil {

2
pkg/getter/getter.go
Unescape View File

@ -47,7 +47,7 @@ type options struct {
registryClient *registry.Client
timeout time.Duration
transport *http.Transport
client *http.Client
client *http.Client
}
// Option allows specifying various settings configurable by the user for overriding the defaults

1
pkg/getter/httpgetter.go
Unescape View File

@ -35,7 +35,6 @@ type HTTPGetter struct {
once sync.Once
}
// Get performs a Get from repo.Getter and returns the body.
func (g *HTTPGetter) Get(href string, options ...Option) (*bytes.Buffer, error) {
for _, opt := range options {

Write Preview
Loading…
Cancel
Save