From 9fef93a74e61a354c1a4a3cc318eb3d75467e9c6 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 16 Apr 2024 12:50:45 +0200 Subject: [PATCH 1/3] Reduce verbosity when checking if package embeds ECS --- internal/fields/validate.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/fields/validate.go b/internal/fields/validate.go index 9f5b5930ee..2c736dadad 100644 --- a/internal/fields/validate.go +++ b/internal/fields/validate.go @@ -303,9 +303,6 @@ func initDependencyManagement(packageRoot string, specVersion semver.Version, im // Check if the package embeds ECS mappings packageEmbedsEcsMappings := buildManifest.ImportMappings() && !specVersion.LessThan(semver2_3_0) - if !packageEmbedsEcsMappings { - logger.Debugf("Package does not embed ECS mappings") - } // Check if all stack versions support ECS mappings stackSupportsEcsMapping, err := supportsECSMappings(packageRoot) @@ -323,7 +320,7 @@ func initDependencyManagement(packageRoot string, specVersion semver.Version, im if err != nil { return nil, nil, err } - logger.Debug("Imported ECS fields definition from external schema for validation") + logger.Debug("Imported ECS fields definition from external schema for validation (package: %v, stack: %v)", packageEmbedsEcsMappings, stackSupportsEcsMapping) schema = ecsSchema } From c43423fecd761d0b26a2c2c92edaf95cc26b3059 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 16 Apr 2024 13:49:15 +0200 Subject: [PATCH 2/3] Fix formatting --- internal/fields/validate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/fields/validate.go b/internal/fields/validate.go index 2c736dadad..9796aab2f4 100644 --- a/internal/fields/validate.go +++ b/internal/fields/validate.go @@ -320,7 +320,7 @@ func initDependencyManagement(packageRoot string, specVersion semver.Version, im if err != nil { return nil, nil, err } - logger.Debug("Imported ECS fields definition from external schema for validation (package: %v, stack: %v)", packageEmbedsEcsMappings, stackSupportsEcsMapping) + logger.Debugf("Imported ECS fields definition from external schema for validation (package: %v, stack: %v)", packageEmbedsEcsMappings, stackSupportsEcsMapping) schema = ecsSchema } From 5e99b36e2f31ec9b2b82a799444ce6ba0a0c8ab9 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 16 Apr 2024 13:55:23 +0200 Subject: [PATCH 3/3] More descriptive --- internal/fields/validate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/fields/validate.go b/internal/fields/validate.go index 9796aab2f4..b4fb238cdf 100644 --- a/internal/fields/validate.go +++ b/internal/fields/validate.go @@ -320,7 +320,7 @@ func initDependencyManagement(packageRoot string, specVersion semver.Version, im if err != nil { return nil, nil, err } - logger.Debugf("Imported ECS fields definition from external schema for validation (package: %v, stack: %v)", packageEmbedsEcsMappings, stackSupportsEcsMapping) + logger.Debugf("Imported ECS fields definition from external schema for validation (embedded in package: %v, stack uses ecs@mappings template: %v)", packageEmbedsEcsMappings, stackSupportsEcsMapping) schema = ecsSchema }