ING-1283: Use Expires Header from MutateIn request

Author: Westwooo

gateway/dapiimpl/server_v1/dataapi_subdoc.go

@@ -184,6 +184,14 @@ func (s *DataApiServer) MutateInDocument(
 	opts.CollectionName = in.CollectionName
 	opts.Key = key
 
+	if in.Params.Expires != nil {
+		expiry, errSt := parseStringToGocbcorexExpiry(*in.Params.Expires)
+		if errSt != nil {
+			return nil, errSt.Err()
+		}
+		opts.Expiry = expiry
+	}
+
 	if in.Body.StoreSemantic != nil {
 		switch *in.Body.StoreSemantic {
 		case dataapiv1.StoreSemanticInsert:

gateway/test/dapi_crud_test.go

@@ -3813,36 +3813,35 @@ func (s *GatewayOpsTestSuite) TestDapiMutateIn() {
 				}`))
 	})
 
-	// BUG(ING-1283) - Data API mutate in ignores Expires header
-	// s.IterDapiExpiryHeaderTests(func(expiry string, modifyOpts func(*checkDocumentOptions)) {
-	// 	docId := s.binaryDocId([]byte(`{}`))
+	s.IterDapiExpiryHeaderTests(func(expiry string, modifyOpts func(*checkDocumentOptions)) {
+		docId := s.binaryDocId([]byte(`{}`))
 
-	// 	resp := s.sendTestHttpRequest(&testHttpRequest{
-	// 		Method: http.MethodPost,
-	// 		Path: fmt.Sprintf(
-	// 			"/v1.alpha/buckets/%s/scopes/%s/collections/%s/documents/%s/mutate",
-	// 			s.bucketName, s.scopeName, s.collectionName, docId,
-	// 		),
-	// 		Headers: map[string]string{
-	// 			"Authorization": s.basicRestCreds,
-	// 			"Expires":       expiry,
-	// 		},
-	// 		Body: []byte(`{"operations":[{"operation":"DictAdd","path":"add", "value": 43}]}`),
-	// 	})
-	// 	requireRestSuccess(s.T(), resp)
-	// 	assertRestValidEtag(s.T(), resp)
+		resp := s.sendTestHttpRequest(&testHttpRequest{
+			Method: http.MethodPost,
+			Path: fmt.Sprintf(
+				"/v1.alpha/buckets/%s/scopes/%s/collections/%s/documents/%s/mutate",
+				s.bucketName, s.scopeName, s.collectionName, docId,
+			),
+			Headers: map[string]string{
+				"Authorization": s.basicRestCreds,
+				"Expires":       expiry,
+			},
+			Body: []byte(`{"operations":[{"operation":"DictAdd","path":"add", "value": 43}]}`),
+		})
+		requireRestSuccess(s.T(), resp)
+		assertRestValidEtag(s.T(), resp)
 
-	// 	defaultOpts := checkDocumentOptions{
-	// 		BucketName:     s.bucketName,
-	// 		ScopeName:      s.scopeName,
-	// 		CollectionName: s.collectionName,
-	// 		DocId:          docId,
-	// 		Content:        []byte(`{"add":43}`),
-	// 	}
-	// 	modifyOpts(&defaultOpts)
+		defaultOpts := checkDocumentOptions{
+			BucketName:     s.bucketName,
+			ScopeName:      s.scopeName,
+			CollectionName: s.collectionName,
+			DocId:          docId,
+			Content:        []byte(`{"add":43}`),
+		}
+		modifyOpts(&defaultOpts)
 
-	// 	s.checkDocument(s.T(), defaultOpts)
-	// })
+		s.checkDocument(s.T(), defaultOpts)
+	})
 
 	s.RunCommonDapiErrorCases(func(opts *commonDapiTestData) *testHttpResponse {
 		return s.sendTestHttpRequest(&testHttpRequest{