Skip to content
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

Jump to bottom

{Containerapp} Set test region default to northcentralusstage #7058

Merged
merged 13 commits into from
Dec 8, 2023
Merged

{Containerapp} Set test region default to northcentralusstage #7058

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
db4447e
test
Greedygre Nov 23, 2023
7374c83
rerun test in test_containerapp_scenario.py
Greedygre Nov 23, 2023
241d30f
rerun tests
Greedygre Nov 28, 2023
eedcfff
merge main
Greedygre Nov 28, 2023
26ca303
fix test for arc
Greedygre Nov 28, 2023
b02054c
merge main
Greedygre Dec 5, 2023
ab346ba
Merge remote-tracking branch 'origin/xinyu/set_test_region_default_to…
Greedygre Dec 5, 2023
af0cc83
handle storage account related tests
Greedygre Dec 6, 2023
3ab9bde
fix
Greedygre Dec 6, 2023
07eb466
fix hard code of location
Greedygre Dec 7, 2023
abc02f4
format location before compare
Greedygre Dec 7, 2023
c2d75a1
format location
Greedygre Dec 7, 2023
ab484bf
import
Greedygre Dec 7, 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
3 changes: 2 additions & 1 deletion src/containerapp/azext_containerapp/tests/latest/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
from azure.cli.testsdk import (ScenarioTest)

TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))
TEST_LOCATION = os.getenv("CLITestLocation") if os.getenv("CLITestLocation") else "eastus"
STAGE_LOCATION = "northcentralusstage"
TEST_LOCATION = os.getenv("CLITestLocation") if os.getenv("CLITestLocation") else STAGE_LOCATION


