Skip to content

Commit 258fb14

Browse files
Julia Krügerjanl
Julia Krüger
authored andcommitted
fix(create-version-branch): exit when versions are invalid
1 parent 50e6d7b commit 258fb14

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

jobs/create-group-version-branch.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ module.exports = async function (
158158
// get version for each dependency
159159
const npmDoc = await npm.get(isFromHook ? `${installationId}:${depName}` : depName)
160160
const latestDependencyVersion = npmDoc['distTags']['latest']
161+
if (!semver.valid(latestDependencyVersion)) {
162+
log.warn(`exited transform creation: ${depName} ${latestDependencyVersion} is not a valid version`)
163+
return null
164+
}
161165
const repoURL = _.get(npmDoc, `versions['${latestDependencyVersion}'].repository.url`)
162166

163167
return Promise.all(monorepo.map(async pkgRow => {
@@ -169,13 +173,17 @@ module.exports = async function (
169173
const oldPkgVersion = _.get(repoDoc, `packages['${pkg.filename}'].${pkg.type}.${depName}`)
170174
if (!oldPkgVersion) {
171175
log.warn(`exited transform creation: could not find old package version for ${depName}`, { newVersion: version, dependencyType: pkg.type, packageFile: _.get(repoDoc, `packages['${pkg.filename}']`) })
172-
return
176+
return null
177+
}
178+
if (!semver.validRange(oldPkgVersion)) {
179+
log.warn(`exited transform creation: ${depName} oldPkgVersion: ${oldPkgVersion} is not a valid version`, { newVersion: latestDependencyVersion, oldVersion: oldPkgVersion })
180+
return null
173181
}
174182
const satisfies = semver.satisfies(latestDependencyVersion, oldPkgVersion)
175183
// no downgrades
176184
if (semver.ltr(latestDependencyVersion, oldPkgVersion)) {
177185
log.warn(`exited transform creation: ${depName} ${latestDependencyVersion} would be a downgrade from ${oldPkgVersion}`, { newVersion: latestDependencyVersion, oldVersion: oldPkgVersion })
178-
return
186+
return null
179187
}
180188

181189
const transforms = []

jobs/create-version-branch.js

+8
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,18 @@ module.exports = async function (
131131
log.warn(`exited transform creation: could not find old package version for ${depName}`, { newVersion: version, dependencyType, packageFile: _.get(json, [dependencyType]) })
132132
return null
133133
}
134+
if (!semver.validRange(oldPkgVersion)) {
135+
log.warn(`exited transform creation: ${depName} oldPkgVersion: ${oldPkgVersion} is not a valid version`, { newVersion: version, oldVersion: oldPkgVersion })
136+
return null
137+
}
134138

135139
// get version for each dependency
136140
const npmDoc = await npm.get(isFromHook ? `${installationId}:${depName}` : depName)
137141
const latestDependencyVersion = npmDoc['distTags']['latest']
142+
if (!semver.validRange(latestDependencyVersion)) {
143+
log.warn(`exited transform creation: ${depName} latest: ${latestDependencyVersion} is not a valid version`, { newVersion: latestDependencyVersion, oldVersion: oldPkgVersion })
144+
return null
145+
}
138146
const repoURL = _.get(npmDoc, `versions['${latestDependencyVersion}'].repository.url`)
139147

140148
if (semver.ltr(latestDependencyVersion, oldPkgVersion)) { // no downgrades

0 commit comments

Comments
 (0)