Skip to content

Commit 9e65c97

Browse files
authored
Move spec version check for import mappings (#1099)
1 parent 74bc706 commit 9e65c97

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

internal/builder/dynamic_mappings.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ func shouldImportEcsMappings(specVersion, packageRoot string) (bool, error) {
8989
return false, errors.Wrap(err, "invalid spec version")
9090
}
9191

92-
if v.LessThan(semver2_3_0) {
93-
logger.Debugf("Required spec version >= %s to import ECS mappings", semver2_3_0.String())
94-
return false, nil
95-
}
96-
9792
bm, ok, err := buildmanifest.ReadBuildManifest(packageRoot)
9893
if err != nil {
9994
return false, errors.Wrap(err, "can't read build manifest")
@@ -106,6 +101,12 @@ func shouldImportEcsMappings(specVersion, packageRoot string) (bool, error) {
106101
logger.Debug("Package doesn't have to import ECS mappings")
107102
return false, nil
108103
}
104+
105+
if v.LessThan(semver2_3_0) {
106+
logger.Debugf("Required spec version >= %s to import ECS mappings", semver2_3_0.String())
107+
return false, nil
108+
}
109+
109110
return true, nil
110111
}
111112

0 commit comments

Comments
 (0)