Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into wenhug/listaksop
Browse files Browse the repository at this point in the history
  • Loading branch information
Wen Huang committed Jul 3, 2024
2 parents fc93b7a + 4b1bc48 commit 8a3ba95
Show file tree
Hide file tree
Showing 14 changed files with 5,197 additions and 5,116 deletions.

Large diffs are not rendered by default.

1,276 changes: 454 additions & 822 deletions ...iew/tests/latest/recordings/test_aks_create_with_pod_ip_allocation_mode_static_block.yaml
100644 → 100755

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions src/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -71498,6 +71498,49 @@
"version": "1.24.5"
},
"sha256Digest": "fc3d3d751da3262ef123904c3f9253eb7f0d6b1d3c6001aab69c5c6c1a9a89f8"
},
{
"downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.25.0-py3-none-any.whl",
"filename": "spring-1.25.0-py3-none-any.whl",
"metadata": {
"azext.isPreview": false,
"azext.minCliCoreVersion": "2.56.0",
"classifiers": [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"Intended Audience :: System Administrators",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"License :: OSI Approved :: MIT License"
],
"extensions": {
"python.details": {
"contacts": [
{
"email": "[email protected]",
"name": "Microsoft Corporation",
"role": "author"
}
],
"document_names": {
"description": "DESCRIPTION.rst"
},
"project_urls": {
"Home": "https://github.com/Azure/azure-cli-extensions/tree/main/src/spring"
}
}
},
"generator": "bdist_wheel (0.30.0)",
"license": "MIT",
"metadata_version": "2.0",
"name": "spring",
"summary": "Microsoft Azure Command-Line Tools spring Extension",
"version": "1.25.0"
},
"sha256Digest": "2b9cf4ae2fd52b5f644bfefba69ed5e574404597e3cab0e3a9b8e44e7b03363f"
}
],
"spring-cloud": [
Expand Down
4 changes: 4 additions & 0 deletions src/spring/HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Release History
===============
1.25.0
---
* Add arguments `--disable-test-endpoint-auth` in `spring app create` and `spring app update`.

1.24.5
---
* Verify that `--artifact-path` and `--source-path` exist before all steps in `az spring app deploy`, `az spring app deployment create` and `az spring job deploy` commands.
Expand Down
7 changes: 7 additions & 0 deletions src/spring/azext_spring/_app_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,16 @@ def _format_properties(self, **kwargs):
kwargs['vnet_addons'] = self._load_vnet_addons(**kwargs)
kwargs['ingress_settings'] = self._load_ingress_settings(**kwargs)
kwargs['secrets'] = self._load_secrets_config(**kwargs)
kwargs['test_endpoint_auth_state'] = self._get_test_endpoint_auth_state(**kwargs)
kwargs['addon_configs'] = self._load_addon_configs(**kwargs)
return models.AppResourceProperties(**kwargs)

def _get_test_endpoint_auth_state(self, disable_test_endpoint_auth=None, **_):
if disable_test_endpoint_auth is None:
return None

return models.TestEndpointAuthState.DISABLED if disable_test_endpoint_auth else models.TestEndpointAuthState.ENABLED

def _format_identity(self, system_assigned=None, user_assigned=None, **_):
target_identity_type = self._get_identity_assign_type(system_assigned, user_assigned)
user_identity_payload = self._get_user_identity_payload(user_assigned)
Expand Down
9 changes: 9 additions & 0 deletions src/spring/azext_spring/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,11 @@ def load_arguments(self, _):
help='A json file path indicates the certificates which would be loaded to app')
c.argument('deployment_name', default='default',
help='Name of the default deployment.', validator=validate_name)
c.argument('disable_test_endpoint_auth',
arg_type=get_three_state_flag(),
options_list=['--disable-test-endpoint-auth', '--disable-tea'],
help="If true, disable authentication of the app's test endpoint.",
default=False)

with self.argument_context('spring app update') as c:
c.argument('assign_endpoint', arg_type=get_three_state_flag(),
Expand All @@ -409,6 +414,10 @@ def load_arguments(self, _):
c.argument('deployment', options_list=['--deployment', '-d'],
help='Name of an existing deployment of the app. Default to the production deployment if not specified.',
validator=fulfill_deployment_param_or_warning)
c.argument('disable_test_endpoint_auth',
arg_type=get_three_state_flag(),
options_list=['--disable-test-endpoint-auth', '--disable-tea'],
help="If true, disable authentication of the app's test endpoint.")

with self.argument_context('spring app append-persistent-storage') as c:
c.argument('storage_name', type=str,
Expand Down
4 changes: 4 additions & 0 deletions src/spring/azext_spring/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def app_create(cmd, client, resource_group, service, name,
bind_service_registry=None,
bind_application_configuration_service=None,
bind_config_server=None,
disable_test_endpoint_auth=None,
# app.update
enable_persistent_storage=None,
persistent_storage=None,
Expand Down Expand Up @@ -122,6 +123,7 @@ def app_create(cmd, client, resource_group, service, name,
'bind_service_registry': bind_service_registry,
'bind_application_configuration_service': bind_application_configuration_service,
'bind_config_server': bind_config_server,
'disable_test_endpoint_auth': disable_test_endpoint_auth,
'enable_temporary_disk': True,
'enable_persistent_storage': enable_persistent_storage,
'persistent_storage': persistent_storage,
Expand Down Expand Up @@ -206,6 +208,7 @@ def app_update(cmd, client, resource_group, service, name,
backend_protocol=None,
client_auth_certs=None,
workload_profile=None,
disable_test_endpoint_auth=None,
# deployment.source
runtime_version=None,
jvm_options=None,
Expand Down Expand Up @@ -277,6 +280,7 @@ def app_update(cmd, client, resource_group, service, name,
'backend_protocol': backend_protocol,
'client_auth_certs': client_auth_certs,
'secrets': secrets,
'disable_test_endpoint_auth': disable_test_endpoint_auth,
'workload_profile_name': workload_profile
}
if deployment is None:
Expand Down
1,467 changes: 0 additions & 1,467 deletions src/spring/azext_spring/tests/latest/recordings/test_app_actuator_configs.yaml

This file was deleted.

Loading

0 comments on commit 8a3ba95

Please sign in to comment.