Merge pull request #5 from grycap/dev-calarcon

Dev calarcon
grycap · May 11, 2023 · f578799 · f578799
2 parents 7772f6b + 68c2763
commit f578799
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/oscar_python/client.py b/oscar_python/client.py
@@ -42,29 +42,25 @@ def __init__(self, options) -> None:
             self.oidc_client(options)
 
     def basic_auth_client(self, options):
-        self.id = self.id
+        self.id = options['cluster_id']
         self.endpoint = options['endpoint']
         self.user = options['user']
         self.password = options['password']
         self.ssl = bool(options['ssl'])
 
     def oidc_client(self, options):
-        self.id = self.id
+        self.id = options['cluster_id']
         self.endpoint = options['endpoint']
         self.shortname = options['shortname']
         self.ssl = bool(options['ssl'])
 
     def set_auth_type(self, options):
         if 'user' in options:
             self._AUTH_TYPE = "basicauth"
-            try:
-                self.get_cluster_info()
-            except:
-               print("")
         elif 'shortname' in options:
             self._AUTH_TYPE = "oidc"
             try:
-                agent.get_access_token(self.shortname)
+                agent.get_access_token(options['shortname'])
             except agent.OidcAgentError as e:
                 print("ERROR oidc-agent: {}".format(e))
         else:

diff --git a/version.py b/version.py
@@ -14,4 +14,4 @@
 """Stores the package version."""
 
 
-__version__ = '1.1.0-beta1'
+__version__ = '1.1.0-beta2'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@
		"""Stores the package version."""


		__version__ = '1.1.0-beta1'
		__version__ = '1.1.0-beta2'