move s3 related constants from package http to s3_constants

3 files changed, 12 insertions, 12 deletions

diff --git a/weed/server/common.go b/weed/server/common.go
index 0d458c9c3..39a8637ac 100644
--- a/weed/server/common.go
+++ b/weed/server/common.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	xhttp "github.com/chrislusf/seaweedfs/weed/s3api/http"
+	"github.com/chrislusf/seaweedfs/weed/s3api/s3_constants"
 	"io"
 	"io/fs"
 	"mime/multipart"
@@ -254,7 +254,7 @@ func handleStaticResources2(r *mux.Router) {
 
 func adjustPassthroughHeaders(w http.ResponseWriter, r *http.Request, filename string) {
 	for header, values := range r.Header {
-		if normalizedHeader, ok := xhttp.PassThroughHeaders[strings.ToLower(header)]; ok {
+		if normalizedHeader, ok := s3_constants.PassThroughHeaders[strings.ToLower(header)]; ok {
 			w.Header()[normalizedHeader] = values
 		}
 	}
diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go
index 7be9f5229..28573f7b3 100644
--- a/weed/server/filer_server_handlers_read.go
+++ b/weed/server/filer_server_handlers_read.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/chrislusf/seaweedfs/weed/s3api/s3_constants"
 	"github.com/chrislusf/seaweedfs/weed/util/mem"
 	"io"
 	"math"
@@ -18,7 +19,6 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/images"
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
-	xhttp "github.com/chrislusf/seaweedfs/weed/s3api/http"
 	"github.com/chrislusf/seaweedfs/weed/stats"
 	"github.com/chrislusf/seaweedfs/weed/util"
 )
@@ -173,12 +173,12 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
 	//set tag count
 	tagCount := 0
 	for k := range entry.Extended {
-		if strings.HasPrefix(k, xhttp.AmzObjectTagging+"-") {
+		if strings.HasPrefix(k, s3_constants.AmzObjectTagging+"-") {
 			tagCount++
 		}
 	}
 	if tagCount > 0 {
-		w.Header().Set(xhttp.AmzTagCount, strconv.Itoa(tagCount))
+		w.Header().Set(s3_constants.AmzTagCount, strconv.Itoa(tagCount))
 	}
 
 	setEtag(w, etag)
diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go
index 9bf2df6ef..187dc8231 100644
--- a/weed/server/filer_server_handlers_write_autochunk.go
+++ b/weed/server/filer_server_handlers_write_autochunk.go
@@ -3,6 +3,7 @@ package weed_server
 import (
 	"context"
 	"fmt"
+	"github.com/chrislusf/seaweedfs/weed/s3api/s3_constants"
 	"io"
 	"net/http"
 	"os"
@@ -15,7 +16,6 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/operation"
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
-	xhttp "github.com/chrislusf/seaweedfs/weed/s3api/http"
 	"github.com/chrislusf/seaweedfs/weed/stats"
 	"github.com/chrislusf/seaweedfs/weed/storage/needle"
 	"github.com/chrislusf/seaweedfs/weed/util"
@@ -349,23 +349,23 @@ func SaveAmzMetaData(r *http.Request, existing map[string][]byte, isReplace bool
 		}
 	}
 
-	if sc := r.Header.Get(xhttp.AmzStorageClass); sc != "" {
-		metadata[xhttp.AmzStorageClass] = []byte(sc)
+	if sc := r.Header.Get(s3_constants.AmzStorageClass); sc != "" {
+		metadata[s3_constants.AmzStorageClass] = []byte(sc)
 	}
 
-	if tags := r.Header.Get(xhttp.AmzObjectTagging); tags != "" {
+	if tags := r.Header.Get(s3_constants.AmzObjectTagging); tags != "" {
 		for _, v := range strings.Split(tags, "&") {
 			tag := strings.Split(v, "=")
 			if len(tag) == 2 {
-				metadata[xhttp.AmzObjectTagging+"-"+tag[0]] = []byte(tag[1])
+				metadata[s3_constants.AmzObjectTagging+"-"+tag[0]] = []byte(tag[1])
 			} else if len(tag) == 1 {
-				metadata[xhttp.AmzObjectTagging+"-"+tag[0]] = nil
+				metadata[s3_constants.AmzObjectTagging+"-"+tag[0]] = nil
 			}
 		}
 	}
 
 	for header, values := range r.Header {
-		if strings.HasPrefix(header, xhttp.AmzUserMetaPrefix) {
+		if strings.HasPrefix(header, s3_constants.AmzUserMetaPrefix) {
 			for _, value := range values {
 				metadata[header] = []byte(value)
 			}