Skip to content

Commit 4e958d8

Browse files
author
Simon Emms
committed
[licensor]: remove prebuilds from the team level license
1 parent 58ea318 commit 4e958d8

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

components/licensor/ee/pkg/licensor/licensor.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ type allowance struct {
8787

8888
var allowanceMap = map[LicenseLevel]allowance{
8989
LevelTeam: {
90-
PrebuildTime: 50 * time.Hour,
9190
Features: featureSet{
92-
FeaturePrebuild: struct{}{},
93-
9491
FeatureAdminDashboard: struct{}{},
9592
},
9693
},

components/licensor/ee/pkg/licensor/licensor_test.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,7 @@ func TestFeatures(t *testing.T) {
238238
FeaturePrebuild,
239239
}, LicenseTypeGitpod, seats, nil},
240240

241-
{"Gitpod (over seats): no license", true, LicenseLevel(0), []Feature{
242-
FeaturePrebuild,
243-
}, LicenseTypeGitpod, 11, nil},
241+
{"Gitpod (over seats): no license", true, LicenseLevel(0), []Feature{}, LicenseTypeGitpod, 11, nil},
244242
{"Gitpod (over seats): invalid license level", false, LicenseLevel(666), []Feature{}, LicenseTypeGitpod, seats + 1, nil},
245243
{"Gitpod (over seats): enterprise license", false, LevelEnterprise, []Feature{}, LicenseTypeGitpod, seats + 1, nil},
246244

@@ -274,14 +272,8 @@ func TestFeatures(t *testing.T) {
274272
FeaturePrebuild,
275273
}, LicenseTypeReplicated, seats + 1, &replicatedPaid},
276274

277-
{"Replicated (over seats - fallback): invalid license level", false, LicenseLevel(666), []Feature{
278-
FeatureAdminDashboard,
279-
FeaturePrebuild,
280-
}, LicenseTypeReplicated, seats + 1, &replicatedCommunity},
281-
{"Replicated (over seats - fallback): enterprise license", false, LevelEnterprise, []Feature{
282-
FeatureAdminDashboard,
283-
FeaturePrebuild,
284-
}, LicenseTypeReplicated, seats + 1, &replicatedCommunity},
275+
{"Replicated (over seats - fallback): invalid license level", false, LicenseLevel(666), []Feature{FeatureAdminDashboard}, LicenseTypeReplicated, seats + 1, &replicatedCommunity},
276+
{"Replicated (over seats - fallback): enterprise license", false, LevelEnterprise, []Feature{FeatureAdminDashboard}, LicenseTypeReplicated, seats + 1, &replicatedCommunity},
285277
}
286278

287279
for _, test := range tests {

0 commit comments

Comments
 (0)