chore: extract sops_external logic

Author: vdbe

sops/data.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
@@ -59,3 +60,22 @@ func getFileData(sourceFile types.String, inputType types.String) (data map[stri
 	}
 	return data, raw, nil
 }
+
+func getExternalData(source types.String, inputType types.String) (data map[string]string, raw string, err error) {
+	content, err := ioutil.ReadAll(strings.NewReader(source.ValueString()))
+	if err != nil {
+		return nil, "", newSummaryError("Error reading source", err)
+	}
+
+	format := inputType.ValueString()
+	if err := validateInputType(format); err != nil {
+		return nil, "", newSummaryError("Invalid input type", err)
+	}
+
+	data, raw, err = readData(content, format)
+	if err != nil {
+		return nil, "", newSummaryError("Error reading data", err)
+	}
+
+	return data, raw, nil
+}

sops/data_sops_external.go

@@ -2,8 +2,6 @@ package sops
 
 import (
 	"context"
-	"io/ioutil"
-	"strings"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
@@ -70,22 +68,13 @@ func (d *externalDataSource) Read(ctx context.Context, req datasource.ReadReques
 		return
 	}
 
-	source := config.Source.ValueString()
-	content, err := ioutil.ReadAll(strings.NewReader(source))
+	data, raw, err := getExternalData(config.Source, config.InputType)
 	if err != nil {
-		resp.Diagnostics.AddError("Error reading source", err.Error())
-		return
-	}
-
-	format := config.InputType.ValueString()
-	if err := validateInputType(format); err != nil {
-		resp.Diagnostics.AddError("Invalid input type", err.Error())
-		return
-	}
-
-	data, raw, err := readData(content, format)
-	if err != nil {
-		resp.Diagnostics.AddError("Error reading data", err.Error())
+		if detailedErr, ok := err.(summaryError); ok {
+			resp.Diagnostics.AddError(detailedErr.Summary, detailedErr.Err.Error())
+		} else {
+			resp.Diagnostics.AddError("Failed to decrypt file", err.Error())
+		}
 		return
 	}
 

sops/ephemeral_sops_external.go

@@ -2,8 +2,6 @@ package sops
 
 import (
 	"context"
-	"io/ioutil"
-	"strings"
 
 	"github.com/hashicorp/terraform-plugin-framework/ephemeral"
 	"github.com/hashicorp/terraform-plugin-framework/ephemeral/schema"
@@ -65,22 +63,13 @@ func (d *externalEphemeralResource) Open(ctx context.Context, req ephemeral.Open
 		return
 	}
 
-	source := config.Source.ValueString()
-	content, err := ioutil.ReadAll(strings.NewReader(source))
+	data, raw, err := getExternalData(config.Source, config.InputType)
 	if err != nil {
-		resp.Diagnostics.AddError("Error reading source", err.Error())
-		return
-	}
-
-	format := config.InputType.ValueString()
-	if err := validateInputType(format); err != nil {
-		resp.Diagnostics.AddError("Invalid input type", err.Error())
-		return
-	}
-
-	data, raw, err := readData(content, format)
-	if err != nil {
-		resp.Diagnostics.AddError("Error reading data", err.Error())
+		if detailedErr, ok := err.(summaryError); ok {
+			resp.Diagnostics.AddError(detailedErr.Summary, detailedErr.Err.Error())
+		} else {
+			resp.Diagnostics.AddError("Failed to decrypt file", err.Error())
+		}
 		return
 	}