set vendor in input file

hashicorp · Feb 2, 2023 · a4f550d · a4f550d
1 parent d83bf6f
commit a4f550d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ This is a GitHub Action wrapper around nFPM, used to produce DEBs and RPMs.
 | `arch`       | Build architecture.                      |                |
 | `version`    | Product semver version. |  |
 | `maintainer` | Maintainer name. | |
+| `vendor`     | Default vendor | HashiCorp |
 | `description` | Product description. | |
 | `homepage`    | Product homepage. | |
 | `license`     | Product usage license. | |

diff --git a/action.yml b/action.yml
@@ -30,7 +30,7 @@ inputs:
     required: false
   vendor:
     description: 'Vendor name'
-    default: ''
+    default: 'HashiCorp'
     required: false
   description:
     description: 'Product description.'

diff --git a/fpm_template.go b/fpm_template.go
@@ -76,6 +76,8 @@ func main() {
 	inputName := os.Getenv("INPUT_NAME")
 	inputArch := os.Getenv("INPUT_ARCH")
 	inputVersion := os.Getenv("INPUT_VERSION")
+	inputMaintainer := os.Getenv("INPUT_MAINTAINER")
+	inputVendor := os.Getenv("INPUT_VENDOR")
 	inputDescription := os.Getenv("INPUT_DESCRIPTION")
 	inputHomepage := os.Getenv("INPUT_HOMEPAGE")
 	inputLicense := os.Getenv("INPUT_LICENSE")
@@ -95,15 +97,6 @@ func main() {
 	binName := filepath.Base(inputBinary)
 	binDest := filepath.Join(inputBinPath, binName)
 
-	inputVendor := os.Getenv("INPUT_VENDOR")
-	if inputVendor == "" {
-		inputVendor = "HashiCorp"
-	}
-
-	inputMaintainer := os.Getenv("INPUT_MAINTAINER")
-	if inputVendor == "" {
-		inputVendor = "HashiCorp"
-	}
 	// This maps to "armv7hl" for rpm and "armhf" for deb
 	// "arm" is not a valid arch for either type, and it
 	// does not get mapped automatically in nfpm