Add tests for pythoin

Author: ag-ramachandran

.dockerignore

@@ -0,0 +1 @@
+**/local.settings.json

functions-int-tests/src/test/java/com/microsoft/azure/kusto/functions/FunctionsMultiLangTests.java

@@ -45,7 +45,7 @@ public class FunctionsMultiLangTests extends Simulation {
     // File name in docker compose file
     private static final String BASE_IMAGE = "baseimage";
 
-    private static final int HOST_PORT = Integer.getInteger("port", 7103);
+    private static final int HOST_PORT = Integer.getInteger("port", 7071);
     private static final Boolean HOLD_CONTAINER = Boolean.getBoolean("debug");
     private static final Boolean RUN_TRIGGER = Boolean.getBoolean("runTrigger");
     private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
@@ -56,11 +56,6 @@ public class FunctionsMultiLangTests extends Simulation {
 
     private DockerComposeContainer<?> environment;
 
-    private final Map<String, Integer> languagePortMap = Stream
-            .of(new String[][] { { "outofproc", "7101" }, { "java", "7102" }, { "node", "7103" }, { "python", "7104" },
-                    { "csharp", "7105" } })
-            .collect(Collectors.collectingAndThen(Collectors.toMap(data -> data[0], data -> Integer.parseInt(data[1])),
-                    Collections::<String, Integer> unmodifiableMap));
     private String language = getProperty("language", "node");
 
     public FunctionsMultiLangTests() throws JsonProcessingException {
@@ -75,13 +70,7 @@ public void before() {
         // Copy the project into the container
         // Replace the DLL file
         language = getProperty("language", "node");
-        if (!languagePortMap.containsKey(language)) {
-            logger.warn(
-                    "Language " + language + " is not in the list of accepted languages for test. Accepted languages - "
-                            + languagePortMap.keySet());
-            System.exit(137);
-        }
-        int hostPort = languagePortMap.get(language);
+        int hostPort = 7071;
         String dockerComposeFile = RUN_TRIGGER ? PATH_TO_DOCKER_COMPOSE : PATH_TO_DOCKER_COMPOSE_WITH_NO_RMQ;
         File absoluteFilePath = new File(dockerComposeFile).getAbsoluteFile();
         try {
@@ -189,9 +178,9 @@ public void after() {
                     "/src/samples-%s/target/azure-functions/kustojavafunctionssample-20230130111810292/func-logs.txt",
                     language);
         } else if ("outofproc".equalsIgnoreCase(language)) {
-            containerPath = String.format("/src/samples-%s/bin/Debug/net6/func-logs.txt", language);
+            containerPath = String.format("/src/samples-%s/bin/Debug/net8.0/publish/func-logs.txt", language);
         } else if ("csharp".equalsIgnoreCase(language)) {
-            containerPath = String.format("/src/samples-%s/bin/Debug/net6/func-logs.txt", language);
+            containerPath = String.format("/src/samples-%s/bin/Debug/net8.0/func-logs.txt", language);
         } else {
             containerPath = String.format("/src/samples-%s/func-logs.txt", language);
         }

samples/docker/Docker-template.dockerfile

@@ -44,6 +44,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3.11 pyth
 RUN python3.11 -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 #Python installation complete
+RUN apt-get update && apt-get install --no-install-recommends -y dotnet-sdk-8.0 && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+#.NET 8 SDK for dotnet-isolated functions
 COPY ./samples/docker/host.json /src/host.json
 # Copy the DLL to the target use this for the tests
 COPY ./src/bin/Release/netstandard2.1/Microsoft.Azure.WebJobs.Extensions.Kusto.dll /src/Microsoft.Azure.WebJobs.Extensions.Kusto.dll

samples/docker/docker-compose-no-rmq.yml

@@ -1,14 +1,9 @@
-version: '3'
 services:
   baseimage:
     image: func-az-kusto-base:latest
     hostname: func-az-kusto-base
     ports:
-      - "7101:7101"
-      - "7102:7102"
-      - "7103:7103"
-      - "7104:7104"
-      - "7105:7105"
+      - "7071:7071"
   azurite:
     image: mcr.microsoft.com/azure-storage/azurite
     hostname: azurite

samples/docker/docker-compose.yml

@@ -1,14 +1,9 @@
-version: '3'
 services:
   baseimage:
     image: func-az-kusto-base:latest
     hostname: func-az-kusto-base
     ports:
-      - "7101:7101"
-      - "7102:7102"
-      - "7103:7103"
-      - "7104:7104"
-      - "7105:7105"
+      - "7071:7071"
   rabbitmq:
     image: rabbitmq:3.11.9-management
     hostname: rabbitmq

samples/docker/start-functions.sh

@@ -28,30 +28,30 @@ cd "$SAMPLES_DIR"
 case "$language" in
     outofproc)
         echo "Starting out-of-process dotnet-isolated worker"
-        cd bin/Debug/net8.0
-        func start --dotnet-isolated --verbose --port "$port" >> func-logs.txt &
+        cd bin/Debug/net8.0/publish
+        FUNCTIONS_WORKER_RUNTIME=dotnet-isolated func start --dotnet-isolated --no-build --verbose --port "$port" >> func-logs.txt &
         ;;
     csharp)
         echo "Starting C# in-process worker"
         cd bin/Debug/net8.0
-        func start --csharp --verbose --port "$port" >> func-logs.txt &
+        FUNCTIONS_WORKER_RUNTIME=dotnet func start --csharp --verbose --port "$port" >> func-logs.txt &
         ;;
     node)
         echo "Starting Node.js (JavaScript) worker"
-        func start --javascript --verbose --port "$port" >> func-logs.txt &
+        FUNCTIONS_WORKER_RUNTIME=node func start --javascript --verbose --port "$port" >> func-logs.txt &
         ;;
     java)
         echo "Starting Java worker"
         cd target/azure-functions/kustojavafunctionssample-20230130111810292
-        func start --java --verbose --port "$port" >> func-logs.txt &
+        FUNCTIONS_WORKER_RUNTIME=java func start --java --verbose --port "$port" >> func-logs.txt &
         ;;
     python)
         echo "Starting Python worker"
-        func start --python --verbose --port "$port" >> func-logs.txt &
+        FUNCTIONS_WORKER_RUNTIME=python PYTHONPATH="$SAMPLES_DIR" func start --python --verbose --port "$port" >> func-logs.txt &
         ;;
     powershell)
         echo "Starting PowerShell worker"
-        func start --powershell --verbose --port "$port" >> func-logs.txt &
+        FUNCTIONS_WORKER_RUNTIME=powershell func start --powershell --verbose --port "$port" >> func-logs.txt &
         ;;
     *)
         echo "Error: Unsupported language '$language'"

samples/samples-python/Common/__init__.py

@@ -2,29 +2,39 @@
 set -euo pipefail
 
 # Wrapper script to build the E2E test Docker image and configure local settings.
-# Usage: ./run-functional-tests-e2e.sh [KustoConnectionString]
-#   KustoConnectionString is built from CLUSTER and DATABASE env vars if set,
-#   otherwise falls back to the first positional parameter.
+# Usage: ./run-functional-tests-e2e.sh <Cluster> <Database> [Language]
+#
+#   Cluster and Database can also be set via CLUSTER and DATABASE env vars.
+#   Language selects which sample to test (must be a LANG_MAP key, e.g.
+#   samples-csharp, samples-java, etc.). Can also be set via SAMPLE_LANG env var.
+#   Defaults to samples-node.
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 cd "$REPO_ROOT"
 
