From ece0fe5ee43027c41655a60380885320da5e1a06 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate <bot@renovateapp.com>
Date: Tue, 11 Jan 2022 22:30:57 +0100
Subject: [PATCH] chore(deps): update dependency com.google.cloud:libraries-bom
 to v24.2.0 (#1204)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): update dependency com.google.cloud:libraries-bom to v24.2.0

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: make hmac key cleanup more robust

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: BenWhitehead <BenWhitehead@users.noreply.github.com>
---
 README.md                                     |  2 +-
 .../cloud/storage/it/ITStorageTest.java       | 22 ++++++++++++++-----
 samples/snippets/pom.xml                      |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f8861aa9b..74b8cdce0 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>24.1.2</version>
+      <version>24.2.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
index 2307f0374..77e472ac4 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
@@ -69,6 +69,7 @@
 import com.google.cloud.storage.Cors;
 import com.google.cloud.storage.DataGeneration;
 import com.google.cloud.storage.HmacKey;
+import com.google.cloud.storage.HmacKey.HmacKeyState;
 import com.google.cloud.storage.HttpMethod;
 import com.google.cloud.storage.PostPolicyV4;
 import com.google.cloud.storage.PostPolicyV4.PostFieldsV4;
@@ -2426,8 +2427,11 @@ public void testBlobAcl() {
 
   @Test
   public void testHmacKey() {
-    ServiceAccount serviceAccount = ServiceAccount.of(System.getenv("IT_SERVICE_ACCOUNT_EMAIL"));
+    String serviceAccountEmail = System.getenv("IT_SERVICE_ACCOUNT_EMAIL");
+    assertNotNull("Unable to determine service account email", serviceAccountEmail);
+    ServiceAccount serviceAccount = ServiceAccount.of(serviceAccountEmail);
     try {
+      cleanUpHmacKeys(serviceAccount);
 
       HmacKey hmacKey = storage.createHmacKey(serviceAccount);
       String secretKey = hmacKey.getSecretKey();
@@ -2500,10 +2504,18 @@ public void testHmacKey() {
 
       assertEquals(2, Iterators.size(metadatas.getValues().iterator()));
     } finally {
-      Page<HmacKey.HmacKeyMetadata> metadatas =
-          storage.listHmacKeys(Storage.ListHmacKeysOption.serviceAccount(serviceAccount));
-      for (HmacKey.HmacKeyMetadata hmacKeyMetadata : metadatas.iterateAll()) {
-        storage.updateHmacKeyState(hmacKeyMetadata, HmacKey.HmacKeyState.INACTIVE);
+      cleanUpHmacKeys(serviceAccount);
+    }
+  }
+
+  private void cleanUpHmacKeys(ServiceAccount serviceAccount) {
+    Page<HmacKey.HmacKeyMetadata> metadatas =
+        storage.listHmacKeys(Storage.ListHmacKeysOption.serviceAccount(serviceAccount));
+    for (HmacKey.HmacKeyMetadata hmacKeyMetadata : metadatas.iterateAll()) {
+      if (hmacKeyMetadata.getState() == HmacKeyState.ACTIVE) {
+        hmacKeyMetadata = storage.updateHmacKeyState(hmacKeyMetadata, HmacKeyState.INACTIVE);
+      }
+      if (hmacKeyMetadata.getState() == HmacKeyState.INACTIVE) {
         storage.deleteHmacKey(hmacKeyMetadata);
       }
     }
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 16b471a39..eab241659 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>24.1.2</version>
+        <version>24.2.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>