pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

terraform: Rename variable to better follow Terraform nomenclature



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Mar 28 13:13:13 2021 +0200
Changeset:	0f697659ae83dabd1e88863df52a0b363df351f4

Modified Files:
	terraform/provider.mk

Log Message:
terraform: Rename variable to better follow Terraform nomenclature

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0f697659ae83dabd1e88863df52a0b363df351f4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 terraform/provider.mk | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diffs:
diff --git a/terraform/provider.mk b/terraform/provider.mk
index 3f8ffaa235..b5e90d18d3 100644
--- a/terraform/provider.mk
+++ b/terraform/provider.mk
@@ -8,13 +8,13 @@
 #
 # === Package-settable variables ===
 #
-# TERRAFORM_PROVIDER_REGISTRY (optional)
-# TODO: rename to TERRAFORM_PROVIDER_HOSTNAME
+# TERRAFORM_PROVIDER_HOSTNAME (optional)
 #
 # TERRAFORM_PROVIDER_BIN
 #
-# TERRAFORM_PROVIDER_NAME
-# TODO: split to TERRAFORM_PROVIDER_NAMESPACE/TERRAFORM_PROVIDER_TYPE
+# TERRAFORM_PROVIDER_NAMESPACE
+#
+# TERRAFORM_PROVIDER_TYPE
 #
 # TERRAFORM_PROVIDER_VERSION
 #
@@ -27,16 +27,18 @@
 
 DEPENDS+=	${TERRAFORM_PACKAGE_DEP}
 
-TERRAFORM_PROVIDER_REGISTRY?=	registry.terraform.io
+TERRAFORM_PROVIDER_HOSTNAME?=	registry.terraform.io
 TERRAFORM_PROVIDER_VERSION?=	${PKGVERSION_NOREV}
-TERRAFORM_PROVIDER_DIR?=	share/terraform/plugins/${TERRAFORM_PROVIDER_REGISTRY}/${TERRAFORM_PROVIDER_NAME}/${TERRAFORM_PROVIDER_VERSION}/${GO_PLATFORM}
+TERRAFORM_PROVIDER_DIR?=	share/terraform/plugins/${TERRAFORM_PROVIDER_HOSTNAME}/${TERRAFORM_PROVIDER_NAMESPACE}/${TERRAFORM_PROVIDER_TYPE}/${TERRAFORM_PROVIDER_VERSION}/${GO_PLATFORM}
 
-PLIST_SUBST+=		TERRAFORM_PROVIDER_REGISTRY=${TERRAFORM_PROVIDER_REGISTRY}
-PLIST_SUBST+=		TERRAFORM_PROVIDER_NAME=${TERRAFORM_PROVIDER_NAME}
+PLIST_SUBST+=		TERRAFORM_PROVIDER_HOSTNAME=${TERRAFORM_PROVIDER_HOSTNAME}
+PLIST_SUBST+=		TERRAFORM_PROVIDER_NAMESPACE=${TERRAFORM_PROVIDER_NAMESPACE}
+PLIST_SUBST+=		TERRAFORM_PROVIDER_TYPE=${TERRAFORM_PROVIDER_TYPE}
 PLIST_SUBST+=		TERRAFORM_PROVIDER_VERSION=${TERRAFORM_PROVIDER_VERSION}
 
-PRINT_PLIST_AWK+=	{ sub("${TERRAFORM_PROVIDER_REGISTRY}", "$${TERRAFORM_PROVIDER_REGISTRY}") }
-PRINT_PLIST_AWK+=	{ sub("${TERRAFORM_PROVIDER_NAME}", "$${TERRAFORM_PROVIDER_NAME}") }
+PRINT_PLIST_AWK+=	{ sub("${TERRAFORM_PROVIDER_HOSTNAME}", "$${TERRAFORM_PROVIDER_HOSTNAME}") }
+PRINT_PLIST_AWK+=	{ sub("${TERRAFORM_PROVIDER_NAMESPACE}", "$${TERRAFORM_PROVIDER_NAMESPACE}") }
+PRINT_PLIST_AWK+=	{ sub("${TERRAFORM_PROVIDER_TYPE}", "$${TERRAFORM_PROVIDER_TYPE}") }
 PRINT_PLIST_AWK+=	{ sub("${TERRAFORM_PROVIDER_VERSION}", "$${TERRAFORM_PROVIDER_VERSION}") }
 
 INSTALLATION_DIRS?=	${TERRAFORM_PROVIDER_DIR}


Home | Main Index | Thread Index | Old Index