Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
9d2805b
Support subscription ID in template spec resource ID
a0x1ab Jul 29, 2025
c62df70
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Jul 29, 2025
7e371a5
Merge branch 'Azure:dev' into dev
a0x1ab Jul 31, 2025
6ab5348
Remove template spec sub ID tests and recordings
a0x1ab Jul 31, 2025
c717b9d
Merge branch 'dev' of https://github.com/a0x1ab/azure-cli into dev
a0x1ab Jul 31, 2025
42ec214
Refactor template spec functions to simplify subscription_id usage
a0x1ab Jul 31, 2025
077ba98
Updated custom.py
a0x1ab Jul 31, 2025
7d20d46
Add tests for template specs with auxiliary subscription
a0x1ab Aug 5, 2025
ead63c4
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Aug 5, 2025
41c737e
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Aug 21, 2025
09ca820
Add support for tags in SQL server creation
a0x1ab Aug 22, 2025
e01e0e4
Merge branch 'Azure:dev' into dev
a0x1ab Aug 22, 2025
00d17a2
Merge branch 'Azure:dev' into dev
a0x1ab Aug 22, 2025
55aea66
Add example for creating SQL server with tags
a0x1ab Aug 26, 2025
b43133a
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Aug 26, 2025
a9c359d
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Aug 29, 2025
201fa69
Update SQL server create with tags test recording
a0x1ab Aug 29, 2025
6094ba6
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Sep 1, 2025
7a8f59a
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Sep 11, 2025
4dbc7d6
Merge branch 'Azure:dev' into dev
a0x1ab Sep 11, 2025
4a61449
Merge branch 'dev' of https://github.com/a0x1ab/azure-cli into dev
a0x1ab Sep 11, 2025
6de9b42
Merge branch 'Azure:dev' into dev
a0x1ab Sep 13, 2025
a3c6585
Improve AKS SSH key handling and help text
a0x1ab Sep 14, 2025
c2f9b55
Refactor SSH key path assignment formatting
a0x1ab Sep 14, 2025
2290548
Improve SSH key validation logic in AKS CLI
a0x1ab Sep 15, 2025
a426de1
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Sep 15, 2025
a397f37
Remove unnecessary else in SSH key validation
a0x1ab Sep 16, 2025
317a543
Fix line break in SSH key validation error message
a0x1ab Sep 16, 2025
9d27202
Merge branch 'Azure:dev' into dev
a0x1ab Sep 16, 2025
ec5d75a
Merge remote-tracking branch 'upstream/dev' into dev
a0x1ab Sep 22, 2025
1df9697
Merge branch 'Azure:dev' into dev
a0x1ab Oct 1, 2025
9741614
fixed for live test
a0x1ab Oct 2, 2025
267ef3e
fixed linting
a0x1ab Oct 3, 2025
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
6 changes: 5 additions & 1 deletion src/azure-cli/azure/cli/command_modules/acs/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@
- name: --ssh-key-value
type: string
short-summary: Public key path or key contents to install on node VMs for SSH access. For example, 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'.
long-summary: |-
If omitted:
- The CLI will use '~/.ssh/id_rsa.pub' when present
- If that file is not present the CLI will default to server-side generated keys (equivalent to using --no-ssh-key)
- name: --admin-username -u
type: string
short-summary: User account to create on node VMs for SSH access.
Expand Down Expand Up @@ -263,7 +267,7 @@
- name: --no-ssh-key -x
type: string
short-summary: Do not use or create a local SSH key.
long-summary: To access nodes after creating a cluster with this option, use the Azure Portal.
long-summary: If omitted and no local public key exists, the CLI will default to this behavior. To access nodes after creating a cluster with this option, use the Azure Portal.
- name: --pod-cidr
type: string
short-summary: A CIDR notation IP range from which to assign pod IPs when Azure CNI Overlay or Kubenet is used (On 31 March 2028, Kubenet will be retired).
Expand Down
12 changes: 10 additions & 2 deletions src/azure-cli/azure/cli/command_modules/acs/_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,16 @@ def validate_ssh_key(namespace):
"file share, back up your keys to a safe location",
private_key_filepath, public_key_filepath)
else:
raise CLIError('An RSA key file or key value must be supplied to SSH Key Value. '
'You can use --generate-ssh-keys to let CLI generate one for you')
if (not content or str(content).strip() == "" or
(content == os.path.join(os.path.expanduser('~'), '.ssh', 'id_rsa.pub'))):
namespace.no_ssh_key = True
return
raise CLIError(
"The SSH key provided is not a valid RSA public key. "
"Provide the contents of a valid SSH public key (for example, '~/.ssh/id_rsa.pub'), "
"specify a path to a public key file, "
"or add --generate-ssh-keys as a parameter to create a new key pair."
)
namespace.ssh_key_value = content


Expand Down
Loading