From 46967daf11a4fa758109dc9d6c261ee0561b1fbb Mon Sep 17 00:00:00 2001 From: Zheng Xi Zhou Date: Tue, 15 Feb 2022 18:53:40 +0800 Subject: [PATCH] Fix: fixed required items for a Terraform ComponentDefinition (#3257) If a Terraform variable is required, the item in OpenAPI schema is required. Signed-off-by: Zheng Xi Zhou --- pkg/controller/utils/capability.go | 4 +++- pkg/controller/utils/capability_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/controller/utils/capability.go b/pkg/controller/utils/capability.go index c8d53c37b..33655dec4 100644 --- a/pkg/controller/utils/capability.go +++ b/pkg/controller/utils/capability.go @@ -194,7 +194,9 @@ func GetOpenAPISchemaFromTerraformComponentDefinition(configuration string) ([]b } } schema.Title = k - required = append(required, k) + if v.Required { + required = append(required, k) + } if v.Default != nil { schema.Default = v.Default } diff --git a/pkg/controller/utils/capability_test.go b/pkg/controller/utils/capability_test.go index 1dfed4254..02a238b06 100644 --- a/pkg/controller/utils/capability_test.go +++ b/pkg/controller/utils/capability_test.go @@ -317,7 +317,7 @@ variable "mapVar" { type = "map" }`, want: want{ - subStr: "account_name", + subStr: `"required":["intVar","boolVar","listVar","mapVar"]`, err: nil, }, },