share: Fix nits in client creation

A follow-up to Ibb369de02e2e8de4d8925c3d6d11a8b7006c377f with the
following changes:

* Add a comment explaining why we're deferring imports
* Use the cached API version if available
* Reorder imports
* Bump the minimum version of manilaclient, allowing us to remove a
  workaround for single digit version numbers

Change-Id: Ief08df571074bbe7f914dd10cb1a292f18daf881
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/share/client.py

@@ -16,14 +16,14 @@
 import logging
 from typing import TYPE_CHECKING, Any
 
-if TYPE_CHECKING:
-    from manilaclient import client
-
 from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient.i18n import _
 
+if TYPE_CHECKING:
+    from manilaclient import client
+
 LOG = logging.getLogger(__name__)
 
 # global variables used when building the shell
@@ -37,16 +37,16 @@
 
 def make_client(instance: Any) -> 'client.Client':
     """Returns a manilaclient.client.Client instance."""
-    from manilaclient import api_versions
+    # Defer client imports until we actually need them
     from manilaclient import client
 
-    check_version = instance._api_version[API_NAME]
-    if check_version.isdigit():
-        check_version = f"{check_version}.0"
-
-    version = api_versions.get_api_version(check_version)
+    if _share_api_version is not None:
+        version = _share_api_version
+    else:
+        from manilaclient import api_versions
 
-    instance.setup_auth()
+        check_version = instance._api_version[API_NAME]
+        version = api_versions.get_api_version(check_version)
 
     LOG.debug('Instantiating Shared File System client: %s', client.Client)
     LOG.debug('Shared File System API version: %s', version)

requirements.txt

@@ -10,6 +10,6 @@ osc-lib>=4.6.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 python-keystoneclient>=3.22.0 # Apache-2.0
 python-cinderclient>=3.3.0 # Apache-2.0
-python-manilaclient>=5.7.0 # Apache-2.0
+python-manilaclient>=6.0.0 # Apache-2.0
 requests>=2.27.0 # Apache-2.0
 stevedore>=2.0.1 # Apache-2.0