Skip to content

Commit e96ec4c

Browse files
authored
Update datasource_test.go
1 parent cc378d4 commit e96ec4c

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

stackit/internal/services/sqlserverflex/user/datasource_test.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ import (
66
"github.com/google/go-cmp/cmp"
77
"github.com/hashicorp/terraform-plugin-framework/attr"
88
"github.com/hashicorp/terraform-plugin-framework/types"
9-
<<<<<<< sqlserverflex-sdk-update
10-
"github.com/stackitcloud/stackit-sdk-go/core/utils"
119
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
12-
=======
13-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
14-
>>>>>>> main
1510
)
1611

1712
func TestMapDataSourceFields(t *testing.T) {
@@ -78,13 +73,8 @@ func TestMapDataSourceFields(t *testing.T) {
7873
"null_fields_and_int_conversions",
7974
&sqlserverflex.GetUserResponse{
8075
Item: &sqlserverflex.UserResponseUser{
81-
<<<<<<< sqlserverflex-sdk-update
82-
Id: utils.Ptr("uid"),
83-
Roles: []string{},
84-
=======
8576
Id: new("uid"),
86-
Roles: &[]string{},
87-
>>>>>>> main
77+
Roles: []string{},
8878
Username: nil,
8979
Host: nil,
9080
Port: new(int64(2123456789)),

0 commit comments

Comments
 (0)