move pkg/rpc, pkg/csvparser, pkg/argon2 to contrib

Signed-off-by: Harshavardhana <harsha@minio.io>

cmd/http-tracer.go

@@ -32,8 +32,8 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio/minio/cmd/logger"
+	jsonrpc "github.com/minio/minio/contrib/pkg/rpc"
 	"github.com/minio/minio/pkg/handlers"
-	jsonrpc "github.com/minio/minio/pkg/rpc"
 	trace "github.com/minio/minio/pkg/trace"
 )
 

cmd/web-handlers.go

@@ -46,6 +46,7 @@ import (
 	"github.com/minio/minio/cmd/crypto"
 	xhttp "github.com/minio/minio/cmd/http"
 	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/contrib/pkg/rpc/json2"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
@@ -56,7 +57,6 @@ import (
 	"github.com/minio/minio/pkg/hash"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/ioutil"
-	"github.com/minio/minio/pkg/rpc/json2"
 )
 
 func extractBucketObject(args reflect.Value) (bucketName, objectName string) {

cmd/web-router.go

@@ -27,8 +27,8 @@ import (
 
 	"github.com/minio/minio/browser"
 	"github.com/minio/minio/cmd/logger"
-	jsonrpc "github.com/minio/minio/pkg/rpc"
-	"github.com/minio/minio/pkg/rpc/json2"
+	jsonrpc "github.com/minio/minio/contrib/pkg/rpc"
+	"github.com/minio/minio/contrib/pkg/rpc/json2"
 )
 
 // webAPI container for Web API.

contrib/pkg/argon2/argon2.go

@@ -35,14 +35,8 @@
 // [1] https://github.com/P-H-C/phc-winner-argon2/blob/master/argon2-specs.pdf
 // [2] https://tools.ietf.org/html/draft-irtf-cfrg-argon2-03#section-9.3
 //
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://golang.org/x/crypto/argon2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
-//
-// Modification here specifically adds sync.Pool reusable buffers to
-// avoid large memory build up with frequent
+// Modified to be used with MinIO. Modification here specifically adds
+// sync.Pool reusable buffers to avoid large memory build up with frequent
 // allocations done by memory hard PBKDF.
 package argon2
 

contrib/pkg/csvparser/reader.go

@@ -50,13 +50,7 @@
 //	{`Multi-line
 //	field`, `comma is ,`}
 //
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://golang.org/pkg/encoding/csv
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
-//
-// Main modifications include
+// Modified to be used with MinIO. Main modifications include
 // - Configurable 'quote' parameter
 // - Performance improvements
 //    benchmark                                            old ns/op     new ns/op     delta

contrib/pkg/rpc/compression_selector.go

@@ -2,13 +2,9 @@
 // Copyright 2012 The Gorilla Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE.ORIG file.
-//
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package rpc
 

contrib/pkg/rpc/doc.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
+// Copyright 2021 MinIO, Inc. modified to be used with MinIO.
 // forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
 
 /*
 Package rpc is a foundation for RPC over HTTP services, providing
@@ -26,8 +23,8 @@ Let's setup a server and register a codec and service:
 
 	import (
 		"http"
-		"github.com/minio/minio/pkg/rpc/"
-		"github.com/minio/minio/pkg/rpc/json2"
+		"github.com/minio/minio/contrib/pkg/rpc/"
+		"github.com/minio/minio/contrib/pkg/rpc/json2"
 	)
 
 	func init() {

contrib/pkg/rpc/encoder_selector.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2020 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package rpc
 

contrib/pkg/rpc/json2/client.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package json2
 

contrib/pkg/rpc/json2/error.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package json2
 

contrib/pkg/rpc/json2/json_test.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package json2
 
@@ -19,7 +16,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/minio/minio/pkg/rpc"
+	"github.com/minio/minio/contrib/pkg/rpc"
 )
 
 // ResponseRecorder is an implementation of http.ResponseWriter that

contrib/pkg/rpc/json2/server.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package json2
 
@@ -15,7 +12,7 @@ import (
 	"net/http"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/pkg/rpc"
+	"github.com/minio/minio/contrib/pkg/rpc"
 )
 
 var null = jsoniter.RawMessage([]byte("null"))

contrib/pkg/rpc/map.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package rpc
 

contrib/pkg/rpc/server.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package rpc
 

contrib/pkg/rpc/server_test.go

@@ -3,11 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Copyright 2021 MinIO, Inc. All rights reserved.
-// forked from https://github.com/gorilla/rpc/v2
-// modified to be used with MinIO under GNU Affero General
-// Public License 3.0 license that can be found in
-// the LICENSE file.
+// Modified to be used with MinIO, uses jsoniter and
+// supports tracing JSON-rpc calls.
 
 package rpc
 

pkg/madmin/encrypt.go

@@ -24,7 +24,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/minio/minio/pkg/argon2"
+	"github.com/minio/minio/contrib/pkg/argon2"
 	"github.com/minio/minio/pkg/fips"
 	"github.com/secure-io/sio-go"
 	"github.com/secure-io/sio-go/sioutil"

pkg/s3select/csv/reader.go

@@ -26,7 +26,7 @@ import (
 	"sync"
 	"unicode/utf8"
 
-	csv "github.com/minio/minio/pkg/csvparser"
+	csv "github.com/minio/minio/contrib/pkg/csvparser"
 	"github.com/minio/minio/pkg/s3select/sql"
 )
 

pkg/s3select/csv/record.go

@@ -24,7 +24,7 @@ import (
 	"io"
 
 	"github.com/bcicen/jstream"
-	csv "github.com/minio/minio/pkg/csvparser"
+	csv "github.com/minio/minio/contrib/pkg/csvparser"
 	"github.com/minio/minio/pkg/s3select/sql"
 )
 

pkg/s3select/json/record.go

@@ -27,7 +27,7 @@ import (
 	"strings"
 
 	"github.com/bcicen/jstream"
-	csv "github.com/minio/minio/pkg/csvparser"
+	csv "github.com/minio/minio/contrib/pkg/csvparser"
 	"github.com/minio/minio/pkg/s3select/sql"
 )
 

pkg/s3select/simdj/record.go

@@ -21,9 +21,8 @@ import (
 	"fmt"
 	"io"
 
-	csv "github.com/minio/minio/pkg/csvparser"
-
 	"github.com/bcicen/jstream"
+	csv "github.com/minio/minio/contrib/pkg/csvparser"
 	"github.com/minio/minio/pkg/s3select/json"
 	"github.com/minio/minio/pkg/s3select/sql"
 	"github.com/minio/simdjson-go"