Refactor

.github/workflows/ci.yaml

@@ -19,8 +19,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - name: 'Foresight: Collect workflow telemetry'
-        uses: runforesight/foresight-workflow-kit-action@v1
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install tox
@@ -34,24 +32,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - name: 'Foresight: Collect workflow telemetry'
-        uses: runforesight/foresight-workflow-kit-action@v1
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install tox
         # TODO: Consider replacing with custom image on self-hosted runner OR pinning version
         run: python3 -m pip install tox
       - name: Run tests
-        run: tox run -e unit -- --junit-xml=pytest_report.xml
-      - name: 'Foresight: Collect test results'
-        uses: runforesight/foresight-test-kit-action@v1
-        if: ${{ success() || failure() }}
-        with:
-          test_framework: PYTEST
-          test_format: JUNIT
-          test_path: pytest_report.xml
-          coverage_format: LCOV/TXT
-          coverage_path: coverage.lcov
+        run: tox run -e unit
 
   build:
     name: Build charms
@@ -66,13 +53,12 @@ jobs:
     name: ${{ matrix.tox-environments }}
     needs:
       - lint
-      - unit-test
+      # TODO: re-enable after adding unit tests
+      #- unit-test
       - build
     runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
-      - name: 'Foresight: Collect workflow telemetry'
-        uses: runforesight/foresight-workflow-kit-action@v1
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup operator environment
@@ -98,16 +84,9 @@ jobs:
           fi
       - name: Run integration tests
         # set a predictable model name so it can be consumed by charm-logdump-action
-        run: sg microk8s -c "tox run -e ${{ matrix.tox-environments }} -- -m '${{ steps.select-tests.outputs.mark_expression }}' --model testing --junit-xml=pytest_report.xml"
+        run: sg microk8s -c "tox run -e ${{ matrix.tox-environments }} -- -m '${{ steps.select-tests.outputs.mark_expression }}' --model testing"
         env:
           CI_PACKED_CHARMS: ${{ needs.build.outputs.charms }}
-      - name: 'Foresight: Collect test results'
-        uses: runforesight/foresight-test-kit-action@v1
-        if: ${{ success() || failure() }}
-        with:
-          test_framework: PYTEST
-          test_format: JUNIT
-          test_path: pytest_report.xml
       - name: Dump logs
         uses: canonical/charm-logdump-action@main
         if: failure()

.github/workflows/release.yaml

@@ -13,8 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - name: 'Foresight: Collect workflow telemetry'
-        uses: runforesight/foresight-workflow-kit-action@v1
       - name: Checkout
         uses: actions/checkout@v3
         with:

metadata.yaml

@@ -3,6 +3,7 @@
 name: mysql-router-k8s
 display-name: MySQL Router
 maintainers:
+  - Carl Csaposs <carl.csaposs@canonical.com>
   - Paulo Machado <paulo.machado@canonical.com>
   - Shayan Patel <shayan.patel@canonical.com>
 description: |
@@ -30,7 +31,6 @@ resources:
   mysql-router-image:
     type: oci-image
     description: OCI image for mysql-router
-    # TODO: replace with canonical maintained image
-    upstream-source: dataplatformoci/mysql-router:8.0-22.04_edge
+    upstream-source: ghcr.io/canonical/charmed-mysql@sha256:017605f168fcc569d10372bb74b29ef9041256bd066013dec39e9ceee8c88539
 assumes:
   - k8s-api

pyproject.toml

@@ -32,7 +32,9 @@ exclude = [".git", "__pycache__", ".tox", "build", "dist", "*.egg_info", "venv"]
 select = ["E", "W", "F", "C", "N", "R", "D", "H"]
 # Ignore W503, E501 because using black creates errors with this
 # Ignore D107 Missing docstring in __init__
-ignore = ["W503", "E501", "D107"]
+# Ignore D415 Docstring first line punctuation (doesn't make sense for properties)
+# Ignore D403 First word of the first line should be properly capitalized (false positive on "MySQL")
+ignore = ["W503", "E501", "D107", "D415", "D403"]
 # D100, D101, D102, D103: Ignore missing docstrings in tests
 per-file-ignores = ["tests/*:D100,D101,D102,D103,D104"]
 docstring-convention = "google"

requirements.txt

@@ -2,6 +2,5 @@ cryptography==39.0.1
 jsonschema==4.17.3
 lightkube-models==1.24.1.4
 lightkube==0.11.0
-mysql-connector-python
 ops >= 2.0.0
 tenacity==8.0.1