From 3404fb565eab294ac0f1481a45a21affe0a7647d Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Fri, 20 Jan 2017 12:46:04 -0800
Subject: [PATCH] parameterized_job -> parameterized

---
 jobspec/parse.go                                     | 12 ++++++------
 .../{constructor.hcl => parameterized_job.hcl}       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename jobspec/test-fixtures/{constructor.hcl => parameterized_job.hcl} (93%)

diff --git a/jobspec/parse.go b/jobspec/parse.go
index 633cb0ae5..a4fc88e15 100644
--- a/jobspec/parse.go
+++ b/jobspec/parse.go
@@ -105,7 +105,7 @@ func parseJob(result *structs.Job, list *ast.ObjectList) error {
 	delete(m, "update")
 	delete(m, "periodic")
 	delete(m, "vault")
-	delete(m, "parameterized_job")
+	delete(m, "parameterized")
 
 	// Set the ID and name to the object key
 	result.ID = obj.Keys[0].Token.Value().(string)
@@ -134,7 +134,7 @@ func parseJob(result *structs.Job, list *ast.ObjectList) error {
 		"all_at_once",
 		"constraint",
 		"datacenters",
-		"parameterized_job",
+		"parameterized",
 		"group",
 		"id",
 		"meta",
@@ -174,9 +174,9 @@ func parseJob(result *structs.Job, list *ast.ObjectList) error {
 	}
 
 	// If we have a parameterized definition, then parse that
-	if o := listVal.Filter("parameterized_job"); len(o.Items) > 0 {
+	if o := listVal.Filter("parameterized"); len(o.Items) > 0 {
 		if err := parseParameterizedJob(&result.ParameterizedJob, o); err != nil {
-			return multierror.Prefix(err, "parameterized_job ->")
+			return multierror.Prefix(err, "parameterized ->")
 		}
 	}
 
@@ -1248,7 +1248,7 @@ func parseVault(result *structs.Vault, list *ast.ObjectList) error {
 func parseParameterizedJob(result **structs.ParameterizedJobConfig, list *ast.ObjectList) error {
 	list = list.Elem()
 	if len(list.Items) > 1 {
-		return fmt.Errorf("only one 'parameterized_job' block allowed per job")
+		return fmt.Errorf("only one 'parameterized' block allowed per job")
 	}
 
 	// Get our resource object
@@ -1280,7 +1280,7 @@ func parseParameterizedJob(result **structs.ParameterizedJobConfig, list *ast.Ob
 	if ot, ok := o.Val.(*ast.ObjectType); ok {
 		listVal = ot.List
 	} else {
-		return fmt.Errorf("parameterized_job block should be an object")
+		return fmt.Errorf("parameterized block should be an object")
 	}
 
 	// Parse the meta block
diff --git a/jobspec/test-fixtures/constructor.hcl b/jobspec/test-fixtures/parameterized_job.hcl
similarity index 93%
rename from jobspec/test-fixtures/constructor.hcl
rename to jobspec/test-fixtures/parameterized_job.hcl
index 46025942f..1b95a7de2 100644
--- a/jobspec/test-fixtures/constructor.hcl
+++ b/jobspec/test-fixtures/parameterized_job.hcl
@@ -1,5 +1,5 @@
 job "parameterized_job" {
-    parameterized_job {
+    parameterized {
         payload = "required"
         meta_keys {
             required = ["foo", "bar"]