refactor(bootstap): prepare for resolver package split

0xERR0R · Dec 6, 2023 · 29a5681 · 29a5681
1 parent ef29cdc
commit 29a5681
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/resolver/bootstrap.go b/resolver/bootstrap.go
@@ -123,7 +123,7 @@ func (b *Bootstrap) Resolve(ctx context.Context, request *model.Request) (*model
 }
 
 func (b *Bootstrap) UpstreamIPs(ctx context.Context, r *UpstreamResolver) (*IPSet, error) {
-	hostname := r.cfg.Host
+	hostname := r.Upstream().Host
 
 	if ip := net.ParseIP(hostname); ip != nil { // nil-safe when hostname is an IP: makes writing tests easier
 		return newIPSet([]net.IP{ip}), nil

diff --git a/resolver/upstream_resolver.go b/resolver/upstream_resolver.go
@@ -243,6 +243,10 @@ func (r UpstreamResolver) String() string {
 	return fmt.Sprintf("%s '%s'", r.Type(), r.cfg)
 }
 
+func (r UpstreamResolver) Upstream() config.Upstream {
+	return r.cfg.Upstream
+}
+
 func (r *UpstreamResolver) log() *logrus.Entry {
 	return r.typed.log().WithField("upstream", r.cfg.String())
 }