Merge pull request #170 from Azure/ipam-vite

Azure IPAM 2.0 Updates

.dockerignore

@@ -1,5 +1,6 @@
 node_modules
 build
+dist
 .dockerignore
 Dockerfile
 Dockerfile.prod

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM node:16-slim AS builder
+FROM node:18-slim AS builder
 
 # Set Working Directory
 WORKDIR /app
@@ -41,7 +41,7 @@ RUN mkdir /var/run/sshd
 
 # Install NodeJS 16.x
 RUN apt install curl -y
-RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh
+RUN curl -sL https://deb.nodesource.com/setup_18.x -o nodesource_setup.sh
 RUN bash ./nodesource_setup.sh
 RUN apt install nodejs
 RUN npm install -g react-inject-env

deploy/deploy.ps1

@@ -878,7 +878,7 @@ process {
           Extension = "deb"
           Port = 80
           Images = @{
-            UI     = 'node:16-slim'
+            UI     = 'node:18-slim'
             Engine = 'python:3.9-slim'
             LB     = 'nginx:alpine'
           }
@@ -887,9 +887,9 @@ process {
           Extension = "rhel"
           Port = 8080
           Images = @{
-            UI     = 'registry.access.redhat.com/ubi8/nodejs-16'
+            UI     = 'registry.access.redhat.com/ubi8/nodejs-18'
             Engine = 'registry.access.redhat.com/ubi8/python-39'
-            LB     = 'registry.access.redhat.com/ubi8/nginx-120'
+            LB     = 'registry.access.redhat.com/ubi8/nginx-122'
           }
         }
       }

docker-compose.prod.yml

@@ -2,10 +2,10 @@ version: '3.8'
 services:
   ipam-ui:
     environment:
-      REACT_APP_AZURE_ENV: ${AZURE_ENV}
-      REACT_APP_UI_ID: ${UI_APP_ID}
-      REACT_APP_ENGINE_ID: ${ENGINE_APP_ID}
-      REACT_APP_TENANT_ID: ${TENANT_ID}
+      VITE_AZURE_ENV: ${AZURE_ENV}
+      VITE_UI_ID: ${UI_APP_ID}
+      VITE_ENGINE_ID: ${ENGINE_APP_ID}
+      VITE_TENANT_ID: ${TENANT_ID}
     image: azureipam.azurecr.io/ipam-ui:latest
   ipam-engine:
     environment:

docker-compose.yml

@@ -7,10 +7,10 @@ services:
       args:
         PORT: 8080
     environment:
-      REACT_APP_AZURE_ENV: ${AZURE_ENV}
-      REACT_APP_UI_ID: ${UI_APP_ID}
-      REACT_APP_ENGINE_ID: ${ENGINE_APP_ID}
-      REACT_APP_TENANT_ID: ${TENANT_ID}
+      VITE_AZURE_ENV: ${AZURE_ENV}
+      VITE_UI_ID: ${UI_APP_ID}
+      VITE_ENGINE_ID: ${ENGINE_APP_ID}
+      VITE_TENANT_ID: ${TENANT_ID}
       WDS_SOCKET_PORT: 3000
     volumes:
       - ./ui:/app

engine/app/globals.py

@@ -1,7 +1,10 @@
 import os
+import aiohttp
 
 from azure.identity import AzureAuthorityHosts
 
