Skip to content

Remove licensor component #16983

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
Merged
merged 2 commits into from
Mar 23, 2023
Merged

Remove licensor component #16983

merged 2 commits into from
Mar 23, 2023

Conversation

aledbf
Copy link
Member

@aledbf aledbf commented Mar 22, 2023 •
edited by AlexTugarev
Loading

Description

Remove deprecated component related to self-hosted

Related Issue(s)

Fixes #16981

Release Notes

NONE

Build Options:

  • /werft with-werft
    Run the build with werft instead of GHA
  • leeway-no-cache
  • /werft no-test
    Run Leeway with --dont-test
Publish Options
  • /werft publish-to-npm
  • /werft publish-to-jb-marketplace
Installer Options
  • with-ee-license
  • with-dedicated-emulation
  • with-ws-manager-mk2
  • workspace-feature-flags
    Add desired feature flags to the end of the line above, space separated

Preview Environment Options:

  • /werft with-local-preview
    If enabled this will build install/preview
  • /werft with-preview
  • /werft with-large-vm
  • /werft with-gce-vm
    If enabled this will create the environment on GCE infra
  • /werft with-integration-tests=all
    Valid options are all, workspace, webapp, ide, jetbrains, vscode, ssh

@aledbf aledbf force-pushed the aledbf/remove-licensor branch 3 times, most recently from 0d16abe to 8494d1f Compare March 22, 2023 21:01
@werft-gitpod-dev-com
Copy link

started the job as gitpod-build-aledbf-remove-licensor.10 because the annotations in the pull request description changed
(with .werft/ from main)

@aledbf aledbf force-pushed the aledbf/remove-licensor branch from bdfebd6 to 9b36bcb Compare March 22, 2023 23:19
@aledbf aledbf marked this pull request as ready for review March 22, 2023 23:32
@aledbf aledbf requested a review from a team March 22, 2023 23:32
@aledbf aledbf requested a review from gtsiolis as a code owner March 22, 2023 23:32
@github-actions github-actions bot added the team: webapp Issue belongs to the WebApp team label Mar 22, 2023
AlexTugarev
AlexTugarev reviewed Mar 23, 2023
View reviewed changes
components/dashboard/src/admin/License.tsx

// if user seats is 0, it means that there is no user limit in the license
const userLimit = license?.seats === 0 ? "Unlimited" : license?.seats;
const userLimit = "Unlimited";
Copy link
Member

Choose a reason for hiding this comment

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

❓ do we need the License page at all?
cc. @geropl and @atduarte

We can do that as a follow-up.

AlexTugarev
AlexTugarev reviewed Mar 23, 2023
View reviewed changes
components/server/ee/src/workspace/gitpod-server-impl.ts
async validateLicense(ctx: TraceContext): Promise<LicenseValidationResult> {
const v = this.licenseEvaluator.validate();
Copy link
Member

Choose a reason for hiding this comment

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

👍🏻 not removing the method should work fine during roll out.

AlexTugarev
AlexTugarev reviewed Mar 23, 2023
View reviewed changes
yarn.lock
@@ -12522,22 +12444,6 @@ node-forge@^0.10.0:
resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==

node-gyp@^8.3.0:
Copy link
Member

Choose a reason for hiding this comment

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

🕺🏻

AlexTugarev
AlexTugarev approved these changes Mar 23, 2023
View reviewed changes
Copy link
Member

@AlexTugarev AlexTugarev left a comment

Choose a reason for hiding this comment

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

LGTM

/hold just in case if this needs a second reviewer

@AlexTugarev
Copy link
Member

AlexTugarev commented Mar 23, 2023 •
edited by werft-gitpod-dev-com bot
Loading

❓ What should happen with the license handling in ./gitpod/.werft?

@geropl
Copy link
Member

geropl commented Mar 23, 2023 •
edited
Loading

@AlexTugarev I have no time to look into this PR, but: We still rely on there being a license/empty license for the "Dedicated" setup atm; this is what helps determine the BillingMode for Dedicated (just like self-hosted) to be none.

Could you check that with this PR this is still the case? 🙏

E.g., it's ok to drop all the license-based restrictions (ripping out licensor), but we need to maintain the logic around "defaulting to some license if withPayment is false and there is no license configured" somehow.

@geropl
Copy link
Member

geropl commented Mar 23, 2023 •
edited
Loading

We just double-checked: There is no usage of config.license / db.getKey() anymore. ✔️

@geropl
Copy link
Member

geropl commented Mar 23, 2023

The build is failing bc of docker-up, so let's keep the hold until that is fixed.

@geropl
Copy link
Member

geropl commented Mar 23, 2023

/unhold

Deployment is 🟢

@roboquat roboquat merged commit 555ee27 into main Mar 23, 2023
@roboquat roboquat deleted the aledbf/remove-licensor branch March 23, 2023 09:35
This was referenced Mar 23, 2023
Closed
Closed
Closed
Closed
@roboquat roboquat added deployed: webapp Meta team change is running in production deployed Change is completely running in production labels Mar 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexTugarev AlexTugarev AlexTugarev approved these changes

@gtsiolis gtsiolis Awaiting requested review from gtsiolis

Assignees
No one assigned
Labels
deployed: webapp Meta team change is running in production deployed Change is completely running in production release-note-none size/XXL team: webapp Issue belongs to the WebApp team
Projects
🍎 WebApp Team
Status: In Validation
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[server] Unexpected GLIBC_2.32 error
4 participants
@aledbf @AlexTugarev @geropl @roboquat