From 8c584d0b62ac53de474c81a84913767ef68e3a7d Mon Sep 17 00:00:00 2001 From: Salome Papiashvili Date: Wed, 10 Apr 2024 14:34:01 +0200 Subject: [PATCH] Minor fix to address ambiguity in error message. (#10389) --- .../services/composer/resource_composer_environment.go.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_environment.go.erb b/mmv1/third_party/terraform/services/composer/resource_composer_environment.go.erb index 2a2f0b545757..1164d8d7904d 100644 --- a/mmv1/third_party/terraform/services/composer/resource_composer_environment.go.erb +++ b/mmv1/third_party/terraform/services/composer/resource_composer_environment.go.erb @@ -173,8 +173,10 @@ func ResourceComposerEnvironment() *schema.Resource { <% unless version == "ga" -%> customdiff.ForceNewIf("config.0.node_config.0.network", forceNewCustomDiff("config.0.node_config.0.network")), customdiff.ForceNewIf("config.0.node_config.0.subnetwork", forceNewCustomDiff("config.0.node_config.0.subnetwork")), - customdiff.ValidateChange("config.0.software_config.0.image_version", imageVersionChangeValidationFunc), - versionValidationCustomizeDiffFunc, + customdiff.Sequence( + customdiff.ValidateChange("config.0.software_config.0.image_version", imageVersionChangeValidationFunc), + versionValidationCustomizeDiffFunc, + ), <% end -%> ),