rename

weed/filer/s3iam_conf.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"github.com/chrislusf/seaweedfs/weed/pb/iam_pb"
 	"github.com/golang/protobuf/jsonpb"
+	"github.com/golang/protobuf/proto"
 	"io"
 )
 
@@ -14,7 +15,7 @@ func ParseS3ConfigurationFromBytes(content []byte, config *iam_pb.S3ApiConfigura
 	return nil
 }
 
-func S3ConfigurationToText(writer io.Writer, config *iam_pb.S3ApiConfiguration) error {
+func ProtoToText(writer io.Writer, config proto.Message) error {
 
 	m := jsonpb.Marshaler{
 		EmitDefaults: false,

weed/filer/s3iam_conf_test.go

@@ -44,7 +44,7 @@ func TestS3Conf(t *testing.T) {
 		},
 	}
 	var buf bytes.Buffer
-	err := S3ConfigurationToText(&buf, s3Conf)
+	err := ProtoToText(&buf, s3Conf)
 	assert.Equal(t, err, nil)
 	s3ConfSaved := &iam_pb.S3ApiConfiguration{}
 	err = ParseS3ConfigurationFromBytes(buf.Bytes(), s3ConfSaved)

weed/iamapi/iamapi_server.go

@@ -96,8 +96,8 @@ func (iam IamS3ApiConfigure) GetS3ApiConfiguration(s3cfg *iam_pb.S3ApiConfigurat
 
 func (iam IamS3ApiConfigure) PutS3ApiConfiguration(s3cfg *iam_pb.S3ApiConfiguration) (err error) {
 	buf := bytes.Buffer{}
-	if err := filer.S3ConfigurationToText(&buf, s3cfg); err != nil {
-		return fmt.Errorf("S3ConfigurationToText: %s", err)
+	if err := filer.ProtoToText(&buf, s3cfg); err != nil {
+		return fmt.Errorf("ProtoToText: %s", err)
 	}
 	return pb.WithGrpcFilerClient(
 		iam.option.FilerGrpcAddress,

weed/shell/command_s3_configure.go

@@ -164,7 +164,7 @@ func (c *commandS3Configure) Do(args []string, commandEnv *CommandEnv, writer io
 	}
 
 	buf.Reset()
-	filer.S3ConfigurationToText(&buf, s3cfg)
+	filer.ProtoToText(&buf, s3cfg)
 
 	fmt.Fprintf(writer, string(buf.Bytes()))
 	fmt.Fprintln(writer)