Expose the provider package (#1427)

* Expose the `provider` package This will be used for the Crossplane provider. This feature: https://blog.crossplane.io/new-providers-for-crossplane-donated-by-upbound-bring-up-to-4x-cost-savings/ requires a direct reference to the provider, making the Crossplane provider much faster because it doesn't have to call the TF CLI * Fix import
grafana · Mar 19, 2024 · 0194058 · 0194058
1 parent 32797d3
commit 0194058
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ terraform.tfplan
 terraform.tfstate
 bin/
 modules-dev/
-/pkg/
 website/.vagrant
 website/.bundle
 website/build

diff --git a/internal/testutils/provider.go b/internal/testutils/provider.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/grafana/terraform-provider-grafana/internal/provider"
+	"github.com/grafana/terraform-provider-grafana/pkg/provider"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

diff --git a/main.go b/main.go
@@ -5,7 +5,7 @@ import (
 	"flag"
 	"log"
 
-	"github.com/grafana/terraform-provider-grafana/internal/provider"
+	"github.com/grafana/terraform-provider-grafana/pkg/provider"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tf5server"
 )

diff --git a/pkg/README.md b/pkg/README.md
@@ -0,0 +1,3 @@
+# pkg
+
+Note that while this code is exposed to other Golang projects, there is absolutely no compatibility guarantee between versions.
diff --git a/internal/provider/configure_clients.go → pkg/provider/configure_clients.go b/internal/provider/configure_clients.go → pkg/provider/configure_clients.go
diff --git a/internal/provider/framework_provider.go → pkg/provider/framework_provider.go b/internal/provider/framework_provider.go → pkg/provider/framework_provider.go
diff --git a/internal/provider/legacy_provider.go → pkg/provider/legacy_provider.go b/internal/provider/legacy_provider.go → pkg/provider/legacy_provider.go
diff --git a/internal/provider/legacy_provider_test.go → pkg/provider/legacy_provider_test.go b/internal/provider/legacy_provider_test.go → pkg/provider/legacy_provider_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/grafana/terraform-provider-grafana/internal/common"
-	"github.com/grafana/terraform-provider-grafana/internal/provider"
 	"github.com/grafana/terraform-provider-grafana/internal/testutils"
+	"github.com/grafana/terraform-provider-grafana/pkg/provider"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

diff --git a/internal/provider/provider.go → pkg/provider/provider.go b/internal/provider/provider.go → pkg/provider/provider.go
diff --git a/tools/genimports/main.go b/tools/genimports/main.go
@@ -4,9 +4,11 @@ import (
 	"os"
 
 	"github.com/grafana/terraform-provider-grafana/internal/common"
-	"github.com/grafana/terraform-provider-grafana/internal/provider"
+	"github.com/grafana/terraform-provider-grafana/pkg/provider"
 )
 
+// TODO: Move to cmd, and remove global var in common
+
 func main() {
 	p := provider.Provider("genimports") // Instantiate the provider so that all resources are registered
 	_ = p
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# pkg

		Note that while this code is exposed to other Golang projects, there is absolutely no compatibility guarantee between versions.