fix(qa): cleanup SecretService

qa-tests-backend/src/main/groovy/services/SecretService.groovy

@@ -1,58 +1,40 @@
 package services
 
+import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import io.stackrox.proto.api.v1.Common.ResourceByID
 import io.stackrox.proto.api.v1.SearchServiceOuterClass.RawQuery
 import io.stackrox.proto.api.v1.SecretServiceGrpc
 import io.stackrox.proto.api.v1.SecretServiceOuterClass
 import io.stackrox.proto.storage.SecretOuterClass
 import io.stackrox.proto.storage.SecretOuterClass.ListSecret
-import util.Timer
+
+import util.Retry
 
 @Slf4j
+@CompileStatic
 class SecretService extends BaseService {
 
-    static getSecretClient() {
+    static SecretServiceGrpc.SecretServiceBlockingStub getSecretClient() {
         return SecretServiceGrpc.newBlockingStub(getChannel())
     }
 
     static List<ListSecret> getSecrets(RawQuery query = RawQuery.newBuilder().build()) {
         return getSecretClient().listSecrets(query).secretsList
     }
 
-    static waitForSecret(String id, int timeoutSeconds = 10) {
-        int intervalSeconds = 1
-        int retries = timeoutSeconds / intervalSeconds
-        Timer t = new Timer(retries, intervalSeconds)
-        while (t.IsValid()) {
-            if (getSecret(id) != null ) {
-                log.debug "SR found secret ${id} within ${t.SecondsSince()}s"
-                return true
-            }
-            log.debug "Retrying in ${intervalSeconds}..."
-        }
-        log.warn "SR did not detect the secret ${id}"
-        return false
+    @Retry(attempts = 10)
+    static void waitForSecret(String id) {
+        assert getSecret(id) != null
     }
 
+    @Retry(attempts = 50)
     static SecretOuterClass.Secret getSecret(String id) {
-        int intervalSeconds = 1
-        int retries = 50 / intervalSeconds
-        Timer t = new Timer(retries, intervalSeconds)
-        while (t.IsValid()) {
-            try {
-                SecretOuterClass.Secret sec = getSecretClient().getSecret(ResourceByID.newBuilder().setId(id).build())
-                return sec
-            } catch (Exception e) {
-                log.debug("Exception checking for getting the secret ${id}, retrying...", e)
-            }
-        }
-        log.warn "Failed to add secret ${id} after waiting ${t.SecondsSince()} seconds"
-        return null
+        return getSecretClient().getSecret(ResourceByID.newBuilder().setId(id).build())
     }
 
     static SecretServiceOuterClass.ListSecretsResponse listSecrets() {
-        return getSecretClient().listSecrets()
+        return getSecretClient().listSecrets(RawQuery.newBuilder().build())
     }
 
 }

qa-tests-backend/src/test/groovy/ReconciliationTest.groovy

@@ -122,7 +122,7 @@ class ReconciliationTest extends BaseSpecification {
 
             // Wait is builtin
             secretID = orchestrator.createSecret("testing123", ns)
-            SecretService.waitForSecret(secretID, 10)
+            SecretService.waitForSecret(secretID)
 
             busyboxDeployment = new Deployment()
                     .setNamespace(ns)

qa-tests-backend/src/test/groovy/SACTest.groovy

@@ -201,7 +201,7 @@ class SACTest extends BaseSpecification {
 
     def createSecret(String namespace) {
         String secID = orchestrator.createSecret(SECRETNAME, namespace)
-        SecretService.waitForSecret(secID, 10)
+        SecretService.waitForSecret(secID)
     }
 
     def deleteSecret(String namespace) {