Remove 'get_osc_show_columns_for_sdk_resource' duplicates

There were a number of 'get_osc_show_columns_for_sdk_resource' defined
in-tree. However, osc-lib has provided this method for some time (since
2.2.0, June 2020 [1] - our minimum version is currently 2.3.0) so
there's no need to provide our own copies. Remove them.

[1] https://github.com/openstack/osc-lib/commit/29a0c5a5

Change-Id: I25695f4f9a379dd691b7eaa1e3247164668ae77e
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index 64aa3fcd..43ccf5d2 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -28,7 +28,6 @@ from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import sdk_utils
 from openstackclient.i18n import _
 
 if os.name == "nt":
@@ -48,15 +47,17 @@ LOG = logging.getLogger(__name__)
 
 
 def _get_columns(item):
-    # Trick sdk_utils to return URI attribute
     column_map = {
         'is_protected': 'protected',
         'owner_id': 'owner'
     }
-    hidden_columns = ['location', 'checksum',
-                      'copy_from', 'created_at', 'status', 'updated_at']
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(
-        item.to_dict(), column_map, hidden_columns)
+    hidden_columns = [
+        'location', 'checksum', 'copy_from', 'created_at', 'status',
+        'updated_at',
+    ]
+    return utils.get_osc_show_columns_for_sdk_resource(
+        item.to_dict(), column_map, hidden_columns,
+    )
 
 
 _formatters = {
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index c1f46d2d..becb54f4 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -31,7 +31,6 @@ from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient.common import progressbar
-from openstackclient.common import sdk_utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
@@ -99,13 +98,13 @@ _formatters = {
 
 
 def _get_member_columns(item):
-    # Trick sdk_utils to return URI attribute
     column_map = {
         'image_id': 'image_id'
     }
     hidden_columns = ['id', 'location', 'name']
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(
-        item.to_dict(), column_map, hidden_columns)
+    return utils.get_osc_show_columns_for_sdk_resource(
+        item.to_dict(), column_map, hidden_columns,
+    )
 
 
 def get_data_file(args):