+from azure.core.pipeline.transport import AioHttpTransport
+
 AZURE_ENV_MAP = {
     'AZURE_PUBLIC': {
         'AZURE_ARM': 'management.azure.com',
@@ -26,6 +29,11 @@
 }
 
 class Globals:
+    def __init__(self):
+        conn = aiohttp.TCPConnector(limit=100)
+        session = aiohttp.ClientSession(connector=conn)
+        self.shared_transport = AioHttpTransport(session=session, session_owner=False)
+
     @property
     def CLIENT_ID(self):
         return os.environ.get('CLIENT_ID')
@@ -88,5 +96,9 @@ def CONTAINER_NAME(self):
         ctr_name =  os.environ.get('CONTAINER_NAME')
 
         return ctr_name if ctr_name else 'ipam-ctr'
+
+    @property
+    def SHARED_TRANSPORT(self):
+        return self.shared_transport
 
 globals = Globals()

engine/app/main.py

@@ -1,5 +1,5 @@
 from fastapi import FastAPI, Request, HTTPException, Header
-from fastapi.responses import JSONResponse, RedirectResponse, FileResponse
+from fastapi.responses import JSONResponse, FileResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.exceptions import HTTPException as StarletteHTTPException
 from fastapi.middleware.cors import CORSMiddleware
@@ -46,15 +46,15 @@
 app = FastAPI(
     title = "Azure IPAM",
     description = description,
-    version = "1.0.0",
+    version = "2.0.0",
     contact = {
         "name": "Azure IPAM Team",
         "url": "https://github.com/azure/ipam",
         "email": "[email protected]",
     },
     openapi_url = "/api/openapi.json",
     docs_url = "/api/docs",
-    redoc_url = "/api/docs"
+    redoc_url = "/api/redoc"
 )
 
 app.logger = logger

engine/app/models.py

@@ -1,10 +1,8 @@
-from pydantic import BaseModel, ValidationError, EmailStr, root_validator, validator
+from pydantic import BaseModel, EmailStr, root_validator, validator
 from typing import Optional, Union, Literal, List, Dict, Any
 
-from netaddr import IPSet, IPNetwork, IPAddress
-from datetime import datetime
+from netaddr import IPNetwork, IPAddress
 from uuid import UUID
-import json
 
 class IPv4Network(str):
     """

engine/app/routers/admin.py

@@ -1,12 +1,8 @@
-from fastapi import APIRouter, Depends, Request, Response, HTTPException, Header, Path, status
-from fastapi.responses import JSONResponse, PlainTextResponse
-from fastapi.exceptions import HTTPException as StarletteHTTPException
+from fastapi import APIRouter, Depends, Response, HTTPException, Header, Path, status
+from fastapi.responses import PlainTextResponse
 from fastapi.encoders import jsonable_encoder
 
-import azure.cosmos.exceptions as exceptions
-
-from pydantic import BaseModel, EmailStr, constr
-from typing import Optional, List
+from typing import List
 
 import copy
 import uuid
@@ -24,7 +20,6 @@
     cosmos_query,
     cosmos_upsert,
     cosmos_replace,
-    cosmos_delete,
     cosmos_retry,
     arg_query
 )

engine/app/routers/azure.py

@@ -1,27 +1,19 @@
-from fastapi import APIRouter, Depends, Request, Response, HTTPException, Header, status
-from fastapi.responses import JSONResponse
-from fastapi.exceptions import HTTPException as StarletteHTTPException
-from fastapi.encoders import jsonable_encoder
+from fastapi import APIRouter, Depends, HTTPException, Header
 
 from azure.core.exceptions import ClientAuthenticationError, HttpResponseError
 from azure.mgmt.compute.aio import ComputeManagementClient
 from azure.mgmt.network.aio import NetworkManagementClient
 from azure.mgmt.resource.subscriptions.aio import SubscriptionClient
 
-import azure.cosmos.exceptions as exceptions
-
-from typing import Optional, List
+from typing import  List
 
 import re
 import copy
 import time
 import asyncio
-from ipaddress import IPv4Network
 from netaddr import IPSet, IPNetwork
 from uuid import uuid4
 
-from sqlalchemy import true
-
 from app.dependencies import (
     check_token_expired,
     get_admin,
@@ -35,7 +27,6 @@
     get_client_credentials,
     get_obo_credentials,
     cosmos_query,
-    cosmos_upsert,
     cosmos_replace,
     cosmos_retry,
     arg_query,
@@ -75,14 +66,15 @@ async def get_subscriptions_sdk(credentials):
     azure_arm_url = 'https://{}'.format(globals.AZURE_ARM_URL)
     azure_arm_scope = '{}/.default'.format(azure_arm_url)
 
-    subscriptions = []
-
     subscription_client = SubscriptionClient(
         credential=credentials,
         base_url=azure_arm_url,
-        credential_scopes=[azure_arm_scope]
+        credential_scopes=[azure_arm_scope],
+        transport=globals.SHARED_TRANSPORT
     )
 
+    subscriptions = []
+
     async for poll in subscription_client.subscriptions.list():
         quota_id = poll.subscription_policies.quota_id
         quota_id_parts = quota_id.split("_")
@@ -123,7 +115,8 @@ async def update_vhub_data(auth, admin, hubs):
             credential=creds,
             subscription_id=hub['subscription_id'],
             base_url=azure_arm_url,
-            credential_scopes=[azure_arm_scope]
+            credential_scopes=[azure_arm_scope],
+            transport=globals.SHARED_TRANSPORT
         )
 
         hub['peerings'] = []
@@ -191,7 +184,8 @@ async def get_vmss_list_sdk_helper(credentials, subscription, list):
         credential=credentials,
         subscription_id=subscription['subscription_id'],
         base_url=azure_arm_url,
-        credential_scopes=[azure_arm_scope]
+        credential_scopes=[azure_arm_scope],
+        transport=globals.SHARED_TRANSPORT
     )
 
     try:
@@ -241,7 +235,8 @@ async def get_vmss_interfaces_sdk_helper(credentials, vmss, list):
         credential=credentials,
         subscription_id=vmss['subscription']['subscription_id'],
         base_url=azure_arm_url,
-        credential_scopes=[azure_arm_scope]
+        credential_scopes=[azure_arm_scope],
+        transport=globals.SHARED_TRANSPORT
     )
 
     try:

engine/app/routers/common/helper.py

@@ -1,5 +1,4 @@
 from fastapi import HTTPException
-from fastapi.responses import JSONResponse
 
 from azure.identity.aio import OnBehalfOfCredential, ClientSecretCredential
 
@@ -13,16 +12,17 @@
 from azure.cosmos.aio import CosmosClient
 import azure.cosmos.exceptions as exceptions
 
-import os
 import jwt
 from netaddr import IPNetwork
 from functools import wraps
 
-from requests import options
-
 from app.globals import globals
 
-# SCOPE = "https://management.azure.com/user_impersonation"
+cosmos_client = CosmosClient(
+    url=globals.COSMOS_URL,
+    credential=globals.COSMOS_KEY,
+    transport=globals.SHARED_TRANSPORT
+)
 
 def valid_ipv4(addr):
     try:
@@ -139,7 +139,7 @@ async def get_mgmt_group_name(tenant_id):
 async def cosmos_query(query: str, tenant_id: str):
     """DOCSTRING"""
 
-    cosmos_client = CosmosClient(globals.COSMOS_URL, credential=globals.COSMOS_KEY)
+    # cosmos_client = CosmosClient(globals.COSMOS_URL, credential=globals.COSMOS_KEY)
 
     database_name = globals.DATABASE_NAME
     database = cosmos_client.get_database_client(database_name)
@@ -155,14 +155,14 @@ async def cosmos_query(query: str, tenant_id: str):
 
     result_array = [result async for result in query_results]
 
-    await cosmos_client.close()
+    # await cosmos_client.close()
 
     return result_array
 
 async def cosmos_upsert(data):
     """DOCSTRING"""
 
-    cosmos_client = CosmosClient(globals.COSMOS_URL, credential=globals.COSMOS_KEY)
+    # cosmos_client = CosmosClient(globals.COSMOS_URL, credential=globals.COSMOS_KEY)
 
     database_name = globals.DATABASE_NAME
     database = cosmos_client.get_database_client(database_name)
@@ -174,17 +174,17 @@ async def cosmos_upsert(data):
         res = await container.upsert_item(data)
     except:
         raise
-    finally:
-        await cosmos_client.close()
+    # finally:
+    #     await cosmos_client.close()
 
-    await cosmos_client.close()
+    # await cosmos_client.close()
 
     return res
 
 async def cosmos_replace(old, new):
     """DOCSTRING"""
 
-    cosmos_client = CosmosClient(globals.COSMOS_URL, credential=globals.COSMOS_KEY)
+    # cosmos_client = CosmosClient(globals.COSMOS_URL, credential=globals.COSMOS_KEY)
 
     database_name = globals.DATABASE_NAME
     database = cosmos_client.get_database_client(database_name)
@@ -201,17 +201,17 @@ async def cosmos_replace(old, new):
         )
     except:
         raise
-    finally:
-        await cosmos_client.close()
+    # finally:
+    #     await cosmos_client.close()
 
-    await cosmos_client.close()
+    # await cosmos_client.close()
 
     return
 
 async def cosmos_delete(item, tenant_id: str):
     """DOCSTRING"""
 
-    cosmos_client = CosmosClient(globals.COSMOS_URL, credential=globals.COSMOS_KEY)
+    # cosmos_client = CosmosClient(globals.COSMOS_URL, credential=globals.COSMOS_KEY)
 
     database_name = globals.DATABASE_NAME
     database = cosmos_client.get_database_client(database_name)
@@ -226,10 +226,10 @@ async def cosmos_delete(item, tenant_id: str):
         )
     except:
         raise
-    finally:
-        await cosmos_client.close()
+    # finally:
+    #     await cosmos_client.close()
 
-    await cosmos_client.close()
+    # await cosmos_client.close()
 
     return
 
@@ -331,7 +331,8 @@ async def arg_query_helper(credentials, query):
     resource_graph_client = ResourceGraphClient(
         credential=credentials,
         base_url=azure_arm_url,
-        credential_scopes=[azure_arm_scope]
+        credential_scopes=[azure_arm_scope],
+        transport=globals.SHARED_TRANSPORT
     )
 
     try: