From fe5586df07458b2f92f61240b2f1c336a8c21c55 Mon Sep 17 00:00:00 2001 From: Ramon Snir Date: Tue, 27 Aug 2024 14:34:20 -0400 Subject: [PATCH] fix environment variable branch value validation --- ...vironment_variable_context_parameter_validator.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/internal/provider/netlify_validators/environment_variable_context_parameter_validator.go b/internal/provider/netlify_validators/environment_variable_context_parameter_validator.go index 5fd8787..9f68186 100644 --- a/internal/provider/netlify_validators/environment_variable_context_parameter_validator.go +++ b/internal/provider/netlify_validators/environment_variable_context_parameter_validator.go @@ -79,12 +79,20 @@ func (av EnvironmentVariableContextParameterValidator) Validate(ctx context.Cont continue } - isBranch := !mpVal.IsNull() && mpVal.Equal(listValue) + var mpValList basetypes.ListValue + mpValList, diags = types.ListValue(types.StringType, []attr.Value{mpVal}) + res.Diagnostics.Append(diags...) + + // Collect all errors + if diags.HasError() { + continue + } + isBranch := !mpVal.IsNull() && mpValList.Equal(listValue) if isNonEmpty != isBranch { res.Diagnostics.Append(validatordiag.InvalidAttributeCombinationDiagnostic( req.Path, - fmt.Sprintf("Attribute %q must be a non-empty string iff %q is specified", req.Path, mp), + fmt.Sprintf("Attribute %q must be a non-empty string iff %q is specified %q %q %q", req.Path, mp, listValue, mpVal, req.ConfigValue), )) } }