Merge pull request #214 from nspcc-dev/change-expiration-headers

docs/migration-new-upload.md

@@ -14,7 +14,7 @@ like "FilePath", "FileName", and "Timestamp", can be passed in a JSON-formatted
 key-value map. Thanks to the JSON format of this header, we no longer face
 issues with the case-insensitivity of the gateway and the case-sensitivity of
 NeoFS. All attributes are passed directly to NeoFS. Additionally, 
-`X-Neofs-EXPIRATION*` headers are available to set object expiration. Learn 
+`X-Neofs-Expiration-*` headers are available to set object expiration. Learn 
 more in the Swagger documentation (`/v1/docs`).
 
 Notice that while the `/upload` API required you to create a multipart/form-data

handlers/util.go

@@ -390,13 +390,13 @@ func paramIsPositive(s *string) bool {
 
 func addExpirationHeaders(headers map[string]string, params apiserver.NewUploadContainerObjectParams) {
 	// Add non-empty string pointer values to the map
-	if params.XNeofsEXPIRATIONDURATION != nil && *params.XNeofsEXPIRATIONDURATION != "" {
-		headers[ExpirationDurationAttr] = *params.XNeofsEXPIRATIONDURATION
+	if params.XNeofsExpirationDuration != nil && *params.XNeofsExpirationDuration != "" {
+		headers[ExpirationDurationAttr] = *params.XNeofsExpirationDuration
 	}
-	if params.XNeofsEXPIRATIONTIMESTAMP != nil && *params.XNeofsEXPIRATIONTIMESTAMP != "" {
-		headers[ExpirationTimestampAttr] = *params.XNeofsEXPIRATIONTIMESTAMP
+	if params.XNeofsExpirationTimestamp != nil && *params.XNeofsExpirationTimestamp != "" {
+		headers[ExpirationTimestampAttr] = *params.XNeofsExpirationTimestamp
 	}
-	if params.XNeofsEXPIRATIONRFC3339 != nil && *params.XNeofsEXPIRATIONRFC3339 != "" {
-		headers[ExpirationRFC3339Attr] = *params.XNeofsEXPIRATIONRFC3339
+	if params.XNeofsExpirationRFC3339 != nil && *params.XNeofsExpirationRFC3339 != "" {
+		headers[ExpirationRFC3339Attr] = *params.XNeofsExpirationRFC3339
 	}
 }

handlers/util_test.go

@@ -305,19 +305,19 @@ func Test_parseAndFilterAttributes(t *testing.T) {
 	str1 := `{
 		"skip empty":"",
 		"":"skip empty",
-		"__NEOFS__EXPIRATION_DURATION":"1000s",
+		"__NEOFS__EXPIRATION_EPOCH":"1000",
 		"file-N%me":"simple %bj filename",
 		"writer":"Leo Tolstoy",
 		"Chapter1":"pe@ce",
 		"chapter2":"war"}`
 
 	emptyMap := make(map[string]string)
 	map1 := map[string]string{
-		"__NEOFS__EXPIRATION_DURATION": "1000s",
-		"file-N%me":                    "simple %bj filename",
-		"writer":                       "Leo Tolstoy",
-		"Chapter1":                     "pe@ce",
-		"chapter2":                     "war",
+		"__NEOFS__EXPIRATION_EPOCH": "1000",
+		"file-N%me":                 "simple %bj filename",
+		"writer":                    "Leo Tolstoy",
+		"Chapter1":                  "pe@ce",
+		"chapter2":                  "war",
 	}
 
 	tests := []struct {

spec/rest.yaml

@@ -933,10 +933,10 @@ paths:
             - `__NEOFS__EXPIRATION_EPOCH` - specifies the expiration epoch used by NeoFS. 
             This attribute should be used if you are familiar with the NeoFS epoch system. 
             More information can be found here: [NeoFS Specifications](https://github.com/nspcc-dev/neofs-spec/blob/master/01-arch/01-netmap.md).
-            Instead of this attribute you can use one of `X-Neofs-*` headers below.
+            Instead of this attribute you can use one of `X-Neofs-Expiration-*` headers below.
           schema:
             type: string
-        - name: X-Neofs-EXPIRATION_RFC3339
+        - name: X-Neofs-Expiration-RFC3339
           in: header
           description: |
             Specifies the expiration time in RFC3339 format. Examples:
@@ -946,13 +946,13 @@ paths:
             attribute of the created object.
           schema:
             type: string
-        - name: X-Neofs-EXPIRATION_TIMESTAMP
+        - name: X-Neofs-Expiration-Timestamp
           in: header
           description: Specifies the exact timestamp of object expiration. It will be rounded
             to the next epoch and stored in the `__NEOFS__EXPIRATION_EPOCH` attribute of the created object.
           schema:
             type: string
-        - name: X-Neofs-EXPIRATION_DURATION
+        - name: X-Neofs-Expiration-Duration
           in: header
           description: | 
             Specifies the duration until object expiration in Go's duration format. Examples: