Merge pull request #100 from tbyfield/amlim/updateDataPlane2023-07-01…

…-preview

Update data plane to v2023-07-01-preview

src/devcenter/azext_devcenter/_client_factory.py

@@ -14,68 +14,43 @@
 
 
 def cf_devcenter_dataplane(cli_ctx, endpoint=None, dev_center=None, project_name=None):
-    from azure.cli.core.commands.client_factory import get_mgmt_service_client
+    from azure.cli.core._profile import Profile
     from azext_devcenter.vendored_sdks.devcenter_dataplane import (
-        DevCenterDataplaneClient,
+        DevCenterClient,
     )
 
     validate_endpoint(endpoint, dev_center)
 
     if endpoint is None and dev_center is not None:
         project = get_project_data(cli_ctx, dev_center, project_name)
-
-        # We need to set the project name even if we don't need this information
-        # since initializing DevCenterDataplaneClient requires this param
-        if project_name is None:
-            project_name = project["name"]
         endpoint = project["devCenterUri"]
 
-    if project_name is None:
-        project_name = "placeholder"  # see comment above
+    profile = Profile(cli_ctx=cli_ctx)
 
+    credential = profile.get_login_credentials(resource="https://devcenter.azure.com")
     cli_ctx.cloud.endpoints.active_directory_resource_id = "https://devcenter.azure.com"
 
-    return get_mgmt_service_client(
-        cli_ctx,
-        DevCenterDataplaneClient,
-        subscription_bound=False,
-        base_url_bound=False,
-        endpoint=endpoint,
-        project_name=project_name,
-    )
-
-
-def cf_project_dp(cli_ctx, dev_center, *_):
-    return cf_devcenter_dataplane(cli_ctx, dev_center).project
+    return DevCenterClient(endpoint, credential[0])
 
 
-def cf_pool_dp(cli_ctx, dev_center, *_):
-    return cf_devcenter_dataplane(cli_ctx, dev_center).pool
+def cf_dev_center_dp(cli_ctx, dev_center, *_):
+    return cf_devcenter_dataplane(cli_ctx, dev_center).dev_center
 
 
-def cf_schedule_dp(cli_ctx, dev_center, *_):
-    return cf_devcenter_dataplane(cli_ctx, dev_center).schedule
+def cf_dev_boxes_dp(cli_ctx, dev_center, *_):
+    return cf_devcenter_dataplane(cli_ctx, dev_center).dev_boxes
 
 
-def cf_dev_box_dp(cli_ctx, dev_center, *_):
-    return cf_devcenter_dataplane(cli_ctx, dev_center).dev_box
+def cf_dev_box_operations_dp(cli_ctx, dev_center, *_):
+    return cf_devcenter_dataplane(cli_ctx, dev_center).dev_box_operations
 
 
-def cf_environment_dp(cli_ctx, dev_center, *_):
+def cf_environments_dp(cli_ctx, dev_center, *_):
     return cf_devcenter_dataplane(cli_ctx, dev_center).environments
 
 
-def cf_catalog_dp(cli_ctx, dev_center, *_):
-    return cf_devcenter_dataplane(cli_ctx, dev_center).catalogs
-
-
-def cf_environment_definition_dp(cli_ctx, dev_center, *_):
-    return cf_devcenter_dataplane(cli_ctx, dev_center).environment_definitions
-
-
-def cf_environment_type_dp(cli_ctx, dev_center, *_):
-    return cf_devcenter_dataplane(cli_ctx, dev_center).environment_type
-
+def cf_environment_operations_dp(cli_ctx, dev_center, *_):
+    return cf_devcenter_dataplane(cli_ctx, dev_center).environment_operations
 
 # Control plane
 

src/devcenter/azext_devcenter/_help.py

@@ -95,6 +95,30 @@
     short-summary: Manage schedules.
 """
 
+helps[
+    "devcenter dev schedule list"
+] = """
+    type: command
+    short-summary: "List schedules."
+    examples:
+      - name: List schedules by project using dev center
+        text: |-
+               az devcenter dev schedule list --dev-center-name "ContosoDevCenter" \
+--project-name "DevProject"
+      - name: List schedules by project using endpoint
+        text: |-
+               az devcenter dev schedule list --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
+--project-name "DevProject"
+      - name: List schedules by pool using dev center
+        text: |-
+               az devcenter dev schedule list --dev-center-name "ContosoDevCenter" \
+--pool-name "DevPool" --project-name "DevProject"
+      - name: List schedules by pool using endpoint
+        text: |-
+               az devcenter dev schedule list --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
+--pool-name "DevPool" --project-name "DevProject"
+"""
+
 helps[
     "devcenter dev schedule show"
 ] = """
