From e397cb71d7db5657866738951a20da76d85997d9 Mon Sep 17 00:00:00 2001 From: Michael Kriese <michael.kriese@visualon.de> Date: Thu, 26 May 2022 06:47:10 +0200 Subject: [PATCH] fix(manager:terraform): use github-releases (#15713) Co-authored-by: Jamie Magee <jamie.magee@gmail.com> --- .../manager/terraform/__snapshots__/extract.spec.ts.snap | 8 ++++---- lib/modules/manager/terraform/index.ts | 2 ++ lib/modules/manager/terraform/required-version.ts | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/modules/manager/terraform/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/terraform/__snapshots__/extract.spec.ts.snap index 1ee1db241e..9e11cf8204 100644 --- a/lib/modules/manager/terraform/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/terraform/__snapshots__/extract.spec.ts.snap @@ -384,7 +384,7 @@ Object { }, Object { "currentValue": ">= 0.13", - "datasource": "github-tags", + "datasource": "github-releases", "depName": "hashicorp/terraform", "depType": "required_version", "extractVersion": "v(?<version>.*)$", @@ -452,7 +452,7 @@ Object { "deps": Array [ Object { "currentValue": "1.1.6", - "datasource": "github-tags", + "datasource": "github-releases", "depName": "hashicorp/terraform", "depType": "tfe_workspace", "extractVersion": "v(?<version>.*)$", @@ -462,7 +462,7 @@ Object { }, Object { "currentValue": "1.1.9", - "datasource": "github-tags", + "datasource": "github-releases", "depName": "hashicorp/terraform", "depType": "tfe_workspace", "extractVersion": "v(?<version>.*)$", @@ -476,7 +476,7 @@ Object { "deps": Array [ Object { "currentValue": "1.0.0", - "datasource": "github-tags", + "datasource": "github-releases", "depName": "hashicorp/terraform", "depType": "required_version", "extractVersion": "v(?<version>.*)$", diff --git a/lib/modules/manager/terraform/index.ts b/lib/modules/manager/terraform/index.ts index a9f3a64c86..0d97764f86 100644 --- a/lib/modules/manager/terraform/index.ts +++ b/lib/modules/manager/terraform/index.ts @@ -1,5 +1,6 @@ import { BitBucketTagsDatasource } from '../../datasource/bitbucket-tags'; import { GitTagsDatasource } from '../../datasource/git-tags'; +import { GithubReleasesDatasource } from '../../datasource/github-releases'; import { GithubTagsDatasource } from '../../datasource/github-tags'; import { HelmDatasource } from '../../datasource/helm'; import { TerraformModuleDatasource } from '../../datasource/terraform-module'; @@ -13,6 +14,7 @@ export const supportedDatasources = [ BitBucketTagsDatasource.id, GitTagsDatasource.id, GithubTagsDatasource.id, + GithubReleasesDatasource.id, HelmDatasource.id, TerraformModuleDatasource.id, TerraformProviderDatasource.id, diff --git a/lib/modules/manager/terraform/required-version.ts b/lib/modules/manager/terraform/required-version.ts index 195188e607..9b6063e548 100644 --- a/lib/modules/manager/terraform/required-version.ts +++ b/lib/modules/manager/terraform/required-version.ts @@ -1,6 +1,6 @@ import { logger } from '../../../logger'; import { regEx } from '../../../util/regex'; -import { GithubTagsDatasource } from '../../datasource/github-tags'; +import { GithubReleasesDatasource } from '../../datasource/github-releases'; import type { PackageDependency } from '../types'; import { TerraformDependencyTypes } from './common'; import type { ExtractionResult, TerraformManagerData } from './types'; @@ -47,7 +47,7 @@ export function extractTerraformRequiredVersion( export function analyseTerraformVersion(dep: PackageDependency): void { dep.depType = 'required_version'; - dep.datasource = GithubTagsDatasource.id; + dep.datasource = GithubReleasesDatasource.id; dep.depName = 'hashicorp/terraform'; dep.extractVersion = 'v(?<version>.*)$'; } -- GitLab