providres/nomad: address PR feedback (mostly copy)

hashicorp · Oct 24, 2016 · d7be1de · d7be1de
1 parent ae5b996
commit d7be1de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/builtin/providers/nomad/provider_test.go b/builtin/providers/nomad/provider_test.go
@@ -11,7 +11,7 @@ import (
 // How to run the acceptance tests for this provider:
 //
 // - Obtain an official Nomad release from https://nomadproject.io
-//   and extra "nomad" somewhere
+//   and extra the "nomad" binary
 //
 // - Run the following to start the Nomad agent in development mode:
 //       nomad agent -dev

diff --git a/builtin/providers/nomad/resource_job.go b/builtin/providers/nomad/resource_job.go
@@ -79,7 +79,10 @@ func resourceJobRegister(d *schema.ResourceData, meta interface{}) error {
 		log.Printf("[DEBUG] Deregistering job: %q", prevId)
 		_, _, err := client.Jobs().Deregister(prevId, nil)
 		if err != nil {
-			return fmt.Errorf("error deregistering previous job %q: %s", prevId, err)
+			return fmt.Errorf(
+				"error deregistering previous job %q "+
+					"before registering new job %q: %s",
+				prevId, jobspecStruct.ID, err)
 		}
 
 		// Success! Clear our state.

diff --git a/website/source/docs/providers/nomad/index.html.markdown b/website/source/docs/providers/nomad/index.html.markdown
@@ -32,5 +32,5 @@ resource "nomad_job" "monitoring" {
 
 The following arguments are supported:
 
-* `address` - (Optional) The HTTP(S) API address of the agent to use. Defaults to "127.0.0.1:4646". `NOMAD_ADDR` can also be used.
-* `region` - (Optional) The Nomad region to target. `NOMAD_REGION` can also be used.
+* `address` - (Optional) The HTTP(S) API address of the Nomad agent to use. Defaults to `127.0.0.1:4646`. The `NOMAD_ADDR` environment variable can also be used.
+* `region` - (Optional) The Nomad region to target. The `NOMAD_REGION` environment variable can also be used.