diff --git a/cmd/generate/main.go b/cmd/generate/main.go index bc4d7a0b0..47aa28ce7 100644 --- a/cmd/generate/main.go +++ b/cmd/generate/main.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/grafana/terraform-provider-grafana/v2/pkg/generate" + "github.com/grafana/terraform-provider-grafana/v3/pkg/generate" "github.com/fatih/color" "github.com/urfave/cli/v2" diff --git a/go.mod b/go.mod index 603d67b0d..05a7bc74c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/grafana/terraform-provider-grafana/v2 +module github.com/grafana/terraform-provider-grafana/v3 go 1.22 diff --git a/internal/resources/cloud/common.go b/internal/resources/cloud/common.go index 14fd9425e..34160e71c 100644 --- a/internal/resources/cloud/common.go +++ b/internal/resources/cloud/common.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/go-uuid" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" diff --git a/internal/resources/cloud/common_lister.go b/internal/resources/cloud/common_lister.go index 7faed433d..4bb6c66aa 100644 --- a/internal/resources/cloud/common_lister.go +++ b/internal/resources/cloud/common_lister.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) // ListerData is used as the data arg in "ListIDs" functions. It allows getting data common to multiple resources. diff --git a/internal/resources/cloud/data_source_cloud_ips_test.go b/internal/resources/cloud/data_source_cloud_ips_test.go index 540b7c546..c05f71be2 100644 --- a/internal/resources/cloud/data_source_cloud_ips_test.go +++ b/internal/resources/cloud/data_source_cloud_ips_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/internal/resources/cloud/data_source_cloud_organization_test.go b/internal/resources/cloud/data_source_cloud_organization_test.go index 1df3d4e91..7c86345e2 100644 --- a/internal/resources/cloud/data_source_cloud_organization_test.go +++ b/internal/resources/cloud/data_source_cloud_organization_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/cloud/data_source_cloud_stack.go b/internal/resources/cloud/data_source_cloud_stack.go index 13d45562e..dc33f4632 100644 --- a/internal/resources/cloud/data_source_cloud_stack.go +++ b/internal/resources/cloud/data_source_cloud_stack.go @@ -4,7 +4,7 @@ import ( "context" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/cloud/data_source_cloud_stack_test.go b/internal/resources/cloud/data_source_cloud_stack_test.go index 0a7801a21..f99901599 100644 --- a/internal/resources/cloud/data_source_cloud_stack_test.go +++ b/internal/resources/cloud/data_source_cloud_stack_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/cloud/resource_cloud_access_policy.go b/internal/resources/cloud/resource_cloud_access_policy.go index 7285370f0..1f9e5f788 100644 --- a/internal/resources/cloud/resource_cloud_access_policy.go +++ b/internal/resources/cloud/resource_cloud_access_policy.go @@ -7,7 +7,7 @@ import ( "time" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/internal/resources/cloud/resource_cloud_access_policy_token.go b/internal/resources/cloud/resource_cloud_access_policy_token.go index 653fe46f3..1e9ad8aa5 100644 --- a/internal/resources/cloud/resource_cloud_access_policy_token.go +++ b/internal/resources/cloud/resource_cloud_access_policy_token.go @@ -5,7 +5,7 @@ import ( "time" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/cloud/resource_cloud_access_policy_token_test.go b/internal/resources/cloud/resource_cloud_access_policy_token_test.go index d1c0280ba..54e9ffa3a 100644 --- a/internal/resources/cloud/resource_cloud_access_policy_token_test.go +++ b/internal/resources/cloud/resource_cloud_access_policy_token_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/cloud" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/cloud" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/internal/resources/cloud/resource_cloud_org_member.go b/internal/resources/cloud/resource_cloud_org_member.go index 272e673bb..8f31a6e27 100644 --- a/internal/resources/cloud/resource_cloud_org_member.go +++ b/internal/resources/cloud/resource_cloud_org_member.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/internal/resources/cloud/resource_cloud_org_member_test.go b/internal/resources/cloud/resource_cloud_org_member_test.go index cebe449b3..217ba884d 100644 --- a/internal/resources/cloud/resource_cloud_org_member_test.go +++ b/internal/resources/cloud/resource_cloud_org_member_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/internal/resources/cloud/resource_cloud_plugin.go b/internal/resources/cloud/resource_cloud_plugin.go index 47dbd58b0..cde44a3bf 100644 --- a/internal/resources/cloud/resource_cloud_plugin.go +++ b/internal/resources/cloud/resource_cloud_plugin.go @@ -4,7 +4,7 @@ import ( "context" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/cloud/resource_cloud_plugin_test.go b/internal/resources/cloud/resource_cloud_plugin_test.go index 1cabb7bec..3e2834fa3 100644 --- a/internal/resources/cloud/resource_cloud_plugin_test.go +++ b/internal/resources/cloud/resource_cloud_plugin_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/internal/resources/cloud/resource_cloud_stack.go b/internal/resources/cloud/resource_cloud_stack.go index 187b095b6..d97940c88 100644 --- a/internal/resources/cloud/resource_cloud_stack.go +++ b/internal/resources/cloud/resource_cloud_stack.go @@ -13,7 +13,7 @@ import ( "time" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" diff --git a/internal/resources/cloud/resource_cloud_stack_service_account.go b/internal/resources/cloud/resource_cloud_stack_service_account.go index ebefee5d3..9d8db6a59 100644 --- a/internal/resources/cloud/resource_cloud_stack_service_account.go +++ b/internal/resources/cloud/resource_cloud_stack_service_account.go @@ -9,7 +9,7 @@ import ( "github.com/grafana/grafana-com-public-clients/go/gcom" goapi "github.com/grafana/grafana-openapi-client-go/client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/cloud/resource_cloud_stack_service_account_test.go b/internal/resources/cloud/resource_cloud_stack_service_account_test.go index c779d52ec..ba92fdacd 100644 --- a/internal/resources/cloud/resource_cloud_stack_service_account_test.go +++ b/internal/resources/cloud/resource_cloud_stack_service_account_test.go @@ -7,9 +7,9 @@ import ( "github.com/grafana/grafana-com-public-clients/go/gcom" "github.com/grafana/grafana-openapi-client-go/client/service_accounts" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/cloud" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/cloud" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/internal/resources/cloud/resource_cloud_stack_service_account_token.go b/internal/resources/cloud/resource_cloud_stack_service_account_token.go index a7734da90..d18332a57 100644 --- a/internal/resources/cloud/resource_cloud_stack_service_account_token.go +++ b/internal/resources/cloud/resource_cloud_stack_service_account_token.go @@ -8,7 +8,7 @@ import ( "time" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/cloud/resource_cloud_stack_test.go b/internal/resources/cloud/resource_cloud_stack_test.go index dfbb87d1f..03e07cda5 100644 --- a/internal/resources/cloud/resource_cloud_stack_test.go +++ b/internal/resources/cloud/resource_cloud_stack_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/cloud" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/cloud" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/cloud/resource_synthetic_monitoring_installation.go b/internal/resources/cloud/resource_synthetic_monitoring_installation.go index d518a849d..20252683d 100644 --- a/internal/resources/cloud/resource_synthetic_monitoring_installation.go +++ b/internal/resources/cloud/resource_synthetic_monitoring_installation.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/grafana-com-public-clients/go/gcom" SMAPI "github.com/grafana/synthetic-monitoring-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/cloud/resource_synthetic_monitoring_installation_test.go b/internal/resources/cloud/resource_synthetic_monitoring_installation_test.go index e794e3700..7c1bb1b50 100644 --- a/internal/resources/cloud/resource_synthetic_monitoring_installation_test.go +++ b/internal/resources/cloud/resource_synthetic_monitoring_installation_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/grafana/grafana-com-public-clients/go/gcom" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/cloud/resources.go b/internal/resources/cloud/resources.go index 5c53845cc..884c36e2e 100644 --- a/internal/resources/cloud/resources.go +++ b/internal/resources/cloud/resources.go @@ -1,7 +1,7 @@ package cloud import ( - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/examples_test.go b/internal/resources/examples_test.go index 469b4c0de..d5d724c04 100644 --- a/internal/resources/examples_test.go +++ b/internal/resources/examples_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" - "github.com/grafana/terraform-provider-grafana/v2/pkg/provider" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/pkg/provider" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/common_check_exists_test.go b/internal/resources/grafana/common_check_exists_test.go index bcada03d4..df1e48316 100644 --- a/internal/resources/grafana/common_check_exists_test.go +++ b/internal/resources/grafana/common_check_exists_test.go @@ -11,9 +11,9 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/annotations" "github.com/grafana/grafana-openapi-client-go/client/provisioning" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/grafana" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/grafana" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/internal/resources/grafana/common_lister.go b/internal/resources/grafana/common_lister.go index afe522b58..2d5739395 100644 --- a/internal/resources/grafana/common_lister.go +++ b/internal/resources/grafana/common_lister.go @@ -7,7 +7,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/orgs" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) // ListerData is used as the data arg in "ListIDs" functions. It allows getting data common to multiple resources. diff --git a/internal/resources/grafana/common_plugin_framework.go b/internal/resources/grafana/common_plugin_framework.go index 970a23b8c..778a85b58 100644 --- a/internal/resources/grafana/common_plugin_framework.go +++ b/internal/resources/grafana/common_plugin_framework.go @@ -6,7 +6,7 @@ import ( "strconv" goapi "github.com/grafana/grafana-openapi-client-go/client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" frameworkSchema "github.com/hashicorp/terraform-plugin-framework/resource/schema" diff --git a/internal/resources/grafana/common_resource_permission.go b/internal/resources/grafana/common_resource_permission.go index ff9ef055a..75c2692c8 100644 --- a/internal/resources/grafana/common_resource_permission.go +++ b/internal/resources/grafana/common_resource_permission.go @@ -9,7 +9,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/access_control" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/internal/resources/grafana/common_resource_permission_sdk2.go b/internal/resources/grafana/common_resource_permission_sdk2.go index 713e73517..6e5411079 100644 --- a/internal/resources/grafana/common_resource_permission_sdk2.go +++ b/internal/resources/grafana/common_resource_permission_sdk2.go @@ -9,7 +9,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/access_control" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/grafana/data_source_dashboard.go b/internal/resources/grafana/data_source_dashboard.go index e3bfb59e6..b8de0bc7e 100644 --- a/internal/resources/grafana/data_source_dashboard.go +++ b/internal/resources/grafana/data_source_dashboard.go @@ -8,7 +8,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/search" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_dashboard_test.go b/internal/resources/grafana/data_source_dashboard_test.go index c17c2a882..b01af1814 100644 --- a/internal/resources/grafana/data_source_dashboard_test.go +++ b/internal/resources/grafana/data_source_dashboard_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_dashboards.go b/internal/resources/grafana/data_source_dashboards.go index 826a41e01..11b5e8225 100644 --- a/internal/resources/grafana/data_source_dashboards.go +++ b/internal/resources/grafana/data_source_dashboards.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/grafana/grafana-openapi-client-go/client/search" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_dashboards_test.go b/internal/resources/grafana/data_source_dashboards_test.go index cb0100722..4a01a4401 100644 --- a/internal/resources/grafana/data_source_dashboards_test.go +++ b/internal/resources/grafana/data_source_dashboards_test.go @@ -3,7 +3,7 @@ package grafana_test import ( "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_data_source.go b/internal/resources/grafana/data_source_data_source.go index bca3e0316..74d2a9f5a 100644 --- a/internal/resources/grafana/data_source_data_source.go +++ b/internal/resources/grafana/data_source_data_source.go @@ -4,7 +4,7 @@ import ( "context" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_data_source_test.go b/internal/resources/grafana/data_source_data_source_test.go index db6715ca7..e3c9da30b 100644 --- a/internal/resources/grafana/data_source_data_source_test.go +++ b/internal/resources/grafana/data_source_data_source_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_folder.go b/internal/resources/grafana/data_source_folder.go index 51067be28..029e41c57 100644 --- a/internal/resources/grafana/data_source_folder.go +++ b/internal/resources/grafana/data_source_folder.go @@ -6,7 +6,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/search" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_folder_test.go b/internal/resources/grafana/data_source_folder_test.go index 27d57bbc9..43e9cc8eb 100644 --- a/internal/resources/grafana/data_source_folder_test.go +++ b/internal/resources/grafana/data_source_folder_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_folders.go b/internal/resources/grafana/data_source_folders.go index 7c872c12f..69f0eecb0 100644 --- a/internal/resources/grafana/data_source_folders.go +++ b/internal/resources/grafana/data_source_folders.go @@ -5,7 +5,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/search" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_folders_test.go b/internal/resources/grafana/data_source_folders_test.go index df47c980f..267678006 100644 --- a/internal/resources/grafana/data_source_folders_test.go +++ b/internal/resources/grafana/data_source_folders_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_library_panel.go b/internal/resources/grafana/data_source_library_panel.go index d7e0e875f..a2cb34e2f 100644 --- a/internal/resources/grafana/data_source_library_panel.go +++ b/internal/resources/grafana/data_source_library_panel.go @@ -3,7 +3,7 @@ package grafana import ( "context" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_library_panel_test.go b/internal/resources/grafana/data_source_library_panel_test.go index c1b332062..e9a069b6b 100644 --- a/internal/resources/grafana/data_source_library_panel_test.go +++ b/internal/resources/grafana/data_source_library_panel_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_organization_preferences.go b/internal/resources/grafana/data_source_organization_preferences.go index 7cf10ec53..18d82c323 100644 --- a/internal/resources/grafana/data_source_organization_preferences.go +++ b/internal/resources/grafana/data_source_organization_preferences.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_organization_preferences_test.go b/internal/resources/grafana/data_source_organization_preferences_test.go index 2e8fb334e..afff150c9 100644 --- a/internal/resources/grafana/data_source_organization_preferences_test.go +++ b/internal/resources/grafana/data_source_organization_preferences_test.go @@ -3,7 +3,7 @@ package grafana_test import ( "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_organization_test.go b/internal/resources/grafana/data_source_organization_test.go index b231b8e05..da7c765b3 100644 --- a/internal/resources/grafana/data_source_organization_test.go +++ b/internal/resources/grafana/data_source_organization_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_role.go b/internal/resources/grafana/data_source_role.go index 071b4dc21..bc4267f83 100644 --- a/internal/resources/grafana/data_source_role.go +++ b/internal/resources/grafana/data_source_role.go @@ -4,7 +4,7 @@ import ( "context" "github.com/grafana/grafana-openapi-client-go/client/access_control" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_role_test.go b/internal/resources/grafana/data_source_role_test.go index cf4034601..18bc56e98 100644 --- a/internal/resources/grafana/data_source_role_test.go +++ b/internal/resources/grafana/data_source_role_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_service_account.go b/internal/resources/grafana/data_source_service_account.go index e0e7faa9f..1af125d23 100644 --- a/internal/resources/grafana/data_source_service_account.go +++ b/internal/resources/grafana/data_source_service_account.go @@ -7,7 +7,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/service_accounts" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_service_account_test.go b/internal/resources/grafana/data_source_service_account_test.go index 5110468f5..936ccb2e6 100644 --- a/internal/resources/grafana/data_source_service_account_test.go +++ b/internal/resources/grafana/data_source_service_account_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccDataSourceServiceAccount_basic(t *testing.T) { diff --git a/internal/resources/grafana/data_source_team.go b/internal/resources/grafana/data_source_team.go index 89c661f29..998685b3e 100644 --- a/internal/resources/grafana/data_source_team.go +++ b/internal/resources/grafana/data_source_team.go @@ -4,7 +4,7 @@ import ( "context" "github.com/grafana/grafana-openapi-client-go/client/teams" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/data_source_team_test.go b/internal/resources/grafana/data_source_team_test.go index 14fb7a455..fc33c9ffd 100644 --- a/internal/resources/grafana/data_source_team_test.go +++ b/internal/resources/grafana/data_source_team_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_user_test.go b/internal/resources/grafana/data_source_user_test.go index 879cea075..90e28044e 100644 --- a/internal/resources/grafana/data_source_user_test.go +++ b/internal/resources/grafana/data_source_user_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/data_source_users_test.go b/internal/resources/grafana/data_source_users_test.go index e03750ab2..1b240b928 100644 --- a/internal/resources/grafana/data_source_users_test.go +++ b/internal/resources/grafana/data_source_users_test.go @@ -3,7 +3,7 @@ package grafana_test import ( "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/oss_org_id.go b/internal/resources/grafana/oss_org_id.go index a329e088c..ecd64b4a3 100644 --- a/internal/resources/grafana/oss_org_id.go +++ b/internal/resources/grafana/oss_org_id.go @@ -7,7 +7,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/oss_org_id_test.go b/internal/resources/grafana/oss_org_id_test.go index a6b40eea9..349bcda4e 100644 --- a/internal/resources/grafana/oss_org_id_test.go +++ b/internal/resources/grafana/oss_org_id_test.go @@ -10,8 +10,8 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/service_accounts" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/grafana/resource_alerting_contact_point.go b/internal/resources/grafana/resource_alerting_contact_point.go index b437a12eb..9febf1161 100644 --- a/internal/resources/grafana/resource_alerting_contact_point.go +++ b/internal/resources/grafana/resource_alerting_contact_point.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) var ( diff --git a/internal/resources/grafana/resource_alerting_contact_point_notifiers.go b/internal/resources/grafana/resource_alerting_contact_point_notifiers.go index cabae6fc9..0399a0b8d 100644 --- a/internal/resources/grafana/resource_alerting_contact_point_notifiers.go +++ b/internal/resources/grafana/resource_alerting_contact_point_notifiers.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) type alertmanagerNotifier struct{} diff --git a/internal/resources/grafana/resource_alerting_contact_point_test.go b/internal/resources/grafana/resource_alerting_contact_point_test.go index b390a4d84..9cfb9e7d6 100644 --- a/internal/resources/grafana/resource_alerting_contact_point_test.go +++ b/internal/resources/grafana/resource_alerting_contact_point_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccContactPoint_basic(t *testing.T) { diff --git a/internal/resources/grafana/resource_alerting_message_template.go b/internal/resources/grafana/resource_alerting_message_template.go index df18285d3..32394839e 100644 --- a/internal/resources/grafana/resource_alerting_message_template.go +++ b/internal/resources/grafana/resource_alerting_message_template.go @@ -10,7 +10,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/provisioning" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/internal/resources/grafana/resource_alerting_message_template_test.go b/internal/resources/grafana/resource_alerting_message_template_test.go index 89d3ea06e..abb7ed1f5 100644 --- a/internal/resources/grafana/resource_alerting_message_template_test.go +++ b/internal/resources/grafana/resource_alerting_message_template_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/resource_alerting_mute_timing.go b/internal/resources/grafana/resource_alerting_mute_timing.go index 62b787cd2..3e9fe1d39 100644 --- a/internal/resources/grafana/resource_alerting_mute_timing.go +++ b/internal/resources/grafana/resource_alerting_mute_timing.go @@ -9,7 +9,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/provisioning" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/resource_alerting_mute_timing_test.go b/internal/resources/grafana/resource_alerting_mute_timing_test.go index b79807453..0b94ddce0 100644 --- a/internal/resources/grafana/resource_alerting_mute_timing_test.go +++ b/internal/resources/grafana/resource_alerting_mute_timing_test.go @@ -7,7 +7,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/models" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccMuteTiming_basic(t *testing.T) { diff --git a/internal/resources/grafana/resource_alerting_notification_policy.go b/internal/resources/grafana/resource_alerting_notification_policy.go index 104af855c..16866aa6d 100644 --- a/internal/resources/grafana/resource_alerting_notification_policy.go +++ b/internal/resources/grafana/resource_alerting_notification_policy.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) func resourceNotificationPolicy() *common.Resource { diff --git a/internal/resources/grafana/resource_alerting_notification_policy_test.go b/internal/resources/grafana/resource_alerting_notification_policy_test.go index b75578284..9c73c7813 100644 --- a/internal/resources/grafana/resource_alerting_notification_policy_test.go +++ b/internal/resources/grafana/resource_alerting_notification_policy_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccNotificationPolicy_basic(t *testing.T) { diff --git a/internal/resources/grafana/resource_alerting_rule_group.go b/internal/resources/grafana/resource_alerting_rule_group.go index 6d01a617a..76cc7d179 100644 --- a/internal/resources/grafana/resource_alerting_rule_group.go +++ b/internal/resources/grafana/resource_alerting_rule_group.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) var resourceRuleGroupID = common.NewResourceID( diff --git a/internal/resources/grafana/resource_alerting_rule_group_test.go b/internal/resources/grafana/resource_alerting_rule_group_test.go index 32be069bc..307f072a3 100644 --- a/internal/resources/grafana/resource_alerting_rule_group_test.go +++ b/internal/resources/grafana/resource_alerting_rule_group_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccAlertRule_basic(t *testing.T) { diff --git a/internal/resources/grafana/resource_annotation.go b/internal/resources/grafana/resource_annotation.go index 25451dd2d..46fa569b9 100644 --- a/internal/resources/grafana/resource_annotation.go +++ b/internal/resources/grafana/resource_annotation.go @@ -7,7 +7,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/annotations" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/grafana/resource_annotation_test.go b/internal/resources/grafana/resource_annotation_test.go index a5e8c6b6b..1d36631f4 100644 --- a/internal/resources/grafana/resource_annotation_test.go +++ b/internal/resources/grafana/resource_annotation_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" diff --git a/internal/resources/grafana/resource_dashboard.go b/internal/resources/grafana/resource_dashboard.go index 592de565d..7f0b06e38 100644 --- a/internal/resources/grafana/resource_dashboard.go +++ b/internal/resources/grafana/resource_dashboard.go @@ -13,7 +13,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/search" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) var ( diff --git a/internal/resources/grafana/resource_dashboard_permission.go b/internal/resources/grafana/resource_dashboard_permission.go index 773d2d41a..65b82ca79 100644 --- a/internal/resources/grafana/resource_dashboard_permission.go +++ b/internal/resources/grafana/resource_dashboard_permission.go @@ -3,7 +3,7 @@ package grafana import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) func resourceDashboardPermission() *common.Resource { diff --git a/internal/resources/grafana/resource_dashboard_permission_item.go b/internal/resources/grafana/resource_dashboard_permission_item.go index ce87d98bf..7b1e35d84 100644 --- a/internal/resources/grafana/resource_dashboard_permission_item.go +++ b/internal/resources/grafana/resource_dashboard_permission_item.go @@ -4,7 +4,7 @@ import ( "context" "github.com/grafana/grafana-openapi-client-go/client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" diff --git a/internal/resources/grafana/resource_dashboard_permission_item_test.go b/internal/resources/grafana/resource_dashboard_permission_item_test.go index d7391a994..8b41f857d 100644 --- a/internal/resources/grafana/resource_dashboard_permission_item_test.go +++ b/internal/resources/grafana/resource_dashboard_permission_item_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/resource_dashboard_permission_test.go b/internal/resources/grafana/resource_dashboard_permission_test.go index 3795cdba1..8cca9121e 100644 --- a/internal/resources/grafana/resource_dashboard_permission_test.go +++ b/internal/resources/grafana/resource_dashboard_permission_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/grafana/resource_dashboard_public.go b/internal/resources/grafana/resource_dashboard_public.go index 9fe771103..251ddd54c 100644 --- a/internal/resources/grafana/resource_dashboard_public.go +++ b/internal/resources/grafana/resource_dashboard_public.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/dashboard_public" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/resource_dashboard_public_test.go b/internal/resources/grafana/resource_dashboard_public_test.go index db13d8d45..62644f630 100644 --- a/internal/resources/grafana/resource_dashboard_public_test.go +++ b/internal/resources/grafana/resource_dashboard_public_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/resource_dashboard_test.go b/internal/resources/grafana/resource_dashboard_test.go index 602060c4d..8aa005eaf 100644 --- a/internal/resources/grafana/resource_dashboard_test.go +++ b/internal/resources/grafana/resource_dashboard_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/grafana" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/grafana" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" diff --git a/internal/resources/grafana/resource_data_source.go b/internal/resources/grafana/resource_data_source.go index 3e89213b4..726ded086 100644 --- a/internal/resources/grafana/resource_data_source.go +++ b/internal/resources/grafana/resource_data_source.go @@ -15,7 +15,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) func resourceDataSource() *common.Resource { diff --git a/internal/resources/grafana/resource_data_source_config.go b/internal/resources/grafana/resource_data_source_config.go index 5ada60109..e0bbb9d3b 100644 --- a/internal/resources/grafana/resource_data_source_config.go +++ b/internal/resources/grafana/resource_data_source_config.go @@ -9,7 +9,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" _ "embed" ) diff --git a/internal/resources/grafana/resource_data_source_permission.go b/internal/resources/grafana/resource_data_source_permission.go index 5fc4c7ebd..51572aa7a 100644 --- a/internal/resources/grafana/resource_data_source_permission.go +++ b/internal/resources/grafana/resource_data_source_permission.go @@ -3,7 +3,7 @@ package grafana import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) func resourceDatasourcePermission() *common.Resource { diff --git a/internal/resources/grafana/resource_data_source_permission_item.go b/internal/resources/grafana/resource_data_source_permission_item.go index aa30f0d67..8460063c4 100644 --- a/internal/resources/grafana/resource_data_source_permission_item.go +++ b/internal/resources/grafana/resource_data_source_permission_item.go @@ -4,7 +4,7 @@ import ( "context" "github.com/grafana/grafana-openapi-client-go/client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" diff --git a/internal/resources/grafana/resource_data_source_permission_item_test.go b/internal/resources/grafana/resource_data_source_permission_item_test.go index fbc75e273..16a49adc3 100644 --- a/internal/resources/grafana/resource_data_source_permission_item_test.go +++ b/internal/resources/grafana/resource_data_source_permission_item_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/resource_data_source_permission_test.go b/internal/resources/grafana/resource_data_source_permission_test.go index 1dc029b0c..dd0595131 100644 --- a/internal/resources/grafana/resource_data_source_permission_test.go +++ b/internal/resources/grafana/resource_data_source_permission_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/resource_data_source_test.go b/internal/resources/grafana/resource_data_source_test.go index a85b4e351..99c7d4699 100644 --- a/internal/resources/grafana/resource_data_source_test.go +++ b/internal/resources/grafana/resource_data_source_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" diff --git a/internal/resources/grafana/resource_folder.go b/internal/resources/grafana/resource_folder.go index d2b056ba6..5c3ffde50 100644 --- a/internal/resources/grafana/resource_folder.go +++ b/internal/resources/grafana/resource_folder.go @@ -11,7 +11,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/search" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/grafana/resource_folder_permission.go b/internal/resources/grafana/resource_folder_permission.go index 34a9e68d4..ebdc266aa 100644 --- a/internal/resources/grafana/resource_folder_permission.go +++ b/internal/resources/grafana/resource_folder_permission.go @@ -3,7 +3,7 @@ package grafana import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) func resourceFolderPermission() *common.Resource { diff --git a/internal/resources/grafana/resource_folder_permission_item.go b/internal/resources/grafana/resource_folder_permission_item.go index 45c88b4c4..0b28004ca 100644 --- a/internal/resources/grafana/resource_folder_permission_item.go +++ b/internal/resources/grafana/resource_folder_permission_item.go @@ -4,7 +4,7 @@ import ( "context" "github.com/grafana/grafana-openapi-client-go/client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" diff --git a/internal/resources/grafana/resource_folder_permission_item_test.go b/internal/resources/grafana/resource_folder_permission_item_test.go index eb9569d42..bfb05a53f 100644 --- a/internal/resources/grafana/resource_folder_permission_item_test.go +++ b/internal/resources/grafana/resource_folder_permission_item_test.go @@ -6,7 +6,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/folders" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/resource_folder_permission_test.go b/internal/resources/grafana/resource_folder_permission_test.go index 72870397c..f478ea57a 100644 --- a/internal/resources/grafana/resource_folder_permission_test.go +++ b/internal/resources/grafana/resource_folder_permission_test.go @@ -6,7 +6,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/folders" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/grafana/resource_folder_test.go b/internal/resources/grafana/resource_folder_test.go index 7490c127c..f5775f8d5 100644 --- a/internal/resources/grafana/resource_folder_test.go +++ b/internal/resources/grafana/resource_folder_test.go @@ -10,9 +10,9 @@ import ( "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/grafana" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/grafana" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" diff --git a/internal/resources/grafana/resource_library_panel.go b/internal/resources/grafana/resource_library_panel.go index 0ed29c5d1..424fb0cb9 100644 --- a/internal/resources/grafana/resource_library_panel.go +++ b/internal/resources/grafana/resource_library_panel.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) func resourceLibraryPanel() *common.Resource { diff --git a/internal/resources/grafana/resource_library_panel_test.go b/internal/resources/grafana/resource_library_panel_test.go index 95e9f5b63..079159122 100644 --- a/internal/resources/grafana/resource_library_panel_test.go +++ b/internal/resources/grafana/resource_library_panel_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" diff --git a/internal/resources/grafana/resource_organization.go b/internal/resources/grafana/resource_organization.go index e2744810c..aa1d9e713 100644 --- a/internal/resources/grafana/resource_organization.go +++ b/internal/resources/grafana/resource_organization.go @@ -11,7 +11,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/orgs" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "golang.org/x/text/cases" diff --git a/internal/resources/grafana/resource_organization_preferences.go b/internal/resources/grafana/resource_organization_preferences.go index 518f12cae..5b9ecbc24 100644 --- a/internal/resources/grafana/resource_organization_preferences.go +++ b/internal/resources/grafana/resource_organization_preferences.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/grafana/resource_organization_preferences_test.go b/internal/resources/grafana/resource_organization_preferences_test.go index e7b7e0b6b..69febef40 100644 --- a/internal/resources/grafana/resource_organization_preferences_test.go +++ b/internal/resources/grafana/resource_organization_preferences_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/grafana/resource_organization_test.go b/internal/resources/grafana/resource_organization_test.go index b94f83ff6..579696abc 100644 --- a/internal/resources/grafana/resource_organization_test.go +++ b/internal/resources/grafana/resource_organization_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) diff --git a/internal/resources/grafana/resource_playlist.go b/internal/resources/grafana/resource_playlist.go index 8e4b3af29..f4d13157f 100644 --- a/internal/resources/grafana/resource_playlist.go +++ b/internal/resources/grafana/resource_playlist.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/resource_playlist_test.go b/internal/resources/grafana/resource_playlist_test.go index 94e92ec41..39ee0aab8 100644 --- a/internal/resources/grafana/resource_playlist_test.go +++ b/internal/resources/grafana/resource_playlist_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/grafana" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/grafana" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/grafana/resource_report.go b/internal/resources/grafana/resource_report.go index f74f10966..bb957f3e2 100644 --- a/internal/resources/grafana/resource_report.go +++ b/internal/resources/grafana/resource_report.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) const ( diff --git a/internal/resources/grafana/resource_report_test.go b/internal/resources/grafana/resource_report_test.go index a8f9fbbe7..b468c0cd4 100644 --- a/internal/resources/grafana/resource_report_test.go +++ b/internal/resources/grafana/resource_report_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/grafana/resource_role.go b/internal/resources/grafana/resource_role.go index 2cb32f0ea..4faa9a767 100644 --- a/internal/resources/grafana/resource_role.go +++ b/internal/resources/grafana/resource_role.go @@ -9,7 +9,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/client/access_control" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) func resourceRole() *common.Resource { diff --git a/internal/resources/grafana/resource_role_assignment.go b/internal/resources/grafana/resource_role_assignment.go index e06f91298..bcbcbe1d6 100644 --- a/internal/resources/grafana/resource_role_assignment.go +++ b/internal/resources/grafana/resource_role_assignment.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/resource_role_assignment_item.go b/internal/resources/grafana/resource_role_assignment_item.go index f6ee34a15..51f1ce834 100644 --- a/internal/resources/grafana/resource_role_assignment_item.go +++ b/internal/resources/grafana/resource_role_assignment_item.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/internal/resources/grafana/resource_role_assignment_item_test.go b/internal/resources/grafana/resource_role_assignment_item_test.go index e3faa8d12..962d6e1da 100644 --- a/internal/resources/grafana/resource_role_assignment_item_test.go +++ b/internal/resources/grafana/resource_role_assignment_item_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccRoleAssignmentItem(t *testing.T) { diff --git a/internal/resources/grafana/resource_role_assignment_test.go b/internal/resources/grafana/resource_role_assignment_test.go index 5b73f3dda..7cb233263 100644 --- a/internal/resources/grafana/resource_role_assignment_test.go +++ b/internal/resources/grafana/resource_role_assignment_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccRoleAssignments(t *testing.T) { diff --git a/internal/resources/grafana/resource_role_test.go b/internal/resources/grafana/resource_role_test.go index 45a46eb2b..bda4d429f 100644 --- a/internal/resources/grafana/resource_role_test.go +++ b/internal/resources/grafana/resource_role_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccRole_basic(t *testing.T) { diff --git a/internal/resources/grafana/resource_service_account.go b/internal/resources/grafana/resource_service_account.go index 700a7970d..4dc9576c0 100644 --- a/internal/resources/grafana/resource_service_account.go +++ b/internal/resources/grafana/resource_service_account.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/service_accounts" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/internal/resources/grafana/resource_service_account_permission.go b/internal/resources/grafana/resource_service_account_permission.go index 307836d2c..027d528d5 100644 --- a/internal/resources/grafana/resource_service_account_permission.go +++ b/internal/resources/grafana/resource_service_account_permission.go @@ -3,7 +3,7 @@ package grafana import ( "strconv" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/resource_service_account_permission_item.go b/internal/resources/grafana/resource_service_account_permission_item.go index 722a20aea..99e3f3e43 100644 --- a/internal/resources/grafana/resource_service_account_permission_item.go +++ b/internal/resources/grafana/resource_service_account_permission_item.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/grafana/grafana-openapi-client-go/client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/internal/resources/grafana/resource_service_account_permission_item_test.go b/internal/resources/grafana/resource_service_account_permission_item_test.go index 676781674..3ba30e114 100644 --- a/internal/resources/grafana/resource_service_account_permission_item_test.go +++ b/internal/resources/grafana/resource_service_account_permission_item_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccServiceAccountPermissionItem_basic(t *testing.T) { diff --git a/internal/resources/grafana/resource_service_account_permission_test.go b/internal/resources/grafana/resource_service_account_permission_test.go index abe19c9c5..f41e2454c 100644 --- a/internal/resources/grafana/resource_service_account_permission_test.go +++ b/internal/resources/grafana/resource_service_account_permission_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccServiceAccountPermission_basic(t *testing.T) { diff --git a/internal/resources/grafana/resource_service_account_test.go b/internal/resources/grafana/resource_service_account_test.go index a377a4d06..548e883f2 100644 --- a/internal/resources/grafana/resource_service_account_test.go +++ b/internal/resources/grafana/resource_service_account_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccServiceAccount_basic(t *testing.T) { diff --git a/internal/resources/grafana/resource_service_account_token.go b/internal/resources/grafana/resource_service_account_token.go index 734f13bdf..32dd93f6e 100644 --- a/internal/resources/grafana/resource_service_account_token.go +++ b/internal/resources/grafana/resource_service_account_token.go @@ -7,7 +7,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client/service_accounts" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/resource_service_account_token_test.go b/internal/resources/grafana/resource_service_account_token_test.go index 8f3a312db..4827edd28 100644 --- a/internal/resources/grafana/resource_service_account_token_test.go +++ b/internal/resources/grafana/resource_service_account_token_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/grafana/resource_sso_settings.go b/internal/resources/grafana/resource_sso_settings.go index 72c57afb9..1d9c8a2b3 100644 --- a/internal/resources/grafana/resource_sso_settings.go +++ b/internal/resources/grafana/resource_sso_settings.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) const ( diff --git a/internal/resources/grafana/resource_sso_settings_test.go b/internal/resources/grafana/resource_sso_settings_test.go index 6d088ec1b..b67ec0481 100644 --- a/internal/resources/grafana/resource_sso_settings_test.go +++ b/internal/resources/grafana/resource_sso_settings_test.go @@ -12,7 +12,7 @@ import ( "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestSSOSettings_basic_oauth2(t *testing.T) { diff --git a/internal/resources/grafana/resource_team.go b/internal/resources/grafana/resource_team.go index 71715be40..330e87244 100644 --- a/internal/resources/grafana/resource_team.go +++ b/internal/resources/grafana/resource_team.go @@ -8,7 +8,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/grafana/resource_team_external_group.go b/internal/resources/grafana/resource_team_external_group.go index e70188728..cc2efe609 100644 --- a/internal/resources/grafana/resource_team_external_group.go +++ b/internal/resources/grafana/resource_team_external_group.go @@ -8,7 +8,7 @@ import ( goapi "github.com/grafana/grafana-openapi-client-go/client" teamsSync "github.com/grafana/grafana-openapi-client-go/client/sync_team_groups" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/resource_team_external_group_test.go b/internal/resources/grafana/resource_team_external_group_test.go index 44ae24916..285437368 100644 --- a/internal/resources/grafana/resource_team_external_group_test.go +++ b/internal/resources/grafana/resource_team_external_group_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/grafana/resource_team_test.go b/internal/resources/grafana/resource_team_test.go index d9ef08413..4d88ae802 100644 --- a/internal/resources/grafana/resource_team_test.go +++ b/internal/resources/grafana/resource_team_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/grafana/resource_user.go b/internal/resources/grafana/resource_user.go index 7f5b16c09..bbba64a3d 100644 --- a/internal/resources/grafana/resource_user.go +++ b/internal/resources/grafana/resource_user.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/grafana/resource_user_test.go b/internal/resources/grafana/resource_user_test.go index df14e3e78..d84bb9f4c 100644 --- a/internal/resources/grafana/resource_user_test.go +++ b/internal/resources/grafana/resource_user_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/grafana/grafana-openapi-client-go/models" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" ) func TestAccUser_basic(t *testing.T) { diff --git a/internal/resources/grafana/resources.go b/internal/resources/grafana/resources.go index b578e78b7..9ddf47c75 100644 --- a/internal/resources/grafana/resources.go +++ b/internal/resources/grafana/resources.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/machinelearning/resource_holiday.go b/internal/resources/machinelearning/resource_holiday.go index 64dab063d..083ff4690 100644 --- a/internal/resources/machinelearning/resource_holiday.go +++ b/internal/resources/machinelearning/resource_holiday.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/grafana/machine-learning-go-client/mlapi" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) var resourceHolidayID = common.NewResourceID(common.StringIDField("id")) diff --git a/internal/resources/machinelearning/resource_holiday_test.go b/internal/resources/machinelearning/resource_holiday_test.go index ccbe30c03..93fe3ebfe 100644 --- a/internal/resources/machinelearning/resource_holiday_test.go +++ b/internal/resources/machinelearning/resource_holiday_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/grafana/machine-learning-go-client/mlapi" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/machinelearning/resource_job.go b/internal/resources/machinelearning/resource_job.go index f24b9501a..57dd14b4a 100644 --- a/internal/resources/machinelearning/resource_job.go +++ b/internal/resources/machinelearning/resource_job.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/grafana/machine-learning-go-client/mlapi" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) var resourceJobID = common.NewResourceID(common.StringIDField("id")) diff --git a/internal/resources/machinelearning/resource_job_test.go b/internal/resources/machinelearning/resource_job_test.go index 98c5c8e11..43684d7df 100644 --- a/internal/resources/machinelearning/resource_job_test.go +++ b/internal/resources/machinelearning/resource_job_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/grafana/machine-learning-go-client/mlapi" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/machinelearning/resource_outlier_detector.go b/internal/resources/machinelearning/resource_outlier_detector.go index 47888377f..9ef6fd4f0 100644 --- a/internal/resources/machinelearning/resource_outlier_detector.go +++ b/internal/resources/machinelearning/resource_outlier_detector.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/grafana/machine-learning-go-client/mlapi" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/machinelearning/resource_outlier_detector_test.go b/internal/resources/machinelearning/resource_outlier_detector_test.go index 1904af039..5b05840aa 100644 --- a/internal/resources/machinelearning/resource_outlier_detector_test.go +++ b/internal/resources/machinelearning/resource_outlier_detector_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/grafana/machine-learning-go-client/mlapi" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/machinelearning/resources.go b/internal/resources/machinelearning/resources.go index f683154d9..0f9a0c817 100644 --- a/internal/resources/machinelearning/resources.go +++ b/internal/resources/machinelearning/resources.go @@ -3,7 +3,7 @@ package machinelearning import ( "context" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/oncall/data_source_integration_test.go b/internal/resources/oncall/data_source_integration_test.go index 46675b42f..a752dc0ae 100644 --- a/internal/resources/oncall/data_source_integration_test.go +++ b/internal/resources/oncall/data_source_integration_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/oncall/data_source_outgoing_webhook_test.go b/internal/resources/oncall/data_source_outgoing_webhook_test.go index 12adfc864..236f083f5 100644 --- a/internal/resources/oncall/data_source_outgoing_webhook_test.go +++ b/internal/resources/oncall/data_source_outgoing_webhook_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/oncall/data_source_schedule_test.go b/internal/resources/oncall/data_source_schedule_test.go index 3200189d5..0674da953 100644 --- a/internal/resources/oncall/data_source_schedule_test.go +++ b/internal/resources/oncall/data_source_schedule_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/oncall/data_source_slack_channel_test.go b/internal/resources/oncall/data_source_slack_channel_test.go index 091f7b55f..b036ec941 100644 --- a/internal/resources/oncall/data_source_slack_channel_test.go +++ b/internal/resources/oncall/data_source_slack_channel_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/oncall/data_source_team_test.go b/internal/resources/oncall/data_source_team_test.go index b707840d4..d750c1842 100644 --- a/internal/resources/oncall/data_source_team_test.go +++ b/internal/resources/oncall/data_source_team_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/oncall/data_source_user_group_test.go b/internal/resources/oncall/data_source_user_group_test.go index f325c8d6f..c4073cc16 100644 --- a/internal/resources/oncall/data_source_user_group_test.go +++ b/internal/resources/oncall/data_source_user_group_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/oncall/data_source_user_test.go b/internal/resources/oncall/data_source_user_test.go index 477175ac6..19ed4c24d 100644 --- a/internal/resources/oncall/data_source_user_test.go +++ b/internal/resources/oncall/data_source_user_test.go @@ -5,7 +5,7 @@ import ( "regexp" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/oncall/resource_escalation.go b/internal/resources/oncall/resource_escalation.go index 3225d82dd..b78ddc74d 100644 --- a/internal/resources/oncall/resource_escalation.go +++ b/internal/resources/oncall/resource_escalation.go @@ -8,7 +8,7 @@ import ( "strings" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/oncall/resource_escalation_chain.go b/internal/resources/oncall/resource_escalation_chain.go index 73848f337..72e189a9a 100644 --- a/internal/resources/oncall/resource_escalation_chain.go +++ b/internal/resources/oncall/resource_escalation_chain.go @@ -6,7 +6,7 @@ import ( "net/http" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/oncall/resource_escalation_test.go b/internal/resources/oncall/resource_escalation_test.go index 52eef2a33..7e060e0e7 100644 --- a/internal/resources/oncall/resource_escalation_test.go +++ b/internal/resources/oncall/resource_escalation_test.go @@ -5,8 +5,8 @@ import ( "testing" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/oncall/resource_integration.go b/internal/resources/oncall/resource_integration.go index da4225487..7be308a4c 100644 --- a/internal/resources/oncall/resource_integration.go +++ b/internal/resources/oncall/resource_integration.go @@ -8,7 +8,7 @@ import ( "strings" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/oncall/resource_integration_test.go b/internal/resources/oncall/resource_integration_test.go index 64106e694..06935ea2c 100644 --- a/internal/resources/oncall/resource_integration_test.go +++ b/internal/resources/oncall/resource_integration_test.go @@ -5,8 +5,8 @@ import ( "testing" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/oncall/resource_outgoing_webhook.go b/internal/resources/oncall/resource_outgoing_webhook.go index 4b6c7da6d..861d6ecc3 100644 --- a/internal/resources/oncall/resource_outgoing_webhook.go +++ b/internal/resources/oncall/resource_outgoing_webhook.go @@ -6,7 +6,7 @@ import ( "net/http" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/oncall/resource_outgoing_webhook_test.go b/internal/resources/oncall/resource_outgoing_webhook_test.go index 47087418d..8183f93e2 100644 --- a/internal/resources/oncall/resource_outgoing_webhook_test.go +++ b/internal/resources/oncall/resource_outgoing_webhook_test.go @@ -5,8 +5,8 @@ import ( "testing" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/oncall/resource_route.go b/internal/resources/oncall/resource_route.go index 359e7b34c..7cc716b09 100644 --- a/internal/resources/oncall/resource_route.go +++ b/internal/resources/oncall/resource_route.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/oncall/resource_route_test.go b/internal/resources/oncall/resource_route_test.go index a96f3e4a0..1deead940 100644 --- a/internal/resources/oncall/resource_route_test.go +++ b/internal/resources/oncall/resource_route_test.go @@ -5,8 +5,8 @@ import ( "testing" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/oncall/resource_schedule.go b/internal/resources/oncall/resource_schedule.go index 51adc2b0a..684260ef9 100644 --- a/internal/resources/oncall/resource_schedule.go +++ b/internal/resources/oncall/resource_schedule.go @@ -7,7 +7,7 @@ import ( "strings" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/oncall/resource_schedule_test.go b/internal/resources/oncall/resource_schedule_test.go index 9d135fc2a..222687def 100644 --- a/internal/resources/oncall/resource_schedule_test.go +++ b/internal/resources/oncall/resource_schedule_test.go @@ -5,8 +5,8 @@ import ( "testing" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/oncall/resource_shift.go b/internal/resources/oncall/resource_shift.go index 6651a5942..bb238a0de 100644 --- a/internal/resources/oncall/resource_shift.go +++ b/internal/resources/oncall/resource_shift.go @@ -8,7 +8,7 @@ import ( "strings" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/oncall/resource_shift_test.go b/internal/resources/oncall/resource_shift_test.go index d52f5ccc6..8c00be0e6 100644 --- a/internal/resources/oncall/resource_shift_test.go +++ b/internal/resources/oncall/resource_shift_test.go @@ -5,8 +5,8 @@ import ( "testing" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/oncall/resources.go b/internal/resources/oncall/resources.go index b1412fc57..5936475d2 100644 --- a/internal/resources/oncall/resources.go +++ b/internal/resources/oncall/resources.go @@ -4,7 +4,7 @@ import ( "context" onCallAPI "github.com/grafana/amixr-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/slo/data_source_slo.go b/internal/resources/slo/data_source_slo.go index 2e68a97cc..4baf88b6e 100644 --- a/internal/resources/slo/data_source_slo.go +++ b/internal/resources/slo/data_source_slo.go @@ -4,7 +4,7 @@ import ( "context" slo "github.com/grafana/slo-openapi-client/go" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/slo/data_source_slo_test.go b/internal/resources/slo/data_source_slo_test.go index 3bb2d6977..2ac30779e 100644 --- a/internal/resources/slo/data_source_slo_test.go +++ b/internal/resources/slo/data_source_slo_test.go @@ -4,7 +4,7 @@ import ( "testing" slo "github.com/grafana/slo-openapi-client/go" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/slo/resource_slo.go b/internal/resources/slo/resource_slo.go index cb67b663a..c31c3e068 100644 --- a/internal/resources/slo/resource_slo.go +++ b/internal/resources/slo/resource_slo.go @@ -7,7 +7,7 @@ import ( slo "github.com/grafana/slo-openapi-client/go" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "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" diff --git a/internal/resources/slo/resource_slo_test.go b/internal/resources/slo/resource_slo_test.go index 249a0e7c2..52eee7eef 100644 --- a/internal/resources/slo/resource_slo_test.go +++ b/internal/resources/slo/resource_slo_test.go @@ -7,8 +7,8 @@ import ( "testing" slo "github.com/grafana/slo-openapi-client/go" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/slo/resources.go b/internal/resources/slo/resources.go index 45f82db9e..501fd145f 100644 --- a/internal/resources/slo/resources.go +++ b/internal/resources/slo/resources.go @@ -4,7 +4,7 @@ import ( "context" slo "github.com/grafana/slo-openapi-client/go" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/resources/syntheticmonitoring/data_source_probe.go b/internal/resources/syntheticmonitoring/data_source_probe.go index ebe5c73cf..6f6a9f533 100644 --- a/internal/resources/syntheticmonitoring/data_source_probe.go +++ b/internal/resources/syntheticmonitoring/data_source_probe.go @@ -9,7 +9,7 @@ import ( sm "github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring" smapi "github.com/grafana/synthetic-monitoring-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) func dataSourceProbe() *schema.Resource { diff --git a/internal/resources/syntheticmonitoring/data_source_probe_test.go b/internal/resources/syntheticmonitoring/data_source_probe_test.go index 186690d80..23e00066e 100644 --- a/internal/resources/syntheticmonitoring/data_source_probe_test.go +++ b/internal/resources/syntheticmonitoring/data_source_probe_test.go @@ -3,7 +3,7 @@ package syntheticmonitoring_test import ( "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/syntheticmonitoring/data_source_probes_test.go b/internal/resources/syntheticmonitoring/data_source_probes_test.go index 7b2dfc05a..92797f323 100644 --- a/internal/resources/syntheticmonitoring/data_source_probes_test.go +++ b/internal/resources/syntheticmonitoring/data_source_probes_test.go @@ -3,7 +3,7 @@ package syntheticmonitoring_test import ( "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) diff --git a/internal/resources/syntheticmonitoring/resource_check.go b/internal/resources/syntheticmonitoring/resource_check.go index 1dc824afb..d49d25d87 100644 --- a/internal/resources/syntheticmonitoring/resource_check.go +++ b/internal/resources/syntheticmonitoring/resource_check.go @@ -14,7 +14,7 @@ import ( sm "github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring" smapi "github.com/grafana/synthetic-monitoring-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) const ( diff --git a/internal/resources/syntheticmonitoring/resource_check_test.go b/internal/resources/syntheticmonitoring/resource_check_test.go index 134e46b39..04243f8d6 100644 --- a/internal/resources/syntheticmonitoring/resource_check_test.go +++ b/internal/resources/syntheticmonitoring/resource_check_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/syntheticmonitoring/resource_probe.go b/internal/resources/syntheticmonitoring/resource_probe.go index 74ee6d61e..565889731 100644 --- a/internal/resources/syntheticmonitoring/resource_probe.go +++ b/internal/resources/syntheticmonitoring/resource_probe.go @@ -14,7 +14,7 @@ import ( sm "github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring" smapi "github.com/grafana/synthetic-monitoring-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" ) var resourceProbeID = common.NewResourceID(common.IntIDField("id"), common.OptionalStringIDField("authToken")) diff --git a/internal/resources/syntheticmonitoring/resource_probe_test.go b/internal/resources/syntheticmonitoring/resource_probe_test.go index 30783558c..475d351fa 100644 --- a/internal/resources/syntheticmonitoring/resource_probe_test.go +++ b/internal/resources/syntheticmonitoring/resource_probe_test.go @@ -7,8 +7,8 @@ import ( "strconv" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/internal/resources/syntheticmonitoring/resources.go b/internal/resources/syntheticmonitoring/resources.go index 8b797eba2..6593e10ba 100644 --- a/internal/resources/syntheticmonitoring/resources.go +++ b/internal/resources/syntheticmonitoring/resources.go @@ -4,7 +4,7 @@ import ( "context" smapi "github.com/grafana/synthetic-monitoring-api-go-client" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/internal/testutils/provider.go b/internal/testutils/provider.go index 73ce9f90f..98698387d 100644 --- 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/v2/pkg/provider" + "github.com/grafana/terraform-provider-grafana/v3/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 index 9ab56ebdc..17558d522 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "flag" "log" - "github.com/grafana/terraform-provider-grafana/v2/pkg/provider" + "github.com/grafana/terraform-provider-grafana/v3/pkg/provider" "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-go/tfprotov5/tf5server" ) diff --git a/pkg/generate/cloud.go b/pkg/generate/cloud.go index bfbcd6dba..e15339a9d 100644 --- a/pkg/generate/cloud.go +++ b/pkg/generate/cloud.go @@ -11,8 +11,8 @@ import ( "github.com/grafana/grafana-com-public-clients/go/gcom" "github.com/grafana/grafana-openapi-client-go/client/service_accounts" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/cloud" - "github.com/grafana/terraform-provider-grafana/v2/pkg/provider" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/cloud" + "github.com/grafana/terraform-provider-grafana/v3/pkg/provider" "github.com/hashicorp/hcl/v2/hclwrite" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/zclconf/go-cty/cty" diff --git a/pkg/generate/generate.go b/pkg/generate/generate.go index 9d6e2b025..7b14c0780 100644 --- a/pkg/generate/generate.go +++ b/pkg/generate/generate.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" "github.com/hashicorp/hcl/v2/hclwrite" "github.com/zclconf/go-cty/cty" ) diff --git a/pkg/generate/generate_test.go b/pkg/generate/generate_test.go index 94b0483b5..71b702e6c 100644 --- a/pkg/generate/generate_test.go +++ b/pkg/generate/generate_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" - "github.com/grafana/terraform-provider-grafana/v2/pkg/generate" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/pkg/generate" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/stretchr/testify/assert" diff --git a/pkg/generate/grafana.go b/pkg/generate/grafana.go index c516d0597..18ce4da5c 100644 --- a/pkg/generate/grafana.go +++ b/pkg/generate/grafana.go @@ -6,11 +6,11 @@ import ( "path/filepath" "strings" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/grafana" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/machinelearning" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/slo" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/syntheticmonitoring" - "github.com/grafana/terraform-provider-grafana/v2/pkg/provider" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/grafana" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/machinelearning" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/slo" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/syntheticmonitoring" + "github.com/grafana/terraform-provider-grafana/v3/pkg/provider" "github.com/hashicorp/hcl/v2/hclwrite" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/zclconf/go-cty/cty" diff --git a/pkg/provider/configure_clients.go b/pkg/provider/configure_clients.go index 9a5a935bf..aa2886e93 100644 --- a/pkg/provider/configure_clients.go +++ b/pkg/provider/configure_clients.go @@ -19,8 +19,8 @@ import ( SMAPI "github.com/grafana/synthetic-monitoring-api-go-client" "github.com/go-openapi/strfmt" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/grafana" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/grafana" "github.com/hashicorp/go-retryablehttp" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/pkg/provider/legacy_provider.go b/pkg/provider/legacy_provider.go index 12c215fd7..1e7dc16b0 100644 --- a/pkg/provider/legacy_provider.go +++ b/pkg/provider/legacy_provider.go @@ -10,12 +10,12 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/cloud" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/grafana" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/machinelearning" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/oncall" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/slo" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/syntheticmonitoring" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/cloud" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/grafana" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/machinelearning" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/oncall" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/slo" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/syntheticmonitoring" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" ) diff --git a/pkg/provider/legacy_provider_test.go b/pkg/provider/legacy_provider_test.go index 82101f743..984f9cf90 100644 --- a/pkg/provider/legacy_provider_test.go +++ b/pkg/provider/legacy_provider_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/testutils" - "github.com/grafana/terraform-provider-grafana/v2/pkg/provider" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/testutils" + "github.com/grafana/terraform-provider-grafana/v3/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/pkg/provider/resources.go b/pkg/provider/resources.go index baf8c6474..5d579eafb 100644 --- a/pkg/provider/resources.go +++ b/pkg/provider/resources.go @@ -3,13 +3,13 @@ package provider import ( - "github.com/grafana/terraform-provider-grafana/v2/internal/common" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/cloud" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/grafana" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/machinelearning" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/oncall" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/slo" - "github.com/grafana/terraform-provider-grafana/v2/internal/resources/syntheticmonitoring" + "github.com/grafana/terraform-provider-grafana/v3/internal/common" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/cloud" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/grafana" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/machinelearning" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/oncall" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/slo" + "github.com/grafana/terraform-provider-grafana/v3/internal/resources/syntheticmonitoring" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/tools/genimports/main.go b/tools/genimports/main.go index b24e931b2..2f55cc069 100644 --- a/tools/genimports/main.go +++ b/tools/genimports/main.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/grafana/terraform-provider-grafana/v2/pkg/provider" + "github.com/grafana/terraform-provider-grafana/v3/pkg/provider" ) func main() {