build: sprint release (#252)

* test: create general purpose vscode operator function & finish select azure tenant test case (#225) * feat: create general purpose vscode operator function & finish select azure tenant test case * test: select tenant use env * test: use dot env * test: add codecov ignore test folder * test: add codecov ignore test folder * test: add codecov ignore test folder * test: add codecov ignore test folder * test: debug * test: debug * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: yaml test * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: create general purpose vscode operator function & finish select azure tenant test case * test: change case name --------- Co-authored-by: Ivan_Chen <[email protected]> * test: add auto case "Azure Tree View" (#232) * add auto case "Azure Tree View" * set single test timeout * select days sub first, then verify tree items * use sub "AML Infra - Engineering System" to do the test * remove local change * Add verification for "Environments","Rules" and "Deployments" * feat: data plane view support (#209) * feat: rbac demo * feat: support api server * feat: update * feat: ready * feat: update * feat: update * test: update test case * feat: add feautres * docs: strings * test: update * feat: update command * feat: change to b type * feat: adjust treeitem view structure * feat: update * feat: update * feat: separate defines * feat: update * feat: update * test: add test cases * test: add test cases * fix: update the code according to comments * fix: update code according to comments * feat: update code * feat: update * feat: update * fix: update * test: fix comments and test cases * test: update * fix: update the uistring * feat: add telemetry for dataplane (#238) * feat: add telemetry for dataplane * test: add test case * test: add test case * test: update * test: update * chore: add telemetry event for handleurl * test: update * fix: fix the comments * fix: rename the telemetry event * fix: update * test: update * test: update * fix: update * test: synchronize results to test plan (#239) * build(deps): bump axios from 1.6.2 to 1.7.4 (#236) Bumps [axios](https://github.com/axios/axios) from 1.6.2 to 1.7.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.6.2...v1.7.4) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * ci: upgrade the upload artifact action version (#245) * docs: add changelog and readme for data plane (#241) * docs: add changelog and readme for data plane * docs: update * docs: update * docs: update --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Siyuan Chen <[email protected]> Co-authored-by: Ivan_Chen <[email protected]> Co-authored-by: QinghuiMeng-M <[email protected]> Co-authored-by: Helly Zhang <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
microsoft · Sep 19, 2024 · f0cc50c · f0cc50c
1 parent f59ef04
commit f0cc50c
Show file tree

Hide file tree

Showing 64 changed files with 2,585 additions and 228 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -59,7 +59,7 @@ jobs:
             npx @vscode/vsce package --no-dependencies --githubBranch ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
           fi
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: release
           path: |

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -1,5 +1,11 @@
 name: "ui-test"
 on:
+  workflow_dispatch:
+    inputs:
+      target-testplan-name:
+        description: "For example: APIC240830. Sync test result to this test plan."
+        required: false
+        type: string
   push:
     branches: ["dev", "main"]
   pull_request_target:
@@ -8,6 +14,8 @@ on:
 jobs:
   e2e-test:
     runs-on: ubuntu-latest
+    env:
+      CI: true
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -31,8 +39,52 @@ jobs:
           xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" npx playwright test
         working-directory: ./src/test/e2e
       - if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: |
             test-results
+
+  test-plan-update:
+    needs: e2e-test
+    if: ${{ always() && github.event.inputs.target-testplan-name != '' }}
+    environment: engineering
+    permissions:
+      id-token: write
+      contents: read
+    runs-on: ubuntu-latest
+    env:
+      AUTO_TEST_PLAN_ID: 26611787
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Setup project
+        run: |
+          npm install
+
+      - uses: azure/login@v2
+        with:
+          client-id: ${{secrets.DEVOPS_CLIENT_ID}}
+          tenant-id: ${{secrets.DEVOPS_TENANT_ID}}
+          subscription-id: ${{secrets.DEVOPS_SUB_ID}}
+          enable-AzPSSession: true
+
+      - name: Archive Test Plan
+        working-directory: ./src/test/e2e
+        run: |
+          testplanid=`npx ts-node scripts/testPlan.ts obtain vscode ${{ github.event.inputs.target-testplan-name }}`
+          echo "Testplan id is $testplanid"
+          npx ts-node scripts/testPlan.ts archive $testplanid
+
+      - name: Download TestPlan
+        uses: actions/download-artifact@v3
+        with:
+          path: ./test-results
+
+      - name: Sync to Azure DevOps Test Plan
+        working-directory: ./src/test/e2e
+        run: |
+          npx ts-node scripts/testPlan.ts report ./testplan.json ../../../test-results
diff --git a/.gitignore b/.gitignore
@@ -138,3 +138,6 @@ extensions
 
 # templates from widdershins
 templates/openapi3
+
+# temp file for test plan synchrization
+testplan.json
diff --git a/PRERELEASE.md b/PRERELEASE.md
@@ -3,6 +3,15 @@
 
 > Note: This changelog only includes the changes for the pre-release versions of Azure API Center for Visual Studio Code. For the changelog of stable versions, please refer to the [Changelog of Azure API Center for Visual Studio Code](https://github.com/microsoft/vscode-azureapicenter/blob/main/CHANGELOG.md).
 
+### September 9, 2024
+* Add Platform API Catalog to Azure API Center:
+    * Connect to An Existing API Center from UI, Command Palette or DeepLink
+    * View and List all the APIs, Versions, Definitions
+    * Export API, Generate API Client, Generate Markdown, Open API Document from API Definitions
+    * Sign In and Sign Out from Platform API Catalog
+    * Disconnect to Platform API Catalog
+    * Search APIs from Platform API Catalog
+
 ### August 19, 2024
 
 * Manage API Analysis for Azure API Center:

diff --git a/README.md b/README.md
@@ -26,6 +26,9 @@ Ensure that new API versions don't break API consumers with breaking change dete
 
 ![Generate Open API specification](./media/generate-api-documentation.gif)
 
+### [[Pre-Release]](#pre-release) Platform API Catalog
+![[data-view]](./media/add-data-api.gif)
+
 ### Discover
 
 Find the right API, fast from your organization's hand-crafted API catalog with API Center.

diff --git a/media/add-data-api.gif b/media/add-data-api.gif
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -164,15 +164,44 @@
         "command": "azure-api-center.selectTenant",
         "title": "%azure-api-center.commands.selectTenant.title%",
         "category": "Azure API Center"
+      },
+      {
+        "command": "azure-api-center.apiCenterWorkspace.addApis",
+        "title": "%azure-api-center.commands.apiCenterWorkspace.addApis.title%",
+        "icon": "$(add)",
+        "category": "Azure API Center"
+      },
+      {
+        "command": "azure-api-center.apiCenterWorkspace.refresh",
+        "title": "%azure-api-center.commands.apiCenterTreeView.refresh.title%",
+        "icon": "$(refresh)",
+        "category": "Azure API Center"
+      },
+      {
+        "command": "azure-api-center.apiCenterWorkspace.collapse",
+        "title": "%azure-api-center.commands.apiCenterWorkspace.collapse.title%",
+        "icon": "$(collapse-all)",
+        "category": "Azure API Center"
+      },
+      {
+        "command": "azure-api-center.apiCenterWorkspace.removeApi",
+        "title": "%azure-api-center.commands.apiCenterWorkspace.removeApis.title%",
+        "icon": "$(close)",
+        "category": "Azure API Center"
       }
     ],
     "views": {
       "api-center-treeview": [
         {
           "id": "apiCenterTreeView",
-          "name": "API Center",
+          "name": "%azure-api-center.views.api-center-treeview.controlplane.title%",
           "icon": "media/api-center-icon.svg",
           "contextualTitle": "Azure API Center"
+        },
+        {
+          "id": "apiCenterWorkspace",
+          "name": "%azure-api-center.views.api-center-treeview.dataplane.title%",
+          "visibility": "visible"
         }
       ]
     },
@@ -191,6 +220,21 @@
           "command": "azure-api-center.apiCenterTreeView.refresh",
           "when": "view == apiCenterTreeView",
           "group": "navigation"
+        },
+        {
+          "command": "azure-api-center.apiCenterWorkspace.addApis",
+          "when": "view == apiCenterWorkspace",
+          "group": "navigation@2"
+        },
+        {
+          "command": "azure-api-center.apiCenterWorkspace.refresh",
+          "when": "view == apiCenterWorkspace",
+          "group": "navigation@1"
+        },
+        {
+          "command": "azure-api-center.apiCenterWorkspace.collapse",
+          "when": "view == apiCenterWorkspace",
+          "group": "navigation@3"
         }
       ],
       "view/item/context": [
@@ -201,15 +245,15 @@
         },
         {
           "command": "azure-api-center.open-api-docs",
-          "when": "view == apiCenterTreeView && viewItem == azureApiCenterApiVersionDefinitionTreeItem-openapi"
+          "when": "(view == apiCenterTreeView && viewItem == azureApiCenterApiVersionDefinitionTreeItem-openapi) || (view == apiCenterWorkspace && viewItem == azureApiCenterApiVersionDataPlaneDefinitionTreeItem-openapi)"
         },
         {
           "command": "azure-api-center.open-postman",
           "when": "view == apiCenterTreeView && viewItem =~ /never/"
         },
         {
           "command": "azure-api-center.generate-api-client",
-          "when": "view == apiCenterTreeView && viewItem == azureApiCenterApiVersionDefinitionTreeItem-openapi"
+          "when": "(view == apiCenterTreeView && viewItem == azureApiCenterApiVersionDefinitionTreeItem-openapi) || (view == apiCenterWorkspace && viewItem == azureApiCenterApiVersionDataPlaneDefinitionTreeItem-openapi)"
         },
         {
           "command": "azure-api-center.importOpenApiByFile",
@@ -221,7 +265,7 @@
         },
         {
           "command": "azure-api-center.exportApi",
-          "when": "view == apiCenterTreeView && viewItem =~ /azureApiCenterApiVersionDefinitionTreeItem/"
+          "when": "(view == apiCenterTreeView && viewItem =~ /azureApiCenterApiVersionDefinitionTreeItem/) || (view == apiCenterWorkspace && viewItem =~ /azureApiCenterApiVersionDataPlaneDefinitionTreeItem/)"
         },
         {
           "command": "azure-api-center.showOpenApi",
@@ -233,20 +277,20 @@
         },
         {
           "command": "azure-api-center.generateMarkdownDocument",
-          "when": "view == apiCenterTreeView && viewItem == azureApiCenterApiVersionDefinitionTreeItem-openapi"
+          "when": "(view == apiCenterTreeView && viewItem == azureApiCenterApiVersionDefinitionTreeItem-openapi) || (view == apiCenterWorkspace && viewItem == azureApiCenterApiVersionDataPlaneDefinitionTreeItem-openapi)"
         },
         {
           "command": "azure-api-center.registerApi",
           "when": "view == apiCenterTreeView && viewItem =~ /^azureApiCenterApis/"
         },
         {
           "command": "azure-api-center.searchApi",
-          "when": "view == apiCenterTreeView && viewItem =~ /^azureApiCenterApis/",
+          "when": "(view == apiCenterTreeView || view == apiCenterWorkspace) && viewItem =~ /^azureApiCenterApis/ ",
           "group": "inline@0"
         },
         {
           "command": "azure-api-center.cleanupSearchResult",
-          "when": "view == apiCenterTreeView && viewItem == azureApiCenterApis-search",
+          "when": "(view == apiCenterTreeView || view == apiCenterWorkspace) && viewItem == azureApiCenterApis-search",
           "group": "inline@1"
         },
         {
@@ -277,6 +321,11 @@
           "command": "azure-api-center.deleteCustomFunction",
           "when": "view == apiCenterTreeView && viewItem == azureApiCenterFunction",
           "group": "function@1"
+        },
+        {
+          "command": "azure-api-center.apiCenterWorkspace.removeApi",
+          "when": "view == apiCenterWorkspace && viewItem == azureApiCenterDataPlane",
+          "group": "inline@0"
         }
       ],
       "copilot": [
@@ -358,6 +407,14 @@
         {
           "command": "azure-api-center.deleteCustomFunction",
           "when": "never"
+        },
+        {
+          "command": "azure-api-center.apiCenterWorkspace.removeApi",
+          "when": "never"
+        },
+        {
+          "command": "azure-api-center.apiCenterWorkspace.collapse",
+          "when": "never"
         }
       ]
     },
