diff --git a/components/licensor/ee/pkg/licensor/gitpod.go b/components/licensor/ee/pkg/licensor/gitpod.go index c474b69c1849fa..4a920e00e024dc 100644 --- a/components/licensor/ee/pkg/licensor/gitpod.go +++ b/components/licensor/ee/pkg/licensor/gitpod.go @@ -21,7 +21,7 @@ func NewGitpodEvaluator(key []byte, domain string) (res *Evaluator) { return &Evaluator{ lic: defaultLicense, allowFallback: true, - plan: CommunityLicense, + plan: LicenseTypeCommunity, } } @@ -64,7 +64,7 @@ func NewGitpodEvaluator(key []byte, domain string) (res *Evaluator) { return &Evaluator{ lic: lic.LicensePayload, - allowFallback: false, // Gitpod licenses cannot fallback - assume these are always paid-for - plan: ProfessionalLicense, // This essentially means "paid" license + allowFallback: false, // Gitpod licenses cannot fallback - assume these are always paid-for + plan: LicenseTypePaid, // This essentially means "paid" license } } diff --git a/components/licensor/ee/pkg/licensor/licensor.go b/components/licensor/ee/pkg/licensor/licensor.go index 562f2279936c1b..4ec9b1b298de37 100644 --- a/components/licensor/ee/pkg/licensor/licensor.go +++ b/components/licensor/ee/pkg/licensor/licensor.go @@ -29,8 +29,10 @@ const ( type LicenseSubscriptionLevel string const ( - CommunityLicense LicenseSubscriptionLevel = "community" - ProfessionalLicense LicenseSubscriptionLevel = "prod" + LicenseTypeCommunity LicenseSubscriptionLevel = "community" + LicenseTypePaid LicenseSubscriptionLevel = "prod" + LicenseTypeTrial LicenseSubscriptionLevel = "trial" + LicenseTypeDevelopment LicenseSubscriptionLevel = "dev" ) // LicenseData has type specific info about the license diff --git a/components/licensor/ee/pkg/licensor/licensor_test.go b/components/licensor/ee/pkg/licensor/licensor_test.go index 5f07df8ae3caa3..eec2696e28d2e2 100644 --- a/components/licensor/ee/pkg/licensor/licensor_test.go +++ b/components/licensor/ee/pkg/licensor/licensor_test.go @@ -79,7 +79,7 @@ func (test *licenseTest) Run(t *testing.T) { payload, err := json.Marshal(replicatedLicensePayload{ LicenseType: func() LicenseSubscriptionLevel { if test.ReplicatedLicenseType == nil { - return ReplicatedLicenseTypePaid + return LicenseTypePaid } return *test.ReplicatedLicenseType }(), @@ -210,8 +210,8 @@ func TestSeats(t *testing.T) { } func TestFeatures(t *testing.T) { - replicatedCommunity := ReplicatedLicenseTypeCommunity - replicatedPaid := ReplicatedLicenseTypePaid + replicatedCommunity := LicenseTypeCommunity + replicatedPaid := LicenseTypePaid tests := []struct { Name string diff --git a/components/licensor/ee/pkg/licensor/replicated.go b/components/licensor/ee/pkg/licensor/replicated.go index 9d9d3bc5d482b2..c39e0ecdb3513f 100644 --- a/components/licensor/ee/pkg/licensor/replicated.go +++ b/components/licensor/ee/pkg/licensor/replicated.go @@ -23,14 +23,6 @@ type replicatedFields struct { Value interface{} `json:"value"` // This is of type "fieldType" } -// variable names are what Replicated calls them in the vendor portal -const ( - ReplicatedLicenseTypeCommunity LicenseSubscriptionLevel = "community" - ReplicatedLicenseTypeDevelopment LicenseSubscriptionLevel = "dev" - ReplicatedLicenseTypePaid LicenseSubscriptionLevel = "prod" - ReplicatedLicenseTypeTrial LicenseSubscriptionLevel = "trial" -) - // replicatedLicensePayload exists to convert the JSON structure to a LicensePayload type replicatedLicensePayload struct { LicenseID string `json:"license_id"` @@ -95,7 +87,7 @@ func defaultReplicatedLicense() *Evaluator { return &Evaluator{ lic: defaultLicense, allowFallback: true, - plan: ReplicatedLicenseTypeCommunity, + plan: LicenseTypeCommunity, } } @@ -143,7 +135,7 @@ func newReplicatedEvaluator(client *http.Client, domain string) (res *Evaluator) return &Evaluator{ lic: lic, - allowFallback: replicatedPayload.LicenseType == ReplicatedLicenseTypeCommunity, // Only community licenses are allowed to fallback + allowFallback: replicatedPayload.LicenseType == LicenseTypeCommunity, // Only community licenses are allowed to fallback plan: replicatedPayload.LicenseType, } } diff --git a/components/licensor/typescript/ee/src/api.ts b/components/licensor/typescript/ee/src/api.ts index ff6c1812abf998..84d8a65b58dd31 100644 --- a/components/licensor/typescript/ee/src/api.ts +++ b/components/licensor/typescript/ee/src/api.ts @@ -32,12 +32,10 @@ export interface LicensePayload { } export enum LicenseSubscriptionLevel { - ReplicatedLicenseTypeCommunity = "community", - ReplicatedLicenseTypeDevelopment = "dev", - ReplicatedLicenseTypePaid = "prod", - ReplicatedLicenseTypeTrial = "trial", - CommunityLicense = "community", - ProfessionalLicense = "prod", + LicenseTypeCommunity = "community", + LicenseTypePaid = "prod", + LicenseTypeTrial = "trial", + LicenseTypeDevelopment = "dev", } export enum LicenseType { LicenseTypeGitpod = "gitpod",