Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

rename 'Enterprise licenses' to 'Enterprise subscriptions' to accurately represent enterprise accounts #61049

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

bobheadxi
Copy link
Member

https://github.com/sourcegraph/sourcegraph/pull/60911 renamed "Subscriptions" to "Enterprise licenses", but the two are not equivalent, as "subscriptions" are an entity above individual licenses - for example Create new Enterprise license is not equivalent to the previous Create new product subscription. This entity is important because there are some elements of these subscriptions that are more subscription-oriented, than license-oriented - for example, Cody Gateway rate limits exist at an "Enterprise subscription" level and are not necessarily tied to individual licenses (though they can affect what is evaluated at the "subscription" level).

In RFC 885 Sourcegraph Enterprise Portal outlining how Core Services plans to change this area (and also the existing use cases of a "subscription"-like entity), we've taken to referring to these as "Enterprise subscriptions" to differentiate from PLG ones. This naming more accurately reflects the model while avoiding confusion with PLG subscriptions.

See thread: https://sourcegraph.slack.com/archives/C04MEF2T33M/p1710292839852869?thread_ts=1709789262.898779&cid=C04MEF2T33M

This PR applies the new naming and also fixes a few spots missed in https://github.com/sourcegraph/sourcegraph/pull/60911

Test plan

sg start dotcom

image
image
image

@cla-bot cla-bot bot added the cla-signed label Mar 13, 2024
@bobheadxi bobheadxi force-pushed the rename-enterprise-subscriptions branch from 9707a5b to 1be8dfb Compare March 13, 2024 03:58
@bobheadxi bobheadxi requested review from sqs, eseliger and chrsmith March 13, 2024 03:58
Copy link
Member

@eseliger eseliger left a comment

Choose a reason for hiding this comment

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

Can you also fixup the handbook?

@bobheadxi
Copy link
Member Author

Can you also fixup the handbook?

PR is in sourcegraph/handbook#8710, and sourcegraph/docs#150 for docs as well 😄

@bobheadxi bobheadxi merged commit 095a429 into main Mar 13, 2024
9 checks passed
@bobheadxi bobheadxi deleted the rename-enterprise-subscriptions branch March 13, 2024 04:23
bobheadxi referenced this pull request in sourcegraph/handbook Mar 13, 2024
bobheadxi referenced this pull request in sourcegraph/docs Mar 13, 2024
Partially revert #125 - see https://github.com/sourcegraph/sourcegraph/pull/61049. In particular #125 introduced some errors about how Cody Gateway properties are evaluated, notably very few Cody Gateway access properties are evaluated from license keys.

While here I also found another error - there's a table indicating the product subscription token is `not derived from a Sourcegraph license key`, but it _is_ derived from the license key, which is how the zero-config Cody mechanism works. I've fixed this in this PR
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants