Skip to content

Commit b235f34

Browse files
GokceGKGokceGK
authored
Update resource_test.go
1 parent 7860641 commit b235f34

1 file changed

Lines changed: 15 additions & 92 deletions

File tree

‎stackit/internal/services/sqlserverflex/instance/resource_test.go‎

Lines changed: 15 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ import (
88
"github.com/google/go-cmp/cmp"
99
"github.com/hashicorp/terraform-plugin-framework/attr"
1010
"github.com/hashicorp/terraform-plugin-framework/types"
11-
<<<<<<< sqlserverflex-sdk-update
12-
"github.com/stackitcloud/stackit-sdk-go/core/utils"
1311
sqlserverflex "github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex/v2api"
14-
=======
15-
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
16-
>>>>>>> main
1712
)
1813

1914
type sqlserverflexClientMocked struct {
@@ -104,27 +99,15 @@ func TestMapFields(t *testing.T) {
10499
},
105100
BackupSchedule: new("schedule"),
106101
Flavor: &sqlserverflex.Flavor{
107-
<<<<<<< sqlserverflex-sdk-update
108-
Cpu: utils.Ptr(int32(12)),
109-
Description: utils.Ptr("description"),
110-
Id: utils.Ptr("flavor_id"),
111-
Memory: utils.Ptr(int32(34)),
112-
},
113-
Id: utils.Ptr("iid"),
114-
Name: utils.Ptr("name"),
115-
Replicas: utils.Ptr(int32(56)),
116-
Status: utils.Ptr("status"),
117-
=======
118-
Cpu: new(int64(12)),
102+
Cpu: new(int32(12)),
119103
Description: new("description"),
120104
Id: new("flavor_id"),
121-
Memory: new(int64(34)),
105+
Memory: new(int32(34)),
122106
},
123107
Id: new("iid"),
124108
Name: new("name"),
125-
Replicas: new(int64(56)),
109+
Replicas: new(int32(56)),
126110
Status: new("status"),
127-
>>>>>>> main
128111
Storage: &sqlserverflex.Storage{
129112
Class: new("class"),
130113
Size: new(int64(78)),
@@ -188,17 +171,10 @@ func TestMapFields(t *testing.T) {
188171
},
189172
BackupSchedule: new("schedule"),
190173
Flavor: nil,
191-
<<<<<<< sqlserverflex-sdk-update
192-
Id: utils.Ptr("iid"),
193-
Name: utils.Ptr("name"),
194-
Replicas: utils.Ptr(int32(56)),
195-
Status: utils.Ptr("status"),
196-
=======
197174
Id: new("iid"),
198175
Name: new("name"),
199-
Replicas: new(int64(56)),
176+
Replicas: new(int32(56)),
200177
Status: new("status"),
201-
>>>>>>> main
202178
Storage: nil,
203179
Options: &map[string]string{
204180
"edition": "edition",
@@ -273,17 +249,10 @@ func TestMapFields(t *testing.T) {
273249
},
274250
BackupSchedule: new("schedule"),
275251
Flavor: nil,
276-
<<<<<<< sqlserverflex-sdk-update
277-
Id: utils.Ptr("iid"),
278-
Name: utils.Ptr("name"),
279-
Replicas: utils.Ptr(int32(56)),
280-
Status: utils.Ptr("status"),
281-
=======
282252
Id: new("iid"),
283253
Name: new("name"),
284-
Replicas: new(int64(56)),
254+
Replicas: new(int32(56)),
285255
Status: new("status"),
286-
>>>>>>> main
287256
Storage: nil,
288257
Options: &map[string]string{
289258
"edition": "edition",
@@ -438,18 +407,6 @@ func TestToCreatePayload(t *testing.T) {
438407
"ip_2",
439408
},
440409
},
441-
<<<<<<< sqlserverflex-sdk-update
442-
BackupSchedule: utils.Ptr("schedule"),
443-
FlavorId: "flavor_id",
444-
Name: "name",
445-
Storage: &sqlserverflex.InstanceDocumentationStorage{
446-
Class: utils.Ptr("class"),
447-
Size: utils.Ptr(int64(34)),
448-
},
449-
Options: &sqlserverflex.InstanceDocumentationOptions{
450-
Edition: utils.Ptr("edition"),
451-
RetentionDays: utils.Ptr("1"),
452-
=======
453410
BackupSchedule: new("schedule"),
454411
FlavorId: new("flavor_id"),
455412
Name: new("name"),
@@ -460,7 +417,6 @@ func TestToCreatePayload(t *testing.T) {
460417
Options: &sqlserverflex.CreateInstancePayloadOptions{
461418
Edition: new("edition"),
462419
RetentionDays: new("1"),
463-
>>>>>>> main
464420
},
465421
Version: new("version"),
466422
},
@@ -733,17 +689,10 @@ func TestLoadFlavorId(t *testing.T) {
733689
&sqlserverflex.ListFlavorsResponse{
734690
Flavors: []sqlserverflex.InstanceFlavorEntry{
735691
{
736-
<<<<<<< sqlserverflex-sdk-update
737-
Id: utils.Ptr("fid-1"),
738-
Cpu: utils.Ptr(int32(2)),
739-
Description: utils.Ptr("description"),
740-
Memory: utils.Ptr(int32(8)),
741-
=======
742692
Id: new("fid-1"),
743-
Cpu: new(int64(2)),
693+
Cpu: new(int32(2)),
744694
Description: new("description"),
745-
Memory: new(int64(8)),
746-
>>>>>>> main
695+
Memory: new(int32(8)),
747696
},
748697
},
749698
},
@@ -765,29 +714,16 @@ func TestLoadFlavorId(t *testing.T) {
765714
&sqlserverflex.ListFlavorsResponse{
766715
Flavors: []sqlserverflex.InstanceFlavorEntry{
767716
{
768-
<<<<<<< sqlserverflex-sdk-update
769-
Id: utils.Ptr("fid-1"),
770-
Cpu: utils.Ptr(int32(2)),
771-
Description: utils.Ptr("description"),
772-
Memory: utils.Ptr(int32(8)),
773-
},
774-
{
775-
Id: utils.Ptr("fid-2"),
776-
Cpu: utils.Ptr(int32(1)),
777-
Description: utils.Ptr("description"),
778-
Memory: utils.Ptr(int32(4)),
779-
=======
780717
Id: new("fid-1"),
781-
Cpu: new(int64(2)),
718+
Cpu: new(int32(2)),
782719
Description: new("description"),
783-
Memory: new(int64(8)),
720+
Memory: new(int32(8)),
784721
},
785722
{
786723
Id: new("fid-2"),
787-
Cpu: new(int64(1)),
724+
Cpu: new(int32(1)),
788725
Description: new("description"),
789-
Memory: new(int64(4)),
790-
>>>>>>> main
726+
Memory: new(int32(4)),
791727
},
792728
},
793729
},
@@ -809,29 +745,16 @@ func TestLoadFlavorId(t *testing.T) {
809745
&sqlserverflex.ListFlavorsResponse{
810746
Flavors: []sqlserverflex.InstanceFlavorEntry{
811747
{
812-
<<<<<<< sqlserverflex-sdk-update
813-
Id: utils.Ptr("fid-1"),
814-
Cpu: utils.Ptr(int32(1)),
815-
Description: utils.Ptr("description"),
816-
Memory: utils.Ptr(int32(8)),
817-
},
818-
{
819-
Id: utils.Ptr("fid-2"),
820-
Cpu: utils.Ptr(int32(1)),
821-
Description: utils.Ptr("description"),
822-
Memory: utils.Ptr(int32(4)),
823-
=======
824748
Id: new("fid-1"),
825-
Cpu: new(int64(1)),
749+
Cpu: new(int32(1)),
826750
Description: new("description"),
827-
Memory: new(int64(8)),
751+
Memory: new(int32(8)),
828752
},
829753
{
830754
Id: new("fid-2"),
831-
Cpu: new(int64(1)),
755+
Cpu: new(int32(1)),
832756
Description: new("description"),
833-
Memory: new(int64(4)),
834-
>>>>>>> main
757+
Memory: new(int32(4)),
835758
},
836759
},
837760
},

0 commit comments

Comments
 (0)