Skip to content

Commit 90bbd46

Browse files
notchairmknotchairmk
committed
base on latest go-tfe changes, update structs
1 parent d58284e commit 90bbd46

File tree

5 files changed

+37
-33
lines changed

5 files changed

+37
-33
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module github.com/hashicorp/terraform-provider-tfe
22

33
go 1.21
44

5-
replace github.com/hashicorp/go-tfe => ../go-tfe
6-
75
require (
86
github.com/agext/levenshtein v1.2.3 // indirect
97
github.com/fatih/color v1.16.0 // indirect
@@ -44,7 +42,7 @@ require (
4442
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
4543
github.com/hashicorp/go-plugin v1.6.0 // indirect
4644
github.com/hashicorp/go-uuid v1.0.3
47-
github.com/hashicorp/jsonapi v1.3.1
45+
github.com/hashicorp/jsonapi v1.3.2
4846
github.com/hashicorp/logutils v1.0.0 // indirect
4947
github.com/hashicorp/terraform-exec v0.20.0 // indirect
5048
github.com/hashicorp/terraform-json v0.21.0 // indirect
@@ -84,3 +82,5 @@ require (
8482
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
8583
gopkg.in/yaml.v3 v3.0.1 // indirect
8684
)
85+
86+
replace github.com/hashicorp/go-tfe => github.com/hashicorp/go-tfe v1.72.1-0.20250107212614-518ceb022e03

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISH
6666
github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
6767
github.com/hashicorp/go-slug v0.16.0 h1:S/ko9fms1gf6305ktJNUKGxFmscZ+yWvAtsas0SYUyA=
6868
github.com/hashicorp/go-slug v0.16.0/go.mod h1:THWVTAXwJEinbsp4/bBRcmbaO5EYNLTqxbG4tZ3gCYQ=
69-
github.com/hashicorp/go-tfe v1.70.0 h1:R5a9Z+jdVz6eRWtSLsl1nw+5Qe/swunZcJgeKK5NQtQ=
70-
github.com/hashicorp/go-tfe v1.70.0/go.mod h1:2rOcdTxXwbWm0W7dCKjC3Ec8KQ+HhW165GiurXNshc4=
69+
github.com/hashicorp/go-tfe v1.72.1-0.20250107212614-518ceb022e03 h1:s5LThLEu3U7J+puf9HKzqswU6ySD1Wqgez8UwOuCxw8=
70+
github.com/hashicorp/go-tfe v1.72.1-0.20250107212614-518ceb022e03/go.mod h1:4/yd7fl8960i71v5q8cmpIiA5wB9rBRfvTpFfD/dbvE=
7171
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
7272
github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
7373
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -79,8 +79,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
7979
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
8080
github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI=
8181
github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=
82-
github.com/hashicorp/jsonapi v1.3.1 h1:GtPvnmcWgYwCuDGvYT5VZBHcUyFdq9lSyCzDjn1DdPo=
83-
github.com/hashicorp/jsonapi v1.3.1/go.mod h1:kWfdn49yCjQvbpnvY1dxxAuAFzISwrrMDQOcu6NsFoM=
82+
github.com/hashicorp/jsonapi v1.3.2 h1:gP3fX2ZT7qXi+PbwieptzkspIohO2kCSiBUvUTBAbMs=
83+
github.com/hashicorp/jsonapi v1.3.2/go.mod h1:kWfdn49yCjQvbpnvY1dxxAuAFzISwrrMDQOcu6NsFoM=
8484
github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
8585
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
8686
github.com/hashicorp/terraform-exec v0.20.0 h1:DIZnPsqzPGuUnq6cH8jWcPunBfY+C+M8JyYF3vpnuEo=

‎internal/provider/client_mock_workspaces_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ func (m *mockWorkspaces) RemoveTags(ctx context.Context, workspaceID string, opt
165165
panic("not implemented")
166166
}
167167

168+
func (m *mockWorkspaces) DeleteAllTagBindings(ctx context.Context, workspaceID string) error {
169+
panic("not implemented")
170+
}
171+
168172
func (m *mockWorkspaces) SafeDelete(ctx context.Context, organization string, workspace string) error {
169173
panic("not implemented")
170174
}

‎internal/provider/resource_tfe_team_notification_configuration.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ type modelTFETeamNotificationConfiguration struct {
5656

5757
// modelFromTFETeamNotificationConfiguration builds a modelTFETeamNotificationConfiguration
5858
// struct from a tfe.TeamNotificationConfiguration value.
59-
func modelFromTFETeamNotificationConfiguration(v *tfe.TeamNotificationConfiguration) modelTFETeamNotificationConfiguration {
59+
func modelFromTFETeamNotificationConfiguration(v *tfe.NotificationConfiguration) modelTFETeamNotificationConfiguration {
6060
result := modelTFETeamNotificationConfiguration{
6161
ID: types.StringValue(v.ID),
6262
Name: types.StringValue(v.Name),
@@ -272,7 +272,7 @@ func (r *resourceTFETeamNotificationConfiguration) Create(ctx context.Context, r
272272
teamID := plan.TeamID.ValueString()
273273

274274
// Create a new options struct
275-
options := tfe.TeamNotificationConfigurationCreateOptions{
275+
options := tfe.NotificationConfigurationCreateOptions{
276276
DestinationType: tfe.NotificationDestination(tfe.NotificationDestinationType(plan.DestinationType.ValueString())),
277277
Enabled: plan.Enabled.ValueBoolPointer(),
278278
Name: plan.Name.ValueStringPointer(),
@@ -314,7 +314,7 @@ func (r *resourceTFETeamNotificationConfiguration) Create(ctx context.Context, r
314314
}
315315

316316
tflog.Debug(ctx, "Creating team notification configuration")
317-
tnc, err := r.config.Client.TeamNotificationConfigurations.Create(ctx, teamID, options)
317+
tnc, err := r.config.Client.NotificationConfigurations.Create(ctx, teamID, options)
318318
if err != nil {
319319
resp.Diagnostics.AddError("Unable to create team notification configuration", err.Error())
320320
return
@@ -342,7 +342,7 @@ func (r *resourceTFETeamNotificationConfiguration) Read(ctx context.Context, req
342342
}
343343

344344
tflog.Debug(ctx, fmt.Sprintf("Reading team notification configuration %q", state.ID.ValueString()))
345-
tnc, err := r.config.Client.TeamNotificationConfigurations.Read(ctx, state.ID.ValueString())
345+
tnc, err := r.config.Client.NotificationConfigurations.Read(ctx, state.ID.ValueString())
346346
if err != nil {
347347
resp.Diagnostics.AddError("Unable to read team notification configuration", err.Error())
348348
return
@@ -374,7 +374,7 @@ func (r *resourceTFETeamNotificationConfiguration) Update(ctx context.Context, r
374374
}
375375

376376
// Create a new options struct
377-
options := tfe.TeamNotificationConfigurationUpdateOptions{
377+
options := tfe.NotificationConfigurationUpdateOptions{
378378
Enabled: plan.Enabled.ValueBoolPointer(),
379379
Name: plan.Name.ValueStringPointer(),
380380
Token: plan.Token.ValueStringPointer(),
@@ -415,7 +415,7 @@ func (r *resourceTFETeamNotificationConfiguration) Update(ctx context.Context, r
415415
}
416416

417417
tflog.Debug(ctx, "Updating team notification configuration")
418-
tnc, err := r.config.Client.TeamNotificationConfigurations.Update(ctx, state.ID.ValueString(), options)
418+
tnc, err := r.config.Client.NotificationConfigurations.Update(ctx, state.ID.ValueString(), options)
419419
if err != nil {
420420
resp.Diagnostics.AddError("Unable to update team notification configuration", err.Error())
421421
return
@@ -443,7 +443,7 @@ func (r *resourceTFETeamNotificationConfiguration) Delete(ctx context.Context, r
443443
}
444444

445445
tflog.Debug(ctx, "Deleting team notification configuration")
446-
err := r.config.Client.TeamNotificationConfigurations.Delete(ctx, state.ID.ValueString())
446+
err := r.config.Client.NotificationConfigurations.Delete(ctx, state.ID.ValueString())
447447
if err != nil {
448448
resp.Diagnostics.AddError("Unable to delete team notification configuration", err.Error())
449449
return

‎internal/provider/resource_tfe_team_notification_configuration_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
)
1818

1919
func TestAccTFETeamNotificationConfiguration_basic(t *testing.T) {
20-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
20+
notificationConfiguration := &tfe.NotificationConfiguration{}
2121
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
2222

2323
resource.Test(t, resource.TestCase{
@@ -48,7 +48,7 @@ func TestAccTFETeamNotificationConfiguration_basic(t *testing.T) {
4848
}
4949

5050
func TestAccTFETeamNotificationConfiguration_emailUserIDs(t *testing.T) {
51-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
51+
notificationConfiguration := &tfe.NotificationConfiguration{}
5252
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
5353

5454
resource.Test(t, resource.TestCase{
@@ -79,7 +79,7 @@ func TestAccTFETeamNotificationConfiguration_emailUserIDs(t *testing.T) {
7979
}
8080

8181
func TestAccTFETeamNotificationConfiguration_update(t *testing.T) {
82-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
82+
notificationConfiguration := &tfe.NotificationConfiguration{}
8383
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
8484

8585
resource.Test(t, resource.TestCase{
@@ -132,7 +132,7 @@ func TestAccTFETeamNotificationConfiguration_update(t *testing.T) {
132132
}
133133

134134
func TestAccTFETeamNotificationConfiguration_updateEmailUserIDs(t *testing.T) {
135-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
135+
notificationConfiguration := &tfe.NotificationConfiguration{}
136136
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
137137

138138
resource.Test(t, resource.TestCase{
@@ -294,7 +294,7 @@ func TestAccTFETeamNotificationConfiguration_validateSchemaAttributesBadDestinat
294294
}
295295

296296
func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesEmail(t *testing.T) {
297-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
297+
notificationConfiguration := &tfe.NotificationConfiguration{}
298298
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
299299

300300
resource.Test(t, resource.TestCase{
@@ -336,7 +336,7 @@ func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesEmail
336336
}
337337

338338
func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesGeneric(t *testing.T) {
339-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
339+
notificationConfiguration := &tfe.NotificationConfiguration{}
340340
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
341341

342342
resource.Test(t, resource.TestCase{
@@ -382,7 +382,7 @@ func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesGener
382382
}
383383

384384
func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesSlack(t *testing.T) {
385-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
385+
notificationConfiguration := &tfe.NotificationConfiguration{}
386386
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
387387

388388
resource.Test(t, resource.TestCase{
@@ -432,7 +432,7 @@ func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesSlack
432432
}
433433

434434
func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesMicrosoftTeams(t *testing.T) {
435-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
435+
notificationConfiguration := &tfe.NotificationConfiguration{}
436436
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
437437

438438
resource.Test(t, resource.TestCase{
@@ -478,7 +478,7 @@ func TestAccTFETeamNotificationConfiguration_updateValidateSchemaAttributesMicro
478478
}
479479

480480
func TestAccTFETeamNotificationConfiguration_duplicateTriggers(t *testing.T) {
481-
notificationConfiguration := &tfe.TeamNotificationConfiguration{}
481+
notificationConfiguration := &tfe.NotificationConfiguration{}
482482
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
483483

484484
resource.Test(t, resource.TestCase{
@@ -574,7 +574,7 @@ func TestAccTFETeamNotificationConfigurationImport_emptyEmailUserIDs(t *testing.
574574
})
575575
}
576576

577-
func testAccCheckTFETeamNotificationConfigurationExists(n string, notificationConfiguration *tfe.TeamNotificationConfiguration) resource.TestCheckFunc {
577+
func testAccCheckTFETeamNotificationConfigurationExists(n string, notificationConfiguration *tfe.NotificationConfiguration) resource.TestCheckFunc {
578578
return func(s *terraform.State) error {
579579
config := testAccProvider.Meta().(ConfiguredClient)
580580

@@ -587,7 +587,7 @@ func testAccCheckTFETeamNotificationConfigurationExists(n string, notificationCo
587587
return fmt.Errorf("No instance ID is set")
588588
}
589589

590-
nc, err := config.Client.TeamNotificationConfigurations.Read(ctx, rs.Primary.ID)
590+
nc, err := config.Client.NotificationConfigurations.Read(ctx, rs.Primary.ID)
591591
if err != nil {
592592
return err
593593
}
@@ -598,7 +598,7 @@ func testAccCheckTFETeamNotificationConfigurationExists(n string, notificationCo
598598
}
599599
}
600600

601-
func testAccCheckTFETeamNotificationConfigurationAttributes(notificationConfiguration *tfe.TeamNotificationConfiguration) resource.TestCheckFunc {
601+
func testAccCheckTFETeamNotificationConfigurationAttributes(notificationConfiguration *tfe.NotificationConfiguration) resource.TestCheckFunc {
602602
return func(s *terraform.State) error {
603603
if notificationConfiguration.Name != "notification_basic" {
604604
return fmt.Errorf("Bad name: %s", notificationConfiguration.Name)
@@ -626,7 +626,7 @@ func testAccCheckTFETeamNotificationConfigurationAttributes(notificationConfigur
626626
}
627627
}
628628

629-
func testAccCheckTFETeamNotificationConfigurationAttributesUpdate(notificationConfiguration *tfe.TeamNotificationConfiguration) resource.TestCheckFunc {
629+
func testAccCheckTFETeamNotificationConfigurationAttributesUpdate(notificationConfiguration *tfe.NotificationConfiguration) resource.TestCheckFunc {
630630
return func(s *terraform.State) error {
631631
if notificationConfiguration.Name != "notification_update" {
632632
return fmt.Errorf("Bad name: %s", notificationConfiguration.Name)
@@ -654,7 +654,7 @@ func testAccCheckTFETeamNotificationConfigurationAttributesUpdate(notificationCo
654654
}
655655
}
656656

657-
func testAccCheckTFETeamNotificationConfigurationAttributesEmailUserIDs(notificationConfiguration *tfe.TeamNotificationConfiguration) resource.TestCheckFunc {
657+
func testAccCheckTFETeamNotificationConfigurationAttributesEmailUserIDs(notificationConfiguration *tfe.NotificationConfiguration) resource.TestCheckFunc {
658658
return func(s *terraform.State) error {
659659
if notificationConfiguration.Name != "notification_email" {
660660
return fmt.Errorf("Bad name: %s", notificationConfiguration.Name)
@@ -682,7 +682,7 @@ func testAccCheckTFETeamNotificationConfigurationAttributesEmailUserIDs(notifica
682682
}
683683
}
684684

685-
func testAccCheckTFETeamNotificationConfigurationAttributesUpdateEmailUserIDs(notificationConfiguration *tfe.TeamNotificationConfiguration) resource.TestCheckFunc {
685+
func testAccCheckTFETeamNotificationConfigurationAttributesUpdateEmailUserIDs(notificationConfiguration *tfe.NotificationConfiguration) resource.TestCheckFunc {
686686
return func(s *terraform.State) error {
687687
if notificationConfiguration.Name != "notification_email_update" {
688688
return fmt.Errorf("Bad name: %s", notificationConfiguration.Name)
@@ -710,7 +710,7 @@ func testAccCheckTFETeamNotificationConfigurationAttributesUpdateEmailUserIDs(no
710710
}
711711
}
712712

713-
func testAccCheckTFETeamNotificationConfigurationAttributesSlack(notificationConfiguration *tfe.TeamNotificationConfiguration) resource.TestCheckFunc {
713+
func testAccCheckTFETeamNotificationConfigurationAttributesSlack(notificationConfiguration *tfe.NotificationConfiguration) resource.TestCheckFunc {
714714
return func(s *terraform.State) error {
715715
if notificationConfiguration.Name != "notification_slack" {
716716
return fmt.Errorf("Bad name: %s", notificationConfiguration.Name)
@@ -734,7 +734,7 @@ func testAccCheckTFETeamNotificationConfigurationAttributesSlack(notificationCon
734734
}
735735
}
736736

737-
func testAccCheckTFETeamNotificationConfigurationAttributesMicrosoftTeams(notificationConfiguration *tfe.TeamNotificationConfiguration) resource.TestCheckFunc {
737+
func testAccCheckTFETeamNotificationConfigurationAttributesMicrosoftTeams(notificationConfiguration *tfe.NotificationConfiguration) resource.TestCheckFunc {
738738
return func(s *terraform.State) error {
739739
if notificationConfiguration.Name != "notification_msteams" {
740740
return fmt.Errorf("Bad name: %s", notificationConfiguration.Name)
@@ -760,7 +760,7 @@ func testAccCheckTFETeamNotificationConfigurationAttributesMicrosoftTeams(notifi
760760
}
761761
}
762762

763-
func testAccCheckTFETeamNotificationConfigurationAttributesDuplicateTriggers(notificationConfiguration *tfe.TeamNotificationConfiguration) resource.TestCheckFunc {
763+
func testAccCheckTFETeamNotificationConfigurationAttributesDuplicateTriggers(notificationConfiguration *tfe.NotificationConfiguration) resource.TestCheckFunc {
764764
return func(s *terraform.State) error {
765765
if notificationConfiguration.Name != "notification_duplicate_triggers" {
766766
return fmt.Errorf("Bad name: %s", notificationConfiguration.Name)
@@ -800,7 +800,7 @@ func testAccCheckTFETeamNotificationConfigurationDestroy(s *terraform.State) err
800800
return fmt.Errorf("No instance ID is set")
801801
}
802802

803-
_, err := config.Client.TeamNotificationConfigurations.Read(ctx, rs.Primary.ID)
803+
_, err := config.Client.NotificationConfigurations.Read(ctx, rs.Primary.ID)
804804
if err == nil {
805805
return fmt.Errorf("Notification configuration %s still exists", rs.Primary.ID)
806806
}

0 commit comments

Comments
 (0)