@@ -384,6 +441,7 @@
     ],
     "configuration": [
       {
+        "title": "Azure Api Center",
         "properties": {
           "azure-api-center.selectedSubscriptions": {
             "type": "array",
@@ -443,6 +501,7 @@
     "copy-webpack-plugin": "^12.0.2",
     "copyfiles": "^2.4.1",
     "crypto-js": "^3.1.2",
+    "dotenv": "^16.4.5",
     "eslint": "^8.50.0",
     "eslint-plugin-header": "^3.1.1",
     "glob": "^10.3.3",
@@ -476,7 +535,7 @@
     "@vscode/extension-telemetry": "^0.6.2",
     "ajv": "^8.12.0",
     "archiver": "^7.0.1",
-    "axios": "^1.6.0",
+    "axios": "^1.7.4",
     "express": "^4.19.2",
     "fs-extra": "^11.1.1",
     "get-port": "^7.0.0",

diff --git a/package.nls.json b/package.nls.json
@@ -26,5 +26,10 @@
     "azure-api-center.commands.deleteCustomFunction.title": "Delete",
     "azure-api-center.chatParticipants.apicenter.description": "Build, discover, and consume great APIs.",
     "azure-api-center.chatParticipants.apicenter.commands.list.description": "List available APIs.",
-    "azure-api-center.chatParticipants.apicenter.commands.find.description": "Find an API given a search query."
+    "azure-api-center.chatParticipants.apicenter.commands.find.description": "Find an API given a search query.",
+    "azure-api-center.commands.apiCenterWorkspace.collapse.title": "Collapse",
+    "azure-api-center.views.api-center-treeview.controlplane.title": "Azure API Center",
+    "azure-api-center.views.api-center-treeview.dataplane.title": "Platform API Catalog",
+    "azure-api-center.commands.apiCenterWorkspace.addApis.title": "Connect to an API Center",
+    "azure-api-center.commands.apiCenterWorkspace.removeApis.title": "Disconnect from API Center"
 }