From c84417ddf14ef47388ad8af919d24daff5b8d012 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sat, 5 Jan 2019 18:57:40 +0100
Subject: [PATCH] fix(terraform): extract registry
---
lib/manager/terraform/extract.js | 2 +-
.../__snapshots__/extract.spec.js.snap | 24 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/lib/manager/terraform/extract.js b/lib/manager/terraform/extract.js
index 52da361763..2a2ab5a9b4 100644
--- a/lib/manager/terraform/extract.js
+++ b/lib/manager/terraform/extract.js
@@ -71,7 +71,7 @@ function extractPackageFile(content) {
dep.purl = 'pkg:terraform/' + dep.depName;
} else if (moduleParts.length === 4) {
dep.depType = 'terraform';
- dep.registry = moduleParts.unshift();
+ dep.registry = moduleParts.shift();
dep.depName = moduleParts.join('/');
dep.depNameShort = dep.depName;
dep.lineNumber = dep.versionLine;
diff --git a/test/manager/terraform/__snapshots__/extract.spec.js.snap b/test/manager/terraform/__snapshots__/extract.spec.js.snap
index a6000e48cc..1adf8ef0d9 100644
--- a/test/manager/terraform/__snapshots__/extract.spec.js.snap
+++ b/test/manager/terraform/__snapshots__/extract.spec.js.snap
@@ -86,35 +86,35 @@ Object {
},
Object {
"currentValue": "~> 1.1.0",
- "depName": "app.terraform.io/example-corp/k8s-cluster/azurerm",
- "depNameShort": "app.terraform.io/example-corp/k8s-cluster/azurerm",
+ "depName": "example-corp/k8s-cluster/azurerm",
+ "depNameShort": "example-corp/k8s-cluster/azurerm",
"depType": "terraform",
"lineNumber": 71,
"moduleName": "consul",
- "purl": "pkg:terraform/app.terraform.io/example-corp/k8s-cluster/azurerm?registry=4",
- "registry": 4,
+ "purl": "pkg:terraform/example-corp/k8s-cluster/azurerm?registry=app.terraform.io",
+ "registry": "app.terraform.io",
"source": "app.terraform.io/example-corp/k8s-cluster/azurerm",
},
Object {
"currentValue": "~> 1.1",
- "depName": "app.terraform.io/example-corp/k8s-cluster/azurerm",
- "depNameShort": "app.terraform.io/example-corp/k8s-cluster/azurerm",
+ "depName": "example-corp/k8s-cluster/azurerm",
+ "depNameShort": "example-corp/k8s-cluster/azurerm",
"depType": "terraform",
"lineNumber": 76,
"moduleName": "consul2",
- "purl": "pkg:terraform/app.terraform.io/example-corp/k8s-cluster/azurerm?registry=4",
- "registry": 4,
+ "purl": "pkg:terraform/example-corp/k8s-cluster/azurerm?registry=app.terraform.io",
+ "registry": "app.terraform.io",
"source": "app.terraform.io/example-corp/k8s-cluster/azurerm",
},
Object {
"currentValue": "~~ 1.1",
- "depName": "app.terraform.io/example-corp/k8s-cluster/azurerm",
- "depNameShort": "app.terraform.io/example-corp/k8s-cluster/azurerm",
+ "depName": "example-corp/k8s-cluster/azurerm",
+ "depNameShort": "example-corp/k8s-cluster/azurerm",
"depType": "terraform",
"lineNumber": 81,
"moduleName": "consul3",
- "purl": "pkg:terraform/app.terraform.io/example-corp/k8s-cluster/azurerm?registry=4",
- "registry": 4,
+ "purl": "pkg:terraform/example-corp/k8s-cluster/azurerm?registry=app.terraform.io",
+ "registry": "app.terraform.io",
"skipReason": "unsupported-version",
"source": "app.terraform.io/example-corp/k8s-cluster/azurerm",
},
--
GitLab