@@ -245,6 +269,22 @@
 --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000"
 """
 
+helps[
+    "devcenter dev dev-box repair"
+] = """
+    type: command
+    short-summary: "Attempts automated repair steps to resolve common problems on a Dev Box. The dev box may restart during this operation."
+    examples:
+      - name: Repair using dev center
+        text: |-
+               az devcenter dev dev-box repair --name "MyDevBox" --dev-center-name "ContosoDevCenter" \
+               --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000"
+      - name: Repair using endpoint
+        text: |-
+               az devcenter dev dev-box repair --name "MyDevBox" --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
+--project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000"
+"""
+
 helps[
     "devcenter dev dev-box stop"
 ] = """
@@ -313,6 +353,40 @@
 --user-id "00000000-0000-0000-0000-000000000000"
 """
 
+helps[
+    "devcenter dev dev-box list-operation"
+] = """
+    type: command
+    short-summary: "Lists operations on the dev box which have occurred within the past 90 days."
+    examples:
+      - name: List operations using dev center
+        text: |-
+               az devcenter dev dev-box list-operation --dev-center-name "ContosoDevCenter" \
+--project-name "DevProject" --name "myDevBox" --user-id "00000000-0000-0000-0000-000000000000"
+      - name: List operations using endpoint
+        text: |-
+               az devcenter dev dev-box list-operation --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
+--project-name "DevProject" --name "myDevBox" --user-id "00000000-0000-0000-0000-000000000000"
+"""
+
+helps[
+    "devcenter dev dev-box show-operation"
+] = """
+    type: command
+    short-summary: "Get an operation on a dev box."
+    examples:
+      - name: Get operation using dev center
+        text: |-
+               az devcenter dev dev-box show-operation --dev-center-name "ContosoDevCenter" \
+--project-name "DevProject" --name "myDevBox" --operation-id \
+"f5dbdfab-fa0e-4831-8d13-25359aa5e680" --user-id "00000000-0000-0000-0000-000000000000"
+      - name: Get operation using endpoint
+        text: |-
+               az devcenter dev dev-box show-operation --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
+--project-name "DevProject" --name "myDevBox" --operation-id \
+"f5dbdfab-fa0e-4831-8d13-25359aa5e680" --user-id "00000000-0000-0000-0000-000000000000"
+"""
+
 helps[
     "devcenter dev dev-box show-action"
 ] = """
@@ -576,3 +650,38 @@
                az devcenter dev environment-definition show --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
 --project-name "DevProject" --catalog-name "myCatalog" --definition-name "foo"
 """
+
+
+helps[
+    "devcenter dev environment list-operation"
+] = """
+    type: command
+    short-summary: "Lists operations on the environment which have occurred within the past 90 days."
+    examples:
+      - name: List operations using dev center
+        text: |-
+               az devcenter dev environment list-operation --dev-center-name "ContosoDevCenter" \
+--project-name "DevProject" --name "myEnv" --user-id "00000000-0000-0000-0000-000000000000"
+      - name: List operations using endpoint
+        text: |-
+               az devcenter dev environment list-operation --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
+--project-name "DevProject" --name "myEnv" --user-id "00000000-0000-0000-0000-000000000000"
+"""
+
+helps[
+    "devcenter dev environment show-operation"
+] = """
+    type: command
+    short-summary: "Gets an environment action result."
+    examples:
+      - name: Get operation using dev center
+        text: |-
+               az devcenter dev environment show-operation --dev-center-name "ContosoDevCenter" \
+--project-name "DevProject" --name "myEnv" --operation-id \
+"f5dbdfab-fa0e-4831-8d13-25359aa5e680" --user-id "00000000-0000-0000-0000-000000000000"
+      - name: Get operation using endpoint
+        text: |-
+               az devcenter dev environment show-operation --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \
+--project-name "DevProject" --name "myEnv" --operation-id \
+"f5dbdfab-fa0e-4831-8d13-25359aa5e680" --user-id "00000000-0000-0000-0000-000000000000"
+"""