44 "time"
55
66 "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
7- "github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
7+ rdbV1 "github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
88 "github.com/scaleway/scaleway-sdk-go/scw"
99)
1010
@@ -13,13 +13,13 @@ const (
1313)
1414
1515// newRdbAPI returns a new RDB API
16- func newRdbAPI (m interface {}) * rdb .API {
16+ func newRdbAPI (m interface {}) * rdbV1 .API {
1717 meta := m .(* Meta )
18- return rdb .NewAPI (meta .scwClient )
18+ return rdbV1 .NewAPI (meta .scwClient )
1919}
2020
2121// rdbAPIWithRegion returns a new lb API and the region for a Create request
22- func rdbAPIWithRegion (d * schema.ResourceData , m interface {}) (* rdb .API , scw.Region , error ) {
22+ func rdbAPIWithRegion (d * schema.ResourceData , m interface {}) (* rdbV1 .API , scw.Region , error ) {
2323 meta := m .(* Meta )
2424
2525 region , err := extractRegion (d , meta )
@@ -30,15 +30,15 @@ func rdbAPIWithRegion(d *schema.ResourceData, m interface{}) (*rdb.API, scw.Regi
3030}
3131
3232// rdbAPIWithRegionAndID returns an lb API with region and ID extracted from the state
33- func rdbAPIWithRegionAndID (m interface {}, id string ) (* rdb .API , scw.Region , string , error ) {
33+ func rdbAPIWithRegionAndID (m interface {}, id string ) (* rdbV1 .API , scw.Region , string , error ) {
3434 region , ID , err := parseRegionalID (id )
3535 if err != nil {
3636 return nil , "" , "" , err
3737 }
3838 return newRdbAPI (m ), region , ID , nil
3939}
4040
41- func flattenRdbInstanceReadReplicas (readReplicas []* rdb .Endpoint ) interface {} {
41+ func flattenRdbInstanceReadReplicas (readReplicas []* rdbV1 .Endpoint ) interface {} {
4242 replicasI := []map [string ]interface {}(nil )
4343 for _ , readReplica := range readReplicas {
4444 replicasI = append (replicasI , map [string ]interface {}{
@@ -50,7 +50,7 @@ func flattenRdbInstanceReadReplicas(readReplicas []*rdb.Endpoint) interface{} {
5050 return replicasI
5151}
5252
53- func flattenInstanceSettings (settings []* rdb .InstanceSetting ) interface {} {
53+ func flattenInstanceSettings (settings []* rdbV1 .InstanceSetting ) interface {} {
5454 res := make (map [string ]string )
5555 for _ , value := range settings {
5656 res [value .Name ] = value .Value
@@ -59,11 +59,11 @@ func flattenInstanceSettings(settings []*rdb.InstanceSetting) interface{} {
5959 return res
6060}
6161
62- func expandInstanceSettings (i interface {}) []* rdb .InstanceSetting {
62+ func expandInstanceSettings (i interface {}) []* rdbV1 .InstanceSetting {
6363 rawRule := i .(map [string ]interface {})
64- var res []* rdb .InstanceSetting
64+ var res []* rdbV1 .InstanceSetting
6565 for key , value := range rawRule {
66- res = append (res , & rdb .InstanceSetting {
66+ res = append (res , & rdbV1 .InstanceSetting {
6767 Name : key ,
6868 Value : value .(string ),
6969 })
@@ -72,16 +72,16 @@ func expandInstanceSettings(i interface{}) []*rdb.InstanceSetting {
7272 return res
7373}
7474
75- func expandPrivateNetwork (data interface {}, exist bool ) []* rdb .EndpointSpec {
75+ func expandPrivateNetwork (data interface {}, exist bool ) []* rdbV1 .EndpointSpec {
7676 if data == nil || ! exist {
7777 return nil
7878 }
7979
80- var res []* rdb .EndpointSpec
80+ var res []* rdbV1 .EndpointSpec
8181 for _ , pn := range data .([]interface {}) {
8282 r := pn .(map [string ]interface {})
83- spec := & rdb .EndpointSpec {
84- PrivateNetwork : & rdb .EndpointSpecPrivateNetwork {
83+ spec := & rdbV1 .EndpointSpec {
84+ PrivateNetwork : & rdbV1 .EndpointSpecPrivateNetwork {
8585 PrivateNetworkID : expandID (r ["pn_id" ].(string )),
8686 ServiceIP : expandIPNet (r ["ip" ].(string )),
8787 },
@@ -92,7 +92,7 @@ func expandPrivateNetwork(data interface{}, exist bool) []*rdb.EndpointSpec {
9292 return res
9393}
9494
95- func flattenInstancePrivateNetwork (readEndpoints []* rdb .Endpoint ) interface {} {
95+ func flattenInstancePrivateNetwork (readEndpoints []* rdbV1 .Endpoint ) interface {} {
9696 privateNetworkI := []map [string ]interface {}(nil )
9797 if len (readEndpoints ) == 0 {
9898 return nil
@@ -101,7 +101,7 @@ func flattenInstancePrivateNetwork(readEndpoints []*rdb.Endpoint) interface{} {
101101 if readPN .PrivateNetwork != nil {
102102 pn := readPN .PrivateNetwork
103103 privateNetworkI = append (privateNetworkI , map [string ]interface {}{
104- // "ip": flattenIPNet(pn.ServiceIP),
104+ "ip" : flattenIPNet (pn .ServiceIP ),
105105 "pn_id" : pn .PrivateNetworkID ,
106106 })
107107 }
0 commit comments