From a30f0ddea392a78c26280d1c7003fe8cfd308172 Mon Sep 17 00:00:00 2001
From: Alex Noonan <amnoonann@gmail.com>
Date: Tue, 7 Jul 2020 17:38:37 -0700
Subject: [PATCH] use inclusive language

---
 cmd/red/proxy.go | 10 +++++-----
 proxy.go         |  8 ++++----
 registry.go      | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cmd/red/proxy.go b/cmd/red/proxy.go
index efb3a54..aa4e77e 100644
--- a/cmd/red/proxy.go
+++ b/cmd/red/proxy.go
@@ -178,7 +178,7 @@ func makeConsulRegistry(u *url.URL) *consulRegistry {
 			Cache: &consul.ResolverCache{
 				CacheTimeout: 10 * time.Second,
 			},
-			Blacklist: &consul.ResolverBlacklist{},
+			Denylist: &consul.ResolverDenylist{},
 		},
 	}
 
@@ -194,7 +194,7 @@ func makeConsulRegistry(u *url.URL) *consulRegistry {
 		r.client.Address,
 	)
 
-	var _ redis.ServerBlacklist = r
+	var _ redis.ServerDenylist = r
 	return r
 }
 
@@ -223,9 +223,9 @@ func (r *consulRegistry) LookupServers(ctx context.Context) ([]redis.ServerEndpo
 	return servers, nil
 }
 
-func (r *consulRegistry) BlacklistServer(server redis.ServerEndpoint) {
-	stats.Incr("blacklist_server.count")
-	r.resolver.Blacklist.Blacklist(stringAddr(server.Addr), time.Now().Add(10*time.Second))
+func (r *consulRegistry) DenyServer(server redis.ServerEndpoint) {
+	stats.Incr("denied_server.count")
+	r.resolver.Denylist.Denylist(stringAddr(server.Addr), time.Now().Add(10*time.Second))
 }
 
 type stringAddr string
diff --git a/proxy.go b/proxy.go
index a672223..3eda543 100644
--- a/proxy.go
+++ b/proxy.go
@@ -74,7 +74,7 @@ func (proxy *ReverseProxy) serveRequest(w ResponseWriter, req *Request) {
 		return
 	default:
 		w.Write(errorf("ERR Connecting to the upstream server failed."))
-		proxy.blacklistServer(upstream)
+		proxy.denyServer(upstream)
 		proxy.log(err)
 		return
 	}
@@ -161,9 +161,9 @@ func (proxy *ReverseProxy) lookupServers(ctx context.Context) ([]ServerEndpoint,
 	return r.LookupServers(ctx)
 }
 
-func (proxy *ReverseProxy) blacklistServer(upstream string) {
-	if b, ok := proxy.Registry.(ServerBlacklist); !ok {
-		b.BlacklistServer(ServerEndpoint{Addr: upstream})
+func (proxy *ReverseProxy) denyServer(upstream string) {
+	if b, ok := proxy.Registry.(ServerDenylist); !ok {
+		b.DenylistServer(ServerEndpoint{Addr: upstream})
 	}
 }
 
diff --git a/registry.go b/registry.go
index d520bfd..c347080 100644
--- a/registry.go
+++ b/registry.go
@@ -9,11 +9,11 @@ type ServerRegistry interface {
 	LookupServers(ctx context.Context) ([]ServerEndpoint, error)
 }
 
-// ServerBlacklist is implemented by some ServerRegistry to support black
-// listing some server addresses.
-type ServerBlacklist interface {
-	// Blacklist temporarily blacklists the given server endpoint.
-	BlacklistServer(ServerEndpoint)
+// ServerDenyList is implemented by some ServerRegistry to support denying
+// some server addresses.
+type ServerDenylist interface {
+	// DenyServer temporarily denies the given server endpoint.
+	DenyServer(ServerEndpoint)
 }
 
 // A ServerEndpoint represents a single backend redis server.