tfsdk: Return attr.Value being nil as its own error diagnostic

Author: bflad

tfsdk/config.go

@@ -26,7 +26,17 @@ func (c Config) Get(ctx context.Context, target interface{}) diag.Diagnostics {
 func (c Config) GetAttribute(ctx context.Context, path *tftypes.AttributePath, target interface{}) diag.Diagnostics {
 	attrValue, diags := c.getAttributeValue(ctx, path)
 
-	if attrValue == nil || diags.HasError() {
+	if diags.HasError() {
+		return diags
+	}
+
+	if attrValue == nil {
+		diags.AddAttributeError(
+			path,
+			"Config Read Error",
+			"An unexpected error was encountered trying to read an attribute from the configuration. This is always an error in the provider. Please report the following to the provider developer:\n\n"+
+				"Missing attribute value, however no error was returned. Preventing the panic from this situation.",
+		)
 		return diags
 	}
 

tfsdk/plan.go

@@ -26,7 +26,17 @@ func (p Plan) Get(ctx context.Context, target interface{}) diag.Diagnostics {
 func (p Plan) GetAttribute(ctx context.Context, path *tftypes.AttributePath, target interface{}) diag.Diagnostics {
 	attrValue, diags := p.getAttributeValue(ctx, path)
 
-	if attrValue == nil || diags.HasError() {
+	if diags.HasError() {
+		return diags
+	}
+
+	if attrValue == nil {
+		diags.AddAttributeError(
+			path,
+			"Plan Read Error",
+			"An unexpected error was encountered trying to read an attribute from the plan. This is always an error in the provider. Please report the following to the provider developer:\n\n"+
+				"Missing attribute value, however no error was returned. Preventing the panic from this situation.",
+		)
 		return diags
 	}
 

tfsdk/state.go

@@ -26,7 +26,17 @@ func (s State) Get(ctx context.Context, target interface{}) diag.Diagnostics {
 func (s State) GetAttribute(ctx context.Context, path *tftypes.AttributePath, target interface{}) diag.Diagnostics {
 	attrValue, diags := s.getAttributeValue(ctx, path)
 
-	if attrValue == nil || diags.HasError() {
+	if diags.HasError() {
+		return diags
+	}
+
+	if attrValue == nil {
+		diags.AddAttributeError(
+			path,
+			"State Read Error",
+			"An unexpected error was encountered trying to read an attribute from the state. This is always an error in the provider. Please report the following to the provider developer:\n\n"+
+				"Missing attribute value, however no error was returned. Preventing the panic from this situation.",
+		)
 		return diags
 	}