Extract meta Client to a common package (#805)

It's becoming hard to manage all resources at the root
It's a huge amount of functions all in the same package
By exporting the client to common package, I'll be able to send oncall to its own folder, cloud too, oss, etc

Author: julienduchesne

main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 
-	"github.com/grafana/terraform-provider-grafana/grafana"
+	"github.com/grafana/terraform-provider-grafana/provider"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
 )
 
@@ -21,6 +21,6 @@ func main() {
 	flag.BoolVar(&debugMode, "debug", false, "set to true to run the provider with support for debuggers like delve")
 	flag.Parse()
 
-	opts := &plugin.ServeOpts{ProviderFunc: grafana.Provider(version), Debug: debugMode, ProviderAddr: "registry.terraform.io/grafana/grafana"}
+	opts := &plugin.ServeOpts{ProviderFunc: provider.Provider(version), Debug: debugMode, ProviderAddr: "registry.terraform.io/grafana/grafana"}
 	plugin.Serve(opts)
 }

grafana/adapters.go provider/adapters.gografana/adapters.go renamed to provider/adapters.go

@@ -1,4 +1,4 @@
-package grafana
+package provider
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

provider/common/client.go

@@ -0,0 +1,26 @@
+package common
+
+import (
+	"sync"
+
+	onCallAPI "github.com/grafana/amixr-api-go-client"
+	gapi "github.com/grafana/grafana-api-golang-client"
+	"github.com/grafana/machine-learning-go-client/mlapi"
+	SMAPI "github.com/grafana/synthetic-monitoring-api-go-client"
+)
+
+type Client struct {
+	GrafanaAPIURL    string
+	GrafanaAPIConfig *gapi.Config
+	GrafanaAPI       *gapi.Client
+	GrafanaCloudAPI  *gapi.Client
+
+	SMAPI    *SMAPI.Client
+	SMAPIURL string
+
+	MLAPI *mlapi.Client
+
+	OnCallClient *onCallAPI.Client
+
+	AlertingMutex sync.Mutex
+}

grafana/data_source_cloud_ips.go provider/data_source_cloud_ips.gografana/data_source_cloud_ips.go renamed to provider/data_source_cloud_ips.go

@@ -1,4 +1,4 @@
-package grafana
+package provider
 
 import (
 	"context"

grafana/data_source_cloud_ips_test.go provider/data_source_cloud_ips_test.gografana/data_source_cloud_ips_test.go renamed to provider/data_source_cloud_ips_test.go

@@ -1,4 +1,4 @@
-package grafana
+package provider
 
 import (
 	"fmt"

grafana/data_source_cloud_organization.go …ovider/data_source_cloud_organization.gografana/data_source_cloud_organization.go renamed to provider/data_source_cloud_organization.go grafana/data_source_cloud_organization.go renamed to provider/data_source_cloud_organization.go

@@ -1,10 +1,11 @@
-package grafana
+package provider
 
 import (
 	"context"
 	"strconv"
 	"time"
 
+	"github.com/grafana/terraform-provider-grafana/provider/common"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -48,7 +49,7 @@ func DatasourceCloudOrganization() *schema.Resource {
 }
 
 func datasourceCloudOrganizationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	client := meta.(*client).gcloudapi
+	client := meta.(*common.Client).GrafanaCloudAPI
 
 	id := d.Get("id").(string)
 	if id == "" {

…a/data_source_cloud_organization_test.go …r/data_source_cloud_organization_test.gografana/data_source_cloud_organization_test.go renamed to provider/data_source_cloud_organization_test.go grafana/data_source_cloud_organization_test.go renamed to provider/data_source_cloud_organization_test.go

@@ -1,4 +1,4 @@
-package grafana
+package provider
 
 import (
 	"fmt"

grafana/data_source_cloud_stack.go provider/data_source_cloud_stack.gografana/data_source_cloud_stack.go renamed to provider/data_source_cloud_stack.go

@@ -1,8 +1,9 @@
-package grafana
+package provider
 
 import (
 	"context"
 
+	"github.com/grafana/terraform-provider-grafana/provider/common"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -31,7 +32,7 @@ available at “https://<stack_slug>.grafana.net".`,
 }
 
 func datasourceCloudStackRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	client := meta.(*client).gcloudapi
+	client := meta.(*common.Client).GrafanaCloudAPI
 
 	slug := d.Get("slug").(string)
 

grafana/data_source_cloud_stack_test.go provider/data_source_cloud_stack_test.gografana/data_source_cloud_stack_test.go renamed to provider/data_source_cloud_stack_test.go

@@ -1,4 +1,4 @@
-package grafana
+package provider
 
 import (
 	"fmt"

grafana/data_source_dashboard.go provider/data_source_dashboard.gografana/data_source_dashboard.go renamed to provider/data_source_dashboard.go

@@ -1,4 +1,4 @@
-package grafana
+package provider
 
 import (
 	"context"
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	gapi "github.com/grafana/grafana-api-golang-client"
+	"github.com/grafana/terraform-provider-grafana/provider/common"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -95,9 +96,9 @@ func findDashboardWithID(client *gapi.Client, id int64) (*gapi.FolderDashboardSe
 }
 
 func dataSourceDashboardRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	gapiURL := meta.(*client).gapiURL
+	gapiURL := meta.(*common.Client).GrafanaAPIURL
 	var dashboard *gapi.Dashboard
-	client := meta.(*client).gapi
+	client := meta.(*common.Client).GrafanaAPI
 
 	// get UID from ID if specified
 	id := d.Get("dashboard_id").(int)