stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

chore: fixing tests

Browse source
This commit is contained in:
Marcel_Henselin 2025-12-19 09:49:19 +01:00
parent a861661036
commit feef0b61d6
14 changed files with 1452 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/postgresflexalpha/api_default_test.go
View file

@ -1,5 +1,3 @@
// Copyright (c) STACKIT
/*
PostgreSQL Flex API

8
pkg/postgresflexalpha/wait/wait.go
View file

@ -1,5 +1,3 @@
// Copyright (c) STACKIT
package wait
import (
@ -29,7 +27,7 @@ type APIClientInstanceInterface interface {
// Interface needed for tests
type APIClientUserInterface interface {
GetUserExecute(ctx context.Context, projectId, region, instanceId, userId string) (*postgresflex.GetUserResponse, error)
GetUserRequestExecute(ctx context.Context, projectId, region, instanceId string, userId int64) (*postgresflex.GetUserResponse, error)
}
// CreateInstanceWaitHandler will wait for instance creation
@ -152,9 +150,9 @@ func ForceDeleteInstanceWaitHandler(ctx context.Context, a APIClientInstanceInte
}
// DeleteUserWaitHandler will wait for delete
func DeleteUserWaitHandler(ctx context.Context, a APIClientUserInterface, projectId, region, instanceId, userId string) *wait.AsyncActionHandler[struct{}] {
func DeleteUserWaitHandler(ctx context.Context, a APIClientUserInterface, projectId, region, instanceId string, userId int64) *wait.AsyncActionHandler[struct{}] {
handler := wait.New(func() (waitFinished bool, response *struct{}, err error) {
_, err = a.GetUserExecute(ctx, projectId, region, instanceId, userId)
_, err = a.GetUserRequestExecute(ctx, projectId, region, instanceId, userId)
if err == nil {
return false, nil, nil
}

54
pkg/postgresflexalpha/wait/wait_test.go
View file

@ -1,5 +1,3 @@
// Copyright (c) STACKIT
package wait
import (
@ -10,7 +8,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
"github.com/stackitcloud/stackit-sdk-go/core/utils"
"github.com/stackitcloud/stackit-sdk-go/services/postgresflex"
postgresflex "github.com/stackitcloud/terraform-provider-stackit/pkg/postgresflexalpha"
)
// Used for testing instance operations
@ -22,7 +20,7 @@ type apiClientInstanceMocked struct {
usersGetErrorStatus int
}
func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _, _ string) (*postgresflex.InstanceResponse, error) {
func (a *apiClientInstanceMocked) GetInstanceRequestExecute(_ context.Context, _, _, _ string) (*postgresflex.GetInstanceResponse, error) {
if a.instanceGetFails {
return nil, &oapierror.GenericOpenAPIError{
StatusCode: 500,
@ -35,15 +33,13 @@ func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _, _
}
}
return &postgresflex.InstanceResponse{
Item: &postgresflex.Instance{
Id: &a.instanceId,
Status: &a.instanceState,
},
return &postgresflex.GetInstanceResponse{
Id: &a.instanceId,
Status: postgresflex.GetInstanceResponseGetStatusAttributeType(&a.instanceState),
}, nil
}
func (a *apiClientInstanceMocked) ListUsersExecute(_ context.Context, _, _, _ string) (*postgresflex.ListUsersResponse, error) {
func (a *apiClientInstanceMocked) ListUsersRequestExecute(_ context.Context, _, _, _ string) (*postgresflex.ListUserResponse, error) {
if a.usersGetErrorStatus != 0 {
return nil, &oapierror.GenericOpenAPIError{
StatusCode: a.usersGetErrorStatus,
@ -51,20 +47,22 @@ func (a *apiClientInstanceMocked) ListUsersExecute(_ context.Context, _, _, _ st
}
aux := int64(0)
return &postgresflex.ListUsersResponse{
Count: &aux,
Items: &[]postgresflex.ListUsersResponseItem{},
return &postgresflex.ListUserResponse{
Pagination: &postgresflex.Pagination{
TotalRows: &aux,
},
Users: &[]postgresflex.ListUser{},
}, nil
}
// Used for testing user operations
type apiClientUserMocked struct {
getFails bool
userId string
userId int64
isUserDeleted bool
}
func (a *apiClientUserMocked) GetUserExecute(_ context.Context, _, _, _, _ string) (*postgresflex.GetUserResponse, error) {
func (a *apiClientUserMocked) GetUserRequestExecute(_ context.Context, _, _, _ string, _ int64) (*postgresflex.GetUserResponse, error) {
if a.getFails {
return nil, &oapierror.GenericOpenAPIError{
StatusCode: 500,
@ -78,9 +76,7 @@ func (a *apiClientUserMocked) GetUserExecute(_ context.Context, _, _, _, _ strin
}
return &postgresflex.GetUserResponse{
Item: &postgresflex.UserResponse{
Id: &a.userId,
},
Id: &a.userId,
}, nil
}
@ -155,13 +151,11 @@ func TestCreateInstanceWaitHandler(t *testing.T) {
usersGetErrorStatus: tt.usersGetErrorStatus,
}
var wantRes *postgresflex.InstanceResponse
var wantRes *postgresflex.GetInstanceResponse
if tt.wantResp {
wantRes = &postgresflex.InstanceResponse{
Item: &postgresflex.Instance{
Id: &instanceId,
Status: utils.Ptr(tt.instanceState),
},
wantRes = &postgresflex.GetInstanceResponse{
Id: &instanceId,
Status: postgresflex.GetInstanceResponseGetStatusAttributeType(utils.Ptr(tt.instanceState)),
}
}
@ -232,13 +226,11 @@ func TestUpdateInstanceWaitHandler(t *testing.T) {
instanceGetFails: tt.instanceGetFails,
}
var wantRes *postgresflex.InstanceResponse
var wantRes *postgresflex.GetInstanceResponse
if tt.wantResp {
wantRes = &postgresflex.InstanceResponse{
Item: &postgresflex.Instance{
Id: &instanceId,
Status: utils.Ptr(tt.instanceState),
},
wantRes = &postgresflex.GetInstanceResponse{
Id: &instanceId,
Status: postgresflex.GetInstanceResponseGetStatusAttributeType(utils.Ptr(tt.instanceState)),
}
}
@ -377,7 +369,7 @@ func TestDeleteUserWaitHandler(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.desc, func(t *testing.T) {
userId := "foo-bar"
userId := int64(1001)
apiClient := &apiClientUserMocked{
getFails: tt.getFails,

16
pkg/sqlserverflexalpha/api_default.go
View file

@ -217,7 +217,7 @@ type DefaultApi interface {
@param region The region which should be addressed
@return ApiGetFlavorsRequestRequest
*/
GetFlavorsRequest(ctx context.Context, projectId string, region string) ApiGetFlavorsRequestRequest
GetFlavorsRequest(ctx context.Context, projectId, region string, page, size *int64, sort FlavorSort) ApiGetFlavorsRequestRequest
/*
GetFlavorsRequestExecute executes the request
@ -227,7 +227,7 @@ type DefaultApi interface {
@return GetFlavorsResponse
*/
GetFlavorsRequestExecute(ctx context.Context, projectId string, region string) (*GetFlavorsResponse, error)
GetFlavorsRequestExecute(ctx context.Context, projectId, region string, page, size *int64, sort FlavorSort) (*GetFlavorsResponse, error)
/*
GetInstanceRequest Get Specific Instance
Get information about a specific available instance
@ -2700,21 +2700,27 @@ Get all available flavors for a project.
@param region The region which should be addressed
@return ApiGetFlavorsRequestRequest
*/
func (a *APIClient) GetFlavorsRequest(ctx context.Context, projectId string, region string) ApiGetFlavorsRequestRequest {
func (a *APIClient) GetFlavorsRequest(ctx context.Context, projectId, region string, page, size *int64, sort FlavorSort) ApiGetFlavorsRequestRequest {
return GetFlavorsRequestRequest{
apiService: a.defaultApi,
ctx: ctx,
apiService: a.defaultApi,
projectId: projectId,
region: region,
page: page,
size: size,
sort: &sort,
}
}
func (a *APIClient) GetFlavorsRequestExecute(ctx context.Context, projectId string, region string) (*GetFlavorsResponse, error) {
func (a *APIClient) GetFlavorsRequestExecute(ctx context.Context, projectId, region string, page, size *int64, sort FlavorSort) (*GetFlavorsResponse, error) {
r := GetFlavorsRequestRequest{
apiService: a.defaultApi,
ctx: ctx,
projectId: projectId,
region: region,
page: page,
size: size,
sort: &sort,
}
return r.Execute()
}

6
pkg/sqlserverflexalpha/api_default_test.go
View file

@ -1,5 +1,3 @@
// Copyright (c) STACKIT
/*
STACKIT MSSQL Service API
@ -586,7 +584,9 @@ func Test_sqlserverflexalpha_DefaultApiService(t *testing.T) {
projectId := projectIdValue
region := regionValue
resp, reqErr := apiClient.GetFlavorsRequest(context.Background(), projectId, region).Execute()
page := int64(1)
size := int64(10)
resp, reqErr := apiClient.GetFlavorsRequest(context.Background(), projectId, region, &page, &size, FLAVORSORT_ID_DESC).Execute()
if reqErr != nil {
t.Fatalf("error in call: %v", reqErr)

97
pkg/sqlserverflexalpha/model_get_backup_response.go
View file

@ -21,6 +21,22 @@ var _ MappedNullable = &GetBackupResponse{}
types and functions for completionTime
*/
//// isAny
//type GetBackupResponseGetCompletionTimeAttributeType = any
//type GetBackupResponseGetCompletionTimeArgType = any
//type GetBackupResponseGetCompletionTimeRetType = any
//
//func getGetBackupResponseGetCompletionTimeAttributeTypeOk(arg GetBackupResponseGetCompletionTimeAttributeType) (ret GetBackupResponseGetCompletionTimeRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setGetBackupResponseGetCompletionTimeAttributeType(arg *GetBackupResponseGetCompletionTimeAttributeType, val GetBackupResponseGetCompletionTimeRetType) {
// *arg = &val
//}
// isModel
type GetBackupResponseGetCompletionTimeAttributeType = *string
type GetBackupResponseGetCompletionTimeArgType = string
@ -41,6 +57,22 @@ func setGetBackupResponseGetCompletionTimeAttributeType(arg *GetBackupResponseGe
types and functions for id
*/
//// isAny
//type GetBackupResponseGetIdAttributeType = any
//type GetBackupResponseGetIdArgType = any
//type GetBackupResponseGetIdRetType = any
//
//func getGetBackupResponseGetIdAttributeTypeOk(arg GetBackupResponseGetIdAttributeType) (ret GetBackupResponseGetIdRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setGetBackupResponseGetIdAttributeType(arg *GetBackupResponseGetIdAttributeType, val GetBackupResponseGetIdRetType) {
// *arg = &val
//}
// isModel
type GetBackupResponseGetIdAttributeType = *int64
type GetBackupResponseGetIdArgType = int64
@ -60,6 +92,23 @@ func setGetBackupResponseGetIdAttributeType(arg *GetBackupResponseGetIdAttribute
/*
types and functions for name
*/
//// isAny
//type GetBackupResponseGetNameAttributeType = any
//type GetBackupResponseGetNameArgType = any
//type GetBackupResponseGetNameRetType = any
//
//func getGetBackupResponseGetNameAttributeTypeOk(arg GetBackupResponseGetNameAttributeType) (ret GetBackupResponseGetNameRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setGetBackupResponseGetNameAttributeType(arg *GetBackupResponseGetNameAttributeType, val GetBackupResponseGetNameRetType) {
// *arg = &val
//}
// isModel
type GetBackupResponseGetNameAttributeType = *string
type GetBackupResponseGetNameArgType = string
@ -80,6 +129,22 @@ func setGetBackupResponseGetNameAttributeType(arg *GetBackupResponseGetNameAttri
types and functions for retainedUntil
*/
//// isAny
//type GetBackupResponseGetRetainedUntilAttributeType = any
//type GetBackupResponseGetRetainedUntilArgType = any
//type GetBackupResponseGetRetainedUntilRetType = any
//
//func getGetBackupResponseGetRetainedUntilAttributeTypeOk(arg GetBackupResponseGetRetainedUntilAttributeType) (ret GetBackupResponseGetRetainedUntilRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setGetBackupResponseGetRetainedUntilAttributeType(arg *GetBackupResponseGetRetainedUntilAttributeType, val GetBackupResponseGetRetainedUntilRetType) {
// *arg = &val
//}
// isModel
type GetBackupResponseGetRetainedUntilAttributeType = *string
type GetBackupResponseGetRetainedUntilArgType = string
@ -100,6 +165,22 @@ func setGetBackupResponseGetRetainedUntilAttributeType(arg *GetBackupResponseGet
types and functions for size
*/
//// isAny
//type GetBackupResponseGetSizeAttributeType = any
//type GetBackupResponseGetSizeArgType = any
//type GetBackupResponseGetSizeRetType = any
//
//func getGetBackupResponseGetSizeAttributeTypeOk(arg GetBackupResponseGetSizeAttributeType) (ret GetBackupResponseGetSizeRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setGetBackupResponseGetSizeAttributeType(arg *GetBackupResponseGetSizeAttributeType, val GetBackupResponseGetSizeRetType) {
// *arg = &val
//}
// isModel
type GetBackupResponseGetSizeAttributeType = *int64
type GetBackupResponseGetSizeArgType = int64
@ -120,6 +201,22 @@ func setGetBackupResponseGetSizeAttributeType(arg *GetBackupResponseGetSizeAttri
types and functions for type
*/
//// isAny
//type GetBackupResponseGetTypeAttributeType = any
//type GetBackupResponseGetTypeArgType = any
//type GetBackupResponseGetTypeRetType = any
//
//func getGetBackupResponseGetTypeAttributeTypeOk(arg GetBackupResponseGetTypeAttributeType) (ret GetBackupResponseGetTypeRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setGetBackupResponseGetTypeAttributeType(arg *GetBackupResponseGetTypeAttributeType, val GetBackupResponseGetTypeRetType) {
// *arg = &val
//}
// isModel
type GetBackupResponseGetTypeAttributeType = *string
type GetBackupResponseGetTypeArgType = string

104
pkg/sqlserverflexalpha/model_list_backup.go
View file

@ -21,6 +21,22 @@ var _ MappedNullable = &ListBackup{}
types and functions for completionTime
*/
//// isAny
//type ListBackupGetCompletionTimeAttributeType = any
//type ListBackupGetCompletionTimeArgType = any
//type ListBackupGetCompletionTimeRetType = any
//
//func getListBackupGetCompletionTimeAttributeTypeOk(arg ListBackupGetCompletionTimeAttributeType) (ret ListBackupGetCompletionTimeRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setListBackupGetCompletionTimeAttributeType(arg *ListBackupGetCompletionTimeAttributeType, val ListBackupGetCompletionTimeRetType) {
// *arg = &val
//}
// isModel
type ListBackupGetCompletionTimeAttributeType = *string
type ListBackupGetCompletionTimeArgType = string
@ -41,6 +57,22 @@ func setListBackupGetCompletionTimeAttributeType(arg *ListBackupGetCompletionTim
types and functions for id
*/
// isAny
//type ListBackupGetIdAttributeType = any
//type ListBackupGetIdArgType = any
//type ListBackupGetIdRetType = any
//
//func getListBackupGetIdAttributeTypeOk(arg ListBackupGetIdAttributeType) (ret ListBackupGetIdRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setListBackupGetIdAttributeType(arg *ListBackupGetIdAttributeType, val ListBackupGetIdRetType) {
// *arg = &val
//}
// isModel
type ListBackupGetIdAttributeType = *int64
type ListBackupGetIdArgType = int64
@ -61,6 +93,22 @@ func setListBackupGetIdAttributeType(arg *ListBackupGetIdAttributeType, val List
types and functions for name
*/
//// isAny
//type ListBackupGetNameAttributeType = any
//type ListBackupGetNameArgType = any
//type ListBackupGetNameRetType = any
//
//func getListBackupGetNameAttributeTypeOk(arg ListBackupGetNameAttributeType) (ret ListBackupGetNameRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setListBackupGetNameAttributeType(arg *ListBackupGetNameAttributeType, val ListBackupGetNameRetType) {
// *arg = &val
//}
// isModel
type ListBackupGetNameAttributeType = *string
type ListBackupGetNameArgType = string
@ -81,6 +129,22 @@ func setListBackupGetNameAttributeType(arg *ListBackupGetNameAttributeType, val
types and functions for retainedUntil
*/
//// isAny
//type ListBackupGetRetainedUntilAttributeType = any
//type ListBackupGetRetainedUntilArgType = any
//type ListBackupGetRetainedUntilRetType = any
//
//func getListBackupGetRetainedUntilAttributeTypeOk(arg ListBackupGetRetainedUntilAttributeType) (ret ListBackupGetRetainedUntilRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setListBackupGetRetainedUntilAttributeType(arg *ListBackupGetRetainedUntilAttributeType, val ListBackupGetRetainedUntilRetType) {
// *arg = &val
//}
// isModel
type ListBackupGetRetainedUntilAttributeType = *string
type ListBackupGetRetainedUntilArgType = string
@ -97,6 +161,26 @@ func setListBackupGetRetainedUntilAttributeType(arg *ListBackupGetRetainedUntilA
*arg = &val
}
/*
types and functions for size
*/
//// isAny
//type ListBackupGetSizeAttributeType = any
//type ListBackupGetSizeArgType = any
//type ListBackupGetSizeRetType = any
//
//func getListBackupGetSizeAttributeTypeOk(arg ListBackupGetSizeAttributeType) (ret ListBackupGetSizeRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setListBackupGetSizeAttributeType(arg *ListBackupGetSizeAttributeType, val ListBackupGetSizeRetType) {
// *arg = &val
//}
// isModel
type ListBackupGetSizeAttributeType = *int64
type ListBackupGetSizeArgType = int64
@ -113,6 +197,26 @@ func setListBackupGetSizeAttributeType(arg *ListBackupGetSizeAttributeType, val
*arg = &val
}
/*
types and functions for type
*/
//// isAny
//type ListBackupGetTypeAttributeType = any
//type ListBackupGetTypeArgType = any
//type ListBackupGetTypeRetType = any
//
//func getListBackupGetTypeAttributeTypeOk(arg ListBackupGetTypeAttributeType) (ret ListBackupGetTypeRetType, ok bool) {
// if arg == nil {
// return ret, false
// }
// return *arg, true
//}
//
//func setListBackupGetTypeAttributeType(arg *ListBackupGetTypeAttributeType, val ListBackupGetTypeRetType) {
// *arg = &val
//}
// isModel
type ListBackupGetTypeAttributeType = *string
type ListBackupGetTypeArgType = string

20
pkg/sqlserverflexalpha/wait/wait.go
View file

@ -1,5 +1,3 @@
// Copyright (c) STACKIT
package wait
import (
@ -12,7 +10,7 @@ import (
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
"github.com/stackitcloud/stackit-sdk-go/core/wait"
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
sqlserverflex "github.com/stackitcloud/terraform-provider-stackit/pkg/sqlserverflexalpha"
)
const (
@ -25,20 +23,20 @@ const (
// Interface needed for tests
type APIClientInstanceInterface interface {
GetInstanceExecute(ctx context.Context, projectId, instanceId, region string) (*sqlserverflex.GetInstanceResponse, error)
GetInstanceRequestExecute(ctx context.Context, projectId, region, instanceId string) (*sqlserverflex.GetInstanceResponse, error)
}
// CreateInstanceWaitHandler will wait for instance creation
func CreateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId, region string) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] {
handler := wait.New(func() (waitFinished bool, response *sqlserverflex.GetInstanceResponse, err error) {
s, err := a.GetInstanceExecute(ctx, projectId, instanceId, region)
s, err := a.GetInstanceRequestExecute(ctx, projectId, region, instanceId)
if err != nil {
return false, nil, err
}
if s == nil || s.Item == nil || s.Item.Id == nil || *s.Item.Id != instanceId || s.Item.Status == nil {
if s == nil || s.Id == nil || *s.Id != instanceId || s.Status == nil {
return false, nil, nil
}
switch strings.ToLower(*s.Item.Status) {
switch strings.ToLower(string(*s.Status)) {
case strings.ToLower(InstanceStateSuccess):
return true, s, nil
case strings.ToLower(InstanceStateUnknown), strings.ToLower(InstanceStateFailed):
@ -55,14 +53,14 @@ func CreateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface
// UpdateInstanceWaitHandler will wait for instance update
func UpdateInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId, region string) *wait.AsyncActionHandler[sqlserverflex.GetInstanceResponse] {
handler := wait.New(func() (waitFinished bool, response *sqlserverflex.GetInstanceResponse, err error) {
s, err := a.GetInstanceExecute(ctx, projectId, instanceId, region)
s, err := a.GetInstanceRequestExecute(ctx, projectId, region, instanceId)
if err != nil {
return false, nil, err
}
if s == nil || s.Item == nil || s.Item.Id == nil || *s.Item.Id != instanceId || s.Item.Status == nil {
if s == nil || s.Id == nil || *s.Id != instanceId || s.Status == nil {
return false, nil, nil
}
switch strings.ToLower(*s.Item.Status) {
switch strings.ToLower(string(*s.Status)) {
case strings.ToLower(InstanceStateSuccess):
return true, s, nil
case strings.ToLower(InstanceStateUnknown), strings.ToLower(InstanceStateFailed):
@ -84,7 +82,7 @@ func PartialUpdateInstanceWaitHandler(ctx context.Context, a APIClientInstanceIn
// DeleteInstanceWaitHandler will wait for instance deletion
func DeleteInstanceWaitHandler(ctx context.Context, a APIClientInstanceInterface, projectId, instanceId, region string) *wait.AsyncActionHandler[struct{}] {
handler := wait.New(func() (waitFinished bool, response *struct{}, err error) {
_, err = a.GetInstanceExecute(ctx, projectId, instanceId, region)
_, err = a.GetInstanceRequestExecute(ctx, projectId, region, instanceId)
if err == nil {
return false, nil, nil
}

24
pkg/sqlserverflexalpha/wait/wait_test.go
View file

@ -1,5 +1,3 @@
// Copyright (c) STACKIT
package wait
import (
@ -10,7 +8,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
"github.com/stackitcloud/stackit-sdk-go/core/utils"
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
sqlserverflex "github.com/stackitcloud/terraform-provider-stackit/pkg/sqlserverflexalpha"
)
// Used for testing instance operations
@ -21,7 +19,7 @@ type apiClientInstanceMocked struct {
instanceGetFails bool
}
func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _, _ string) (*sqlserverflex.GetInstanceResponse, error) {
func (a *apiClientInstanceMocked) GetInstanceRequestExecute(_ context.Context, _, _, _ string) (*sqlserverflex.GetInstanceResponse, error) {
if a.instanceGetFails {
return nil, &oapierror.GenericOpenAPIError{
StatusCode: 500,
@ -35,10 +33,8 @@ func (a *apiClientInstanceMocked) GetInstanceExecute(_ context.Context, _, _, _
}
return &sqlserverflex.GetInstanceResponse{
Item: &sqlserverflex.Instance{
Id: &a.instanceId,
Status: &a.instanceState,
},
Id: &a.instanceId,
Status: sqlserverflex.GetInstanceResponseGetStatusAttributeType(&a.instanceState),
}, nil
}
func TestCreateInstanceWaitHandler(t *testing.T) {
@ -98,10 +94,8 @@ func TestCreateInstanceWaitHandler(t *testing.T) {
var wantRes *sqlserverflex.GetInstanceResponse
if tt.wantResp {
wantRes = &sqlserverflex.GetInstanceResponse{
Item: &sqlserverflex.Instance{
Id: &instanceId,
Status: utils.Ptr(tt.instanceState),
},
Id: &instanceId,
Status: sqlserverflex.GetInstanceResponseGetStatusAttributeType(utils.Ptr(tt.instanceState)),
}
}
@ -175,10 +169,8 @@ func TestUpdateInstanceWaitHandler(t *testing.T) {
var wantRes *sqlserverflex.GetInstanceResponse
if tt.wantResp {
wantRes = &sqlserverflex.GetInstanceResponse{
Item: &sqlserverflex.Instance{
Id: &instanceId,
Status: utils.Ptr(tt.instanceState),
},
Id: &instanceId,
Status: sqlserverflex.GetInstanceResponseGetStatusAttributeType(utils.Ptr(tt.instanceState)),
}
}