-# Build KustoConnectionString from CLUSTER/DATABASE env vars, or fall back to $1
-if [ -n "${CLUSTER:-}" ] && [ -n "${DATABASE:-}" ]; then
-    KUSTO_CONNECTION_STRING="Data Source=${CLUSTER};Database=${DATABASE};Fed=True"
-    echo "==> Using KustoConnectionString from CLUSTER and DATABASE env vars"
-elif [ $# -ge 1 ]; then
-    KUSTO_CONNECTION_STRING="$1"
-    echo "==> Using KustoConnectionString from parameter"
+# Build KustoConnectionString from positional args or CLUSTER/DATABASE env vars.
+# Positional args take precedence over env vars.
+LANG_ARG=""
+if [ $# -ge 2 ]; then
+    CLUSTER="$1"
+    DATABASE="$2"
+    LANG_ARG="${3:-}"
+    echo "==> Using Cluster and Database from positional parameters"
+elif [ -n "${CLUSTER:-}" ] && [ -n "${DATABASE:-}" ]; then
+    LANG_ARG="${1:-}"
+    echo "==> Using Cluster and Database from env vars"
 else
-    echo "Error: Either set CLUSTER and DATABASE env vars, or pass KustoConnectionString as \$1"
-    echo "Usage: $0 [KustoConnectionString]"
-    echo "  CLUSTER   - Kusto cluster URL (e.g. https://mycluster.kusto.windows.net)"
-    echo "  DATABASE  - Kusto database name"
+    echo "Error: Provide Cluster and Database as positional args, or set CLUSTER and DATABASE env vars"
+    echo "Usage: $0 <Cluster> <Database> [Language]"
+    echo "  Cluster   - Kusto cluster URL (e.g. https://mycluster.kusto.windows.net)"
+    echo "  Database  - Kusto database name"
+    echo "  Language  - LANG_MAP key (e.g. samples-csharp, samples-java). Default: samples-node"
     exit 1
 fi
 
+KUSTO_CONNECTION_STRING="Data Source=${CLUSTER};Database=${DATABASE};Fed=True"
+
 # Source access token from az CLI if not already set
 if [ -z "${ACCESS_TOKEN:-}" ]; then
     echo "==> Fetching access token from az CLI..."
@@ -33,48 +43,71 @@ fi
 
 # Map sample directories to their FUNCTIONS_WORKER_RUNTIME values
 declare -A LANG_MAP=(
-    ["samples-csharp"]="dotnet"
+    ["samples-csharp"]="csharp"
     ["samples-java"]="java"
     ["samples-node"]="node"
     ["samples-outofproc"]="dotnet-isolated"
     ["samples-powershell"]="powershell"
     ["samples-python"]="python"
 )
 
+FUNC_PORT=7071
+
+# Resolve language: positional arg > SAMPLE_LANG env var > default (samples-node)
+if [ -n "$LANG_ARG" ]; then
+    SAMPLE_LANG="$LANG_ARG"
+else
+    SAMPLE_LANG="${SAMPLE_LANG:-samples-node}"
+fi
+
+# Validate SAMPLE_LANG against LANG_MAP
+if [ -z "${LANG_MAP[$SAMPLE_LANG]+_}" ]; then
+    echo "Error: '${SAMPLE_LANG}' is not a valid language key."
+    echo "Valid keys: ${!LANG_MAP[*]}"
+    exit 1
+fi
+echo "==> Running tests for language: ${SAMPLE_LANG} (runtime: ${LANG_MAP[$SAMPLE_LANG]})"
+
+runtime="${LANG_MAP[$SAMPLE_LANG]}"
+
 echo "=== Step 1: Building Docker image ==="
 "$SCRIPT_DIR/build-docker-image.sh"
 
-echo "=== Step 2: Generating local.settings.json for each language sample ==="
+echo "=== Step 2: Generating local.settings.json for ${SAMPLE_LANG} ==="
 
 CONN_STRING_WITH_TOKEN="${KUSTO_CONNECTION_STRING};AAD Federated Security=True;UserToken=${ACCESS_TOKEN}"
 
-for sample_dir in "${!LANG_MAP[@]}"; do
-    runtime="${LANG_MAP[$sample_dir]}"
-    target_dir="samples/${sample_dir}"
-    target="${target_dir}/local.settings.json"
-
-    if [ ! -d "$target_dir" ]; then
-        echo "Warning: ${target_dir} does not exist, skipping"
-        continue
-    fi
-
-    echo "Creating ${target} with FUNCTIONS_WORKER_RUNTIME=${runtime}"
-
-    # Use jq if available for safe JSON manipulation, otherwise fall back to sed
-    if command -v jq &>/dev/null; then
-        jq \
-            --arg runtime "$runtime" \
-            --arg connStr "$CONN_STRING_WITH_TOKEN" \
-            '.Values.FUNCTIONS_WORKER_RUNTIME = $runtime | .Values.KustoConnectionString = $connStr' \
-            local.settings.json.example > "${target}"
-    else
-        sed \
-            -e "s/<lang>/${runtime}/" \
-            -e "s|<KustoConnectionString>|${CONN_STRING_WITH_TOKEN//|/\\|}|" \
-            local.settings.json.example > "${target}"
-    fi
-done
-
-echo "=== Step 3: Running functional tests ==="
+target_dir="samples/${SAMPLE_LANG}"
+target="${target_dir}/local.settings.json"
+
+if [ ! -d "$target_dir" ]; then
+    echo "Error: ${target_dir} does not exist"
+    exit 1
+fi
+
+rm -f "${target}"
+echo "Creating ${target} with FUNCTIONS_WORKER_RUNTIME=${runtime}"
+
+if command -v jq &>/dev/null; then
+    jq \
+        --arg runtime "$runtime" \
+        --arg connStr "$CONN_STRING_WITH_TOKEN" \
+        '.Values.FUNCTIONS_WORKER_RUNTIME = $runtime | .Values.KustoConnectionString = $connStr' \
+        local.settings.json.example > "${target}"
+else
+    sed \
+        -e "s/<lang>/${runtime}/" \
+        -e "s|<KustoConnectionString>|${CONN_STRING_WITH_TOKEN//|/\\|}|" \
+        local.settings.json.example > "${target}"
+fi
+
+if [ "$SAMPLE_LANG" = "samples-outofproc" ]; then
+    echo "=== Step 3: Building ${SAMPLE_LANG} ==="
+    dotnet publish "${target_dir}" -c Debug -o "${target_dir}/bin/Debug/net8.0/publish"
+    cp "${target}" "${target_dir}/bin/Debug/net8.0/publish/local.settings.json"
+fi
+
+echo "=== Step 4: Running functional tests ==="
 cd "$REPO_ROOT/functions-int-tests"
-mvn clean gatling:test
+test_language="${SAMPLE_LANG#samples-}"
+mvn clean gatling:test -Dlanguage="${test_language}" -Dport="${FUNC_PORT}"