Fix terraform provider data sources (#52545)

* Fix template Read method * Update data sources * Add test case * terraform fmt * Fix test case
gravitational · Mar 5, 2025 · 6f33839 · 6f33839
1 parent 1684e54
commit 6f33839
Show file tree

Hide file tree

Showing 29 changed files with 447 additions and 25 deletions.
diff --git a/integrations/terraform/gen/plural_data_source.go.tpl b/integrations/terraform/gen/plural_data_source.go.tpl
@@ -74,7 +74,21 @@ func (r dataSourceTeleport{{.Name}}) Read(ctx context.Context, req tfsdk.ReadDat
 		return
 	}
 
-    var state types.Object
+	var state types.Object
+	resp.Diagnostics.Append(req.Config.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	// Todo: Remove after updating terraform-plugin to >=v1.5.0.
+	// terraform-plugin-testing version <1.5.0 requires data resources to
+	// implement the 'id' attribute.
+	// https://developer.hashicorp.com/terraform/plugin/framework/acctests#no-id-found-in-attributes
+	v, ok := state.Attrs["id"]
+	if !ok || v.IsNull() {
+		state.Attrs["id"] = id
+	}
+
 	{{if .IsPlainStruct -}}
 	{{.VarName}} := {{.VarName}}I
 	{{else if .ConvertPackagePath -}}

diff --git a/integrations/terraform/gen/singular_data_source.go.tpl b/integrations/terraform/gen/singular_data_source.go.tpl
@@ -59,7 +59,12 @@ func (r dataSourceTeleport{{.Name}}) Read(ctx context.Context, req tfsdk.ReadDat
 		return
 	}
 
-    var state types.Object
+	var state types.Object
+	resp.Diagnostics.Append(req.Config.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	{{if .IsPlainStruct -}}
 	{{.VarName}} := {{.VarName}}I
 	{{else -}}
@@ -71,6 +76,15 @@ func (r dataSourceTeleport{{.Name}}) Read(ctx context.Context, req tfsdk.ReadDat
 		return
 	}
 
+	// Todo: Remove after updating terraform-plugin to >=v1.5.0.
+	// terraform-plugin-testing version <1.5.0 requires data resources to
+	// implement the 'id' attribute.
+	// https://developer.hashicorp.com/terraform/plugin/framework/acctests#no-id-found-in-attributes
+	v, ok := state.Attrs["id"]
+	if !ok || v.IsNull() {
+		state.Attrs["id"] = types.String{Value: {{.VarName}}.GetName()}
+	}
+
 	diags = resp.State.Set(ctx, &state)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {

diff --git a/integrations/terraform/provider/data_source_teleport_access_list.go b/integrations/terraform/provider/data_source_teleport_access_list.go
diff --git a/integrations/terraform/provider/data_source_teleport_access_monitoring_rule.go b/integrations/terraform/provider/data_source_teleport_access_monitoring_rule.go
diff --git a/integrations/terraform/provider/data_source_teleport_app.go b/integrations/terraform/provider/data_source_teleport_app.go
diff --git a/integrations/terraform/provider/data_source_teleport_auth_preference.go b/integrations/terraform/provider/data_source_teleport_auth_preference.go
diff --git a/integrations/terraform/provider/data_source_teleport_cluster_maintenance_config.go b/integrations/terraform/provider/data_source_teleport_cluster_maintenance_config.go
diff --git a/integrations/terraform/provider/data_source_teleport_cluster_networking_config.go b/integrations/terraform/provider/data_source_teleport_cluster_networking_config.go
diff --git a/integrations/terraform/provider/data_source_teleport_database.go b/integrations/terraform/provider/data_source_teleport_database.go
diff --git a/integrations/terraform/provider/data_source_teleport_device_trust.go b/integrations/terraform/provider/data_source_teleport_device_trust.go
diff --git a/integrations/terraform/provider/data_source_teleport_dynamic_windows_desktop.go b/integrations/terraform/provider/data_source_teleport_dynamic_windows_desktop.go
diff --git a/integrations/terraform/provider/data_source_teleport_github_connector.go b/integrations/terraform/provider/data_source_teleport_github_connector.go
diff --git a/integrations/terraform/provider/data_source_teleport_installer.go b/integrations/terraform/provider/data_source_teleport_installer.go
diff --git a/integrations/terraform/provider/data_source_teleport_login_rule.go b/integrations/terraform/provider/data_source_teleport_login_rule.go
diff --git a/integrations/terraform/provider/data_source_teleport_oidc_connector.go b/integrations/terraform/provider/data_source_teleport_oidc_connector.go
diff --git a/integrations/terraform/provider/data_source_teleport_okta_import_rule.go b/integrations/terraform/provider/data_source_teleport_okta_import_rule.go