Support for new S3 configuration options: endpoint & multi del disabling. #218

utils/config.go

@@ -29,6 +29,7 @@ type ConfigStructure struct {
 type S3PublishRoot struct {
 	Region           string `json:"region"`
 	Bucket           string `json:"bucket"`
+	Endpoint         string `json:"endpoint"`
 	AccessKeyID      string `json:"awsAccessKeyID"`
 	SecretAccessKey  string `json:"awsSecretAccessKey"`
 	Prefix           string `json:"prefix"`
@@ -36,6 +37,7 @@ type S3PublishRoot struct {
 	StorageClass     string `json:"storageClass"`
 	EncryptionMethod string `json:"encryptionMethod"`
 	PlusWorkaround   bool   `json:"plusWorkaround"`
+	DisableMultiDel  bool   `json:"disableMultiDel"`
 }
 
 // SwiftPublishRoot describes single OpenStack Swift publishing entry point

utils/config_test.go

@@ -66,13 +66,15 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
 		"    \"test\": {\n"+
 		"      \"region\": \"us-east-1\",\n"+
 		"      \"bucket\": \"repo\",\n"+
+		"      \"endpoint\": \"\",\n"+
 		"      \"awsAccessKeyID\": \"\",\n"+
 		"      \"awsSecretAccessKey\": \"\",\n"+
 		"      \"prefix\": \"\",\n"+
 		"      \"acl\": \"\",\n"+
 		"      \"storageClass\": \"\",\n"+
 		"      \"encryptionMethod\": \"\",\n"+
-		"      \"plusWorkaround\": false\n"+
+		"      \"plusWorkaround\": false,\n"+
+		"      \"disableMultiDel\": false\n"+
 		"    }\n"+
 		"  },\n"+
 		"  \"SwiftPublishEndpoints\": {\n"+