Skip to content

Commit 21d3319

Browse files
Split resources and provider into different packages (#810)
Follow-up to #807 Following the `terraform-provider-aws` repository structure, the main provider instance is in its own package, and resources are separated from it For now, all resource are in a `grafana` package but I will split this off into multiple resource packages
1 parent 1bd6769 commit 21d3319

File tree

152 files changed

+593
-568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+593
-568
lines changed

internal/common/regex.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package common
2+
3+
import "regexp"
4+
5+
var (
6+
IDRegexp = regexp.MustCompile(`^\d+$`)
7+
UIDRegexp = regexp.MustCompile(`^[a-zA-Z0-9-_]+$`)
8+
EmailRegexp = regexp.MustCompile(`.+\@.+\..+`)
9+
SHA256Regexp = regexp.MustCompile(`^[A-Fa-f0-9]{64}$`)
10+
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package provider
1+
package grafana
22

33
import (
44
"context"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package provider
1+
package grafana_test
22

33
import (
44
"fmt"
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"testing"
99

10-
"github.com/grafana/terraform-provider-grafana/provider/testutils"
10+
"github.com/grafana/terraform-provider-grafana/internal/testutils"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1313
)

provider/data_source_cloud_organization.go renamed to internal/grafana/data_source_cloud_organization.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package provider
1+
package grafana
22

33
import (
44
"context"
55
"strconv"
66
"time"
77

8-
"github.com/grafana/terraform-provider-grafana/provider/common"
8+
"github.com/grafana/terraform-provider-grafana/internal/common"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
)

provider/data_source_cloud_organization_test.go renamed to internal/grafana/data_source_cloud_organization_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package provider
1+
package grafana_test
22

33
import (
44
"fmt"
55
"os"
66
"testing"
77

8-
"github.com/grafana/terraform-provider-grafana/provider/testutils"
8+
"github.com/grafana/terraform-provider-grafana/internal/common"
9+
"github.com/grafana/terraform-provider-grafana/internal/testutils"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1011
)
1112

@@ -24,7 +25,7 @@ func TestAccDatasourceCloudOrganization_Basic(t *testing.T) {
2425
{
2526
Config: config,
2627
Check: resource.ComposeTestCheckFunc(
27-
resource.TestMatchResourceAttr("data.grafana_cloud_organization.test", "id", idRegexp),
28+
resource.TestMatchResourceAttr("data.grafana_cloud_organization.test", "id", common.IDRegexp),
2829
resource.TestCheckResourceAttr("data.grafana_cloud_organization.test", "slug", os.Getenv("GRAFANA_CLOUD_ORG")),
2930
resource.TestCheckResourceAttrSet("data.grafana_cloud_organization.test", "name"),
3031
resource.TestCheckResourceAttrSet("data.grafana_cloud_organization.test", "created_at"),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package provider
1+
package grafana
22

33
import (
44
"context"
55

6-
"github.com/grafana/terraform-provider-grafana/provider/common"
6+
"github.com/grafana/terraform-provider-grafana/internal/common"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
99
)

0 commit comments

Comments
 (0)