Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(resource): implement managed database resource types #187

Merged
merged 8 commits into from
Jan 13, 2022
Merged

feat(resource): implement managed database resource types #187

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4904bae
feat(resource): implement managed database resource types
aakso Oct 22, 2021
b18ae58
Merge branch 'master' into feat/managed-databases
peknur Dec 16, 2021
3a852fc
feat(resource): implement managed database resource types
peknur Dec 17, 2021
3ee7bac
Merge branch 'master' into feat/managed-databases
peknur Dec 22, 2021
3b1f971
chore(docs): Add DBaaS documents and examples
peknur Dec 22, 2021
a98c96f
feat(database): wait managed database to be fully created
peknur Dec 27, 2021
aca62ca
chore(docs): Add DBaaS resouce descriptions and update examples
peknur Jan 11, 2022
9bf7014
fix(dbaas): Maintenance window settings
peknur Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
124 changes: 117 additions & 7 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions internal/server/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
9 changes: 5 additions & 4 deletions internal/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/utils/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions upcloud/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion upcloud/datasource_upcloud_hosts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion upcloud/datasource_upcloud_ip_addresses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
9 changes: 5 additions & 4 deletions upcloud/datasource_upcloud_networks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion upcloud/datasource_upcloud_tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
7 changes: 4 additions & 3 deletions upcloud/datasource_upcloud_zone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions upcloud/datasource_upcloud_zones.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
27 changes: 16 additions & 11 deletions upcloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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{
Expand Down
6 changes: 3 additions & 3 deletions upcloud/resource_upcloud_firewall_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions upcloud/resource_upcloud_firewall_rules_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions upcloud/resource_upcloud_floating_ip_address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion upcloud/resource_upcloud_floating_ip_address_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down