From 34fae90fd7f823b59178fdb342d17c6384a5eaf0 Mon Sep 17 00:00:00 2001 From: yhaliaw Date: Thu, 8 Jan 2026 14:58:31 +0800 Subject: [PATCH 1/2] Update license header to 2026 --- .vale.ini | 2 +- LICENSE | 2 +- Makefile | 2 +- Makefile.docs | 2 +- app.py | 2 +- charm/charmcraft.yaml | 2 +- charm/lib/charms/saml_integrator/v0/saml.py | 2 +- charm/lib/charms/traefik_k8s/v2/ingress.py | 2 +- charm/src/charm.py | 2 +- charm/tox.ini | 2 +- generate-src-docs.sh | 2 +- rockcraft.yaml | 2 +- tests/conftest.py | 2 +- tests/integration/__init__.py | 2 +- tests/integration/conftest.py | 2 +- tests/integration/test_app.py | 2 +- tests/integration/test_webhook_redelivery.py | 2 +- tests/unit/__init__.py | 2 +- tests/unit/helpers.py | 2 +- tests/unit/test_app.py | 2 +- tests/unit/test_mq.py | 2 +- tests/unit/test_parse.py | 2 +- tests/unit/test_router.py | 2 +- tests/unit/test_validation.py | 2 +- tests/unit/test_webhook_redelivery.py | 2 +- tox.ini | 2 +- webhook_redelivery.py | 2 +- webhook_router/__init__.py | 2 +- webhook_router/app.py | 2 +- webhook_router/mq.py | 2 +- webhook_router/parse.py | 2 +- webhook_router/router.py | 2 +- webhook_router/validation.py | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.vale.ini b/.vale.ini index fe3518b..987f29c 100644 --- a/.vale.ini +++ b/.vale.ini @@ -1,4 +1,4 @@ -; Copyright 2025 Canonical Ltd. +; Copyright 2026 Canonical Ltd. ; See LICENSE file for licensing details. StylesPath = .vale/styles diff --git a/LICENSE b/LICENSE index 4b8b005..21b28ad 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2025 Canonical Ltd. + Copyright 2026 Canonical Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Makefile b/Makefile index 2db7f38..b4f9e67 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. # Top-level Makefile diff --git a/Makefile.docs b/Makefile.docs index 3a9a630..ff29a21 100644 --- a/Makefile.docs +++ b/Makefile.docs @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. # Minimal makefile for documentation diff --git a/app.py b/app.py index af6c544..fe8bfae 100644 --- a/app.py +++ b/app.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """The main entry point for the charmed webhook router.""" diff --git a/charm/charmcraft.yaml b/charm/charmcraft.yaml index 581eb00..5d88927 100644 --- a/charm/charmcraft.yaml +++ b/charm/charmcraft.yaml @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. name: github-runner-webhook-router diff --git a/charm/lib/charms/saml_integrator/v0/saml.py b/charm/lib/charms/saml_integrator/v0/saml.py index 722b1c6..54ee41b 100644 --- a/charm/lib/charms/saml_integrator/v0/saml.py +++ b/charm/lib/charms/saml_integrator/v0/saml.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # Licensed under the Apache2.0. See LICENSE file in charm source for details. """Library to manage the relation data for the SAML Integrator charm. diff --git a/charm/lib/charms/traefik_k8s/v2/ingress.py b/charm/lib/charms/traefik_k8s/v2/ingress.py index 0723b44..879185c 100644 --- a/charm/lib/charms/traefik_k8s/v2/ingress.py +++ b/charm/lib/charms/traefik_k8s/v2/ingress.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. r"""# Interface Library for ingress. diff --git a/charm/src/charm.py b/charm/src/charm.py index 43a0aea..dfd38a5 100755 --- a/charm/src/charm.py +++ b/charm/src/charm.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Flask Charm entrypoint.""" diff --git a/charm/tox.ini b/charm/tox.ini index b185406..02eb9db 100644 --- a/charm/tox.ini +++ b/charm/tox.ini @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. [tox] diff --git a/generate-src-docs.sh b/generate-src-docs.sh index adc1c6f..bd68dac 100644 --- a/generate-src-docs.sh +++ b/generate-src-docs.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. lazydocs --no-watermark --output-path src-docs webhook_router/* diff --git a/rockcraft.yaml b/rockcraft.yaml index 6e04d79..7fafd93 100644 --- a/rockcraft.yaml +++ b/rockcraft.yaml @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. name: github-runner-webhook-router diff --git a/tests/conftest.py b/tests/conftest.py index c14b94b..42d2cec 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Fixtures for charm tests.""" diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index 97bca57..c6a4ad8 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -1,2 +1,2 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 4ff5eb4..cccdc1d 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Fixtures for the github-runner-webhook-router charm.""" diff --git a/tests/integration/test_app.py b/tests/integration/test_app.py index bd1f475..748f658 100644 --- a/tests/integration/test_app.py +++ b/tests/integration/test_app.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Integration tests for the charmed flask application.""" diff --git a/tests/integration/test_webhook_redelivery.py b/tests/integration/test_webhook_redelivery.py index b8443d4..b86ee94 100644 --- a/tests/integration/test_webhook_redelivery.py +++ b/tests/integration/test_webhook_redelivery.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Integration tests for the webhook redelivery script.""" diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index 97bca57..c6a4ad8 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -1,2 +1,2 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. diff --git a/tests/unit/helpers.py b/tests/unit/helpers.py index 5da3920..fdd7425 100644 --- a/tests/unit/helpers.py +++ b/tests/unit/helpers.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Helper functions for the unit tests.""" diff --git a/tests/unit/test_app.py b/tests/unit/test_app.py index 088ec88..b48fa0e 100644 --- a/tests/unit/test_app.py +++ b/tests/unit/test_app.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """The unit tests for the flask app.""" diff --git a/tests/unit/test_mq.py b/tests/unit/test_mq.py index 2d0b683..2d98bc2 100644 --- a/tests/unit/test_mq.py +++ b/tests/unit/test_mq.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """The unit tests for the mq module.""" diff --git a/tests/unit/test_parse.py b/tests/unit/test_parse.py index 3b77460..66cd54d 100644 --- a/tests/unit/test_parse.py +++ b/tests/unit/test_parse.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Unit tests for the parse module.""" diff --git a/tests/unit/test_router.py b/tests/unit/test_router.py index 7fd7c35..a387a9d 100644 --- a/tests/unit/test_router.py +++ b/tests/unit/test_router.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Unit tests for the router module.""" diff --git a/tests/unit/test_validation.py b/tests/unit/test_validation.py index 9e0a0d6..7514ab5 100644 --- a/tests/unit/test_validation.py +++ b/tests/unit/test_validation.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """The unit tests for the validation module.""" diff --git a/tests/unit/test_webhook_redelivery.py b/tests/unit/test_webhook_redelivery.py index 67cea4c..62215ed 100644 --- a/tests/unit/test_webhook_redelivery.py +++ b/tests/unit/test_webhook_redelivery.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Unit tests for webhook redelivery script.""" diff --git a/tox.ini b/tox.ini index 9a31cb2..bb05477 100644 --- a/tox.ini +++ b/tox.ini @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. [tox] diff --git a/webhook_redelivery.py b/webhook_redelivery.py index 60acbd9..3a62ff8 100644 --- a/webhook_redelivery.py +++ b/webhook_redelivery.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Redeliver failed webhooks since a given time. diff --git a/webhook_router/__init__.py b/webhook_router/__init__.py index 748a04c..fd87e51 100644 --- a/webhook_router/__init__.py +++ b/webhook_router/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Flask application package for webhook router.""" diff --git a/webhook_router/app.py b/webhook_router/app.py index 66f2f5a..f4c03c5 100644 --- a/webhook_router/app.py +++ b/webhook_router/app.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Flask application which receives GitHub webhooks and logs those.""" diff --git a/webhook_router/mq.py b/webhook_router/mq.py index ab6894d..9e36c2a 100644 --- a/webhook_router/mq.py +++ b/webhook_router/mq.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Module for interacting with the message queue.""" diff --git a/webhook_router/parse.py b/webhook_router/parse.py index b4cbee8..762da65 100644 --- a/webhook_router/parse.py +++ b/webhook_router/parse.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Module for parsing the webhook payload.""" diff --git a/webhook_router/router.py b/webhook_router/router.py index 34b0788..2994d5e 100644 --- a/webhook_router/router.py +++ b/webhook_router/router.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Module for routing webhooks to the appropriate message queue.""" import itertools diff --git a/webhook_router/validation.py b/webhook_router/validation.py index 7ad251e..752ee06 100644 --- a/webhook_router/validation.py +++ b/webhook_router/validation.py @@ -1,4 +1,4 @@ -# Copyright 2025 Canonical Ltd. +# Copyright 2026 Canonical Ltd. # See LICENSE file for licensing details. """Module for validating the webhook request.""" From d4a2c0adae5c54f2bc511879d94704fd0df4b133 Mon Sep 17 00:00:00 2001 From: yhaliaw Date: Thu, 8 Jan 2026 15:00:57 +0800 Subject: [PATCH 2/2] Update license check pattern --- .licenserc.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.licenserc.yaml b/.licenserc.yaml index 41e0864..82c6e2b 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -5,6 +5,9 @@ header: content: | Copyright [year] [owner] See LICENSE file for licensing details. + pattern: | + Copyright \d{4} Canonical Ltd. + See LICENSE file for licensing details. paths: - '**' paths-ignore: