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.

Sign up for GitHub

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

Jump to bottom

♻️ 🎨 License plugin: toggle vip feature #7110

Merged
merged 9 commits into from
Jan 28, 2025
Merged

♻️ 🎨 License plugin: toggle vip feature #7110

merged 9 commits into from
Jan 28, 2025

Conversation

pcrespov
Copy link
Member

@pcrespov pcrespov commented Jan 28, 2025 •
edited
Loading

What do these changes do?

  • New WEBSERVER_LICENSES allows disabling functionality (e.g. in TIP deploys or osparc deploys where this functionality is not needed)
    • webserver variants wb-db-event-listener, wb-garbage-collector do not include this functionality
  • Shows in statics config to the front-end
    image
  • ♻️ refactors licenses domain to add _common

Related issue/s

How to test

cd services/web/server
make install-dev
pytest -vv  tests/unit/**/test_*application_settings*.py

Dev-ops

@codecov Codecov
Copy link

codecov bot commented Jan 28, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.66%. Comparing base (795fdfb) to head (d87620a).
Report is 1 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #7110      +/-   ##
==========================================
+ Coverage   87.51%   87.66%   +0.15%     
==========================================
  Files        1641     1634       -7     
  Lines       64222    63878     -344     
  Branches     2054     2054              
==========================================
- Hits        56202    55999     -203     
+ Misses       7683     7542     -141     
  Partials      337      337
Flag Coverage Δ
integrationtests 64.68% <92.85%> (-0.08%) ⬇️
unittests 85.95% <100.00%> (+0.01%) ⬆️
Components Coverage Δ
api 76.84% <ø> (ø)
pkg_aws_library 93.49% <ø> (ø)
pkg_dask_task_models_library 97.09% <ø> (ø)
pkg_models_library 91.33% <ø> (ø)
pkg_notifications_library 84.57% <ø> (ø)
pkg_postgres_database 88.39% <ø> (ø)
pkg_service_integration 70.18% <ø> (ø)
pkg_service_library 74.14% <ø> (ø)
pkg_settings_library 90.49% <ø> (ø)
pkg_simcore_sdk 85.38% <ø> (ø)
agent 96.45% <ø> (ø)
api_server 90.55% <ø> (ø)
autoscaling 96.10% <ø> (ø)
catalog 90.32% <ø> (ø)
clusters_keeper 99.24% <ø> (ø)
dask_sidecar 91.26% <ø> (ø)
datcore_adapter 93.18% <ø> (ø)
director 76.92% <ø> (-0.09%) ⬇️
director_v2 91.30% <ø> (-0.11%) ⬇️
dynamic_scheduler 97.21% <ø> (ø)
dynamic_sidecar 89.75% <ø> (ø)
efs_guardian 90.39% <ø> (ø)
invitations 93.42% <ø> (ø)
osparc_gateway_server ∅ <ø> (∅)
payments 92.66% <ø> (ø)
resource_usage_tracker 88.95% <ø> (+0.32%) ⬆️
storage 89.57% <ø> (ø)
webclient ∅ <ø> (∅)
webserver 86.23% <100.00%> (+0.49%) ⬆️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 795fdfb...d87620a. Read the comment docs.

@pcrespov pcrespov self-assigned this Jan 28, 2025
@pcrespov pcrespov added the a:webserver issue related to the webserver service label Jan 28, 2025
@pcrespov pcrespov added this to the Singularity milestone Jan 28, 2025
@pcrespov pcrespov marked this pull request as ready for review January 28, 2025 13:43
@pcrespov pcrespov force-pushed the is7095/toggle-vip-feature branch from 69a6fe2 to b37c40b Compare January 28, 2025 13:43
@pcrespov pcrespov changed the title WIP: ♻️ 🎨 Is7095/toggle vip feature ♻️ 🎨 License plugin: toggle vip feature Jan 28, 2025
odeimaiz
odeimaiz approved these changes Jan 28, 2025
View reviewed changes
Copy link
Member

@odeimaiz odeimaiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

matusdrobuliak66
matusdrobuliak66 approved these changes Jan 28, 2025
View reviewed changes
Copy link
Contributor

@matusdrobuliak66 matusdrobuliak66 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@GitHK GitHK added the 🤖-automerge marks PR as ready to be merged for Mergify label Jan 28, 2025
@GitHK
Copy link
Contributor

GitHK commented Jan 28, 2025

@Mergifyio refresh

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 28, 2025

refresh

✅ Pull request refreshed

@GitHK
Copy link
Contributor

GitHK commented Jan 28, 2025

@Mergifyio queue

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 28, 2025 •
edited by pcrespov
Loading

queue

🛑 The pull request has been removed from the queue default

