From c8ca4267ef63f0a08e0acf64403a8a76b6650fac Mon Sep 17 00:00:00 2001 From: IKEDA Sho <suicaicoca@gmail.com> Date: Tue, 9 Aug 2022 00:20:16 +0900 Subject: [PATCH] fix(manager): correctly escape the dot character in fileMatch (#17048) --- lib/config/index.spec.ts | 2 +- lib/modules/manager/cargo/index.ts | 2 +- lib/modules/manager/circleci/index.ts | 2 +- lib/modules/manager/cloudbuild/index.ts | 2 +- lib/modules/manager/composer/index.ts | 2 +- lib/modules/manager/droneci/index.ts | 2 +- lib/modules/manager/fleet/index.ts | 2 +- lib/modules/manager/git-submodules/index.ts | 2 +- lib/modules/manager/gomod/index.ts | 2 +- lib/modules/manager/gradle-wrapper/index.ts | 2 +- lib/modules/manager/helm-values/index.ts | 2 +- lib/modules/manager/helmfile/index.ts | 2 +- lib/modules/manager/helmv3/index.ts | 2 +- lib/modules/manager/jsonnet-bundler/index.ts | 2 +- lib/modules/manager/meteor/index.ts | 2 +- lib/modules/manager/nodenv/index.ts | 2 +- lib/modules/manager/npm/index.ts | 2 +- lib/modules/manager/pip_setup/index.ts | 2 +- lib/modules/manager/pyenv/index.ts | 2 +- lib/modules/manager/travis/index.ts | 2 +- lib/modules/manager/velaci/index.ts | 2 +- lib/workers/repository/extract/file-match.spec.ts | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/config/index.spec.ts b/lib/config/index.spec.ts index 3b73bbca77..41deb82830 100644 --- a/lib/config/index.spec.ts +++ b/lib/config/index.spec.ts @@ -95,7 +95,7 @@ describe('config/index', () => { const configParser = await import('./index'); const config = configParser.getManagerConfig(parentConfig, 'npm'); expect(config).toContainEntries([ - ['fileMatch', ['(^|/)package.json$']], + ['fileMatch', ['(^|/)package\\.json$']], ['rollbackPrs', true], ]); expect( diff --git a/lib/modules/manager/cargo/index.ts b/lib/modules/manager/cargo/index.ts index d5814360e2..c910bbb819 100644 --- a/lib/modules/manager/cargo/index.ts +++ b/lib/modules/manager/cargo/index.ts @@ -11,7 +11,7 @@ export { extractPackageFile, updateArtifacts }; export const defaultConfig = { commitMessageTopic: 'Rust crate {{depName}}', - fileMatch: ['(^|/)Cargo.toml$'], + fileMatch: ['(^|/)Cargo\\.toml$'], versioning: cargoVersioning.id, rangeStrategy: 'bump', }; diff --git a/lib/modules/manager/circleci/index.ts b/lib/modules/manager/circleci/index.ts index 7214cac5e7..8505e9d39c 100644 --- a/lib/modules/manager/circleci/index.ts +++ b/lib/modules/manager/circleci/index.ts @@ -8,7 +8,7 @@ export const displayName = 'CircleCI'; export const url = 'https://circleci.com/docs/configuration-reference'; export const defaultConfig = { - fileMatch: ['(^|/).circleci/config.yml$'], + fileMatch: ['(^|/)\\.circleci/config\\.yml$'], }; export const supportedDatasources = [DockerDatasource.id, OrbDatasource.id]; diff --git a/lib/modules/manager/cloudbuild/index.ts b/lib/modules/manager/cloudbuild/index.ts index b1c2d7f1c4..979535276c 100644 --- a/lib/modules/manager/cloudbuild/index.ts +++ b/lib/modules/manager/cloudbuild/index.ts @@ -4,7 +4,7 @@ import { extractPackageFile } from './extract'; export { extractPackageFile }; export const defaultConfig = { - fileMatch: ['(^|/)cloudbuild.ya?ml'], + fileMatch: ['(^|/)cloudbuild\\.ya?ml'], }; export const supportedDatasources = [DockerDatasource.id]; diff --git a/lib/modules/manager/composer/index.ts b/lib/modules/manager/composer/index.ts index be97967a83..90a5a32742 100644 --- a/lib/modules/manager/composer/index.ts +++ b/lib/modules/manager/composer/index.ts @@ -18,7 +18,7 @@ export { }; export const defaultConfig = { - fileMatch: ['(^|/)([\\w-]*)composer.json$'], + fileMatch: ['(^|/)([\\w-]*)composer\\.json$'], versioning: composerVersioningId, }; diff --git a/lib/modules/manager/droneci/index.ts b/lib/modules/manager/droneci/index.ts index 8206a481a5..85f60b8c42 100644 --- a/lib/modules/manager/droneci/index.ts +++ b/lib/modules/manager/droneci/index.ts @@ -7,7 +7,7 @@ export const language = ProgrammingLanguage.Docker; export { extractPackageFile }; export const defaultConfig = { - fileMatch: ['(^|/).drone.yml$'], + fileMatch: ['(^|/)\\.drone\\.yml$'], }; export const supportedDatasources = [DockerDatasource.id]; diff --git a/lib/modules/manager/fleet/index.ts b/lib/modules/manager/fleet/index.ts index 997a8501ac..c864589db2 100644 --- a/lib/modules/manager/fleet/index.ts +++ b/lib/modules/manager/fleet/index.ts @@ -4,7 +4,7 @@ import { HelmDatasource } from '../../datasource/helm'; export { extractPackageFile } from './extract'; export const defaultConfig = { - fileMatch: ['(^|/)fleet.ya?ml'], + fileMatch: ['(^|/)fleet\\.ya?ml'], }; export const supportedDatasources = [GitTagsDatasource.id, HelmDatasource.id]; diff --git a/lib/modules/manager/git-submodules/index.ts b/lib/modules/manager/git-submodules/index.ts index a420292c7c..cd3da8667d 100644 --- a/lib/modules/manager/git-submodules/index.ts +++ b/lib/modules/manager/git-submodules/index.ts @@ -8,7 +8,7 @@ export { default as updateArtifacts } from './artifacts'; export const defaultConfig = { enabled: false, versioning: gitVersioning.id, - fileMatch: ['(^|/).gitmodules$'], + fileMatch: ['(^|/)\\.gitmodules$'], }; export const supportedDatasources = [GitRefsDatasource.id]; diff --git a/lib/modules/manager/gomod/index.ts b/lib/modules/manager/gomod/index.ts index 1e479f6e43..271b5c1258 100644 --- a/lib/modules/manager/gomod/index.ts +++ b/lib/modules/manager/gomod/index.ts @@ -13,7 +13,7 @@ export const url = 'https://go.dev/ref/mod'; export const language = ProgrammingLanguage.Golang; export const defaultConfig = { - fileMatch: ['(^|/)go.mod$'], + fileMatch: ['(^|/)go\\.mod$'], }; export const supportedDatasources = [ diff --git a/lib/modules/manager/gradle-wrapper/index.ts b/lib/modules/manager/gradle-wrapper/index.ts index f3b90c2237..76fae92837 100644 --- a/lib/modules/manager/gradle-wrapper/index.ts +++ b/lib/modules/manager/gradle-wrapper/index.ts @@ -5,7 +5,7 @@ export { extractPackageFile } from './extract'; export { updateArtifacts } from './artifacts'; export const defaultConfig = { - fileMatch: ['(^|/)gradle/wrapper/gradle-wrapper.properties$'], + fileMatch: ['(^|/)gradle/wrapper/gradle-wrapper\\.properties$'], versioning, }; diff --git a/lib/modules/manager/helm-values/index.ts b/lib/modules/manager/helm-values/index.ts index f941ce8694..10f681049c 100644 --- a/lib/modules/manager/helm-values/index.ts +++ b/lib/modules/manager/helm-values/index.ts @@ -3,7 +3,7 @@ export { extractPackageFile } from './extract'; export const defaultConfig = { commitMessageTopic: 'helm values {{depName}}', - fileMatch: ['(^|/)values.yaml$'], + fileMatch: ['(^|/)values\\.yaml$'], pinDigests: false, }; diff --git a/lib/modules/manager/helmfile/index.ts b/lib/modules/manager/helmfile/index.ts index 36e82e44ff..ca2b6b0995 100644 --- a/lib/modules/manager/helmfile/index.ts +++ b/lib/modules/manager/helmfile/index.ts @@ -7,7 +7,7 @@ export const defaultConfig = { stable: 'https://charts.helm.sh/stable', }, commitMessageTopic: 'helm chart {{depName}}', - fileMatch: ['(^|/)helmfile.yaml$'], + fileMatch: ['(^|/)helmfile\\.yaml$'], }; export const supportedDatasources = [HelmDatasource.id, DockerDatasource.id]; diff --git a/lib/modules/manager/helmv3/index.ts b/lib/modules/manager/helmv3/index.ts index b0714f85cf..006145b5c8 100644 --- a/lib/modules/manager/helmv3/index.ts +++ b/lib/modules/manager/helmv3/index.ts @@ -11,7 +11,7 @@ export const defaultConfig = { stable: 'https://charts.helm.sh/stable', }, commitMessageTopic: 'helm chart {{depName}}', - fileMatch: ['(^|/)Chart.yaml$'], + fileMatch: ['(^|/)Chart\\.yaml$'], }; export const supportedDatasources = [DockerDatasource.id, HelmDatasource.id]; diff --git a/lib/modules/manager/jsonnet-bundler/index.ts b/lib/modules/manager/jsonnet-bundler/index.ts index df3ddd9a4d..fec3158e0d 100644 --- a/lib/modules/manager/jsonnet-bundler/index.ts +++ b/lib/modules/manager/jsonnet-bundler/index.ts @@ -5,7 +5,7 @@ export { extractPackageFile } from './extract'; export const supportsLockFileMaintenance = true; export const defaultConfig = { - fileMatch: ['(^|/)jsonnetfile.json$'], + fileMatch: ['(^|/)jsonnetfile\\.json$'], datasource: GitTagsDatasource.id, }; diff --git a/lib/modules/manager/meteor/index.ts b/lib/modules/manager/meteor/index.ts index 38d833b5d7..c922b28096 100644 --- a/lib/modules/manager/meteor/index.ts +++ b/lib/modules/manager/meteor/index.ts @@ -6,7 +6,7 @@ export { extractPackageFile } from './extract'; export const language = ProgrammingLanguage.JavaScript; export const defaultConfig = { - fileMatch: ['(^|/)package.js$'], + fileMatch: ['(^|/)package\\.js$'], }; export const supportedDatasources = [NpmDatasource.id]; diff --git a/lib/modules/manager/nodenv/index.ts b/lib/modules/manager/nodenv/index.ts index 92989c7269..c5bbc91460 100644 --- a/lib/modules/manager/nodenv/index.ts +++ b/lib/modules/manager/nodenv/index.ts @@ -10,7 +10,7 @@ export const url = 'https://github.com/nodenv/nodenv'; export const language = ProgrammingLanguage.NodeJS; export const defaultConfig = { - fileMatch: ['(^|/).node-version$'], + fileMatch: ['(^|/)\\.node-version$'], versioning: nodeVersioning.id, }; diff --git a/lib/modules/manager/npm/index.ts b/lib/modules/manager/npm/index.ts index b43da44507..24a12df8d9 100644 --- a/lib/modules/manager/npm/index.ts +++ b/lib/modules/manager/npm/index.ts @@ -16,7 +16,7 @@ export const language = ProgrammingLanguage.JavaScript; export const supportsLockFileMaintenance = true; export const defaultConfig = { - fileMatch: ['(^|/)package.json$'], + fileMatch: ['(^|/)package\\.json$'], rollbackPrs: true, versioning: npmVersioning.id, digest: { diff --git a/lib/modules/manager/pip_setup/index.ts b/lib/modules/manager/pip_setup/index.ts index 8b1c016a0b..261eced13d 100644 --- a/lib/modules/manager/pip_setup/index.ts +++ b/lib/modules/manager/pip_setup/index.ts @@ -6,7 +6,7 @@ export { extractPackageFile } from './extract'; export const language = ProgrammingLanguage.Python; export const defaultConfig = { - fileMatch: ['(^|/)setup.py$'], + fileMatch: ['(^|/)setup\\.py$'], }; export const supportedDatasources = [PypiDatasource.id]; diff --git a/lib/modules/manager/pyenv/index.ts b/lib/modules/manager/pyenv/index.ts index 6a89e4c120..e235d49349 100644 --- a/lib/modules/manager/pyenv/index.ts +++ b/lib/modules/manager/pyenv/index.ts @@ -9,6 +9,6 @@ export const language = ProgrammingLanguage.Python; export const supportedDatasources = [DockerDatasource.id]; export const defaultConfig = { - fileMatch: ['(^|/).python-version$'], + fileMatch: ['(^|/)\\.python-version$'], versioning: dockerVersioning.id, }; diff --git a/lib/modules/manager/travis/index.ts b/lib/modules/manager/travis/index.ts index 4c0de0736a..4a03418b5d 100644 --- a/lib/modules/manager/travis/index.ts +++ b/lib/modules/manager/travis/index.ts @@ -9,7 +9,7 @@ export const language = ProgrammingLanguage.NodeJS; export const supportedDatasources = [GithubTagsDatasource.id]; export const defaultConfig = { - fileMatch: ['^.travis.yml$'], + fileMatch: ['^\\.travis\\.yml$'], major: { enabled: false, }, diff --git a/lib/modules/manager/velaci/index.ts b/lib/modules/manager/velaci/index.ts index 4b08231104..1c8489921f 100644 --- a/lib/modules/manager/velaci/index.ts +++ b/lib/modules/manager/velaci/index.ts @@ -3,7 +3,7 @@ import { DockerDatasource } from '../../datasource/docker'; export { extractPackageFile } from './extract'; export const defaultConfig = { - fileMatch: ['(^|/).vela.ya?ml$'], + fileMatch: ['(^|/)\\.vela\\.ya?ml$'], }; export const supportedDatasources = [DockerDatasource.id]; diff --git a/lib/workers/repository/extract/file-match.spec.ts b/lib/workers/repository/extract/file-match.spec.ts index 40ba83eea6..85942c05c3 100644 --- a/lib/workers/repository/extract/file-match.spec.ts +++ b/lib/workers/repository/extract/file-match.spec.ts @@ -53,7 +53,7 @@ describe('workers/repository/extract/file-match', () => { includePaths: [], ignorePaths: [], manager: 'npm', - fileMatch: ['(^|/)package.json$'], + fileMatch: ['(^|/)package\\.json$'], }; it('returns npm files', () => { -- GitLab