Fixing issue where edit cloud was breaking view when OLVM environment…

… is completely down
gomorpheus · Dec 3, 2024 · c6c42da · c6c42da
1 parent 0b41c2e
commit c6c42da
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.0.1
+version=1.0.2
 karmanVersion=2.3.0
 morpheusApiVersion=1.1.6
 morpheusPluginGradleVersion=1.0.6

diff --git a/src/main/groovy/com/morpheus/olvm/OlvmOptionSourceProvider.groovy b/src/main/groovy/com/morpheus/olvm/OlvmOptionSourceProvider.groovy
@@ -112,11 +112,13 @@ class OlvmOptionSourceProvider extends AbstractOptionSourceProvider {
         def rtn
         if(cloud?.accountCredentialData?.username && cloud?.accountCredentialData?.password) {
             def connection = OlvmComputeUtility.getToken(cloud)
-            def dcResult = OlvmComputeUtility.listDatacenters([connection:connection])
-            if (dcResult.success && dcResult.data.datacenters) {
-                rtn = [[name: morpheusContext.services.localization.get('gomorpheus.label.all'), value: 'all']]
-                for (dc in dcResult.data.datacenters) {
-                    rtn << [name:dc.name, value:dc.id]
+            if (!connection.error) {
+                def dcResult = OlvmComputeUtility.listDatacenters([connection: connection])
+                if (dcResult.success && dcResult.data.datacenters) {
+                    rtn = [[name: morpheusContext.services.localization.get('gomorpheus.label.all'), value: 'all']]
+                    for (dc in dcResult.data.datacenters) {
+                        rtn << [name: dc.name, value: dc.id]
+                    }
                 }
             }
         }

diff --git a/src/main/groovy/com/morpheus/olvm/util/OlvmComputeUtility.groovy b/src/main/groovy/com/morpheus/olvm/util/OlvmComputeUtility.groovy
@@ -1909,11 +1909,15 @@ class OlvmComputeUtility {
             )
 
             if (resp.success) {
-                return [apiUrl: extractRootURL(config.endpointUrl), token: resp.data['access_token']]
+                return [success:true, apiUrl: extractRootURL(config.endpointUrl), token: resp.data['access_token']]
             } else {
-                throw new RuntimeException("Failed to authenticate to OLVM environment: ${extractErrorMessage(resp.data)}")
+                log.error("Failed to authenticate to OLVM environment: ${extractErrorMessage(resp.data)}")
+                return [success:false, apiUrl: extractRootURL(config.endpointUrl), error:extractErrorMessage(resp.data)]
             }
         }
+        catch (Throwable t) {
+            return [success:false, apiUrl: extractRootURL(config.endpointUrl), error:t.message]
+        }
         finally {
             client?.shutdownClient()
         }