Merge pull request #5554 from grafana/dev

v1.16.3

Author: matiasb

.github/actions/setup-python/action.yml

@@ -18,7 +18,7 @@ runs:
       env:
         PYTHON_REQUIREMENTS_PATHS: ${{ inputs.python-requirements-paths }}
       with:
-        python-version: "3.12.10"
+        python-version: "3.12.11"
         cache: "pip"
         cache-dependency-path: ${{ env.PYTHON_REQUIREMENTS_PATHS }}
     - name: Install Python dependencies

.github/workflows/on-release-published.yml

@@ -107,36 +107,3 @@ jobs:
               "version": "${{ steps.prepare-version-tags.outputs.version }}",
               "appVersion": "${{ steps.prepare-version-tags.outputs.app-version }}"
             }
-
-  merge-helm-release-pr:
-    name: Merge Helm release PR
-    needs:
-      - create-helm-release-pr
-    runs-on: ubuntu-latest
-    # These permissions are needed to assume roles from Github's OIDC.
-    # https://github.com/grafana/shared-workflows/tree/main/actions/get-vault-secrets
-    permissions:
-      id-token: write
-      contents: read
-    steps:
-      - name: Get Vault secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@get-vault-secrets-v1.2.0
-        with:
-          repo_secrets: |
-            GH_APP_ID=github-app:app-id
-            GH_APP_PRIVATE_KEY=github-app:private-key
-
-      - name: Generate Github App token
-        id: generate-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ env.GH_APP_ID }}
-          private-key: ${{ env.GH_APP_PRIVATE_KEY }}
-          owner: grafana
-          repositories: "oncall"
-
-      - name: Merge pull Request
-        uses: juliangruber/merge-pull-request-action@d4773803fdc1d1fd46801ab0c56c135df9075de8 #v1.1.1
-        with:
-          github-token: ${{ steps.generate-token.outputs.token }}
-          number: ${{ needs.create-helm-release-pr.outputs.helm_release_pr_number }}

.github/workflows/publish-technical-documentation-release.yml

@@ -20,10 +20,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      # yamllint disable rule:line-length
       # publish-technical-documentation-release/v2.2.4
-      - uses: grafana/writers-toolkit/publish-technical-documentation-release@8cc658b604c6e05c275af30163a1c7728dfe19b2
+      # yamllint disable rule:line-length
+      - uses: grafana/writers-toolkit/publish-technical-documentation-release@publish-technical-documentation-release/v2 # zizmor: ignore[unpinned-uses]
+        # yamllint enable rule:line-length
         with:
           release_tag_regexp: "^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
           release_branch_regexp: "^release-(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
           release_branch_with_patch_regexp: "^release-(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
           website_directory: content/docs/oncall
+      # yamllint enable rule:line-length

.pre-commit-config.yaml

@@ -110,3 +110,4 @@ repos:
         name: yamllint
         entry: yamllint -c .yamllint.yml
         types: [yaml]
+        args: [--no-warnings]

engine/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.10-alpine3.21 AS base
+FROM python:3.12.11-alpine3.21 AS base
 ARG TARGETPLATFORM
 
 # Create a group and user to run an app

tools/migrators/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.10-alpine3.21
+FROM python:3.12.11-alpine3.21
 
 ENV PYTHONUNBUFFERED=1
 WORKDIR /app

tools/migrators/lib/pagerduty/resources/services.py

@@ -450,14 +450,19 @@ def _transform_service(
     is_technical = isinstance(service, TechnicalService)
     service_type = "service" if is_technical else "business_service"
 
+    service_name = re.sub("[^-a-zA-Z0-9.]", "-", service.name)
+    service_name = re.sub(
+        "-+", "-", service_name
+    )  # Collapse multiple dashes to single dash
+    service_name = re.sub(
+        "^-+|-+$", "", service_name
+    )  # Remove leading and trailing dashes
     # Create the base component structure
     component = {
         "apiVersion": "servicemodel.ext.grafana.com/v1alpha1",
         "kind": "Component",
         "metadata": {
-            "name": service.name.lower().replace(
-                " ", "-"
-            ),  # Convert to k8s-friendly name
+            "name": service_name.lower(),  # Convert to k8s-friendly name
             "annotations": {"pagerduty.com/service-id": service.id},
         },
         "spec": {"type": service_type, "description": service.description},

tools/migrators/lib/tests/pagerduty/resources/test_services.py

@@ -324,6 +324,48 @@ def test_transform_business_service(business_service):
     )
 
 
+@pytest.mark.parametrize(
+    "input_name,expected_name",
+    [
+        # Basic cases
+        ("Simple Service", "simple-service"),
+        ("Test_Service", "test-service"),
+        ("Service.Name", "service.name"),
+        # Edge cases that would cause issues with old logic
+        ("  Leading spaces", "leading-spaces"),
+        ("Trailing spaces  ", "trailing-spaces"),
+        ("  Both sides  ", "both-sides"),
+        ("Multiple   spaces", "multiple-spaces"),
+        # Special characters
+        ("Service@Name", "service-name"),
+        ("Service!@#$%Name", "service-name"),
+        ("Service(with)parens", "service-with-parens"),
+        # Mixed cases
+        ("  Service@Name  ", "service-name"),
+        ("##Service Name##", "service-name"),
+        ("!!!Service!!!Name!!!", "service-name"),
+    ],
+)
+def test_service_name_normalization(input_name, expected_name):
+    """Test service name normalization handles various edge cases correctly."""
+    # Create a mock technical service
+    service = Mock(spec=TechnicalService)
+    service.name = input_name
+    service.description = "Test description"
+    service.id = "P123456"
+    service.status = "active"
+    service.html_url = "https://pagerduty.com/services/P123456"
+    service.self_url = "https://api.pagerduty.com/services/P123456"
+
+    # Transform the service
+    component = _transform_service(service)
+
+    # Check that the name was normalized correctly
+    assert (
+        component["metadata"]["name"] == expected_name
+    ), f"Expected '{expected_name}' for input '{input_name}', got '{component['metadata']['name']}'"
+
+
 def test_validate_component():
     """Test component validation."""
     # Test valid component

tools/migrators/requirements.in

@@ -1,4 +1,4 @@
-requests==2.32.3
+requests==2.32.4
 pdpyras==4.5.0
 pytest==8.2.2
 pytest-env==0.6.2

tools/migrators/requirements.txt

@@ -46,7 +46,7 @@ python-dateutil==2.9.0.post0
     # via kubernetes
 pyyaml==6.0.2
     # via kubernetes
-requests==2.32.3
+requests==2.32.4
     # via
     #   -r requirements.in
     #   kubernetes