Integrate Azure Functions deployment

Signed-off-by: hancheng wang <wanghanchengchn@gmail.com>

Integrate Azure Functions deployment

Signed-off-by: hancheng wang <wanghanchengchn@gmail.com>

Integrate Azure Functions deployment

Signed-off-by: hancheng wang <wanghanchengchn@gmail.com>

Author: wanghanchengchn

.github/workflows/azure_integration_test.yaml

@@ -20,7 +20,7 @@ jobs:
     env:
       AZURE_APP_ID: ${{ secrets.AZURE_APP_ID }}
       AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+      AZURE_TENANT: ${{ secrets.AZURE_TENANT }}
 
     steps:
       - name: Check if environment variables are set  # Validate secrets are passed
@@ -33,8 +33,8 @@ jobs:
             echo "AZURE_PASSWORD is not set. Please check if secrets.AZURE_PASSWORD is in the repository."
             exit 1
           fi
-          if [[ -z "$AZURE_TENANT_ID" ]]; then
-            echo "AZURE_TENANT_ID is not set. Please check if secrets.AZURE_TENANT_ID is in the repository."
+          if [[ -z "$AZURE_TENANT" ]]; then
+            echo "AZURE_TENANT is not set. Please check if secrets.AZURE_TENANT is in the repository."
             exit 1
           fi
 
@@ -59,7 +59,7 @@ jobs:
           python-version: '3.10'
 
       - name: Azure CLI Login Using Service Principal
-        run: az login --service-principal --username "$AZURE_APP_ID" --password "$AZURE_PASSWORD" --tenant "$AZURE_TENANT_ID"
+        run: az login --service-principal --username "$AZURE_APP_ID" --password "$AZURE_PASSWORD" --tenant "$AZURE_TENANT"
 
       - name: Run Azure-related integration test
         run: go test -v ./pkg/driver/deployment/azure_functions_test.go

.github/workflows/e2e_azure.yaml

@@ -20,7 +20,7 @@ jobs:
     env:
       AZURE_APP_ID: ${{ secrets.AZURE_APP_ID }}
       AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+      AZURE_TENANT: ${{ secrets.AZURE_TENANT }}
 
     steps:
       - name: Check if environment variables are set  # Validate secrets are passed
@@ -33,8 +33,8 @@ jobs:
             echo "AZURE_PASSWORD is not set. Please check if secrets.AZURE_PASSWORD is in the repository."
             exit 1
           fi
-          if [[ -z "$AZURE_TENANT_ID" ]]; then
-            echo "AZURE_TENANT_ID is not set. Please check if secrets.AZURE_TENANT_ID is in the repository."
+          if [[ -z "$AZURE_TENANT" ]]; then
+            echo "AZURE_TENANT is not set. Please check if secrets.AZURE_TENANT is in the repository."
             exit 1
           fi
 
@@ -59,7 +59,7 @@ jobs:
           python-version: '3.10'
 
       - name: Azure CLI Login Using Service Principal
-        run: az login --service-principal --username "$AZURE_APP_ID" --password "$AZURE_PASSWORD" --tenant "$AZURE_TENANT_ID"
+        run: az login --service-principal --username "$AZURE_APP_ID" --password "$AZURE_PASSWORD" --tenant "$AZURE_TENANT"
 
       - name: Build and Run Loader
         run: go run cmd/loader.go --config cmd/config_azure_trace.json

.github/workflows/integration_tests.yaml

@@ -31,9 +31,6 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: '3.9'
-    
-    - name: Upgrade pip
-      run: python3 -m pip install --upgrade pip
 
     - uses: actions/cache@v4
       with:

.github/workflows/unit-tests.yaml

@@ -46,9 +46,6 @@ jobs:
           python-version: '3.9'
         env:
           PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
-      
-      - name: Upgrade pip
-        run: python3 -m pip install --upgrade pip
 
       - uses: actions/cache@v4
         with:

azurefunctions_setup/azurefunctionsconfig.yaml

@@ -1,6 +1,6 @@
 # azurefunctionsconfig.yaml
 azurefunctionsconfig:
   resource_group: ExperimentResourceGroup  # Name of the resource group
-  storage_account_name: testinvitrostorage  # Name of the storage account
-  function_app_name: testinvitrofunctionapp  # Name of the function app
+  storage_account_name: invitroteststorage1  # Name of the storage account
+  function_app_name: invitrotestfunctionapp  # Name of the function app
   location: EastUS  # Region where resource created

docs/loader.md

@@ -302,7 +302,7 @@ Note:
     ```
 2. Use existing Service Principal credentials in order login to Azure.
     ```bash