def write_test_file(filename, content):
Expand Down
11 changes: 9 additions & 2 deletions src/containerapp/azext_containerapp/tests/latest/custom_preparers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,16 @@ def __init__(self, name_prefix='aks', location='eastus2euap', aks_name='my-aks-c
def create_resource(self, name, **kwargs):
group = self._get_resource_group(**kwargs)
try:
self.live_only_execute(self.cli_ctx, f'az aks create --resource-group {group} --name {self.infra_cluster} --enable-aad --generate-ssh-keys --enable-cluster-autoscaler --min-count 4 --max-count 10 --node-count 4')
aks_location = self.location
arc_location = self.location

if self.location.__contains__('stage'):
aks_location = "southcentralus"
Greedygre marked this conversation as resolved.
Show resolved Hide resolved
Greedygre marked this conversation as resolved.
Show resolved Hide resolved
arc_location = "eastus2euap"
self.live_only_execute(self.cli_ctx, f'az aks create --resource-group {group} --name {self.infra_cluster} --enable-aad --generate-ssh-keys --enable-cluster-autoscaler --min-count 4 --max-count 10 --node-count 4 --location {aks_location}')
self.live_only_execute(self.cli_ctx, f'az aks get-credentials --resource-group {group} --name {self.infra_cluster} --overwrite-existing --admin')
self.live_only_execute(self.cli_ctx, f'az connectedk8s connect --resource-group {group} --name {self.connected_cluster_name}')

self.live_only_execute(self.cli_ctx, f'az connectedk8s connect --resource-group {group} --name {self.connected_cluster_name} --location {arc_location}')
connected_cluster = self.live_only_execute(self.cli_ctx, f'az connectedk8s show --resource-group {group} --name {self.connected_cluster_name}').get_output_in_json()
while connected_cluster is not None and connected_cluster["connectivityStatus"] == "Connecting":
time.sleep(5)
Expand Down
864 changes: 365 additions & 499 deletions src/containerapp/azext_containerapp/tests/latest/recordings/test_container_acr.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,301 changes: 594 additions & 707 deletions ...pp/azext_containerapp/tests/latest/recordings/test_container_app_mount_azurefile_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2,049 changes: 678 additions & 1,371 deletions ...erapp/azext_containerapp/tests/latest/recordings/test_container_app_mount_secret_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,766 changes: 1,176 additions & 590 deletions ...zext_containerapp/tests/latest/recordings/test_container_app_mount_secret_update_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

301 changes: 167 additions & 134 deletions ...rapp/azext_containerapp/tests/latest/recordings/test_containerapp_anonymous_registry.yaml
View file
Open in desktop

Large diffs are not rendered by default.

924 changes: 555 additions & 369 deletions src/containerapp/azext_containerapp/tests/latest/recordings/test_containerapp_auth_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

225 changes: 89 additions & 136 deletions ...tests/latest/recordings/test_containerapp_compose_create_basic_no_existing_resources.yaml
View file
Open in desktop

Large diffs are not rendered by default.

522 changes: 256 additions & 266 deletions ...ntainerapp/tests/latest/recordings/test_containerapp_compose_create_with_environment.yaml
View file
Open in desktop

Large diffs are not rendered by default.

165 changes: 96 additions & 69 deletions ...app/tests/latest/recordings/test_containerapp_compose_create_with_environment_prompt.yaml
View file
Open in desktop

Large diffs are not rendered by default.

235 changes: 92 additions & 143 deletions ...tainerapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_both.yaml
View file
Open in desktop

Large diffs are not rendered by default.

384 changes: 92 additions & 292 deletions ...erapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_external.yaml
View file
Open in desktop

Large diffs are not rendered by default.

525 changes: 92 additions & 433 deletions ...erapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_internal.yaml
View file
Open in desktop

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions ...inerapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_prompt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interactions:
ParameterSetName:
- -g -n
User-Agent:
- AZURECLI/2.54.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.10.11 (Windows-10-10.0.22621-SP0)
- AZURECLI/2.54.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.10.11 (Windows-10-10.0.22631-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.App?api-version=2022-09-01
response:
Expand Down Expand Up @@ -214,7 +214,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Fri, 10 Nov 2023 11:06:01 GMT
- Mon, 20 Nov 2023 08:18:03 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -242,25 +242,25 @@ interactions:
ParameterSetName:
- -g -n
User-Agent:
- python/3.10.11 (Windows-10-10.0.22621-SP0) AZURECLI/2.54.0
- python/3.10.11 (Windows-10-10.0.22631-SP0) AZURECLI/2.54.0
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_eastus/providers/Microsoft.App/managedEnvironments/env-eastus?api-version=2023-08-01-preview
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_northcentralusstage/providers/Microsoft.App/managedEnvironments/env-northcentralusstage?api-version=2023-08-01-preview
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_eastus/providers/Microsoft.App/managedEnvironments/env-eastus","name":"env-eastus","type":"Microsoft.App/managedEnvironments","location":"East
US","systemData":{"createdBy":"xinyupang@microsoft.com","createdByType":"User","createdAt":"2023-10-23T04:59:04.4655929","lastModifiedBy":"xinyupang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-11-10T02:41:49.4366892"},"properties":{"provisioningState":"Succeeded","daprAIInstrumentationKey":null,"daprAIConnectionString":null,"vnetConfiguration":null,"defaultDomain":"whitebeach-63bf60a5.eastus.azurecontainerapps.io","staticIp":"52.224.202.83","appLogsConfiguration":{"destination":null,"logAnalyticsConfiguration":null},"openTelemetryConfiguration":null,"zoneRedundant":false,"kedaConfiguration":{"version":"2.10.0"},"daprConfiguration":{"version":"1.11.5"},"eventStreamEndpoint":"https://eastus.azurecontainerapps.dev/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_eastus/managedEnvironments/env-eastus/eventstream","customDomainConfiguration":{"customDomainVerificationId":"D3F71C85EB6552E36A89A3E4A080C3CFB00181670B659B0003264FC673AA9B00","dnsSuffix":null,"certificateValue":null,"certificatePassword":null,"thumbprint":null,"subjectName":null,"expirationDate":null},"workloadProfiles":[{"workloadProfileType":"Consumption","name":"Consumption"},{"workloadProfileType":"D8","name":"wpname","minimumCount":1,"maximumCount":8}],"firstPartyConfiguration":null,"appInsightsConfiguration":null,"infrastructureResourceGroup":null,"peerAuthentication":{"mtls":{"enabled":false}}}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_northcentralusstage/providers/Microsoft.App/managedEnvironments/env-northcentralusstage","name":"env-northcentralusstage","type":"Microsoft.App/managedEnvironments","location":"North
Central US (Stage)","systemData":{"createdBy":"xinyupang@microsoft.com","createdByType":"User","createdAt":"2023-11-20T08:08:11.0019945","lastModifiedBy":"xinyupang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-11-20T08:08:11.0019945"},"properties":{"provisioningState":"Succeeded","daprAIInstrumentationKey":null,"daprAIConnectionString":null,"vnetConfiguration":null,"defaultDomain":"salmonpond-ed867706.northcentralusstage.azurecontainerapps.io","staticIp":"20.221.43.228","appLogsConfiguration":{"destination":null,"logAnalyticsConfiguration":null},"openTelemetryConfiguration":null,"zoneRedundant":false,"kedaConfiguration":{"version":"2.10.0"},"daprConfiguration":{"version":"1.11.5"},"eventStreamEndpoint":"https://northcentralusstage.azurecontainerapps.dev/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_northcentralusstage/managedEnvironments/env-northcentralusstage/eventstream","customDomainConfiguration":{"customDomainVerificationId":"D3F71C85EB6552E36A89A3E4A080C3CFB00181670B659B0003264FC673AA9B00","dnsSuffix":null,"certificateValue":null,"certificatePassword":null,"thumbprint":null,"subjectName":null,"expirationDate":null},"workloadProfiles":[{"workloadProfileType":"Consumption","name":"Consumption"}],"firstPartyConfiguration":null,"appInsightsConfiguration":null,"infrastructureResourceGroup":null,"peerAuthentication":{"mtls":{"enabled":false}}}}'
headers:
api-supported-versions:
- 2022-01-01-preview, 2022-03-01, 2022-06-01-preview, 2022-10-01, 2022-11-01-preview,
2023-04-01-preview, 2023-05-01, 2023-05-02-preview, 2023-08-01-preview, 2023-11-02-preview
- 2022-03-01, 2022-06-01-preview, 2022-10-01, 2022-11-01-preview, 2023-04-01-preview,
2023-05-01, 2023-05-02-preview, 2023-08-01-preview, 2023-11-02-preview
cache-control:
- no-cache
content-length:
- '1664'
- '1693'
content-type:
- application/json; charset=utf-8
date:
- Fri, 10 Nov 2023 11:06:04 GMT
- Mon, 20 Nov 2023 08:18:06 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -294,7 +294,7 @@ interactions:
ParameterSetName:
- --compose-file-path --resource-group --environment
User-Agent:
- AZURECLI/2.54.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.10.11 (Windows-10-10.0.22621-SP0)
- AZURECLI/2.54.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.10.11 (Windows-10-10.0.22631-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.App?api-version=2022-09-01
response:
Expand Down Expand Up @@ -495,7 +495,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Fri, 10 Nov 2023 11:06:04 GMT
- Mon, 20 Nov 2023 08:18:07 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -523,25 +523,25 @@ interactions:
ParameterSetName:
- --compose-file-path --resource-group --environment
User-Agent:
- python/3.10.11 (Windows-10-10.0.22621-SP0) AZURECLI/2.54.0
- python/3.10.11 (Windows-10-10.0.22631-SP0) AZURECLI/2.54.0
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_eastus/providers/Microsoft.App/managedEnvironments/env-eastus?api-version=2023-08-01-preview
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_northcentralusstage/providers/Microsoft.App/managedEnvironments/env-northcentralusstage?api-version=2023-08-01-preview
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_eastus/providers/Microsoft.App/managedEnvironments/env-eastus","name":"env-eastus","type":"Microsoft.App/managedEnvironments","location":"East
US","systemData":{"createdBy":"xinyupang@microsoft.com","createdByType":"User","createdAt":"2023-10-23T04:59:04.4655929","lastModifiedBy":"xinyupang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-11-10T02:41:49.4366892"},"properties":{"provisioningState":"Succeeded","daprAIInstrumentationKey":null,"daprAIConnectionString":null,"vnetConfiguration":null,"defaultDomain":"whitebeach-63bf60a5.eastus.azurecontainerapps.io","staticIp":"52.224.202.83","appLogsConfiguration":{"destination":null,"logAnalyticsConfiguration":null},"openTelemetryConfiguration":null,"zoneRedundant":false,"kedaConfiguration":{"version":"2.10.0"},"daprConfiguration":{"version":"1.11.5"},"eventStreamEndpoint":"https://eastus.azurecontainerapps.dev/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_eastus/managedEnvironments/env-eastus/eventstream","customDomainConfiguration":{"customDomainVerificationId":"D3F71C85EB6552E36A89A3E4A080C3CFB00181670B659B0003264FC673AA9B00","dnsSuffix":null,"certificateValue":null,"certificatePassword":null,"thumbprint":null,"subjectName":null,"expirationDate":null},"workloadProfiles":[{"workloadProfileType":"Consumption","name":"Consumption"},{"workloadProfileType":"D8","name":"wpname","minimumCount":1,"maximumCount":8}],"firstPartyConfiguration":null,"appInsightsConfiguration":null,"infrastructureResourceGroup":null,"peerAuthentication":{"mtls":{"enabled":false}}}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_northcentralusstage/providers/Microsoft.App/managedEnvironments/env-northcentralusstage","name":"env-northcentralusstage","type":"Microsoft.App/managedEnvironments","location":"North
Central US (Stage)","systemData":{"createdBy":"xinyupang@microsoft.com","createdByType":"User","createdAt":"2023-11-20T08:08:11.0019945","lastModifiedBy":"xinyupang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2023-11-20T08:08:11.0019945"},"properties":{"provisioningState":"Succeeded","daprAIInstrumentationKey":null,"daprAIConnectionString":null,"vnetConfiguration":null,"defaultDomain":"salmonpond-ed867706.northcentralusstage.azurecontainerapps.io","staticIp":"20.221.43.228","appLogsConfiguration":{"destination":null,"logAnalyticsConfiguration":null},"openTelemetryConfiguration":null,"zoneRedundant":false,"kedaConfiguration":{"version":"2.10.0"},"daprConfiguration":{"version":"1.11.5"},"eventStreamEndpoint":"https://northcentralusstage.azurecontainerapps.dev/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/client.env_rg_northcentralusstage/managedEnvironments/env-northcentralusstage/eventstream","customDomainConfiguration":{"customDomainVerificationId":"D3F71C85EB6552E36A89A3E4A080C3CFB00181670B659B0003264FC673AA9B00","dnsSuffix":null,"certificateValue":null,"certificatePassword":null,"thumbprint":null,"subjectName":null,"expirationDate":null},"workloadProfiles":[{"workloadProfileType":"Consumption","name":"Consumption"}],"firstPartyConfiguration":null,"appInsightsConfiguration":null,"infrastructureResourceGroup":null,"peerAuthentication":{"mtls":{"enabled":false}}}}'
headers:
api-supported-versions:
- 2022-01-01-preview, 2022-03-01, 2022-06-01-preview, 2022-10-01, 2022-11-01-preview,
2023-04-01-preview, 2023-05-01, 2023-05-02-preview, 2023-08-01-preview, 2023-11-02-preview
- 2022-03-01, 2022-06-01-preview, 2022-10-01, 2022-11-01-preview, 2023-04-01-preview,
2023-05-01, 2023-05-02-preview, 2023-08-01-preview, 2023-11-02-preview
cache-control:
- no-cache
content-length:
- '1664'
- '1693'
content-type:
- application/json; charset=utf-8
date:
- Fri, 10 Nov 2023 11:06:07 GMT
- Mon, 20 Nov 2023 08:18:08 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -575,7 +575,7 @@ interactions:
ParameterSetName:
- -n -g --yes
User-Agent:
- AZURECLI/2.54.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.10.11 (Windows-10-10.0.22621-SP0)
- AZURECLI/2.54.0 azsdk-python-azure-mgmt-resource/23.1.0b2 Python/3.10.11 (Windows-10-10.0.22631-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.App?api-version=2022-09-01
response:
Expand Down Expand Up @@ -776,7 +776,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Fri, 10 Nov 2023 11:06:08 GMT
- Mon, 20 Nov 2023 08:18:08 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -806,7 +806,7 @@ interactions:
ParameterSetName:
- -n -g --yes
User-Agent:
- python/3.10.11 (Windows-10-10.0.22621-SP0) AZURECLI/2.54.0
- python/3.10.11 (Windows-10-10.0.22631-SP0) AZURECLI/2.54.0
method: DELETE
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_containerapp_preview000001/providers/Microsoft.App/containerApps/foo?api-version=2023-08-01-preview
response:
Expand All @@ -816,7 +816,7 @@ interactions:
cache-control:
- no-cache
date:
- Fri, 10 Nov 2023 11:06:09 GMT
- Mon, 20 Nov 2023 08:18:10 GMT
expires:
- '-1'
pragma:
Expand All @@ -826,7 +826,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-ratelimit-remaining-subscription-deletes:
- '14999'
- '14998'
status:
code: 204
message: No Content
Expand Down
Loading