Disable projects when user downgrades #2128
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jirevwe
approved these changes
Aug 30, 2024
jirevwe
pushed a commit
that referenced
this pull request
Aug 30, 2024
* dump * feat: add keygen licenser implementation * feat: gate more features * feat: fix & add tests for licensing * feat: fix what test * fix: remove unused import * fix: add skipHook * fix: fix PostRun panic * feat: fix task tests * fix: - pass licenser fields to services - fix organisation_member_test.go & organisation_test.go * fix: add license key env for testcon tests * fix: fix license error check * fix: add test license key env to docker-compose-test.yml * fix: add CONVOY_LICENSE_KEY to integration_test_helper.go * fix: print TEST_LICENSE_KEY * fix: remove print * fix: print * fix: print license key * fix: pass license key in docker-compose-test.yml * fix: - remove print - use withEnv in integration_test.go * fix: add keygen_test.go * fix: remove plan_type validation * fix: make TestKeygenLicenserBoolMethods more insulated * fix: add TestNewDispatcher * deprecate: deprecate RedirectToProjects for old convoy routes * fix: - pass licenser to UpdateEndpointService - check for advanced endpoint mgmt before calling SendRequest * fix: add CommunityPlan & communityLicenser * fix: extract feature list from license entitlements * fix: add GET /ui/license_features api * fix: go generate * fix: move TEST_LICENSE_KEY to Run integration tests (with test containers) * fix: extract license limits from metadata * fix: move /ui/license_features to BuildControlPlaneRoutes * fix: fix GetLicenseFeatures response msg * fix: use json.RawMessage as return type for FeatureListJSON method * fix: - change /ui/license_features to /ui/license/features - add integration build tag to noop.go - check compose error * fix: fix lint issues * fix: edit some feature names * fix: change keygen creds * fix: check compose error for container exited with code 0 * feat: gate project creation * feat: add omitempty tag to Properties.Limit * feat: change CreateOrgMember gating to Register user gating * fix: fix TestCountProjects * feat: gate portal links * fix: - pass projectRepo to licenser from hooks.go - fix ProjectLimit mapstructure tag * fix: - switch to counting users from org members - gate boostrap command * fix: fix Test_communityLicenser * fix: - remove TestCountOrganisationMembers - add TestCountUsers * fix: fix TestCountUsers * add license gating (#2123) * add licensing * update license tags * fix: use userRepo.CountUsers in ensureDefaultUser * fix: remove CreateUser from commnunity licenser * fix: fix Test_communityLicenser * add portal links gating * fix: switch feature list json to `allowed: true/false` because of features with dynamic limits * fix: go generate * fix: fix lint issues * fix: fix /license/features in guestRoutes * check license limits * remove console.log * fetch licenses on org creation * update user locense gating * update license gating on projects, teams, transform and filters * fix: check license expiry * Disable projects when user downgrades (#2128) * fix: - add RemoveEnabledProject - check enabledProjects under limit before adding new project * fix: add test case for RemoveEnabledProject * fix: gate portal link api in data plane routes * fix: change ErrProjectDisabled err msg --------- Co-authored-by: Pelumi Muyiwa-Oni <[email protected]>
Oluwadaminiola
added a commit
that referenced
this pull request
Oct 1, 2024
* dump * feat: add keygen licenser implementation * feat: gate more features * feat: fix & add tests for licensing * feat: fix what test * fix: remove unused import * fix: add skipHook * fix: fix PostRun panic * feat: fix task tests * fix: - pass licenser fields to services - fix organisation_member_test.go & organisation_test.go * fix: add license key env for testcon tests * fix: fix license error check * fix: add test license key env to docker-compose-test.yml * fix: add CONVOY_LICENSE_KEY to integration_test_helper.go * fix: print TEST_LICENSE_KEY * fix: remove print * fix: print * fix: print license key * fix: pass license key in docker-compose-test.yml * fix: - remove print - use withEnv in integration_test.go * fix: add keygen_test.go * fix: remove plan_type validation * fix: make TestKeygenLicenserBoolMethods more insulated * fix: add TestNewDispatcher * deprecate: deprecate RedirectToProjects for old convoy routes * fix: - pass licenser to UpdateEndpointService - check for advanced endpoint mgmt before calling SendRequest * fix: add CommunityPlan & communityLicenser * fix: extract feature list from license entitlements * fix: add GET /ui/license_features api * fix: go generate * fix: move TEST_LICENSE_KEY to Run integration tests (with test containers) * fix: extract license limits from metadata * fix: move /ui/license_features to BuildControlPlaneRoutes * fix: fix GetLicenseFeatures response msg * fix: use json.RawMessage as return type for FeatureListJSON method * fix: - change /ui/license_features to /ui/license/features - add integration build tag to noop.go - check compose error * fix: fix lint issues * fix: edit some feature names * fix: change keygen creds * fix: check compose error for container exited with code 0 * feat: gate project creation * feat: add omitempty tag to Properties.Limit * feat: change CreateOrgMember gating to Register user gating * fix: fix TestCountProjects * feat: gate portal links * fix: - pass projectRepo to licenser from hooks.go - fix ProjectLimit mapstructure tag * fix: - switch to counting users from org members - gate boostrap command * fix: fix Test_communityLicenser * fix: - remove TestCountOrganisationMembers - add TestCountUsers * fix: fix TestCountUsers * add license gating (#2123) * add licensing * update license tags * fix: use userRepo.CountUsers in ensureDefaultUser * fix: remove CreateUser from commnunity licenser * fix: fix Test_communityLicenser * add portal links gating * fix: switch feature list json to `allowed: true/false` because of features with dynamic limits * fix: go generate * fix: fix lint issues * fix: fix /license/features in guestRoutes * check license limits * remove console.log * fetch licenses on org creation * update user locense gating * update license gating on projects, teams, transform and filters * fix: check license expiry * Disable projects when user downgrades (#2128) * fix: - add RemoveEnabledProject - check enabledProjects under limit before adding new project * fix: add test case for RemoveEnabledProject * fix: gate portal link api in data plane routes * fix: change ErrProjectDisabled err msg --------- Co-authored-by: Pelumi Muyiwa-Oni <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.