From cf15952924e8a1840de0926147fdbeb6dca25304 Mon Sep 17 00:00:00 2001 From: Sebastian Poxhofer <secustor@users.noreply.github.com> Date: Wed, 25 Jan 2023 01:07:30 +0100 Subject: [PATCH] feat(manager/terraform): export updateLockedDependency (#20027) --- lib/modules/manager/terraform/index.ts | 1 + .../manager/terraform/lockfile/update-locked.ts | 2 +- .../repository/update/branch/get-updated.spec.ts | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/modules/manager/terraform/index.ts b/lib/modules/manager/terraform/index.ts index 0e85a8a1fe..06aedc5420 100644 --- a/lib/modules/manager/terraform/index.ts +++ b/lib/modules/manager/terraform/index.ts @@ -8,6 +8,7 @@ import { TerraformModuleDatasource } from '../../datasource/terraform-module'; import { TerraformProviderDatasource } from '../../datasource/terraform-provider'; export { updateArtifacts } from './lockfile'; +export { updateLockedDependency } from './lockfile/update-locked'; export { extractPackageFile } from './extract'; export const supportedDatasources = [ diff --git a/lib/modules/manager/terraform/lockfile/update-locked.ts b/lib/modules/manager/terraform/lockfile/update-locked.ts index 962fd5bce6..6a00d7f6b5 100644 --- a/lib/modules/manager/terraform/lockfile/update-locked.ts +++ b/lib/modules/manager/terraform/lockfile/update-locked.ts @@ -19,7 +19,7 @@ export function updateLockedDependency( } return { status: 'unsupported' }; } catch (err) { - logger.debug({ err }, 'bundler.updateLockedDependency() error'); + logger.debug({ err }, 'terraform.updateLockedDependency() error'); return { status: 'update-failed' }; } } diff --git a/lib/workers/repository/update/branch/get-updated.spec.ts b/lib/workers/repository/update/branch/get-updated.spec.ts index 0f335cf143..9dc3d2702d 100644 --- a/lib/workers/repository/update/branch/get-updated.spec.ts +++ b/lib/workers/repository/update/branch/get-updated.spec.ts @@ -1,11 +1,11 @@ import { getConfig, git, mocked } from '../../../../../test/util'; import { GitRefsDatasource } from '../../../../modules/datasource/git-refs'; +import * as _batectWrapper from '../../../../modules/manager/batect-wrapper'; import * as _bundler from '../../../../modules/manager/bundler'; import * as _composer from '../../../../modules/manager/composer'; import * as _gitSubmodules from '../../../../modules/manager/git-submodules'; import * as _helmv3 from '../../../../modules/manager/helmv3'; import * as _npm from '../../../../modules/manager/npm'; -import * as _terraform from '../../../../modules/manager/terraform'; import type { BranchConfig, BranchUpgradeConfig } from '../../../types'; import * as _autoReplace from './auto-replace'; import { getUpdatedPackageFiles } from './get-updated'; @@ -15,7 +15,7 @@ const composer = mocked(_composer); const gitSubmodules = mocked(_gitSubmodules); const helmv3 = mocked(_helmv3); const npm = mocked(_npm); -const terraform = mocked(_terraform); +const batectWrapper = mocked(_batectWrapper); const autoReplace = mocked(_autoReplace); jest.mock('../../../../modules/manager/bundler'); @@ -23,7 +23,7 @@ jest.mock('../../../../modules/manager/composer'); jest.mock('../../../../modules/manager/helmv3'); jest.mock('../../../../modules/manager/npm'); jest.mock('../../../../modules/manager/git-submodules'); -jest.mock('../../../../modules/manager/terraform'); +jest.mock('../../../../modules/manager/batect-wrapper'); jest.mock('../../../../util/git'); jest.mock('./auto-replace'); @@ -359,11 +359,11 @@ describe('workers/repository/update/branch/get-updated', () => { it('update artifacts on update-lockfile strategy with no updateLockedDependency', async () => { config.upgrades.push({ packageFile: 'abc.tf', - manager: 'terraform', + manager: 'batect-wrapper', branchName: '', isLockfileUpdate: true, }); - terraform.updateArtifacts.mockResolvedValueOnce([ + batectWrapper.updateArtifacts.mockResolvedValueOnce([ { file: { type: 'addition', -- GitLab