Merge pull request #563 from agrare/rename_validate_credentials

Rename validate_credentials to verify_credentials
ManageIQ · Sep 30, 2019 · 93efc26 · 93efc26
2 parents 8c15b56 + fe3673a
commit 93efc26
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/amazon/manager_mixin.rb b/app/models/manageiq/providers/amazon/manager_mixin.rb
@@ -51,7 +51,7 @@ module ClassMethods
     # Connections
     #
 
-    # Validate Credentials
+    # Verify Credentials
     # args:
     # {
     #   "region" => "",
@@ -64,15 +64,16 @@ module ClassMethods
     #     }
     #   }
     # }
-    def validate_credentials(args)
+    def verify_credentials(args)
       region           = args["region"]
       default_endpoint = args.dig("endpoints", "default")
 
       access_key, secret_access_key, proxy_uri, assume_role = default_endpoint&.values_at(
         "access_key", "secret_access_key", "proxy_uri", "assume_role"
       )
+      secret_access_key = MiqPassword.try_decrypt(secret_access_key)
 
-      raw_connect(access_key, secret_access_key, "ec2", region, proxy_uri, :assume_role => assume_role)
+      !!raw_connect(access_key, secret_access_key, :EC2, region, proxy_uri, :assume_role => assume_role)
     end
 
     def raw_connect(access_key_id, secret_access_key, service, region,