Merge branch 'main' of github.com:mariadb-corporation/terraform-provi…

…der-skysql-beta

GNUmakefile

@@ -4,3 +4,15 @@ default: testacc
 .PHONY: testacc
 testacc:
 	TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m
+
+install-alpha:
+	go build -o terraform-provider-skysql-alpha .
+	mv terraform-provider-skysql-alpha $(GOBIN)/terraform-provider-skysql-alpha
+
+install-beta:
+	go build -o terraform-provider-skysql-beta .
+	mv terraform-provider-skysql-beta $(GOBIN)/terraform-provider-skysql-beta
+
+install:
+	go build -o terraform-provider-skysql .
+	mv terraform-provider-skysql $(GOBIN)/terraform-provider-skysql

go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/hashicorp/terraform-plugin-log v0.7.0
 	github.com/hashicorp/terraform-plugin-sdk v1.17.2
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
-	github.com/mariadb-corporation/skysql-api-go v0.0.26
 	github.com/matryer/resync v0.0.0-20161211202428-d39c09a11215
 	github.com/stretchr/testify v1.7.2
 )

go.sum

@@ -80,10 +80,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764=
 github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
-github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=

internal/provider/provider.go

@@ -3,6 +3,8 @@ package provider
 import (
 	"context"
 	"errors"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
+	"github.com/matryer/resync"
 	"os"
 
 	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"

internal/provider/service_resource.go

@@ -26,6 +26,9 @@ import (
 	sdkresource "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
 	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
+	"reflect"
+	"regexp"
+	"time"
 )
 
 const defaultCreateTimeout = 60 * time.Minute

internal/provider/service_resource_deletion_protection_test.go

@@ -3,6 +3,13 @@ package provider
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
+	"github.com/stretchr/testify/require"
 	"net/http"
 	"os"
 	"testing"

internal/provider/service_resource_privatlink_test.go

@@ -3,6 +3,13 @@ package provider
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
+	"github.com/stretchr/testify/require"
 	"net/http"
 	"os"
 	"testing"

internal/provider/service_resource_sa_test.go

@@ -3,6 +3,13 @@ package provider
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
+	"github.com/stretchr/testify/require"
 	"net/http"
 	"os"
 	"regexp"

internal/provider/service_resource_scale_test.go

@@ -3,6 +3,13 @@ package provider
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
+	"github.com/stretchr/testify/require"
 	"net/http"
 	"os"
 	"testing"

internal/provider/service_resource_test.go

@@ -2,6 +2,13 @@ package provider
 
 import (
 	"encoding/json"
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
+	"github.com/stretchr/testify/require"
 	"log"
 	"net/http"
 	"net/http/httptest"

internal/provider/service_resource_update_allowlist_test.go

@@ -3,6 +3,13 @@ package provider
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
+	"github.com/stretchr/testify/require"
 	"net/http"
 	"os"
 	"testing"

internal/provider/versions_data_source.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql"
+	"net/url"
 )
 
 // Ensure provider defined types fully satisfy framework interfaces

internal/skysql/client.go

@@ -3,6 +3,10 @@ package skysql
 import (
 	"context"
 	"errors"
+	"github.com/go-resty/resty/v2"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/organization"
+	"github.com/mariadb-corporation/terraform-provider-skysql/internal/skysql/provisioning"
 	"net/http"
 	"net/url"
 	"strconv"

main.go

@@ -35,7 +35,7 @@ func main() {
 	flag.Parse()
 
 	opts := providerserver.ServeOpts{
-		Address: "registry.terraform.io/mariadb-corporation/skysql-beta",
+		Address: "registry.terraform.io/mariadb-corporation/skysql",
 		Debug:   debug,
 	}