Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update track 1 #651

Open
wants to merge 206 commits into
base: track/1
Choose a base branch
from
Open

Update track 1 #651

wants to merge 206 commits into from

Conversation

amandahla
Copy link
Collaborator

Overview

We need to upgrade Synapse without MAS changes so we are merging commits from the main branch to track/1 and also applying/cherry-picking these:

commit deb09e0b41c52c519340ce4938dda24ff091579a (HEAD -> update-track-1, origin/update-track-1, track/1)
Author: Amanda Hager Lopes de Andrade Katz <[email protected]>
Date:   Fri Jan 10 14:59:51 2025 -0300

    Set 1/edge channel as publishing channel for this branch

commit 4f0f50b13d48255eb51658ea2a4097d4fd6518a6
Author: Amanda H. L. de Andrade Katz <[email protected]>
Date:   Wed Jan 8 09:01:45 2025 -0300

    fix matrix-auth v1 publishing (#644)
    
    Co-authored-by: Phan Trung Thanh <[email protected]>

commit 5f40963047f8607f011d1d00ffbaa4bf1a7506dc
Author: Amanda Hager Lopes de Andrade Katz <[email protected]>
Date:   Fri Jan 10 14:57:10 2025 -0300

    Update trivyignore

commit 685620e2b76b520f239efe775d49f14a9a57033a
Author: Amanda Hager Lopes de Andrade Katz <[email protected]>
Date:   Fri Jan 10 14:56:46 2025 -0300

    Fix lint in test_scaling

commit 2721b34d7e7bd7b008a2cb869ee234312d938a28
Author: Amanda Hager Lopes de Andrade Katz <[email protected]>
Date:   Fri Jan 10 14:54:17 2025 -0300

    Update license header

commit 5c396b73fd9a26dea50916437ae7ed62a70b79f9
Author: Amanda Hager Lopes de Andrade Katz <[email protected]>
Date:   Fri Jan 10 14:51:59 2025 -0300

    chore(deps): update dependency element-hq/synapse to v1.121.1

commit d76beb3e0243ce3f44751f441cd7e94838cd2a30
Author: Amanda H. L. de Andrade Katz <[email protected]>
Date:   Mon Dec 16 15:50:49 2024 -0300

    Update matrix-auth library (#623)

commit 3a4c3f149825bfaf8d2cd6da4fb4fb063385ace7
Merge: 55e836f 4f1ecd0
Author: Amanda Hager Lopes de Andrade Katz <[email protected]>
Date:   Fri Jan 10 14:47:11 2025 -0300

    Merge remote-tracking branch 'origin/main' into track/1

Rationale

Apply matrix-auth updates (and others minor changes) in production environment without MAS.

Juju Events Changes

Module Changes

Library Changes

Checklist

  • The charm style guide was applied
  • The contributing guide was applied
  • The changes are compliant with ISD054 - Manging Charm Complexity
  • The documentation is generated using src-docs
  • The documentation for charmhub is updated.
  • The PR is tagged with appropriate label (urgent, trivial, complex)
  • The changelog is updated with changes that affect the users of the charm.

renovate bot and others added 30 commits June 20, 2024 10:32
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: arturo-seijas <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: arturo-seijas <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: arturo-seijas <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Yanks Yoon <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Add ready_check configuration

* Fix fmt

* Update src/charm_state.py

Co-authored-by: Christopher Bartz <[email protected]>

* Update src/charm_state.py

Co-authored-by: Christopher Bartz <[email protected]>

* Change pebble validation, add Pebble layer link and change comment

* Rename ready_check to experimental_ready_check

* Use alive check instead of ready

---------

Co-authored-by: Christopher Bartz <[email protected]>
Co-authored-by: javierdelapuente <[email protected]>
Co-authored-by: arturo-seijas <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot and others added 23 commits November 21, 2024 14:30
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Amanda H. L. de Andrade Katz <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: javierdelapuente <[email protected]>
Co-authored-by: Amanda H. L. de Andrade Katz <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: javierdelapuente <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: javierdelapuente <[email protected]>
* chore(deps): update dependency boto3 to v1.35.68

* chores: ignore Tornado CVE detection

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Amanda Hager Lopes de Andrade Katz <[email protected]>
…fig (#595)

* run reconcile on saml relation broken

* make public_baseurl required and compute its value during charm state init
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: javierdelapuente <[email protected]>
* chore(deps): update ubuntu docker tag to v24

* fix: changing rock

* not working yet

* without bash works...

* this one should work

* fix synapse_stats_exporter

* fix gpg command

* remove commented command

* add CVE-2024-24788 to trivy

* revert changes in gpg command

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Amanda H. L. de Andrade Katz <[email protected]>
Co-authored-by: javierdelapuente <[email protected]>
Co-authored-by: Weii Wang <[email protected]>
Co-authored-by: Phan Trung Thanh <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Copy link
Contributor

Test coverage for deb09e0

Name                                    Stmts   Miss Branch BrPart  Cover   Missing
-----------------------------------------------------------------------------------
src/actions/__init__.py                     1      0      0      0   100%
src/actions/register_user.py               21      0      2      0   100%
src/admin_access_token.py                   9      0      0      0   100%
src/backup.py                             175      5     20      2    96%   353-354, 423-424, 481->483, 484
src/backup_observer.py                    134     16     12      0    89%   132-135, 140-143, 179-182, 211-214
src/charm.py                              288     18     70     10    92%   135->137, 140, 246, 250-251, 279-280, 308, 315, 396-400, 403-404, 432-434, 454, 490-491
src/charm_state.py                        158      9     34      7    92%   271, 275, 296, 321, 327, 333, 337-338, 425
src/charm_types.py                         34      0      0      0   100%
src/database_client.py                     57      1      8      4    92%   35, 47->exit, 69->exit, 88->98
src/database_observer.py                   39      0      4      1    98%   70->72
src/exceptions.py                           3      0      0      0   100%
src/matrix_auth_observer.py                60      5     12      3    89%   61, 64, 148, 167-168
src/media_observer.py                      41      4      2      1    88%   61-63, 82
src/mjolnir.py                             97      3     30      3    95%   82, 91->107, 112-116
src/observability.py                       14      0      0      0   100%
src/pebble.py                             206     27     48     13    84%   57->62, 176->exit, 187-191, 225-226, 246-247, 300->305, 310-311, 323-324, 326-327, 345-346, 363, 365, 367, 369, 371, 399, 451-456
src/redis_observer.py                      35      3      4      0    92%   62-65
src/s3_parameters.py                       22      0      4      0   100%
src/saml_observer.py                       38      0      4      0   100%
src/smtp_observer.py                       56      4     14      2    91%   82-86, 89, 108->113
src/synapse/__init__.py                     4      0      0      0   100%
src/synapse/admin.py                       19      2      2      0    90%   40-41
src/synapse/api.py                        175      3     20      3    97%   176, 229, 402
src/synapse/workload.py                   139      6     24      0    94%   405-406, 416-419
src/synapse/workload_configuration.py     170     29     38     13    80%   95->exit, 99-100, 148-149, 178, 198-199, 231-232, 265, 274-275, 290, 295-296, 317-318, 337->342, 343, 361->363, 373-374, 390, 458-459, 487, 495->497, 497->499, 504-505, 525->532, 535, 555-556
src/user.py                                23      0      2      0   100%
-----------------------------------------------------------------------------------
TOTAL                                    2018    135    354     62    92%

Static code analysis report

Working... ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100% 0:00:00
Run started:2025-01-10 18:05:25.774400

Test results:
  No issues identified.

Code scanned:
  Total lines of code: 11463
  Total lines skipped (#nosec): 4
  Total potential issues skipped due to specifically being disabled (e.g., #nosec BXXX): 0

Run metrics:
  Total issues (by severity):
  	Undefined: 0
  	Low: 0
  	Medium: 0
  	High: 0
  Total issues (by confidence):
  	Undefined: 0
  	Low: 0
  	Medium: 0
  	High: 0
Files skipped (0):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants