Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(manager/terraform): add required_version to preflight content check #12295

Merged
merged 2 commits into from Oct 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/manager/terraform/__fixtures__/terraformBlock.tf
@@ -0,0 +1,3 @@
terraform {
required_version = "1.0.0"
}
15 changes: 15 additions & 0 deletions lib/manager/terraform/__snapshots__/extract.spec.ts.snap
Expand Up @@ -390,6 +390,21 @@ Object {
}
`;

exports[`manager/terraform/extract extractPackageFile() test terraform block with only requirement_terraform_version 1`] = `
Object {
"deps": Array [
Object {
"currentValue": "1.0.0",
"datasource": "github-tags",
"depName": "hashicorp/terraform",
"depType": "required_version",
"extractVersion": "v(?<version>.*)$",
"lineNumber": 1,
},
],
}
`;

exports[`manager/terraform/extract extractPackageFile() update lockfile constraints with range strategy update-lockfile 1`] = `
Object {
"deps": Array [
Expand Down
12 changes: 12 additions & 0 deletions lib/manager/terraform/extract.spec.ts
Expand Up @@ -12,6 +12,7 @@ const tf2 = `module "relative" {
const helm = loadFixture('helm.tf');
const lockedVersion = loadFixture('lockedVersion.tf');
const lockedVersionLockfile = loadFixture('rangeStrategy.hcl');
const terraformBlock = loadFixture('terraformBlock.tf');

const adminConfig: RepoGlobalConfig = {
// `join` fixes Windows CI
Expand Down Expand Up @@ -62,5 +63,16 @@ describe('manager/terraform/extract', () => {
expect(res.deps).toHaveLength(3);
expect(res.deps.filter((dep) => dep.skipReason)).toHaveLength(0);
});

it('test terraform block with only requirement_terraform_version', async () => {
const res = await extractPackageFile(
terraformBlock,
'terraformBlock.tf',
{}
);
expect(res.deps).toHaveLength(1);
expect(res.deps.filter((dep) => dep.skipReason)).toHaveLength(0);
expect(res).toMatchSnapshot();
});
});
});
5 changes: 5 additions & 0 deletions lib/manager/terraform/extract.ts
Expand Up @@ -36,6 +36,7 @@ const contentCheckList = [
'required_providers ',
' "helm_release" ',
' "docker_image" ',
'required_version',
];

export async function extractPackageFile(
Expand All @@ -45,6 +46,10 @@ export async function extractPackageFile(
): Promise<PackageFile | null> {
logger.trace({ content }, 'terraform.extractPackageFile()');
if (!checkFileContainsDependency(content, contentCheckList)) {
logger.trace(
{ fileName },
'preflight content check has not found any relevant content'
);
return null;
}
let deps: PackageDependency<TerraformManagerData>[] = [];
Expand Down