Skip to content

Commit 69b0be2

Browse files
lilincmulilincmu
authored
Update feature set name Plus (entitlement) to Standard (entitlement) (#1827)
* Update feature set name Plus (entitlement) to Standard (entitlement) * Rename helper functions
1 parent adb0fe2 commit 69b0be2

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

‎internal/provider/helper_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ func createBusinessOrganization(t *testing.T, client *tfe.Client) (*tfe.Organiza
6666
return org, orgCleanup
6767
}
6868

69-
func createPlusOrganization(t *testing.T, client *tfe.Client) (*tfe.Organization, func()) {
69+
func createStandardOrganization(t *testing.T, client *tfe.Client) (*tfe.Organization, func()) {
7070
org, orgCleanup := createOrganization(t, client, tfe.OrganizationCreateOptions{
7171
Name: tfe.String("tst-" + randomString(t)),
7272
Email: tfe.String(fmt.Sprintf("%[email protected]", randomString(t))),
7373
})
7474

75-
newSubscriptionUpdater(org).WithPlusEntitlementPlan().Update(t)
75+
newSubscriptionUpdater(org).WithStandardEntitlementPlan().Update(t)
7676

7777
return org, orgCleanup
7878
}

‎internal/provider/resource_tfe_team_notification_configuration_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestAccTFETeamNotificationConfiguration_basic(t *testing.T) {
2424
t.Fatal(err)
2525
}
2626

27-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
27+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
2828
t.Cleanup(cleanupOrg)
2929

3030
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -63,7 +63,7 @@ func TestAccTFETeamNotificationConfiguration_emailUserIDs(t *testing.T) {
6363
t.Fatal(err)
6464
}
6565

66-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
66+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
6767
t.Cleanup(cleanupOrg)
6868

6969
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -102,7 +102,7 @@ func TestAccTFETeamNotificationConfiguration_update(t *testing.T) {
102102
t.Fatal(err)
103103
}
104104

105-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
105+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
106106
t.Cleanup(cleanupOrg)
107107

108108
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -163,7 +163,7 @@ func TestAccTFETeamNotificationConfiguration_updateEmailUserIDs(t *testing.T) {
163163
t.Fatal(err)
164164
}
165165

166-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
166+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
167167
t.Cleanup(cleanupOrg)
168168

169169
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -221,7 +221,7 @@ func TestAccTFETeamNotificationConfiguration_validateSchemaAttributesEmail(t *te
221221
t.Fatal(err)
222222
}
223223

224-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
224+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
225225
t.Cleanup(cleanupOrg)
226226

227227
resource.Test(t, resource.TestCase{
@@ -246,7 +246,7 @@ func TestAccTFETeamNotificationConfiguration_validateSchemaAttributesGeneric(t *
246246
t.Fatal(err)
247247
}
248248

249-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
249+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
250250
t.Cleanup(cleanupOrg)
251251

252252
resource.Test(t, resource.TestCase{
@@ -275,7 +275,7 @@ func TestAccTFETeamNotificationConfiguration_validateSchemaAttributesSlack(t *te
275275
t.Fatal(err)
276276
}
277277

278-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
278+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
279279
t.Cleanup(cleanupOrg)
280280

281281
resource.Test(t, resource.TestCase{
@@ -308,7 +308,7 @@ func TestAccTFETeamNotificationConfiguration_validateSchemaAttributesMicrosoftTe
308308
t.Fatal(err)
309309
}
310310

311-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
311+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
312312
t.Cleanup(cleanupOrg)
313313

314314
resource.Test(t, resource.TestCase{
@@ -341,7 +341,7 @@ func TestAccTFETeamNotificationConfiguration_validateSchemaAttributesBadDestinat
341341
t.Fatal(err)
342342
}
343343

344-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
344+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
345345
t.Cleanup(cleanupOrg)
346346

347347
resource.Test(t, resource.TestCase{
@@ -363,7 +363,7 @@ func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesEmail
363363
t.Fatal(err)
364364
}
365365

366-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
366+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
367367
t.Cleanup(cleanupOrg)
368368

369369
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -413,7 +413,7 @@ func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesGener
413413
t.Fatal(err)
414414
}
415415

416-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
416+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
417417
t.Cleanup(cleanupOrg)
418418

419419
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -467,7 +467,7 @@ func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesSlack
467467
t.Fatal(err)
468468
}
469469

470-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
470+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
471471
t.Cleanup(cleanupOrg)
472472

473473
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -525,7 +525,7 @@ func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesMicro
525525
t.Fatal(err)
526526
}
527527

528-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
528+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
529529
t.Cleanup(cleanupOrg)
530530

531531
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -579,7 +579,7 @@ func TestAccTFETeamNotificationConfiguration_duplicateTriggers(t *testing.T) {
579579
t.Fatal(err)
580580
}
581581

582-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
582+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
583583
t.Cleanup(cleanupOrg)
584584

585585
notificationConfiguration := &tfe.NotificationConfiguration{}
@@ -618,7 +618,7 @@ func TestAccTFETeamNotificationConfigurationImport_basic(t *testing.T) {
618618
t.Fatal(err)
619619
}
620620

621-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
621+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
622622
t.Cleanup(cleanupOrg)
623623

624624
resource.Test(t, resource.TestCase{
@@ -647,7 +647,7 @@ func TestAccTFETeamNotificationConfigurationImport_emailUserIDs(t *testing.T) {
647647
t.Fatal(err)
648648
}
649649

650-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
650+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
651651
t.Cleanup(cleanupOrg)
652652

653653
resource.Test(t, resource.TestCase{
@@ -676,7 +676,7 @@ func TestAccTFETeamNotificationConfigurationImport_emptyEmailUserIDs(t *testing.
676676
t.Fatal(err)
677677
}
678678

679-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
679+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
680680
t.Cleanup(cleanupOrg)
681681

682682
resource.Test(t, resource.TestCase{
@@ -936,7 +936,7 @@ func TestAccTFETeamNotificationConfiguration_tokenWO(t *testing.T) {
936936
t.Fatal(err)
937937
}
938938

939-
org, cleanupOrg := createPlusOrganization(t, tfeClient)
939+
org, cleanupOrg := createStandardOrganization(t, tfeClient)
940940
t.Cleanup(cleanupOrg)
941941

942942
// Create the value comparer so we can add state values to it during the test steps

‎internal/provider/subscription_updater_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ func newSubscriptionUpdater(organization *tfe.Organization) *organizationSubscri
5050
}
5151
}
5252

53-
func (b *organizationSubscriptionUpdater) WithPlusEntitlementPlan() *organizationSubscriptionUpdater {
54-
b.planName = "Plus (entitlement)"
53+
func (b *organizationSubscriptionUpdater) WithStandardEntitlementPlan() *organizationSubscriptionUpdater {
54+
b.planName = "Standard (entitlement)"
5555

5656
start := time.Now()
5757
ceiling := 1

0 commit comments

Comments
 (0)