From c317daf6b8608105a07d9f77c4022ee25d302e75 Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Thu, 6 Jun 2019 21:45:28 +0100
Subject: [PATCH] update proxy/options

---
 options/default.go | 11 ++---------
 options/options.go |  6 ++----
 proxy/proxy.go     |  2 --
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/options/default.go b/options/default.go
index 7b236db2..96d8f4c8 100644
--- a/options/default.go
+++ b/options/default.go
@@ -18,15 +18,8 @@ func (d *defaultOptions) Init(opts ...Option) error {
 	return nil
 }
 
-func (d *defaultOptions) Options() Options {
-	return d
-}
-
-func (d *defaultOptions) Value(k interface{}) (interface{}, bool) {
-	if d.opts == nil {
-		d.opts = new(Values)
-	}
-	return d.opts.Get(k)
+func (d *defaultOptions) Values() *Values {
+	return d.opts
 }
 
 func (d *defaultOptions) String() string {
diff --git a/options/options.go b/options/options.go
index 830adea8..ba6923b2 100644
--- a/options/options.go
+++ b/options/options.go
@@ -9,9 +9,7 @@ type Options interface {
 	// Initialise options
 	Init(...Option) error
 	// Options returns the current options
-	Options() Options
-	// Value returns an option value
-	Value(k interface{}) (interface{}, bool)
+	Values() *Values
 	// The name for who these options exist
 	String() string
 }
@@ -62,7 +60,7 @@ func WithOption(o Option) Option {
 }
 
 // String sets the string
-func String(s string) Option {
+func WithString(s string) Option {
 	return WithValue(stringKey{}, s)
 }
 
diff --git a/proxy/proxy.go b/proxy/proxy.go
index 03c67daf..0a83a43d 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -13,6 +13,4 @@ type Proxy interface {
 	options.Options
 	// ServeRequest will serve a request
 	ServeRequest(context.Context, server.Request, server.Response) error
-	// run the proxy
-	Run() error
 }