Merge pull request #3020 from stephenfin/remove-etag-validation

pierreprinetti · web-flow · commit 18ac27e09fd5 · 2024-04-03T16:28:13.000+02:00
objectstorage: Remove traces of etag validation
diff --git a/openstack/objectstorage/v1/objects/errors.go b/openstack/objectstorage/v1/objects/errors.go
diff --git a/openstack/objectstorage/v1/objects/requests.go b/openstack/objectstorage/v1/objects/requests.go
@@ -249,9 +249,7 @@ func (opts CreateOpts) ToObjectCreateParams() (io.Reader, map[string]string, str
 }
 
 // Create is a function that creates a new object or replaces an existing
-// object. If the returned response's ETag header fails to match the local
-// checksum, the failed request will automatically be retried up to a maximum
-// of 3 times.
+// object.
 func Create(ctx context.Context, c *gophercloud.ServiceClient, containerName, objectName string, opts CreateOptsBuilder) (r CreateResult) {
 	url, err := createURL(c, containerName, objectName)
 	if err != nil {
diff --git a/openstack/objectstorage/v1/objects/results.go b/openstack/objectstorage/v1/objects/results.go
@@ -329,15 +329,11 @@ func (r *CreateHeader) UnmarshalJSON(b []byte) error {
 
 // CreateResult represents the result of a create operation.
 type CreateResult struct {
-	checksum string
 	gophercloud.HeaderResult
 }
 
 // Extract will return a struct of headers returned from a call to Create.
 func (r CreateResult) Extract() (*CreateHeader, error) {
-	//if r.Header.Get("ETag") != fmt.Sprintf("%x", localChecksum) {
-	//	return nil, ErrWrongChecksum{}
-	//}
 	var s CreateHeader
 	err := r.ExtractInto(&s)
 	return &s, err
diff --git a/openstack/objectstorage/v1/objects/testing/requests_test.go b/openstack/objectstorage/v1/objects/testing/requests_test.go
@@ -330,24 +330,6 @@ func TestCreateObjectWithoutContentType(t *testing.T) {
 	th.AssertNoErr(t, res.Err)
 }
 
-/*
-func TestErrorIsRaisedForChecksumMismatch(t *testing.T) {
-	th.SetupHTTP()
-	defer th.TeardownHTTP()
-
-	th.Mux.HandleFunc("/testContainer/testObject", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("ETag", "acbd18db4cc2f85cedef654fccc4a4d8")
-		w.WriteHeader(http.StatusCreated)
-	})
-
-	content := strings.NewReader("The sky was the color of television, tuned to a dead channel.")
-	res := Create(context.TODO(), fake.ServiceClient(), "testContainer", "testObject", &CreateOpts{Content: content})
-
-	err := fmt.Errorf("Local checksum does not match API ETag header")
-	th.AssertDeepEquals(t, err, res.Err)
-}
-*/
-
 func TestCopyObject(t *testing.T) {
 	t.Run("simple", func(t *testing.T) {
 		th.SetupHTTP()
