fixup! pr feedback

edgelesssys · Nov 28, 2023 · 810d7e3 · 810d7e3
1 parent 84991fe
commit 810d7e3
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/terraform-provider-constellation/internal/provider/attestation_data_source.go b/terraform-provider-constellation/internal/provider/attestation_data_source.go
@@ -197,11 +197,11 @@ func (d *AttestationDataSource) Read(ctx context.Context, req datasource.ReadReq
 			resp.Diagnostics.AddError("Fetching SNP Version numbers", err.Error())
 			return
 		}
-		tfSnpVersions := convertSNPAttestationTfStateCompatible(resp, attestationVariant, snpVersions)
-		if resp.Diagnostics.HasError() {
-			return
+		tfSnpAttestation, err := convertSNPAttestationTfStateCompatible(attestationVariant, snpVersions)
+		if err != nil {
+			resp.Diagnostics.AddError("Converting SNP attestation", err.Error())
 		}
-		diags := resp.State.SetAttribute(ctx, path.Root("attestation"), tfSnpVersions)
+		diags := resp.State.SetAttribute(ctx, path.Root("attestation"), tfSnpAttestation)
 		resp.Diagnostics.Append(diags...)
 		if resp.Diagnostics.HasError() {
 			return
@@ -229,9 +229,9 @@ func (d *AttestationDataSource) Read(ctx context.Context, req datasource.ReadReq
 	tflog.Trace(ctx, "read constellation attestation data source")
 }
 
-func convertSNPAttestationTfStateCompatible(resp *datasource.ReadResponse, attestationVariant variant.Variant,
+func convertSNPAttestationTfStateCompatible(attestationVariant variant.Variant,
 	snpVersions attestationconfigapi.SEVSNPVersionAPI,
-) sevSnpAttestation {
+) (tfSnpAttestation sevSnpAttestation, err error) {
 	var cert config.Certificate
 	switch attestationVariant.(type) {
 	case variant.AWSSEVSNP:
@@ -241,9 +241,9 @@ func convertSNPAttestationTfStateCompatible(resp *datasource.ReadResponse, attes
 	}
 	certBytes, err := cert.MarshalJSON()
 	if err != nil {
-		resp.Diagnostics.AddError("Marshalling AMD Root Key", err.Error())
+		return tfSnpAttestation, err
 	}
-	tfSnpVersions := sevSnpAttestation{
+	tfSnpAttestation = sevSnpAttestation{
 		BootloaderVersion: snpVersions.Bootloader,
 		TEEVersion:        snpVersions.TEE,
 		SNPVersion:        snpVersions.SNP,
@@ -254,19 +254,19 @@ func convertSNPAttestationTfStateCompatible(resp *datasource.ReadResponse, attes
 		firmwareCfg := config.DefaultForAzureSEVSNP().FirmwareSignerConfig
 		keyDigestAny, err := firmwareCfg.AcceptedKeyDigests.MarshalYAML()
 		if err != nil {
-			resp.Diagnostics.AddError("Marshalling Accepted Key Digests", err.Error())
+			return tfSnpAttestation, err
 		}
 		keyDigest, ok := keyDigestAny.([]string)
 		if !ok {
-			resp.Diagnostics.AddError("Reading Accepted Key Digests", "Could not convert to []string")
+			return tfSnpAttestation, errors.New("reading Accepted Key Digests: could not convert to []string")
 		}
-		tfSnpVersions.AzureSNPFirmwareSignerConfig = azureSnpFirmwareSignerConfig{
+		tfSnpAttestation.AzureSNPFirmwareSignerConfig = azureSnpFirmwareSignerConfig{
 			AcceptedKeyDigests: keyDigest,
 			EnforcementPolicy:  firmwareCfg.EnforcementPolicy.String(),
 			MAAURL:             firmwareCfg.MAAURL,
 		}
 	}
-	return tfSnpVersions
+	return tfSnpAttestation, nil
 }
 
 func convertMeasurementsTfStateCompatible(m measurements.M) map[string]measurement {