Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 40 additions & 1 deletion src/azure-cli/azure/cli/command_modules/appservice/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -4280,6 +4280,17 @@ def get_stack_names_only(self, delimiter=None, show_runtime_details=False):
linux_auto_updates = [
s.display_name for s in self.stacks if
s.linux and ('java' not in s.display_name.casefold() or s.is_auto_update)]

def is_valid_runtime_name(name):
# Accepts names like "node|18-lts", "python|3.11", but not "NODE:lts" or "node"
parts = name.split(self.DEFAULT_DELIMETER)
return len(parts) == 2 and parts[1] and not parts[1].lower() in ("lts", "default", "stable")

windows_stacks = [n for n in windows_stacks if is_valid_runtime_name(n)]
linux_stacks = [n for n in linux_stacks if is_valid_runtime_name(n)]
windows_auto_updates = [n for n in windows_auto_updates if is_valid_runtime_name(n)]
linux_auto_updates = [n for n in linux_auto_updates if is_valid_runtime_name(n)]

if delimiter is not None:
windows_stacks = [n.replace(self.DEFAULT_DELIMETER, delimiter) for n in windows_stacks]
linux_stacks = [n.replace(self.DEFAULT_DELIMETER, delimiter) for n in linux_stacks]
Expand Down Expand Up @@ -4402,7 +4413,35 @@ def _format_windows_display_text(cls, display_text):

@classmethod
def _is_valid_runtime_setting(cls, runtime_setting):
return runtime_setting is not None and not runtime_setting.is_hidden and not runtime_setting.is_deprecated
# Using datetime module imported at the top level
if runtime_setting is None or getattr(runtime_setting, 'is_hidden', False):
return False
if getattr(runtime_setting, 'is_deprecated', False):
return False
end_of_life = getattr(runtime_setting, 'end_of_life_date', None)
if end_of_life:
try:
if isinstance(end_of_life, str):
try:
end_of_life_dt = datetime.datetime.strptime(
end_of_life, "%Y-%m-%dT%H:%M:%S.%fZ"
).replace(tzinfo=datetime.timezone.utc)
except ValueError:
end_of_life_dt = datetime.datetime.strptime(
end_of_life, "%Y-%m-%dT%H:%M:%SZ"
).replace(tzinfo=datetime.timezone.utc)
else:
# If already a datetime, ensure it's timezone-aware
if end_of_life.tzinfo is None:
end_of_life_dt = end_of_life.replace(tzinfo=datetime.timezone.utc)
else:
end_of_life_dt = end_of_life
now_utc = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)
if now_utc >= end_of_life_dt:
return False
except (ValueError, AttributeError):
pass
return True

@classmethod
def _get_runtime_setting(cls, minor_version, linux, java):
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -1758,4 +1758,4 @@ interactions:
status:
code: 200
message: OK
version: 1
version: 1

Large diffs are not rendered by default.

Large diffs are not rendered by default.