@@ -7,40 +7,53 @@ import {
77 validateDappnodeCompose ,
88 validateNotificationsSchema
99} from "@dappnode/schemas" ;
10- import { getComposePath } from "../../files/index.js" ;
10+ import {
11+ getComposePath ,
12+ stripComposeVersion as removeComposeVersion
13+ } from "../../files/index.js" ;
1114import { CliError } from "../../params.js" ;
1215
1316export function getFileValidationTask ( {
1417 packagesToBuildProps,
15- skipComposeValidation
18+ skipComposeValidation,
19+ stripComposeVersion
1620} : {
1721 packagesToBuildProps : PackageToBuildProps [ ] ;
1822 skipComposeValidation ?: boolean ;
23+ stripComposeVersion ?: boolean ;
1924} ) : ListrTask < ListrContextBuild > {
2025 return {
2126 title : `Validate files` ,
2227 task : async ( ) =>
2328 await validatePackageFiles ( {
2429 packagesToBuildProps,
25- skipComposeValidation
30+ skipComposeValidation,
31+ stripComposeVersion
2632 } )
2733 } ;
2834}
2935
3036async function validatePackageFiles ( {
3137 packagesToBuildProps,
32- skipComposeValidation
38+ skipComposeValidation,
39+ stripComposeVersion
3340} : {
3441 packagesToBuildProps : PackageToBuildProps [ ] ;
3542 skipComposeValidation ?: boolean ;
43+ stripComposeVersion ?: boolean ;
3644} ) : Promise < void > {
3745 for ( const pkgProps of packagesToBuildProps )
38- await validateVariantFiles ( pkgProps , skipComposeValidation ) ;
46+ await validateVariantFiles (
47+ pkgProps ,
48+ skipComposeValidation ,
49+ stripComposeVersion
50+ ) ;
3951}
4052
4153async function validateVariantFiles (
4254 pkgProps : PackageToBuildProps ,
43- skipComposeValidation ?: boolean
55+ skipComposeValidation ?: boolean ,
56+ stripComposeVersion ?: boolean
4457) : Promise < void > {
4558 const {
4659 manifest,
@@ -75,8 +88,9 @@ async function validateVariantFiles(
7588 // Validate notifications schema
7689 if ( notifications ) validateNotificationsSchema ( notifications ) ;
7790
78- // Validate setup wizard schema
79- if ( setupWizard ) validateSetupWizardSchema ( setupWizard ) ;
91+ // Keep version available for the Dappnode validation above. Stripping is
92+ // opt-in while support for versionless Compose files is being tested.
93+ if ( stripComposeVersion ) removeComposeVersion ( compose ) ;
8094}
8195
8296function validatePackageName ( name : string ) : void {
0 commit comments