Pull request #7110 has been dequeued, merge conditions unmatch:

  • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
  • check-success=integration-tests
  • check-success=system-tests
  • check-success=unit-tests
  • any of [🛡 GitHub branch protection]:
    • check-neutral = deploy to dockerhub
    • check-skipped = deploy to dockerhub
    • check-success = deploy to dockerhub
  • any of [🛡 GitHub branch protection]:
    • check-neutral = system-tests
    • check-skipped = system-tests
    • check-success = system-tests
  • any of [🛡 GitHub branch protection]:
    • check-neutral = unit-tests
    • check-skipped = unit-tests
    • check-success = unit-tests
  • any of [🛡 GitHub branch protection]:
    • check-neutral = SonarCloud Code Analysis
    • check-skipped = SonarCloud Code Analysis
    • check-success = SonarCloud Code Analysis
  • any of [🛡 GitHub branch protection]:
    • check-neutral = [build] docker images (excluding frontend) (3.11, ubuntu-22.04)
    • check-skipped = [build] docker images (excluding frontend) (3.11, ubuntu-22.04)
    • check-success = [build] docker images (excluding frontend) (3.11, ubuntu-22.04)
  • any of [🛡 GitHub branch protection]:
    • check-neutral = check OAS' are up to date
    • check-skipped = check OAS' are up to date
    • check-success = check OAS' are up to date
  • any of [🛡 GitHub branch protection]:
    • check-neutral = integration-tests
    • check-skipped = integration-tests
    • check-success = integration-tests
  • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection].

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 28, 2025

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #7110 has been dequeued, merge conditions unmatch:

  • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
  • check-success=integration-tests
  • check-success=system-tests
  • check-success=unit-tests
  • any of [🛡 GitHub branch protection]:
    • check-neutral = deploy to dockerhub
    • check-skipped = deploy to dockerhub
    • check-success = deploy to dockerhub
  • any of [🛡 GitHub branch protection]:
    • check-neutral = system-tests
    • check-skipped = system-tests
    • check-success = system-tests
  • any of [🛡 GitHub branch protection]:
    • check-neutral = unit-tests
    • check-skipped = unit-tests
    • check-success = unit-tests
  • any of [🛡 GitHub branch protection]:
    • check-neutral = SonarCloud Code Analysis
    • check-skipped = SonarCloud Code Analysis
    • check-success = SonarCloud Code Analysis
  • any of [🛡 GitHub branch protection]:
    • check-neutral = [build] docker images (excluding frontend) (3.11, ubuntu-22.04)
    • check-skipped = [build] docker images (excluding frontend) (3.11, ubuntu-22.04)
    • check-success = [build] docker images (excluding frontend) (3.11, ubuntu-22.04)
  • any of [🛡 GitHub branch protection]:
    • check-neutral = check OAS' are up to date
    • check-skipped = check OAS' are up to date
    • check-success = check OAS' are up to date
  • any of [🛡 GitHub branch protection]:
    • check-neutral = integration-tests
    • check-skipped = integration-tests
    • check-success = integration-tests
  • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@GitHK
Copy link
Contributor

GitHK commented Jan 28, 2025

https://github.com/Mergifyio refresh

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 28, 2025

refresh

✅ Pull request refreshed

@pcrespov pcrespov removed the 🤖-automerge marks PR as ready to be merged for Mergify label Jan 28, 2025
@pcrespov pcrespov enabled auto-merge (squash) January 28, 2025 16:35
sanderegg
sanderegg approved these changes Jan 28, 2025
View reviewed changes
Copy link
Member

@sanderegg sanderegg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

sanderegg
sanderegg approved these changes Jan 28, 2025
View reviewed changes
Copy link
Member

@sanderegg sanderegg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all good!

@pcrespov pcrespov merged commit 638b592 into ITISFoundation:master Jan 28, 2025
92 of 94 checks passed
@odeimaiz odeimaiz mentioned this pull request Jan 29, 2025
Merged
1 task
@pcrespov pcrespov deleted the is7095/toggle-vip-feature branch January 29, 2025 20:39
@matusdrobuliak66 matusdrobuliak66 mentioned this pull request Jan 30, 2025
Closed
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matusdrobuliak66 matusdrobuliak66 matusdrobuliak66 approved these changes

@sanderegg sanderegg sanderegg approved these changes

@odeimaiz odeimaiz odeimaiz approved these changes

@giancarloromeo giancarloromeo giancarloromeo approved these changes

@mrnicegyu11 mrnicegyu11 Awaiting requested review from mrnicegyu11 mrnicegyu11 is a code owner

@GitHK GitHK Awaiting requested review from GitHK GitHK is a code owner

@YuryHrytsuk YuryHrytsuk Awaiting requested review from YuryHrytsuk YuryHrytsuk is a code owner

Assignees

@pcrespov pcrespov

Labels
a:webserver issue related to the webserver service
Projects
None yet
Milestone
Singularity
Development

Successfully merging this pull request may close these issues.

ENV_VAR to enable/disable the feature
7 participants
@pcrespov @GitHK @giancarloromeo @odeimaiz @sanderegg @YuryHrytsuk @matusdrobuliak66