Merge pull request #1333 from wking/can-mint-short-circuit

pkg/asset/installconfig/aws/permissions: If we can mint, skip passthrough check

Author: openshift-merge-robot

pkg/asset/installconfig/aws/permissions.go

@@ -211,17 +211,19 @@ func ValidateCreds(ssn *session.Session) error {
 	if err != nil {
 		return errors.Wrap(err, "mint credentials check")
 	}
+	if canMint {
+		return nil
+	}
 
 	// Check whether we can use the current credentials in passthrough mode to satisfy
 	// cluster services needing to interact with the cloud
 	canPassthrough, err := credvalidator.CheckCloudCredPassthrough(client, logger)
 	if err != nil {
 		return errors.Wrap(err, "passthrough credentials check")
 	}
-
-	if !canMint && !canPassthrough {
-		return errors.New("AWS credentials cannot be used to either create new creds or use as-is")
+	if canPassthrough {
+		return nil
 	}
 
-	return nil
+	return errors.New("AWS credentials cannot be used to either create new creds or use as-is")
 }