From 569bee6e7d78956bac61831794ba54272f314e42 Mon Sep 17 00:00:00 2001
From: Sebastian Poxhofer <secustor@users.noreply.github.com>
Date: Sun, 15 Aug 2021 14:19:10 +0200
Subject: [PATCH] feat(terraform): remove RENOVATE_X_TERRAFORM_LOCK_FILE flag
and enable by default (#11264)
---
docs/usage/self-hosted-experimental.md | 4 ----
lib/manager/terraform/lockfile/index.spec.ts | 22 --------------------
lib/manager/terraform/lockfile/index.ts | 8 -------
3 files changed, 34 deletions(-)
diff --git a/docs/usage/self-hosted-experimental.md b/docs/usage/self-hosted-experimental.md
index 39e8b789a1..2f00716900 100644
--- a/docs/usage/self-hosted-experimental.md
+++ b/docs/usage/self-hosted-experimental.md
@@ -35,10 +35,6 @@ If set to any value, Renovate will always paginate requests to GitHub fully, ins
If set to "false" (string), Renovate will remove any existing `package-lock.json` before attempting to update it.
-## RENOVATE_X_TERRAFORM_LOCK_FILE
-
-If set to any value, Renovate will update Terraform lock files and allow lockfile maintenance.
-
## RENOVATE_USER_AGENT
If set to any string, Renovate will use this as the `user-agent` it sends with HTTP requests.
diff --git a/lib/manager/terraform/lockfile/index.spec.ts b/lib/manager/terraform/lockfile/index.spec.ts
index 1588c4c08b..2b496169f6 100644
--- a/lib/manager/terraform/lockfile/index.spec.ts
+++ b/lib/manager/terraform/lockfile/index.spec.ts
@@ -35,15 +35,9 @@ describe(getName(), () => {
setGlobalConfig(adminConfig);
});
- afterEach(() => {
- delete process.env.RENOVATE_X_TERRAFORM_LOCK_FILE;
- });
-
it('returns null if no .terraform.lock.hcl found', async () => {
fs.readLocalFile.mockResolvedValueOnce(null);
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
expect(
await updateArtifacts({
packageFileName: 'main.tf',
@@ -57,8 +51,6 @@ describe(getName(), () => {
it('returns null if .terraform.lock.hcl is empty', async () => {
fs.readLocalFile.mockResolvedValueOnce('empty' as any);
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
expect(
await updateArtifacts({
packageFileName: 'main.tf',
@@ -85,8 +77,6 @@ describe(getName(), () => {
...config,
};
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
const result = await updateArtifacts({
packageFileName: 'main.tf',
updatedDeps: [{ depName: 'hashicorp/aws', lookupName: 'hashicorp/aws' }],
@@ -118,8 +108,6 @@ describe(getName(), () => {
...config,
};
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
const result = await updateArtifacts({
packageFileName: 'main.tf',
updatedDeps: [
@@ -157,8 +145,6 @@ describe(getName(), () => {
...config,
};
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
const result = await updateArtifacts({
packageFileName: 'main.tf',
updatedDeps: [{ depName: 'random', lookupName: 'hashicorp/random' }],
@@ -190,8 +176,6 @@ describe(getName(), () => {
...config,
};
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
const result = await updateArtifacts({
packageFileName: 'test/main.tf',
updatedDeps: [{ depName: 'random', lookupName: 'hashicorp/random' }],
@@ -264,8 +248,6 @@ describe(getName(), () => {
...config,
};
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
const result = await updateArtifacts({
packageFileName: '',
updatedDeps: [],
@@ -339,8 +321,6 @@ describe(getName(), () => {
...config,
};
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
const result = await updateArtifacts({
packageFileName: '',
updatedDeps: [],
@@ -462,8 +442,6 @@ describe(getName(), () => {
...config,
};
- process.env.RENOVATE_X_TERRAFORM_LOCK_FILE = 'test';
-
const result = await updateArtifacts({
packageFileName: '',
updatedDeps: [],
diff --git a/lib/manager/terraform/lockfile/index.ts b/lib/manager/terraform/lockfile/index.ts
index 975f73166c..93ce538429 100644
--- a/lib/manager/terraform/lockfile/index.ts
+++ b/lib/manager/terraform/lockfile/index.ts
@@ -62,14 +62,6 @@ export async function updateArtifacts({
}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
logger.debug(`terraform.updateArtifacts(${packageFileName})`);
- // TODO remove experimental flag, if functionality is confirmed
- if (!process.env.RENOVATE_X_TERRAFORM_LOCK_FILE) {
- logger.debug(
- `terraform.updateArtifacts: skipping updates. Experimental feature not activated`
- );
- return null;
- }
-
const lockFilePath = findLockFile(packageFileName);
try {
const lockFileContent = await readLockFile(lockFilePath);
--
GitLab