Merge pull request #423 from solliancenet/jdh-management-api

Management API and UI deployments
solliancenet · Jan 9, 2024 · 400d896 · 400d896
2 parents 2a4ec20 + 25a3baa
commit 400d896
Show file tree

Hide file tree

Showing 16 changed files with 640 additions and 13 deletions.
diff --git a/.github/workflows/management-api-release.yml b/.github/workflows/management-api-release.yml
@@ -0,0 +1,14 @@
+name: Management API Release
+
+on:
+  workflow_dispatch:
+    inputs: {}
+
+jobs:
+  release_docker_image:
+    name: Release Docker Image
+    uses: ./.github/workflows/release-docker-image.yml
+    with:
+      image: management-api
+      context: ./src
+      dockerfile: ./src/dotnet/ManagementAPI/Dockerfile
diff --git a/.github/workflows/management-ui-release.yml b/.github/workflows/management-ui-release.yml
@@ -0,0 +1,14 @@
+name: Management UI Release
+
+on:
+  workflow_dispatch:
+    inputs: {}
+
+jobs:
+  release_docker_image:
+    name: Release Docker Image
+    uses: ./.github/workflows/release-docker-image.yml
+    with:
+      image: management-ui
+      context: ./src/ui/ManagementPortal
+      dockerfile: ./src/ui/ManagementPortal/Dockerfile
diff --git a/deploy/arm/azureAcaDeploy.json b/deploy/arm/azureAcaDeploy.json
@@ -68,6 +68,11 @@
           "value": "core",
           "contentType": null
         },
+        {
+          "key": "FoundationaLLM:APIs:ManagementAPI:APIUrl",
+          "value": "management",
+          "contentType": null
+        },
         {
           "key": "FoundationaLLM:APIs:DataSourceHubAPI:APIUrl",
           "value": "datasourcehub",
@@ -135,6 +140,11 @@
           "value": "[concat('{\"uri\":\"https://',variables('keyVaultSettings').name, '.vault.azure.net/secrets/foundationallm-app-insights-connection-string\"}')]",
           "contentType": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8"
         },
+        {
+          "key": "FoundationaLLM:APIs:ManagementAPI:AppInsightsConnectionString",
+          "value": "[concat('{\"uri\":\"https://',variables('keyVaultSettings').name, '.vault.azure.net/secrets/foundationallm-app-insights-connection-string\"}')]",
+          "contentType": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8"
+        },
         {
           "key": "FoundationaLLM:APIs:DataSourceHubAPI:APIKey",
           "value": "[concat('{\"uri\":\"https://',variables('keyVaultSettings').name, '.vault.azure.net/secrets/foundationallm-apis-datasourcehubapi-apikey\"}')]",
@@ -395,6 +405,36 @@
           "value": "",
           "contentType": null
         },
+        {
+          "key": "FoundationaLLM:Management:Entra:CallbackPath",
+          "value": "/signin-oidc",
+          "contentType": null
+        },
+        {
+          "key": "FoundationaLLM:Management:Entra:ClientId",
+          "value": "",
+          "contentType": null
+        },
+        {
+          "key": "FoundationaLLM:Management:Entra:ClientSecret",
+          "value": "[concat('{\"uri\":\"https://',variables('keyVaultSettings').name, '.vault.azure.net/secrets/foundationallm-management-entra-clientsecret\"}')]",
+          "contentType": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8"
+        },
+        {
+          "key": "FoundationaLLM:Management:Entra:Instance",
+          "value": "https://login.microsoftonline.com/",
+          "contentType": null
+        },
+        {
+          "key": "FoundationaLLM:Management:Entra:Scopes",
+          "value": "api://FoundationaLLM-Auth/Data.Read",
+          "contentType": null
+        },
+        {
+          "key": "FoundationaLLM:Management:Entra:TenantId",
+          "value": "",
+          "contentType": null
+        },
         {
           "key": "FoundationaLLM:CognitiveSearch:EndPoint",
           "value": "[concat('https://', variables('cognitiveSearchSettings').name, '.search.windows.net')]",
@@ -475,6 +515,36 @@
           "value": "",
           "contentType": null
         },
