feat(resource): implement managed database resource types

UpCloudLtd · Oct 22, 2021 · 4904bae · 4904bae
1 parent 1fc9e0b
commit 4904bae
Show file tree

Hide file tree

Showing 39 changed files with 4,706 additions and 87 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/UpCloudLtd/terraform-provider-upcloud
 go 1.16
 
 require (
-	github.com/UpCloudLtd/upcloud-go-api v0.0.0-20210525102709-661419a1956b
+	github.com/UpCloudLtd/upcloud-go-api/v4 v4.1.2
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/fatih/color v1.10.0 // indirect
 	github.com/google/uuid v1.2.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/internal/server/networking.go b/internal/server/networking.go
@@ -3,8 +3,8 @@ package server
 import (
 	"fmt"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/request"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -5,12 +5,13 @@ import (
 	"log"
 	"time"
 
-	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/storage"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/request"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/storage"
 )
 
 func BuildServerOpts(d *schema.ResourceData, meta interface{}) (*request.CreateServerRequest, error) {

diff --git a/internal/storage/storage.go b/internal/storage/storage.go
@@ -1,7 +1,7 @@
 package storage
 
 import (
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
 )
 
 func FilterZoneIds(vs []upcloud.Zone, f func(upcloud.Zone) bool) []string {

diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/upcloud/config.go b/upcloud/config.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/client"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/client"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 )
 
 type Config struct {

diff --git a/upcloud/datasource_upcloud_hosts.go b/upcloud/datasource_upcloud_hosts.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

diff --git a/upcloud/datasource_upcloud_ip_addresses.go b/upcloud/datasource_upcloud_ip_addresses.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

diff --git a/upcloud/datasource_upcloud_networks.go b/upcloud/datasource_upcloud_networks.go
@@ -5,12 +5,13 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/utils"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/request"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/utils"
 )
 
 func dataSourceNetworks() *schema.Resource {

diff --git a/upcloud/datasource_upcloud_tags.go b/upcloud/datasource_upcloud_tags.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

diff --git a/upcloud/datasource_upcloud_zone.go b/upcloud/datasource_upcloud_zone.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/utils"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/utils"
 )
 
 func dataSourceUpCloudZone() *schema.Resource {

diff --git a/upcloud/datasource_upcloud_zones.go b/upcloud/datasource_upcloud_zones.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/utils"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

diff --git a/upcloud/provider.go b/upcloud/provider.go
@@ -8,11 +8,12 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 
-	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/config"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/client"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/client"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
+	"github.com/UpCloudLtd/terraform-provider-upcloud/internal/config"
+
 	retryablehttp "github.com/hashicorp/go-retryablehttp"
 )
 
@@ -56,14 +57,18 @@ func Provider() *schema.Provider {
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
-			"upcloud_server":              resourceUpCloudServer(),
-			"upcloud_router":              resourceUpCloudRouter(),
-			"upcloud_storage":             resourceUpCloudStorage(),
-			"upcloud_firewall_rules":      resourceUpCloudFirewallRules(),
-			"upcloud_tag":                 resourceUpCloudTag(),
-			"upcloud_network":             resourceUpCloudNetwork(),
-			"upcloud_floating_ip_address": resourceUpCloudFloatingIPAddress(),
-			"upcloud_object_storage":      resourceUpCloudObjectStorage(),
+			"upcloud_server":                            resourceUpCloudServer(),
+			"upcloud_router":                            resourceUpCloudRouter(),
+			"upcloud_storage":                           resourceUpCloudStorage(),
+			"upcloud_firewall_rules":                    resourceUpCloudFirewallRules(),
+			"upcloud_tag":                               resourceUpCloudTag(),
+			"upcloud_network":                           resourceUpCloudNetwork(),
+			"upcloud_floating_ip_address":               resourceUpCloudFloatingIPAddress(),
+			"upcloud_object_storage":                    resourceUpCloudObjectStorage(),
+			"upcloud_managed_database_postgresql":       resourceUpCloudManagedDatabasePostgreSQL(),
+			"upcloud_managed_database_mysql":            resourceUpCloudManagedDatabaseMySQL(),
+			"upcloud_managed_database_user":             resourceUpCloudManagedDatabaseUser(),
+			"upcloud_managed_database_logical_database": resourceUpCloudManagedDatabaseLogicalDatabase(),
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{

diff --git a/upcloud/resource_upcloud_firewall_rules.go b/upcloud/resource_upcloud_firewall_rules.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/request"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

diff --git a/upcloud/resource_upcloud_firewall_rules_test.go b/upcloud/resource_upcloud_firewall_rules_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/request"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 

diff --git a/upcloud/resource_upcloud_floating_ip_address.go b/upcloud/resource_upcloud_floating_ip_address.go
@@ -3,9 +3,9 @@ package upcloud
 import (
 	"context"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/request"
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

diff --git a/upcloud/resource_upcloud_floating_ip_address_test.go b/upcloud/resource_upcloud_floating_ip_address_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/UpCloudLtd/upcloud-go-api/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v4/upcloud/service"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"