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
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_app_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# pylint: disable=wrong-import-order
from azure.cli.core.azclierror import FileOperationError, InvalidArgumentValueError
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from azure.cli.core.util import get_file_json


Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_build_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import json
from azure.cli.core.util import sdk_no_wait
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from ._buildservices_factory import BuildService
from azure.cli.core.commands import LongRunningOperation
from azure.cli.core.commands.client_factory import get_subscription_id
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_buildservices_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from msrestazure.tools import parse_resource_id
from azure.cli.core.commands.client_factory import get_subscription_id
from msrestazure.azure_exceptions import CloudError
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from ._deployment_uploadable_factory import uploader_selector
from ._log_stream import LogStream

Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_client_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# --------------------------------------------------------------------------------------------
from azure.cli.core.commands.client_factory import get_mgmt_service_client
from azure.cli.core.profiles import ResourceType
from .vendored_sdks.appplatform.v2023_09_01_preview import AppPlatformManagementClient
from .vendored_sdks.appplatform.v2023_07_01_preview import AppPlatformManagementClient


def cf_spring(cli_ctx, *_):
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_deployment_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# pylint: disable=wrong-import-order
from azure.cli.core.azclierror import InvalidArgumentValueError
from azure.cli.core.util import get_file_json
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from ._deployment_source_factory import source_selector
from .custom import format_scale

Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_deployment_source_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# --------------------------------------------------------------------------------------------

# pylint: disable=wrong-import-order
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from azure.cli.core.azclierror import ArgumentUsageError
from ._utils import convert_argument_to_parameter_list

Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
validate_app_force_set_system_identity_or_warning,
validate_app_force_set_user_identity_or_warning)
from ._utils import ApiType
from .vendored_sdks.appplatform.v2023_09_01_preview.models._app_platform_management_client_enums import (ConfigurationServiceGeneration, SupportedRuntimeValue, TestKeyType, BackendProtocol, SessionAffinity, ApmType, BindingType)
from .vendored_sdks.appplatform.v2023_07_01_preview.models._app_platform_management_client_enums import (ConfigurationServiceGeneration, SupportedRuntimeValue, TestKeyType, BackendProtocol, SessionAffinity, ApmType, BindingType)


name_type = CLIArgumentType(options_list=[
Expand Down
4 changes: 2 additions & 2 deletions src/spring/azext_spring/_tanzu_component.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from msrestazure.tools import resource_id
from .application_live_view import create as application_live_view_create
from .dev_tool_portal import create_or_update as dev_tool_portal_create
from .vendored_sdks.appplatform.v2023_09_01_preview.models._app_platform_management_client_enums import ConfigurationServiceGeneration
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview.models._app_platform_management_client_enums import ConfigurationServiceGeneration
from .vendored_sdks.appplatform.v2023_07_01_preview import models

GATEWAY_RESOURCE_TYPE = "gateways"
DEFAULT_NAME = "default"
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_util_enterprise.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# pylint: disable=wrong-import-order

from .vendored_sdks.appplatform.v2023_09_01_preview import AppPlatformManagementClient
from .vendored_sdks.appplatform.v2023_07_01_preview import AppPlatformManagementClient
from azure.cli.core.commands.client_factory import get_mgmt_service_client


Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from knack.util import CLIError, todict
from knack.log import get_logger
from azure.cli.core.azclierror import ValidationError
from .vendored_sdks.appplatform.v2023_09_01_preview.models._app_platform_management_client_enums import SupportedRuntimeValue
from .vendored_sdks.appplatform.v2023_07_01_preview.models._app_platform_management_client_enums import SupportedRuntimeValue
from ._client_factory import cf_resource_groups


Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from ._clierror import NotSupportedPricingTierError
from ._utils import (ApiType, _get_rg_location, _get_file_type, _get_sku_name, _java_runtime_in_number)
from ._util_enterprise import is_enterprise_tier
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from ._constant import (MARKETPLACE_OFFER_ID, MARKETPLACE_PLAN_ID, MARKETPLACE_PUBLISHER_ID)

logger = get_logger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions src/spring/azext_spring/_validators_enterprise.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
from azure.cli.core.commands.client_factory import get_subscription_id
from azure.core.exceptions import ResourceNotFoundError
from knack.log import get_logger
from .vendored_sdks.appplatform.v2023_09_01_preview.models import (ApmReference, CertificateReference)
from .vendored_sdks.appplatform.v2023_09_01_preview.models._app_platform_management_client_enums import (ApmType, ConfigurationServiceGeneration)
from .vendored_sdks.appplatform.v2023_07_01_preview.models import (ApmReference, CertificateReference)
from .vendored_sdks.appplatform.v2023_07_01_preview.models._app_platform_management_client_enums import (ApmType, ConfigurationServiceGeneration)

from ._resource_quantity import validate_cpu as validate_and_normalize_cpu
from ._resource_quantity import \
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/api_portal.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from azure.cli.core.azclierror import ClientRequestError
from azure.cli.core.commands.client_factory import get_subscription_id
from msrestazure.tools import resource_id
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from ._utils import get_spring_sku

DEFAULT_NAME = "default"
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/apm.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from msrestazure.tools import parse_resource_id, is_valid_resource_id

from ._utils import get_portal_uri
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models

logger = get_logger(__name__)
DEFAULT_APM_NAME = "default"
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/app_managed_identity.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from ._clierror import ConflictRequestError
from ._utils import wait_till_end
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from azure.cli.core.azclierror import (AzureInternalError, CLIInternalError)
from azure.core.exceptions import HttpResponseError
from msrestazure.azure_exceptions import CloudError
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/application_accelerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from azure.cli.core.util import sdk_no_wait
from knack.log import get_logger
from azure.cli.core.commands.client_factory import get_subscription_id
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from .dev_tool_portal import (is_updatable as is_dev_tool_portal_updatable,
try_get as get_dev_tool_portal,
create_or_update as create_or_update_dev_tool_portal,
Expand Down
4 changes: 2 additions & 2 deletions src/spring/azext_spring/application_configuration_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from azure.cli.core.util import sdk_no_wait
from knack.log import get_logger
from msrestazure.tools import resource_id
from .vendored_sdks.appplatform.v2023_09_01_preview.models._app_platform_management_client_enums import (GitImplementation, ConfigurationServiceGeneration)
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview.models._app_platform_management_client_enums import (GitImplementation, ConfigurationServiceGeneration)
from .vendored_sdks.appplatform.v2023_07_01_preview import models

APPLICATION_CONFIGURATION_SERVICE_NAME = "applicationConfigurationService"
RESOURCE_ID = "resourceId"
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/application_live_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# pylint: disable=unused-argument, logging-format-interpolation, protected-access, wrong-import-order, too-many-lines
from knack.log import get_logger

from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from .dev_tool_portal import (is_updatable as is_dev_tool_portal_updatable,
try_get as get_dev_tool_portal,
create_or_update as create_or_update_dev_tool_portal,
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/buildpack_binding.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# --------------------------------------------------------------------------------------------

# pylint: disable=wrong-import-order
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from azure.cli.core.util import sdk_no_wait
from ._utils import get_portal_uri
from msrestazure.tools import parse_resource_id, is_valid_resource_id
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from azure.mgmt.core.tools import (parse_resource_id, is_valid_resource_id)
from ._utils import (get_portal_uri, get_spring_sku, get_proxy_api_endpoint, BearerAuth)
from knack.util import CLIError
from .vendored_sdks.appplatform.v2023_09_01_preview import models, AppPlatformManagementClient
from .vendored_sdks.appplatform.v2023_07_01_preview import models, AppPlatformManagementClient
from knack.log import get_logger
from azure.cli.core.azclierror import ClientRequestError, FileOperationError, InvalidArgumentValueError, ResourceNotFoundError
from azure.cli.core.commands.client_factory import get_mgmt_service_client, get_subscription_id
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/dev_tool_portal.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from knack.log import get_logger

from azure.cli.core.util import sdk_no_wait
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models

DEFAULT_NAME = "default"

Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from knack.log import get_logger

from .custom import LOG_RUNNING_PROMPT
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from ._utils import get_spring_sku

logger = get_logger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/spring_instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# pylint: disable=wrong-import-order
# pylint: disable=unused-argument, logging-format-interpolation, protected-access, wrong-import-order, too-many-lines
from ._utils import (wait_till_end, _get_rg_location)
from .vendored_sdks.appplatform.v2023_09_01_preview import models
from .vendored_sdks.appplatform.v2023_07_01_preview import models
from .custom import (_warn_enable_java_agent, _update_application_insights_asc_create)
from ._build_service import _update_default_build_agent_pool, create_build_service
from .buildpack_binding import create_default_buildpack_binding_for_application_insights
Expand Down
Loading