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

feat!: apply restrictions to air gapped environments #33241

Merged
merged 41 commits into from
Oct 19, 2024

Conversation

MarcosSpessatto
Copy link
Member

@MarcosSpessatto MarcosSpessatto commented Sep 10, 2024

Proposed changes (including videos or screenshots)

This PR introduces some restrictions when running an air-gapped environment

AIR-5
AIR-6
AIR-10

Issue(s)

Steps to test or reproduce

Further comments

Copy link
Contributor

dionisio-bot bot commented Sep 10, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Sep 10, 2024

🦋 Changeset detected

Latest commit: 879df1d

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 37 packages
Name Type
@rocket.chat/meteor Major
@rocket.chat/i18n Major
@rocket.chat/license Major
@rocket.chat/mock-providers Patch
@rocket.chat/ui-contexts Major
@rocket.chat/web-ui-registration Major
@rocket.chat/fuselage-ui-kit Major
@rocket.chat/ui-client Major
@rocket.chat/ui-voip Major
@rocket.chat/uikit-playground Patch
@rocket.chat/gazzodown Major
@rocket.chat/livechat Patch
@rocket.chat/ui-avatar Major
@rocket.chat/ui-video-conf Major
@rocket.chat/core-typings Major
@rocket.chat/rest-typings Major
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/model-typings Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/network-broker Patch
@rocket.chat/models Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

ee/packages/license/src/token.ts Dismissed Show dismissed Hide dismissed
Copy link

codecov bot commented Sep 10, 2024

Codecov Report

Attention: Patch coverage is 93.98907% with 11 lines in your changes missing coverage. Please review.

Project coverage is 75.04%. Comparing base (274a89b) to head (879df1d).
Report is 2 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #33241      +/-   ##
===========================================
+ Coverage    74.88%   75.04%   +0.16%     
===========================================
  Files          473      479       +6     
  Lines        20810    20991     +181     
  Branches      5314     5328      +14     
===========================================
+ Hits         15583    15753     +170     
- Misses        4602     4611       +9     
- Partials       625      627       +2     
Flag Coverage Δ
unit 75.04% <93.98%> (+0.16%) ⬆️

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

@MarcosSpessatto MarcosSpessatto changed the title feat: apply restrictions to air gapped environments feat!: apply restrictions to air gapped environments Sep 11, 2024
@MarcosSpessatto MarcosSpessatto added this to the 7.0 milestone Sep 11, 2024
@MarcosSpessatto MarcosSpessatto marked this pull request as ready for review September 11, 2024 15:54
@MarcosSpessatto MarcosSpessatto marked this pull request as draft September 12, 2024 13:00
Copy link
Contributor

github-actions bot commented Sep 12, 2024

PR Preview Action v1.4.8
🚀 Deployed preview to https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-33241/
on branch gh-pages at 2024-10-18 22:55 UTC

@MarcosSpessatto MarcosSpessatto marked this pull request as ready for review September 12, 2024 15:41
apps/meteor/ee/app/license/server/settings.ts Outdated Show resolved Hide resolved
apps/meteor/ee/app/license/server/settings.ts Outdated Show resolved Hide resolved
@gabriellsh
Copy link
Member

I had to add the path for airgappedRestrictionsCheck.spec.ts in the mocharc.config file, since the tests were not working.

.changeset/little-gifts-do.md Outdated Show resolved Hide resolved
.changeset/little-gifts-do.md Outdated Show resolved Hide resolved
ee/packages/license/src/AirGappedRestriction.ts Outdated Show resolved Hide resolved
ee/packages/license/src/AirGappedRestriction.ts Outdated Show resolved Hide resolved
ee/packages/license/src/AirGappedRestriction.ts Outdated Show resolved Hide resolved
apps/meteor/ee/app/license/server/airGappedRestrictions.ts Outdated Show resolved Hide resolved
Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

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

since this is a breaking change, the target branch should be release-7.0.0

.changeset/little-gifts-do.md Outdated Show resolved Hide resolved
apps/meteor/app/lib/server/methods/sendMessage.ts Outdated Show resolved Hide resolved
@gabriellsh gabriellsh changed the base branch from develop to release-7.0.0 October 2, 2024 23:45
@gabriellsh gabriellsh force-pushed the feat/airgapped-restrictions branch from 76fa753 to 9888016 Compare October 7, 2024 17:04
@ggazzo ggazzo requested review from a team as code owners October 8, 2024 17:42
@sampaiodiego sampaiodiego force-pushed the release-7.0.0 branch 2 times, most recently from d1aa5f9 to 374979f Compare October 9, 2024 17:43
gabriellsh and others added 7 commits October 17, 2024 11:34
* WIP

* Add banner to sidebarV1

* fix useAirGappedRestriction unit tests

* sidebarV1 banner section unit tests

* Remove log

* replicate banner on sidebarv2

* Fix tests

* remove comment

* Add go link and fix translation
jeanfbrito
jeanfbrito previously approved these changes Oct 18, 2024
@MarcosSpessatto MarcosSpessatto added the stat: QA assured Means it has been tested and approved by a company insider label Oct 18, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Oct 18, 2024
KevLehman
KevLehman previously approved these changes Oct 18, 2024
@ggazzo ggazzo dismissed stale reviews from KevLehman and jeanfbrito via 5c97fc1 October 18, 2024 22:10
@ggazzo ggazzo merged commit f33c07e into develop Oct 19, 2024
51 checks passed
@ggazzo ggazzo deleted the feat/airgapped-restrictions branch October 19, 2024 00:44
This was referenced Oct 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants