3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-24 12:08:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove usage of deleted setting after merge

Browse source
This commit is contained in:
Joe Kralicky 2024-10-08 14:39:44 -04:00
parent 920f75f7e2
commit 3956cbddfd
No known key found for this signature in database
GPG key ID: 75C4875F34A9FB79
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/options.go
View file

@ -1615,7 +1615,6 @@ func (o *Options) ToProto() *config.Config {
copySrcToOptionalDest(&settings.GrpcAddress, &o.GRPCAddr)
settings.GrpcInsecure = o.GRPCInsecure
copyOptionalDuration(&settings.GrpcClientTimeout, o.GRPCClientTimeout)
copySrcToOptionalDest(&settings.GrpcClientDnsRoundrobin, &o.GRPCClientDNSRoundRobin)
settings.DatabrokerServiceUrls = o.DataBrokerURLStrings
copySrcToOptionalDest(&settings.DatabrokerInternalServiceUrl, &o.DataBrokerInternalURLString)
copySrcToOptionalDest(&settings.DatabrokerStorageType, &o.DataBrokerStorageType)

2
internal/zero/api/api.go
View file

@ -8,11 +8,11 @@ import (
"io"
"time"
"github.com/klauspost/compress/zstd"
"google.golang.org/grpc"
"google.golang.org/grpc/keepalive"
"google.golang.org/protobuf/proto"
"github.com/klauspost/compress/zstd"
"github.com/pomerium/pomerium/internal/zero/apierror"
connect_mux "github.com/pomerium/pomerium/internal/zero/connect-mux"
"github.com/pomerium/pomerium/internal/zero/grpcconn"