Skip to content

Improve resolve ids functionality #1974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allmightyspiff merged 4 commits into from
Jun 12, 2023
+5 −6
Merged

Improve resolve ids functionality #1974

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f75a4b6
Improve resolve ids functionality
Jun 7, 2023
46417bc
fix the tox tool
Jun 7, 2023
9b578e5
fix the tox tool
Jun 8, 2023
fa76dfd
fix the tox tool
Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions SoftLayer/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from rich.console import Console
from rich.theme import Theme
from SoftLayer.CLI import exceptions

# pylint: disable=no-member, invalid-name

UUID_RE = re.compile(r'^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$', re.I)
Expand Down Expand Up @@ -262,6 +263,7 @@ def resolve_ids(self, identifier):
return resolve_ids(identifier, self.resolvers)


# pylint: disable=C0123
def resolve_ids(identifier, resolvers):
"""Resolves IDs given a list of functions.

Expand All @@ -271,15 +273,12 @@ def resolve_ids(identifier, resolvers):
"""

# Before doing anything, let's see if this is an integer
try:
if type(identifier) == int:
return [int(identifier)]
except ValueError:
pass # It was worth a shot
# It was worth a shot

# This looks like a globalIdentifier (UUID)
if len(identifier) == 36 and UUID_RE.match(identifier):
elif len(identifier) == 36 and UUID_RE.match(identifier):
return [identifier]

for resolver in resolvers:
ids = resolver(identifier)
if ids:
Expand Down