From 91fd8ffeb73b59ba654708df6ec528d6cc133800 Mon Sep 17 00:00:00 2001 From: kannappanr <30541348+kannappanr@users.noreply.github.com> Date: Thu, 5 Apr 2018 14:19:27 -0700 Subject: [PATCH] Move http package inside cmd (#5776) --- cmd/gateway-main.go | 2 +- cmd/globals.go | 2 +- {pkg => cmd}/http/bufconn.go | 0 {pkg => cmd}/http/bufconn_test.go | 0 {pkg => cmd}/http/conn_bug_21133.go | 0 {pkg => cmd}/http/listener.go | 0 {pkg => cmd}/http/listener_test.go | 0 {pkg => cmd}/http/server.go | 0 {pkg => cmd}/http/server_test.go | 0 cmd/rpc-server.go | 2 +- cmd/server-main.go | 2 +- 11 files changed, 4 insertions(+), 4 deletions(-) rename {pkg => cmd}/http/bufconn.go (100%) rename {pkg => cmd}/http/bufconn_test.go (100%) rename {pkg => cmd}/http/conn_bug_21133.go (100%) rename {pkg => cmd}/http/listener.go (100%) rename {pkg => cmd}/http/listener_test.go (100%) rename {pkg => cmd}/http/server.go (100%) rename {pkg => cmd}/http/server_test.go (100%) diff --git a/cmd/gateway-main.go b/cmd/gateway-main.go index 199e034ca..305a5d008 100644 --- a/cmd/gateway-main.go +++ b/cmd/gateway-main.go @@ -27,8 +27,8 @@ import ( "github.com/gorilla/mux" "github.com/minio/cli" + miniohttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/pkg/errors" - miniohttp "github.com/minio/minio/pkg/http" ) var ( diff --git a/cmd/globals.go b/cmd/globals.go index 0390173c3..3d1f2d9d5 100644 --- a/cmd/globals.go +++ b/cmd/globals.go @@ -25,8 +25,8 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/fatih/color" + miniohttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/pkg/auth" - miniohttp "github.com/minio/minio/pkg/http" ) // minio configuration related constants. diff --git a/pkg/http/bufconn.go b/cmd/http/bufconn.go similarity index 100% rename from pkg/http/bufconn.go rename to cmd/http/bufconn.go diff --git a/pkg/http/bufconn_test.go b/cmd/http/bufconn_test.go similarity index 100% rename from pkg/http/bufconn_test.go rename to cmd/http/bufconn_test.go diff --git a/pkg/http/conn_bug_21133.go b/cmd/http/conn_bug_21133.go similarity index 100% rename from pkg/http/conn_bug_21133.go rename to cmd/http/conn_bug_21133.go diff --git a/pkg/http/listener.go b/cmd/http/listener.go similarity index 100% rename from pkg/http/listener.go rename to cmd/http/listener.go diff --git a/pkg/http/listener_test.go b/cmd/http/listener_test.go similarity index 100% rename from pkg/http/listener_test.go rename to cmd/http/listener_test.go diff --git a/pkg/http/server.go b/cmd/http/server.go similarity index 100% rename from pkg/http/server.go rename to cmd/http/server.go diff --git a/pkg/http/server_test.go b/cmd/http/server_test.go similarity index 100% rename from pkg/http/server_test.go rename to cmd/http/server_test.go diff --git a/cmd/rpc-server.go b/cmd/rpc-server.go index 3ca020832..c0b295883 100644 --- a/cmd/rpc-server.go +++ b/cmd/rpc-server.go @@ -21,7 +21,7 @@ import ( "net/http" "net/rpc" - miniohttp "github.com/minio/minio/pkg/http" + miniohttp "github.com/minio/minio/cmd/http" ) // ServeHTTP implements an http.Handler that answers RPC requests, diff --git a/cmd/server-main.go b/cmd/server-main.go index 668cc7035..6946f270f 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -25,8 +25,8 @@ import ( "github.com/minio/cli" "github.com/minio/dsync" + miniohttp "github.com/minio/minio/cmd/http" "github.com/minio/minio/pkg/errors" - miniohttp "github.com/minio/minio/pkg/http" ) var serverFlags = []cli.Flag{