httpclient: use updateflag.Value instead of global access

stapelberg · stapelberg · commit cbfb18ae2684 · 2025-12-05T17:50:16.000+01:00
diff --git a/httpclient/instance.go b/httpclient/instance.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gokrazy/internal/updateflag"
 )
 
-func For(cfg *config.Struct) (_ *http.Client, foundMatchingCertificate bool, updateBaseURL *url.URL, _ error) {
+func For(updateVal updateflag.Value, cfg *config.Struct) (_ *http.Client, foundMatchingCertificate bool, updateBaseURL *url.URL, _ error) {
 	schema := "http"
 	certPath, _, err := tlsflag.CertificatePathsFor(cfg.Hostname)
 	if err != nil {
@@ -37,7 +37,7 @@ func For(cfg *config.Struct) (_ *http.Client, foundMatchingCertificate bool, upd
 		update.Hostname = cfg.Hostname
 	}
 
-	updateBaseURL, err = updateflag.BaseURL(update.HTTPPort, update.HTTPSPort, schema, update.Hostname, update.HTTPPassword)
+	updateBaseURL, err = updateVal.BaseURL(update.HTTPPort, update.HTTPSPort, schema, update.Hostname, update.HTTPPassword)
 	if err != nil {
 		return nil, false, nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/gokrazy/internal/updateflag"`
`11`	`11`	`)`
`12`	`12`
`13`		`-func For(cfg config.Struct) (_ http.Client, foundMatchingCertificate bool, updateBaseURL *url.URL, _ error) {`
	`13`	`+func For(updateVal updateflag.Value, cfg config.Struct) (_ http.Client, foundMatchingCertificate bool, updateBaseURL *url.URL, _ error) {`
`14`	`14`	`schema := "http"`
`15`	`15`	`certPath, _, err := tlsflag.CertificatePathsFor(cfg.Hostname)`
`16`	`16`	`if err != nil {`
`@@ -37,7 +37,7 @@ func For(cfg config.Struct) (_ http.Client, foundMatchingCertificate bool, upd`
`37`	`37`	`update.Hostname = cfg.Hostname`
`38`	`38`	`}`
`39`	`39`
`40`		`- updateBaseURL, err = updateflag.BaseURL(update.HTTPPort, update.HTTPSPort, schema, update.Hostname, update.HTTPPassword)`
	`40`	`+ updateBaseURL, err = updateVal.BaseURL(update.HTTPPort, update.HTTPSPort, schema, update.Hostname, update.HTTPPassword)`
`41`	`41`	`if err != nil {`
`42`	`42`	`return nil, false, nil, err`
`43`	`43`	`}`