-    az login --service-principal --username $AZURE_APP_ID --password $AZURE_PASSWORD --tenant $AZURE_TENANT_ID
+    az login --service-principal --username $AZURE_APP_ID --password $AZURE_PASSWORD --tenant $AZURE_TENANT
     ```
    > Refer to Note section for generation of Service Principal credentials
 3. Start the Azure Functions deployment experiment:
@@ -321,7 +321,7 @@ Notes:
    - Click **Register**
 3. Once registered, note down the following:
    - **Application (client) ID** → This is your `AZURE_APP_ID`
-   - **Directory (tenant) ID** → This is your `AZURE_TENANT_ID`
+   - **Directory (tenant) ID** → This is your `AZURE_TENANT`
 4. Click **Add a certificate or secret**
    - Click **+ New client secret**
    - Add a description and choose an expiry (e.g., 6 months)
@@ -338,7 +338,7 @@ Notes:
      ```bash
      export AZURE_APP_ID=<appId>
      export AZURE_PASSWORD=<password>
-     export AZURE_TENANT_ID=<tenant>
+     export AZURE_TENANT=<tenant>
      ```
 - Current deployment is via ZIP
-- Python is used for deployment workload as Go is not supported in Consumption Plan
+- Python is used for deployment workload as Go is not supported in Consumption Plan

pkg/driver/deployment/azure_functions.go

@@ -250,31 +250,6 @@ func SetORYXSettings(config *Config, functionAppName string) error {
 
 /* Function to create folders and copy files to the folders */
 
-// func CreateFunctionFolders(baseDir string, functions []*common.Function) error {
-// 	for i := 0; i < len(functions); i++ {
-// 		folderName := fmt.Sprintf("function%d", i)
-// 		folderPath := filepath.Join(baseDir, folderName)
-
-// 		// Create the function folder
-// 		if err := os.MkdirAll(folderPath, os.ModePerm); err != nil {
-// 			return fmt.Errorf("failed to create folder %s: %w", folderPath, err)
-// 		}
-
-// 		// Copy azurefunctionsworkload.py, exec_func.py and function.json into each function folder
-// 		if err := common.CopyFile("azurefunctions_setup/shared_azure_workload/azurefunctionsworkload.py", filepath.Join(folderPath, "azurefunctionsworkload.py")); err != nil {
-// 			return fmt.Errorf("failed to copy azurefunctionsworkload.py to %s: %w", folderPath, err)
-// 		}
-// 		if err := common.CopyFile("azurefunctions_setup/shared_azure_workload/exec_func.py", filepath.Join(folderPath, "exec_func.py")); err != nil {
-// 			return fmt.Errorf("failed to copy exec_func.py to %s: %w", folderPath, err)
-// 		}
-// 		if err := common.CopyFile("azurefunctions_setup/shared_azure_workload/function.json", filepath.Join(folderPath, "function.json")); err != nil {
-// 			return fmt.Errorf("failed to copy function.json to %s: %w", folderPath, err)
-// 		}
-// 	}
-// 	log.Debugf("Created %d function folders with copies of azurefunctionsworkload.py, exec_func.py and function.json under %s folder.\n", len(functions), baseDir)
-// 	return nil
-// }
-
 func CreateFunctionFolders(baseDir, sharedWorkloadDir string, functions []*common.Function) error {
 	for i := 0; i < len(functions); i++ {
 		folderName := fmt.Sprintf("function%d", i)
@@ -345,13 +320,7 @@ func DeployFunctions(config *Config, baseDir string, functions []*common.Functio
 			"--src", zipFilePath,
 			"--build-remote", "true")
 
-		//var stdout, stderr bytes.Buffer // debugging output
-		//cmd.Stdout = &stdout            // debugging output
-		//cmd.Stderr = &stderr            // debugging output
-
 		if err := cmd.Run(); err != nil {
-			//log.Errorf("Deployment stdout:\n%s", stdout.String()) // debugging output
-			//log.Errorf("Deployment stderr:\n%s", stderr.String()) // debugging output
 			return fmt.Errorf("failed to deploy %s to function app %s: %w", zipFilePath, functionAppName, err)
 		}
 

pkg/driver/deployment/azure_functions_test.go

@@ -245,11 +245,11 @@ func setupAzureLogin(t *testing.T) {
 
 	appID := os.Getenv("AZURE_APP_ID")
 	password := os.Getenv("AZURE_PASSWORD")
-	tenantID := os.Getenv("AZURE_TENANT_ID")
+	tenantID := os.Getenv("AZURE_TENANT")
 
 	require.NotEmpty(t, appID, "AZURE_APP_ID must be set")
 	require.NotEmpty(t, password, "AZURE_PASSWORD must be set")
-	require.NotEmpty(t, tenantID, "AZURE_TENANT_ID must be set")
+	require.NotEmpty(t, tenantID, "AZURE_TENANT must be set")
 
 	cmd := exec.Command("az", "login",
 		"--service-principal",