+        {
+          "key": "FoundationaLLM:ManagementAPI:Entra:CallbackPath",
+          "value": "/signin-oidc",
+          "contentType": null
+        },
+        {
+          "key": "FoundationaLLM:ManagementAPI:Entra:ClientId",
+          "value": "",
+          "contentType": null
+        },
+        {
+          "key": "FoundationaLLM:ManagementAPI:Entra:ClientSecret",
+          "value": "[concat('{\"uri\":\"https://',variables('keyVaultSettings').name, '.vault.azure.net/secrets/foundationallm-managementapi-entra-clientsecret\"}')]",
+          "contentType": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8"
+        },
+        {
+          "key": "FoundationaLLM:ManagementAPI:Entra:Instance",
+          "value": "https://login.microsoftonline.com/",
+          "contentType": null
+        },
+        {
+          "key": "FoundationaLLM:ManagementAPI:Entra:Scopes",
+          "value": "Data.Read",
+          "contentType": null
+        },
+        {
+          "key": "FoundationaLLM:ManagementAPI:Entra:TenantId",
+          "value": "",
+          "contentType": null
+        },
         {
           "key": "FoundationaLLM:CoreWorker:AppInsightsConnectionString",
           "value": "[concat('{\"uri\":\"https://',variables('keyVaultSettings').name, '.vault.azure.net/secrets/foundationallm-app-insights-connection-string\"}')]",
@@ -744,6 +814,17 @@
             "memory": "0.25Gi"
           }
         },
+        {
+          "key": "management",
+          "image": "ghcr.io/solliancenet/foundationallm/management-api",
+          "tag": "0.1",
+          "containerPort": 80,
+          "replicas": 1,
+          "resources": {
+            "cpu": 0.25,
+            "memory": "0.25Gi"
+          }
+        },
         {
           "key": "gatekeeper",
           "image": "ghcr.io/solliancenet/foundationallm/gatekeeper-api",
@@ -820,6 +901,17 @@
             "cpu": 0.25,
             "memory": "0.25Gi"
           }
+        },
+        {
+          "key": "managementui",
+          "image": "ghcr.io/solliancenet/foundationallm/management-ui",
+          "tag": "0.1",
+          "containerPort": 3000,
+          "replicas": 1,
+          "resources": {
+            "cpu": 0.25,
+            "memory": "0.25Gi"
+          }
         }
       ]
     },
@@ -1217,6 +1309,28 @@
         "value": ""
       }
     },
+    {
+      "type": "Microsoft.KeyVault/vaults/secrets",
+      "apiVersion": "2023-02-01",
+      "name": "[concat(variables('keyVaultSettings').name, '/foundationallm-managementapi-entra-clientsecret')]",
+      "location": "[parameters('location')]",
+      "dependsOn": [ "[resourceId('Microsoft.KeyVault/vaults', variables('keyVaultSettings').name)]" ],
+      "properties": {
+        "attributes": { "enabled": true },
+        "value": ""
+      }
+    },
+    {
+      "type": "Microsoft.KeyVault/vaults/secrets",
+      "apiVersion": "2023-02-01",
+      "name": "[concat(variables('keyVaultSettings').name, '/foundationallm-management-entra-clientsecret')]",
+      "location": "[parameters('location')]",
+      "dependsOn": [ "[resourceId('Microsoft.KeyVault/vaults', variables('keyVaultSettings').name)]" ],
+      "properties": {
+        "attributes": { "enabled": true },
+        "value": ""
+      }
+    },
     {
       "type": "Microsoft.KeyVault/vaults/secrets",
       "apiVersion": "2023-02-01",
@@ -2079,6 +2193,18 @@
       "type": "string",
       "value": "[reference(resourceId('Microsoft.App/containerApps', format('{0}coreca', parameters('name'))), providers('Microsoft.App', 'containerApps').apiVersions[0]).configuration.ingress.fqdn]"
     },
+    "managementWebUrl": {
+      "type": "string",
+      "value": "[concat('https://', reference(resourceId('Microsoft.App/containerApps', format('{0}managementuica', parameters('name'))), providers('Microsoft.App', 'containerApps').apiVersions[0]).configuration.ingress.fqdn)]"
+    },
+    "managementWebFqdn": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.App/containerApps', format('{0}managementuica', parameters('name'))), providers('Microsoft.App', 'containerApps').apiVersions[0]).configuration.ingress.fqdn]"
+    },
+    "managementApiFqdn": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.App/containerApps', format('{0}managementca', parameters('name'))), providers('Microsoft.App', 'containerApps').apiVersions[0]).configuration.ingress.fqdn]"
+    },
     "agentfactoryAcaName": {
       "type": "string",
       "value": "[format('{0}agentfactoryca', parameters('name'))]"
@@ -2095,6 +2221,10 @@
       "type": "string",
       "value": "[format('{0}corejobca', parameters('name'))]"
     },
+    "managementAcaName": {
+      "type": "string",
+      "value": "[format('{0}managementca', parameters('name'))]"
+    },
     "datasourcehubAcaName": {
       "type": "string",
       "value": "[format('{0}datasourcehubca', parameters('name'))]"
@@ -2127,6 +2257,10 @@
       "type": "string",
       "value": "[format('{0}chatuica', parameters('name'))]"
     },
+    "managementuiAcaName": {
+      "type": "string",
+      "value": "[format('{0}managementuica', parameters('name'))]"
+    },
     "resourcePrefix": {
       "type": "string",
       "value": "[parameters('name')]"