Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-07-25 16:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

cli: support http proxy

Browse source
This commit is contained in:
Thomas Tendyck 2025-04-16 11:05:32 +02:00 • committed by Thomas Tendyck
parent a5a7cec11b
commit d6567ec52d
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cli/internal/cmd/apply.go
View file

@ -14,7 +14,6 @@ import (
"io" "io"
"io/fs" "io/fs"
"log/slog" "log/slog"
"net"
"os" "os"
"path/filepath" "path/filepath"
"slices" "slices"
@ -229,7 +228,7 @@ func runApply(cmd *cobra.Command, _ []string) error {
} }
newDialer := func(validator atls.Validator) *dialer.Dialer { newDialer := func(validator atls.Validator) *dialer.Dialer {
return dialer.New(nil, validator, &net.Dialer{}) return dialer.New(nil, validator, nil)
} }
upgradeID := generateUpgradeID(upgradeCmdKindApply) upgradeID := generateUpgradeID(upgradeCmdKindApply)

3
cli/internal/cmd/recover.go
View file

@ -11,7 +11,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"net"
"sync" "sync"
"time" "time"
@ -78,7 +77,7 @@ func runRecover(cmd *cobra.Command, _ []string) error {
} }
fileHandler := file.NewHandler(afero.NewOsFs()) fileHandler := file.NewHandler(afero.NewOsFs())
newDialer := func(validator atls.Validator) *dialer.Dialer { newDialer := func(validator atls.Validator) *dialer.Dialer {
return dialer.New(nil, validator, &net.Dialer{}) return dialer.New(nil, validator, nil)
} }
r := &recoverCmd{log: log, configFetcher: attestationconfigapi.NewFetcher()} r := &recoverCmd{log: log, configFetcher: attestationconfigapi.NewFetcher()}
if err := r.flags.parse(cmd.Flags()); err != nil { if err := r.flags.parse(cmd.Flags()); err != nil {

2
cli/internal/cmd/verify.go
View file

@ -108,7 +108,7 @@ func runVerify(cmd *cobra.Command, _ []string) error {
fileHandler := file.NewHandler(afero.NewOsFs()) fileHandler := file.NewHandler(afero.NewOsFs())
verifyClient := &constellationVerifier{ verifyClient := &constellationVerifier{
dialer: dialer.New(nil, nil, &net.Dialer{}), dialer: dialer.New(nil, nil, nil),
log: log, log: log,
} }

3
internal/grpc/dialer/dialer.go
View file

@ -67,6 +67,9 @@ func (d *Dialer) DialNoVerify(target string) (*grpc.ClientConn, error) {
} }
func (d *Dialer) grpcWithDialer() grpc.DialOption { func (d *Dialer) grpcWithDialer() grpc.DialOption {
if d.netDialer == nil {
return grpc.EmptyDialOption{}
}
return grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) { return grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
return d.netDialer.DialContext(ctx, "tcp", addr) return d.netDialer.DialContext(ctx, "tcp", addr)
}) })

3
terraform-provider-constellation/internal/provider/cluster_resource.go
View file

@ -15,7 +15,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"net"
"net/url" "net/url"
"regexp" "regexp"
"strings" "strings"
@ -550,7 +549,7 @@ func (r *ClusterResource) Configure(_ context.Context, req resource.ConfigureReq
} }
newDialer := func(validator atls.Validator) *dialer.Dialer { newDialer := func(validator atls.Validator) *dialer.Dialer {
return dialer.New(nil, validator, &net.Dialer{}) return dialer.New(nil, validator, nil)
} }
r.newApplier = func(ctx context.Context, _ atls.Validator) *constellation.Applier { r.newApplier = func(ctx context.Context, _ atls.Validator) *constellation.Applier {