feat(storage): add retry config to the Client and HmacKey operations

storage/emulator_test.sh

@@ -58,7 +58,6 @@ trap cleanup EXIT
 # TODO: move to passing once fixed
 FAILING=(   "buckets.setIamPolicy"
             "objects.insert"
-            "hmacKey.update"
         )
 # TODO: remove regex once all tests are passing
 # Unfortunately, there is no simple way to skip specific tests (see https://github.com/golang/go/issues/41583)
@@ -85,6 +84,7 @@ PASSING=(   "buckets.list"
             "hmacKey.list"
             "hmacKey.create"
             "hmacKey.delete"
+            "hmacKey.update"
             "notifications.list"
             "notifications.create"
             "notifications.get"

storage/hmac.go

@@ -216,12 +216,12 @@ func (c *Client) CreateHMACKey(ctx context.Context, projectID, serviceAccountEma
 	setClientHeader(call.Header())
 
 	var hkPb *raw.HmacKey
-	var err error
-	err = run(ctx, func() error {
-		hkPb, err = call.Context(ctx).Do()
+
+	if err := run(ctx, func() error {
+		h, err := call.Context(ctx).Do()
+		hkPb = h
 		return err
-	}, c.retry, false)
-	if err != nil {
+	}, c.retry, false); err != nil {
 		return nil, err
 	}
 
@@ -263,10 +263,11 @@ func (h *HMACKeyHandle) Update(ctx context.Context, au HMACKeyAttrsToUpdate, opt
 
 	var metadata *raw.HmacKeyMetadata
 	var err error
+	isIdempotent := len(au.Etag) > 0
 	err = run(ctx, func() error {
 		metadata, err = call.Context(ctx).Do()
 		return err
-	}, h.retry, true)
+	}, h.retry, isIdempotent)
 
 	if err != nil {
 		return nil, err

storage/retry_conformance_test.go

@@ -252,12 +252,18 @@ var methods = map[string][]retryFunc{
 	"storage.hmacKey.update": {
 		func(ctx context.Context, c *Client, fs *resources, preconditions bool) error {
 			key := c.HMACKeyHandle(projectID, fs.hmacKey.AccessID)
+			uattrs := HMACKeyAttrsToUpdate{State: "INACTIVE"}
 
-			_, err := key.Update(ctx, HMACKeyAttrsToUpdate{State: "INACTIVE"})
-			if err != nil {
-				return err
+			if preconditions {
+				k, err := key.Get(ctx)
+				if err != nil {
+					return err
+				}
+				uattrs.Etag = k.Etag
 			}
-			return fmt.Errorf("Etag preconditions not supported")
+
+			_, err := key.Update(ctx, uattrs)
+			return err
 		},
 	},
 	"storage.objects.compose": {

storage/storage_test.go

@@ -875,9 +875,9 @@ func TestObjectRetryer(t *testing.T) {
 	}
 }
 
-// Test that Client.Retryer correctly configures the retry configuration
+// Test that Client.SetRetry correctly configures the retry configuration
 // on the Client.
-func TestClientRetryer(t *testing.T) {
+func TestClientSetRetry(t *testing.T) {
 	testCases := []struct {
 		name          string
 		clientOptions []RetryOption