fix: adjust tests to new api version with acl in network segment
This commit is contained in:
parent
318d2e0962
commit
7d66568003
2 changed files with 18 additions and 11 deletions
|
|
@ -222,13 +222,10 @@ func toCreatePayload(model *Model, storage *storageModel, encryption *encryption
|
||||||
networkPayload := &sqlserverflex.CreateInstanceRequestPayloadGetNetworkArgType{}
|
networkPayload := &sqlserverflex.CreateInstanceRequestPayloadGetNetworkArgType{}
|
||||||
if network != nil {
|
if network != nil {
|
||||||
networkPayload.AccessScope = sqlserverflex.CreateInstanceRequestPayloadNetworkGetAccessScopeAttributeType(conversion.StringValueToPointer(network.AccessScope))
|
networkPayload.AccessScope = sqlserverflex.CreateInstanceRequestPayloadNetworkGetAccessScopeAttributeType(conversion.StringValueToPointer(network.AccessScope))
|
||||||
// TODO - implement as soon as exists
|
networkPayload.Acl = &aclElements
|
||||||
// networkPayload.ACL
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return &sqlserverflex.CreateInstanceRequestPayload{
|
return &sqlserverflex.CreateInstanceRequestPayload{
|
||||||
// TODO - remove as soon as exists in network
|
|
||||||
Acl: &aclElements,
|
|
||||||
BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule),
|
BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule),
|
||||||
FlavorId: &flavorId,
|
FlavorId: &flavorId,
|
||||||
Name: conversion.StringValueToPointer(model.Name),
|
Name: conversion.StringValueToPointer(model.Name),
|
||||||
|
|
@ -270,14 +267,19 @@ func toUpdatePayload(model *Model, storage *storageModel, network *networkModel)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO - implement network.ACL as soon as it becomes available
|
networkPayload := &sqlserverflex.UpdateInstancePartiallyRequestPayloadGetNetworkArgType{}
|
||||||
|
if network != nil {
|
||||||
|
networkPayload.AccessScope = sqlserverflex.UpdateInstancePartiallyRequestPayloadNetworkGetAccessScopeAttributeType(conversion.StringValueToPointer(network.AccessScope))
|
||||||
|
networkPayload.Acl = &aclElements
|
||||||
|
}
|
||||||
|
|
||||||
if model.Replicas.ValueInt64() > math.MaxInt32 {
|
if model.Replicas.ValueInt64() > math.MaxInt32 {
|
||||||
return nil, fmt.Errorf("replica count too big: %d", model.Replicas.ValueInt64())
|
return nil, fmt.Errorf("replica count too big: %d", model.Replicas.ValueInt64())
|
||||||
}
|
}
|
||||||
replCount := int32(model.Replicas.ValueInt64()) // nolint:gosec // check is performed above
|
replCount := int32(model.Replicas.ValueInt64()) // nolint:gosec // check is performed above
|
||||||
flavorId := flavorMdl.Id.ValueString()
|
flavorId := flavorMdl.Id.ValueString()
|
||||||
return &sqlserverflex.UpdateInstancePartiallyRequestPayload{
|
return &sqlserverflex.UpdateInstancePartiallyRequestPayload{
|
||||||
Acl: &aclElements,
|
Network: networkPayload,
|
||||||
BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule),
|
BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule),
|
||||||
FlavorId: &flavorId,
|
FlavorId: &flavorId,
|
||||||
Name: conversion.StringValueToPointer(model.Name),
|
Name: conversion.StringValueToPointer(model.Name),
|
||||||
|
|
|
||||||
|
|
@ -125,11 +125,6 @@ func TestMapFields(t *testing.T) {
|
||||||
ProjectId: types.StringValue("pid"),
|
ProjectId: types.StringValue("pid"),
|
||||||
},
|
},
|
||||||
&sqlserverflex.GetInstanceResponse{
|
&sqlserverflex.GetInstanceResponse{
|
||||||
Acl: &[]string{
|
|
||||||
"ip1",
|
|
||||||
"ip2",
|
|
||||||
"",
|
|
||||||
},
|
|
||||||
BackupSchedule: utils.Ptr("schedule"),
|
BackupSchedule: utils.Ptr("schedule"),
|
||||||
FlavorId: utils.Ptr("flavor_id"),
|
FlavorId: utils.Ptr("flavor_id"),
|
||||||
Id: utils.Ptr("iid"),
|
Id: utils.Ptr("iid"),
|
||||||
|
|
@ -145,6 +140,16 @@ func TestMapFields(t *testing.T) {
|
||||||
Version: sqlserverflex.GetInstanceResponseGetVersionAttributeType(utils.Ptr("version")),
|
Version: sqlserverflex.GetInstanceResponseGetVersionAttributeType(utils.Ptr("version")),
|
||||||
IsDeletable: utils.Ptr(true),
|
IsDeletable: utils.Ptr(true),
|
||||||
Encryption: nil,
|
Encryption: nil,
|
||||||
|
Network: &sqlserverflex.InstanceNetwork{
|
||||||
|
AccessScope: nil,
|
||||||
|
Acl: &[]string{
|
||||||
|
"ip1",
|
||||||
|
"ip2",
|
||||||
|
"",
|
||||||
|
},
|
||||||
|
InstanceAddress: nil,
|
||||||
|
RouterAddress: nil,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
&flavorModel{
|
&flavorModel{
|
||||||
Id: basetypes.NewStringValue("flavor_id"),
|
Id: basetypes.NewStringValue("flavor_id"),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue