APM-6134 dependabot fixes

.github/workflows/continuous-integration.yml

@@ -12,10 +12,10 @@ jobs:
               with:
                   fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
 
-            - name: Install Python 3.8
-              uses: actions/setup-python@v1
+            - name: Install Python 3.10
+              uses: actions/setup-python@v5
               with:
-                  python-version: 3.8
+                  python-version: "3.10"
 
             - name: Update apt repositories
               run: sudo apt update
@@ -27,7 +27,7 @@ jobs:
               run: pip install poetry
 
             - name: Cache poetry packages
-              uses: actions/cache@v1
+              uses: actions/cache@v4
               with:
                   path: ~/.cache/pypoetry
                   key: ${{ runner.os }}-build-cache-poetry-packages-${{ hashFiles('**/poetry.lock') }}

.gitignore

@@ -11,6 +11,8 @@
 *.orig
 *.squashfs
 *.retry
+.envrc
+.env
 
 # node
 node_modules/

.python-version

@@ -0,0 +1 @@
+3.10

azure/azure-build-pipeline.yml

@@ -28,6 +28,7 @@ extends:
   parameters:
     service_name: ${{ variables.service_name }}
     short_service_name: ${{ variables.short_service_name }}
+    python_version: ${{ variables.python_version }}
     cache_steps:
       - task: s3-cache-action@1
         inputs:

azure/azure-pr-pipeline.yml

@@ -33,8 +33,7 @@ extends:
     service_name: ${{ variables.service_name }}
     service_base_path: ${{ variables.service_base_path }}
     short_service_name: ${{ variables.short_service_name }}
-    product_display_name: ${{ variables.product_display_name }}
-    product_description: ${{ variables.product_description }}
+    python_version: ${{ variables.python_version }}
     apigee_deployments:
       - environment: internal-dev
         post_deploy:

azure/azure-release-pipeline.yml

@@ -33,6 +33,7 @@ extends:
     service_base_path: ${{ variables.service_base_path }}
     product_display_name: ${{ variables.product_display_name }}
     product_description: ${{ variables.product_description }}
+    python_version: ${{ variables.python_version }}
     apigee_deployments:
       - environment: internal-dev
         post_deploy:

azure/project.yml

@@ -2,3 +2,4 @@ variables:
   service_name: async-slowapp
   service_base_path: async-slowapp
   short_service_name: async-slowapp
+  python_version: 3.10

azure/templates/e2e.yml

@@ -19,11 +19,9 @@ steps:
       displayName: poetry install
 
     - bash: |
-        export RELEASE_RELEASEID=$(Build.BuildId)
         export SOURCE_COMMIT_ID=$(Build.SourceVersion)
-        export APIGEE_ENVIRONMENT="$(APIGEE_ENVIRONMENT)"
-        export SERVICE_BASE_PATH="$(SERVICE_BASE_PATH)"
-        export STATUS_ENDPOINT_API_KEY="$(status-endpoint-api-key)"
+        export PROXY_NAME="$(FULLY_QUALIFIED_SERVICE_NAME)"
+        export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
         make -C e2e ${{ parameters.test_type }}
 
       workingDirectory: $(SERVICE_DIR)

docker/async-slowapp/Makefile

@@ -11,7 +11,7 @@ clean:
 	rm -rf ./node_modules
 
 install:
-	npm install --dev
+	npm install --include=dev
 
 update:
 	npm update