Merge pull request #5141 from hashicorp/dani/fix-static-checks

Fix `make check`

client/taskenv/env.go

@@ -490,7 +490,7 @@ func (b *Builder) SetHookEnv(hook string, envs map[string]string) *Builder {
 	return b.setHookEnvLocked(hook, envs)
 }
 
-// setHookEnvLocked is the implementation of setting hook environemnt variables
+// setHookEnvLocked is the implementation of setting hook environment variables
 // and should be called with the lock held
 func (b *Builder) setHookEnvLocked(hook string, envs map[string]string) *Builder {
 	if _, exists := b.hookEnvs[hook]; !exists {

e2e/e2eutil/utils.go

@@ -1,6 +1,9 @@
 package e2eutil
 
 import (
+	"testing"
+	"time"
+
 	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/e2e/framework"
 	"github.com/hashicorp/nomad/helper"
@@ -9,8 +12,6 @@ import (
 	"github.com/hashicorp/nomad/testutil"
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/require"
-	"testing"
-	"time"
 )
 
 // retries is used to control how many times to retry checking if the cluster has a leader yet

plugins/drivers/proto/driver.pb.go

@@ -1345,7 +1345,7 @@ type TaskConfig struct {
 	// Env is the a set of key/value pairs to be set as environment variables
 	Env map[string]string `protobuf:"bytes,4,rep,name=env,proto3" json:"env,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// DeviceEnv is the set of environment variables that are defined by device
-	// plugins. This allows the driver to differentiate environemnt variables
+	// plugins. This allows the driver to differentiate environment variables
 	// set by the device plugins and those by the user. When populating the
 	// task's environment env should be used.
 	DeviceEnv map[string]string `protobuf:"bytes,5,rep,name=device_env,json=deviceEnv,proto3" json:"device_env,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`

plugins/drivers/proto/driver.proto

@@ -311,7 +311,7 @@ message TaskConfig {
     map<string, string> env = 4;
 
     // DeviceEnv is the set of environment variables that are defined by device
-    // plugins. This allows the driver to differentiate environemnt variables
+    // plugins. This allows the driver to differentiate environment variables
     // set by the device plugins and those by the user. When populating the
     // task's environment env should be used.
     map<string, string> device_env = 5;