From 36f6b1434c35b59fbb89fc8d627ee9e39fcdcf46 Mon Sep 17 00:00:00 2001 From: Dominik Richter Date: Tue, 19 Sep 2023 01:46:19 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20add=20missing=20fields=20to=20sc?= =?UTF-8?q?hema=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We never merged the Name and the min version Signed-off-by: Dominik Richter --- providers-sdk/v1/resources/schema.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/providers-sdk/v1/resources/schema.go b/providers-sdk/v1/resources/schema.go index f00b5c77ad..5d736e8e27 100644 --- a/providers-sdk/v1/resources/schema.go +++ b/providers-sdk/v1/resources/schema.go @@ -17,15 +17,21 @@ func (s *Schema) Add(other *Schema) *Schema { existing.IsExtension = v.IsExtension existing.Provider = v.Provider existing.Init = v.Init - } else if !v.IsExtension { - // TODO: clean up any resource that clashes right now. There are a few - // implicit extensions that cause this behavior at the moment. - // log.Warn().Str("resource", k).Msg("found a resource that is not flagged as `extends` properly") } + // TODO: clean up any resource that clashes right now. There are a few + // implicit extensions that cause this behavior at the moment. + // log.Warn().Str("resource", k).Msg("found a resource that is not flagged as `extends` properly") + // else if !v.IsExtension {} if v.Title != "" { existing.Title = v.Title } + if v.Name != "" { + existing.Name = v.Name + } + if v.MinMondooVersion != "" { + existing.MinMondooVersion = v.MinMondooVersion + } if v.Desc != "" { existing.Desc = v.Desc }