add test for environment type on arc

src/containerapp-preview/azext_containerapp_preview/containerapp_decorator.py

@@ -34,6 +34,7 @@ def __init__(
     ):
         super().__init__(cmd, client, raw_parameters, models)
         self.azext_decorator_utils = _get_azext_module(GA_CONTAINERAPP_EXTENSION_NAME, "azext_containerapp._decorator_utils")
+        self.azext_default_utils = _get_azext_module(GA_CONTAINERAPP_EXTENSION_NAME, "azext_containerapp._utils")
 
     def construct_containerapp(self):
         containerapp_def = super().construct_containerapp()

src/containerapp-preview/azext_containerapp_preview/tests/latest/common.py

@@ -0,0 +1,25 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+import os
+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"
+
+
+def write_test_file(filename, content):
+    test_file = open(filename, "w", encoding='utf-8')
+    _ = test_file.write(content)
+    test_file.close()
+
+
+def clean_up_test_file(filename):
+    if os.path.exists(filename):
+        os.remove(filename)
+
+
+class ContainerappComposePreviewScenarioTest(ScenarioTest):
+    pass

src/containerapp-preview/azext_containerapp_preview/tests/latest/test_containerapp_preview_scenario.py

@@ -4,16 +4,80 @@
 # --------------------------------------------------------------------------------------------
 
 import os
-from azure.cli.testsdk import (ScenarioTest, ResourceGroupPreparer)
-from azure.cli.testsdk.scenario_tests import AllowLargeResponse
+import time
+from azext_containerapp.tests.latest.common import (write_test_file, clean_up_test_file)
+from azure.cli.testsdk import (ScenarioTest, ResourceGroupPreparer, JMESPathCheck, live_only)
+
+from .common import TEST_LOCATION
 
 TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))
 
 
 class ContainerappScenarioTest(ScenarioTest):
 
-    @AllowLargeResponse(8192)
-    def test_containerapp_preview(self):
-        self.cmd('az containerapp create --name "ghrunnersaca" --resource-group "arc-appint-forxinyu12-rg0" --environment "my-environment2" --image "mcr.microsoft.com/k8se/quickstart:latest" --bind postgres:postgres_binding redis')
-        return
+    @ResourceGroupPreparer(location="eastus", random_name_length=15)
+    @live_only()
+    def test_containerapp_preview_environment_type(self, resource_group):
+        self.cmd('configure --defaults location={}'.format(TEST_LOCATION))
+        aks_name = "my-aks-cluster"
+        connected_cluster_name = "my-connected-cluster"
+        self.cmd(
+            f'aks create --resource-group {resource_group} --name {aks_name} --enable-aad --generate-ssh-keys --enable-cluster-autoscaler --min-count 4 --max-count 10 --node-count 4')
+        self.cmd(
+            f'aks get-credentials --resource-group {resource_group} --name {aks_name} --overwrite-existing --admin')
+        self.cmd(f'connectedk8s connect --resource-group {resource_group} --name {connected_cluster_name}')
+        connected_cluster = self.cmd(
+            f'az connectedk8s show --resource-group {resource_group} --name {connected_cluster_name}').get_output_in_json()
+        connected_cluster_id = connected_cluster['id']
+        extension = self.cmd(f'az k8s-extension create'
+                             f' --resource-group {resource_group}'
+                             f' --name containerapp-ext'
+                             f' --cluster-type connectedClusters'
+                             f' --cluster-name {connected_cluster["name"]}'
+                             f' --extension-type "Microsoft.App.Environment" '
+                             f' --release-train stable'
+                             f' --auto-upgrade-minor-version true'
+                             f' --scope cluster'
+                             f' --release-namespace appplat-ns'
+                             f' --configuration-settings "Microsoft.CustomLocation.ServiceAccount=default"'
+                             f' --configuration-settings "appsNamespace=appplat-ns"'
+                             f' --configuration-settings "clusterName={connected_cluster["name"]}"'
+                             f' --configuration-settings "envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group={resource_group}"').get_output_in_json()
+        custom_location_name = "my-custom-location"
+        custom_location_id = self.cmd(
+            f'az customlocation create -g {resource_group} -n {custom_location_name} -l {TEST_LOCATION} --host-resource-id {connected_cluster_id} --namespace appplat-ns -c {extension["id"]}') \
+            .get_output_in_json()['id']
+        # create connected environment with client or create a command for connected?
+        sub_id = self.cmd('az account show').get_output_in_json()['id']
+
+        connected_env_name = 'my-connected-env'
+        connected_env_resource_id = f"/subscriptions/{sub_id}/resourceGroups/{resource_group}/providers/Microsoft.App/connectedEnvironments/{connected_env_name}"
+        file = f"{resource_group}.json"
+        env_payload = '{{ "location": "{location}", "extendedLocation": {{ "name": "{custom_location_id}", "type": "CustomLocation" }}, "Properties": {{}}}}' \
+            .format(location=TEST_LOCATION, custom_location_id=custom_location_id)
+        write_test_file(file, env_payload)
+        self.cmd(
+            f'az rest --method put --uri "{connected_env_resource_id}?api-version=2022-06-01-preview" --body "@{file}"')
+        containerapp_env = self.cmd(
+            f'az rest --method get --uri "{connected_env_resource_id}?api-version=2022-06-01-preview"').get_output_in_json()
+        while containerapp_env["properties"]["provisioningState"].lower() != "succeeded":
+            time.sleep(5)
+            containerapp_env = self.cmd(
+                f'az rest --method get --uri "{connected_env_resource_id}?api-version=2022-06-01-preview"').get_output_in_json()
 
+        ca_name = self.create_random_name(prefix='containerapp', length=24)
+        self.cmd(
+            f'az containerapp create --name {ca_name} --resource-group {resource_group} --environment {connected_env_name} --image "mcr.microsoft.com/k8se/quickstart:latest" --environment-type connected',
+            checks=[
+                JMESPathCheck('properties.environmentId', connected_env_resource_id),
+                JMESPathCheck('properties.provisioningState', "Succeeded"),
+                JMESPathCheck('extendedLocation.name', custom_location_id)
+            ])
+        ca_name2 = self.create_random_name(prefix='containerapp', length=24)
+        self.cmd(
+            f'az containerapp create --name {ca_name2} --resource-group {resource_group} --environment {connected_env_resource_id} --image "mcr.microsoft.com/k8se/quickstart:latest" --environment-type connected',
+            checks=[
+                JMESPathCheck('properties.environmentId', connected_env_resource_id),
+                JMESPathCheck('properties.provisioningState', "Succeeded"),
+                JMESPathCheck('extendedLocation.name', custom_location_id)
+            ])