Upgrade provider to 1.35.0 (#16)

grafana · Mar 2, 2023 · f6a6664 · f6a6664
1 parent 2b426e5
commit f6a6664
Show file tree

Hide file tree

Showing 13 changed files with 188 additions and 39 deletions.
diff --git a/Makefile b/Makefile
@@ -4,13 +4,13 @@
 PROJECT_NAME := provider-grafana
 PROJECT_REPO := github.com/grafana/crossplane-provider-grafana
 
-export TERRAFORM_VERSION := 1.3.7
+export TERRAFORM_VERSION := 1.3.9
 
 export TERRAFORM_PROVIDER_SOURCE := grafana/grafana
 export TERRAFORM_PROVIDER_REPO := https://github.com/grafana/terraform-provider-grafana
-export TERRAFORM_PROVIDER_VERSION := 1.34.0
+export TERRAFORM_PROVIDER_VERSION := 1.35.0
 export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-grafana
-export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-grafana_v1.34.0
+export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-grafana_v1.35.0
 export TERRAFORM_DOCS_PATH := docs/resources
 
 PLATFORMS ?= linux_amd64 linux_arm64

diff --git a/apis/alerting/v1alpha1/zz_generated.deepcopy.go b/apis/alerting/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/alerting/v1alpha1/zz_rulegroup_types.go b/apis/alerting/v1alpha1/zz_rulegroup_types.go
diff --git a/apis/oss/v1alpha1/zz_dashboard_types.go b/apis/oss/v1alpha1/zz_dashboard_types.go
diff --git a/apis/oss/v1alpha1/zz_generated.deepcopy.go b/apis/oss/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/oss/v1alpha1/zz_generated.resolvers.go b/apis/oss/v1alpha1/zz_generated.resolvers.go
diff --git a/apis/oss/v1alpha1/zz_team_types.go b/apis/oss/v1alpha1/zz_team_types.go
diff --git a/config/grafana/config.go b/config/grafana/config.go
@@ -45,6 +45,11 @@ func Configure(p *ujconfig.Provider) {
 		}
 	})
 	p.AddResourceConfigurator("grafana_dashboard", func(r *ujconfig.Resource) {
+		r.References["org_id"] = ujconfig.Reference{
+			TerraformName:     "grafana_organization",
+			RefFieldName:      "OrganizationRef",
+			SelectorFieldName: "OrganizationSelector",
+		}
 		r.References["folder"] = ujconfig.Reference{
 			TerraformName:     "grafana_folder",
 			RefFieldName:      "FolderRef",