chore: cleanup some if err logic

validator-labs · Sep 5, 2024 · 4302cb2 · 4302cb2
1 parent 482a04d
commit 4302cb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/pkg/services/validator/oci.go b/pkg/services/validator/oci.go
@@ -266,8 +266,7 @@ func configureOciRegistryRules(c *components.OCIPluginConfig, ruleNames, authSec
 }
 
 func readOciRegistryRule(c *components.OCIPluginConfig, r *plug.OciRegistryRule, idx int, ruleNames, authSecretNames, sigSecretNames *[]string, kClient kubernetes.Interface, direct bool) error {
-	err := initRule(r, "OCI", "", ruleNames)
-	if err != nil {
+	if err := initRule(r, "OCI", "", ruleNames); err != nil {
 		return err
 	}
 
@@ -318,13 +317,11 @@ func readOciRegistryRule(c *components.OCIPluginConfig, r *plug.OciRegistryRule,
 	}
 	if shouldConfigureSigVerification {
 		if direct {
-			err := configureSigVerification(r)
-			if err != nil {
+			if err := configureSigVerification(r); err != nil {
 				return err
 			}
 		} else {
-			err := configureSigVerificationSecrets(c, r, kClient, sigSecretNames)
-			if err != nil {
+			if err := configureSigVerificationSecrets(c, r, kClient, sigSecretNames); err != nil {
 				return err
 			}
 		}

diff --git a/tests/integration/_validator/testcases/test_validator.go b/tests/integration/_validator/testcases/test_validator.go
@@ -214,7 +214,7 @@ func (t *ValidatorTest) awsPluginInstallValues(ctx *test.TestContext, vals []str
 		"y",               // enable AWS plugin
 		"n",               // use implicit auth
 		"aws-creds",       // AWS secret name
-		"secretkey",       // AWS Secret Key ID
+		"secretkey",       // AWS Access Key ID
 		"secretaccesskey", // AWS Secret Access Key
 		"",                // AWS Session Token
 		"y",               // Configure STS