From a4f811e14f8264f42d902f20173f609deee93a0a Mon Sep 17 00:00:00 2001
From: Mohammed Al Sahaf <msaa1990@gmail.com>
Date: Fri, 14 Mar 2025 04:42:57 +0300
Subject: [PATCH] code review

Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
---
 modules.go                               | 10 ++++++++++
 modules/caddytls/proxy.go                |  3 ---
 modules/internal/network/networkproxy.go |  4 ++--
 network.go                               | 10 ----------
 4 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 modules/caddytls/proxy.go
 delete mode 100644 network.go

diff --git a/modules.go b/modules.go
index 470c25e37..5c601efe4 100644
--- a/modules.go
+++ b/modules.go
@@ -18,6 +18,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"net/http"
+	"net/url"
 	"reflect"
 	"sort"
 	"strings"
@@ -360,6 +362,14 @@ func isModuleMapType(typ reflect.Type) bool {
 		isJSONRawMessage(typ.Elem())
 }
 
+// ProxyFuncProducer is implemented by modules which produce a
+// function that returns a URL to use as network proxy. Modules
+// in the namespace `caddy.network_proxy.source` must implement this
+// interface.
+type ProxyFuncProducer interface {
+	ProxyFunc() func(*http.Request) (*url.URL, error)
+}
+
 var (
 	modules   = make(map[string]ModuleInfo)
 	modulesMu sync.RWMutex
diff --git a/modules/caddytls/proxy.go b/modules/caddytls/proxy.go
deleted file mode 100644
index 7a5e9c5c7..000000000
--- a/modules/caddytls/proxy.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package caddytls
-
-import _ "github.com/caddyserver/caddy/v2/modules/internal/network"
diff --git a/modules/internal/network/networkproxy.go b/modules/internal/network/networkproxy.go
index fa0f5009a..44d8d5cc6 100644
--- a/modules/internal/network/networkproxy.go
+++ b/modules/internal/network/networkproxy.go
@@ -133,10 +133,10 @@ func (p ProxyFromNone) ProxyFunc() func(*http.Request) (*url.URL, error) {
 
 var (
 	_ caddy.Module            = ProxyFromURL{}
-	_ caddy.Provisioner       = &ProxyFromURL{}
+	_ caddy.Provisioner       = (*ProxyFromURL)(nil)
 	_ caddy.Validator         = ProxyFromURL{}
 	_ caddy.ProxyFuncProducer = ProxyFromURL{}
-	_ caddyfile.Unmarshaler   = &ProxyFromURL{}
+	_ caddyfile.Unmarshaler   = (*ProxyFromURL)(nil)
 
 	_ caddy.Module            = ProxyFromNone{}
 	_ caddy.ProxyFuncProducer = ProxyFromNone{}
diff --git a/network.go b/network.go
deleted file mode 100644
index c7f65ecbe..000000000
--- a/network.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package caddy
-
-import (
-	"net/http"
-	"net/url"
-)
-
-type ProxyFuncProducer interface {
-	ProxyFunc() func(*http.Request) (*url.URL, error)
-}