renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-13 15:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(manager/terraform/lockfile): use registryURL defined in lockfile (#28886)

Browse source
This commit is contained in:
Sebastian Poxhofer 2024-05-07 06:03:37 +02:00 committed by GitHub
parent 8191cf8746
commit cbbfcd1514
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/modules/manager/terraform/lockfile/index.spec.ts
View file

@ -76,7 +76,7 @@ describe('modules/manager/terraform/lockfile/index', () => {
it('update single dependency with exact constraint and depType provider', async () => { it('update single dependency with exact constraint and depType provider', async () => {
fs.readLocalFile.mockResolvedValueOnce(codeBlock` fs.readLocalFile.mockResolvedValueOnce(codeBlock`
provider "registry.terraform.io/hashicorp/aws" { provider "registry.opentofu.org/hashicorp/aws" {
version = "3.0.0" version = "3.0.0"
constraints = "3.0.0" constraints = "3.0.0"
hashes = [ hashes = [
@ -111,7 +111,7 @@ describe('modules/manager/terraform/lockfile/index', () => {
{ {
file: { file: {
contents: codeBlock` contents: codeBlock`
provider "registry.terraform.io/hashicorp/aws" { provider "registry.opentofu.org/hashicorp/aws" {
version = "3.36.0" version = "3.36.0"
constraints = "3.36.0" constraints = "3.36.0"
hashes = [ hashes = [
@ -126,7 +126,7 @@ describe('modules/manager/terraform/lockfile/index', () => {
}, },
]); ]);
expect(mockHash.mock.calls).toEqual([ expect(mockHash.mock.calls).toEqual([
['https://registry.terraform.io', 'hashicorp/aws', '3.36.0'], ['https://registry.opentofu.org', 'hashicorp/aws', '3.36.0'],
]); ]);
}); });

8
lib/modules/manager/terraform/lockfile/index.ts
View file

@ -3,7 +3,6 @@ import { logger } from '../../../../logger';
import * as p from '../../../../util/promises'; import * as p from '../../../../util/promises';
import { escapeRegExp, regEx } from '../../../../util/regex'; import { escapeRegExp, regEx } from '../../../../util/regex';
import { GetPkgReleasesConfig, getPkgReleases } from '../../../datasource'; import { GetPkgReleasesConfig, getPkgReleases } from '../../../datasource';
import { TerraformProviderDatasource } from '../../../datasource/terraform-provider';
import { get as getVersioning } from '../../../versioning'; import { get as getVersioning } from '../../../versioning';
import type { import type {
UpdateArtifact, UpdateArtifact,
@ -167,9 +166,6 @@ export async function updateArtifacts({
massageProviderLookupName(dep); massageProviderLookupName(dep);
const { registryUrls, newVersion, packageName } = dep; const { registryUrls, newVersion, packageName } = dep;
const registryUrl = registryUrls
? registryUrls[0]
: TerraformProviderDatasource.defaultRegistryUrls[0];
const updateLock = locks.find( const updateLock = locks.find(
(value) => value.packageName === packageName, (value) => value.packageName === packageName,
); );
@ -191,6 +187,10 @@ export async function updateArtifacts({
continue; continue;
} }
} }
// use registryURL defined in the update and fall back to the one defined in the lockfile
const registryUrl = registryUrls?.[0] ?? updateLock.registryUrl;
const newConstraint = getNewConstraint(dep, updateLock.constraints); const newConstraint = getNewConstraint(dep, updateLock.constraints);
const update: ProviderLockUpdate = { const update: ProviderLockUpdate = {
// TODO #22198 // TODO #22198

17
lib/modules/manager/terraform/readme.md
View file

@ -1,3 +1,20 @@
### Terraform vs OpenTofu
There is no way for Renovate to differentiate, if a user is a Terraform user or has already adopted OpenTofu.
Therefore, Renovate defaults currently to interpret providers without a registry definition to be located at `registry.terraform.io`.
This behaviour can be modified using `packageRules`:
```json title="Prefer releases from OpenTofu"
{
"packageRules": [
{
"matchDatasources": ["terraform-provider"],
"registryUrl": "https://registry.opentofu.org"
}
]
}
```
### Supported dependencies ### Supported dependencies
Renovate supports updating the Terraform dependencies listed below. Renovate supports updating the Terraform dependencies listed below.