From 92fdd0e34e1fddf3cc85c3e0691d4fd1196bc382 Mon Sep 17 00:00:00 2001
From: Mikhail Osipov <mike.osipov@gmail.com>
Date: Thu, 10 Sep 2020 00:18:05 +0300
Subject: expandable variable syntax

---
 pkg/server/hook/aes.go   | 2 +-
 pkg/server/hook/auth.go  | 2 +-
 pkg/server/hook/dump.go  | 2 +-
 pkg/server/hook/proxy.go | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkg/server/hook')

diff --git a/pkg/server/hook/aes.go b/pkg/server/hook/aes.go
index ef0ef1a..e437651 100644
--- a/pkg/server/hook/aes.go
+++ b/pkg/server/hook/aes.go
@@ -65,7 +65,7 @@ func (a *aesPipe) Recv(rq, wq queue.Q) error {
 }
 
 func newAes(env env.Env) *aesPipe {
-	s := env.GetLocal("secret")
+	s := env.Value("secret")
 	h := md5.Sum([]byte(s))
 
 	a := &aesPipe{key: make([]byte, 16)}
diff --git a/pkg/server/hook/auth.go b/pkg/server/hook/auth.go
index 86acd91..a30e257 100644
--- a/pkg/server/hook/auth.go
+++ b/pkg/server/hook/auth.go
@@ -151,7 +151,7 @@ func (a *auth) Recv(rq, wq queue.Q) error {
 func (h *authHook) Open(env env.Env) (interface{}, error) {
 	a := &auth{
 		h:             h,
-		secret:        env.GetLocal("secret"),
+		secret:        env.Value("secret"),
 		recvChallenge: make(chan struct{}),
 		recvHash:      make(chan struct{}),
 		fail:          make(chan struct{}),
diff --git a/pkg/server/hook/dump.go b/pkg/server/hook/dump.go
index d6bcd90..864443b 100644
--- a/pkg/server/hook/dump.go
+++ b/pkg/server/hook/dump.go
@@ -73,7 +73,7 @@ func (h *dumpHook) where(env env.Env) string {
 		return h.file
 	}
 
-	if v := env.GetLocal("dump.file"); v != "" {
+	if v := env.Value("dump.file"); v != "" {
 		return v
 	}
 
diff --git a/pkg/server/hook/proxy.go b/pkg/server/hook/proxy.go
index a488f58..7da4c4a 100644
--- a/pkg/server/hook/proxy.go
+++ b/pkg/server/hook/proxy.go
@@ -65,7 +65,7 @@ func (p *proxy) Recv(rq, wq queue.Q) error {
 }
 
 func (h *proxyHook) Open(env env.Env) (interface{}, error) {
-	addr := env.Eval(h.addr)
+	addr := env.Expand(h.addr)
 	if !isGoodAddr(addr) {
 		return nil, fmt.Errorf("invalid addr '%s'", addr)
 	}
@@ -77,7 +77,7 @@ func (h *proxyHook) Open(env env.Env) (interface{}, error) {
 	}
 
 	if p.auth == "" {
-		p.auth = env.GetLocal("proxy.auth")
+		p.auth = env.Value("proxy.auth")
 	}
 
 	return p, nil
-- 
cgit v1.2.3-70-g09d2