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

♻️ Clean up simcore webserver environment ⚠️ DEVOPS #4491

Merged
merged 32 commits into from
Jul 31, 2023

Conversation

YuryHrytsuk
Copy link
Contributor

@YuryHrytsuk YuryHrytsuk commented Jul 12, 2023

What do these changes do?

Make env variables of Webserver clean, transparent and easy to understand. The env_file has been removed from docker-compoes webesrver service. The environment of docker-compose webserver service has been updated.

Related issue/s

How to test

Deploy the whole stack and check whether simcore webserver is up and running without any errors in logs

DevOps Checklist

⚠️ DEVOPS: Make sure the config of deployment agent is updated according to the changes in this PR

Make sure to provide the following environment variables:

  • SWARM_STACK_NAME
  • AIODEBUG_SLOW_DURATION_SECS
  • DIAGNOSTICS_SLOW_DURATION_SECS
  • STORAGE_PORT
  • RESOURCE_USAGE_TRACKER_HOST
  • WEBSERVER_DEV_FEATURES_ENABLED
  • WEBSERVER_LOGLEVEL
  • LOG_FORMAT_LOCAL_DEV_ENABLED
  • WEBSERVER_HOST
  • WEBSERVER_FRONTEND
  • WEBSERVER_ACTIVITY
  • WEBSERVER_PROMETHEUS_API_VERSION
  • WEBSERVER_PROMETHEUS_URL
  • WEBSERVER_CATALOG
  • CATALOG_HOST
  • CATALOG_PORT
  • POSTGRES_DB
  • POSTGRES_ENDPOINT
  • POSTGRES_HOST
  • POSTGRES_PASSWORD
  • POSTGRES_PORT
  • POSTGRES_USER
  • WEBSERVER_DIAGNOSTICS
  • DIAGNOSTICS_MAX_AVG_LATENCY
  • DIAGNOSTICS_MAX_TASK_DELAY
  • DIRECTOR_V2_HOST
  • DIRECTOR_V2_PORT
  • DIRECTOR_HOST
  • DIRECTOR_PORT
  • WEBSERVER_EMAIL
  • SMTP_HOST
  • SMTP_PORT
  • WEBSERVER_EXPORTER
  • WEBSERVER_GARBAGE_COLLECTOR
  • INVITATIONS_HOST
  • INVITATIONS_LOGLEVEL
  • INVITATIONS_OSPARC_URL
  • INVITATIONS_PASSWORD
  • INVITATIONS_PORT
  • INVITATIONS_SECRET_KEY
  • INVITATIONS_USERNAME
  • WEBSERVER_LOGIN
  • LOGIN_REGISTRATION_CONFIRMATION_REQUIRED
  • LOGIN_REGISTRATION_INVITATION_REQUIRED
  • LOGIN_2FA_REQUIRED
  • REDIS_HOST
  • REDIS_PORT
  • RESOURCE_MANAGER_RESOURCE_TTL_S
  • WEBSERVER_SCICRUNCH
  • SCICRUNCH_API_BASE_URL
  • SCICRUNCH_API_KEY
  • WEBSERVER_SESSION_SECRET_KEY
  • WEBSERVER_STATICWEB
  • STORAGE_ENDPOINT
  • STORAGE_HOST
  • STORAGE_PORT
  • WEBSERVER_STUDIES_DISPATCHER
  • STUDIES_ACCESS_ANONYMOUS_ALLOWED
  • STUDIES_DEFAULT_SERVICE_THUMBNAIL
  • WEBSERVER_TRACING
  • TRACING_ENABLED
  • TRACING_ZIPKIN_ENDPOINT
  • TRACING_THRIFT_COMPACT_ENDPOINT
  • WEBSERVER_PROJECTS
  • PROJECTS_MAX_COPY_SIZE_BYTES
  • PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES
  • RABBIT_HOST
  • RABBIT_PASSWORD
  • RABBIT_PORT
  • RABBIT_USER
  • WEBSERVER_GUNICORN_CMD_ARGS
  • WEBSERVER_DB_LISTENER
  • WEBSERVER_ANNOUNCEMENTS
  • WEBSERVER_NOTIFICATIONS
  • WEBSERVER_CLUSTERS
  • WEBSERVER_GROUPS
  • WEBSERVER_META_MODELING
  • WEBSERVER_PRODUCTS
  • WEBSERVER_PUBLICATIONS
  • WEBSERVER_SOCKETIO
  • WEBSERVER_TAGS
  • WEBSERVER_USERS
  • WEBSERVER_VERSION_CONTROL
  • WB_GC_GARBAGE_COLLECTOR
  • WB_GC_LOGLEVEL
  • WB_GC_RESOURCE_MANAGER_RESOURCE_TTL_S
  • WB_GC_ANNOUNCEMENTS
  • WB_GC_ACTIVITY
  • WB_GC_CATALOG
  • WB_GC_NOTIFICATIONS
  • WB_GC_DB_LISTENER
  • WB_GC_DIAGNOSTICS
  • WB_GC_EMAIL
  • WB_GC_EXPORTER
  • WB_GC_FRONTEND
  • WB_GC_LOGIN
  • WB_GC_PROJECTS
  • WB_GC_SCICRUNCH
  • WB_GC_STATICWEB
  • WB_GC_TRACING
  • WB_GC_CLUSTERS
  • WB_GC_GROUPS
  • WB_GC_META_MODELING
  • WB_GC_PRODUCTS
  • WB_GC_PUBLICATIONS
  • WB_GC_SOCKETIO
  • WB_GC_STUDIES_DISPATCHER
  • WB_GC_TAGS
  • WB_GC_USERS
  • WB_GC_VERSION_CONTROL
  • WB_DB_EL_LOGLEVEL
  • WB_DB_EL_DB_LISTENER
  • WB_DB_EL_SOCKETIO
  • WB_DB_EL_ANNOUNCEMENTS
  • WB_DB_EL_ACTIVITY
  • WB_DB_EL_CATALOG
  • WB_DB_EL_NOTIFICATIONS
  • WB_DB_EL_DIAGNOSTICS
  • WB_DB_EL_EMAIL
  • WB_DB_EL_EXPORTER
  • WB_DB_EL_FRONTEND
  • WB_DB_EL_GARBAGE_COLLECTOR
  • WB_DB_EL_LOGIN
  • WB_DB_EL_PROJECTS
  • WB_DB_EL_SCICRUNCH
  • WB_DB_EL_STATICWEB
  • WB_DB_EL_STORAGE
  • WB_DB_EL_STUDIES_DISPATCHER
  • WB_DB_EL_TRACING
  • WB_DB_EL_CLUSTERS
  • WB_DB_EL_GROUPS
  • WB_DB_EL_META_MODELING
  • WB_DB_EL_PRODUCTS
  • WB_DB_EL_PUBLICATIONS
  • WB_DB_EL_TAGS
  • WB_DB_EL_USERS
  • WB_DB_EL_VERSION_CONTROL

@codecov
Copy link

codecov bot commented Jul 12, 2023

Codecov Report

Merging #4491 (d89e2b3) into master (f2f6a81) will increase coverage by 1.7%.
The diff coverage is 100.0%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master   #4491     +/-   ##
========================================
+ Coverage    84.7%   86.5%   +1.7%     
========================================
  Files        1007    1007             
  Lines       43186   43186             
  Branches     1001    1001             
========================================
+ Hits        36618   37371    +753     
+ Misses       6349    5586    -763     
- Partials      219     229     +10     
Flag Coverage Δ
integrationtests 66.8% <100.0%> (+26.1%) ⬆️
unittests 84.2% <100.0%> (+<0.1%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
...re_service_webserver/garbage_collector/settings.py 100.0% <ø> (+23.5%) ⬆️
...er/src/simcore_service_webserver/login/settings.py 98.5% <ø> (ø)
...ore_service_webserver/resource_manager/settings.py 100.0% <ø> (ø)
...e_service_webserver/studies_dispatcher/settings.py 100.0% <ø> (ø)
.../simcore_service_webserver/application_settings.py 98.2% <100.0%> (ø)
...re_service_webserver/application_settings_utils.py 97.8% <100.0%> (ø)

... and 66 files with indirect coverage changes

@YuryHrytsuk YuryHrytsuk changed the title WIP: ♻️ Clean up simcore webserver environment ♻️ Clean up simcore webserver environment Jul 14, 2023
@YuryHrytsuk YuryHrytsuk changed the title ♻️ Clean up simcore webserver environment WIP: ♻️ Clean up simcore webserver environment Jul 14, 2023
@pcrespov pcrespov added this to the Sundae milestone Jul 19, 2023
@YuryHrytsuk YuryHrytsuk marked this pull request as ready for review July 19, 2023 12:47
@YuryHrytsuk YuryHrytsuk changed the title WIP: ♻️ Clean up simcore webserver environment ♻️ Clean up simcore webserver environment Jul 19, 2023
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.

Thanks!

@YuryHrytsuk YuryHrytsuk requested a review from GitHK July 20, 2023 08:24
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.

next steps should be made for this sooner rather than later.

@YuryHrytsuk YuryHrytsuk requested a review from sanderegg July 21, 2023 06:15
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 for taking care of this.

Copy link
Contributor

@GitHK GitHK left a comment

Choose a reason for hiding this comment

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

Nice, thanks for taking care of this.

services/docker-compose.yml Outdated Show resolved Hide resolved
Copy link
Member

@mrnicegyu11 mrnicegyu11 left a comment

Choose a reason for hiding this comment

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

lgtm

@YuryHrytsuk YuryHrytsuk enabled auto-merge (squash) July 31, 2023 08:02
@codeclimate
Copy link

codeclimate bot commented Jul 31, 2023

Code Climate has analyzed commit d89e2b3 and detected 0 issues on this pull request.

View more on Code Climate.

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@YuryHrytsuk YuryHrytsuk merged commit 72787f8 into ITISFoundation:master Jul 31, 2023
@YuryHrytsuk YuryHrytsuk changed the title ♻️ Clean up simcore webserver environment ♻️ Clean up simcore webserver environment ⚠️ DEVOPS Aug 2, 2023
@matusdrobuliak66 matusdrobuliak66 mentioned this pull request Sep 22, 2023
50 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
a:webserver issue related to the webserver service
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ensure Simcore Webserver is given only necessary env variables
6 participants