Merge pull request #591 from hashicorp/cgo

Using cgo dependencies to look up users
hashicorp · Dec 15, 2015 · badcdd2 · badcdd2
2 parents d8b39f1 + 06443a6
commit badcdd2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 39 deletions.
diff --git a/client/allocdir/alloc_dir_posix.go b/client/allocdir/alloc_dir_posix.go
@@ -5,7 +5,6 @@ package allocdir
 
 import (
 	"fmt"
-	"github.com/hashicorp/nomad/helper/user-lookup"
 	"os"
 	"os/user"
 	"strconv"
@@ -27,7 +26,7 @@ func (d *AllocDir) dropDirPermissions(path string) error {
 		return nil
 	}
 
-	u, err := userlookup.Lookup("nobody")
+	u, err := user.Lookup("nobody")
 	if err != nil {
 		return err
 	}

diff --git a/client/driver/executor/exec_linux.go b/client/driver/executor/exec_linux.go
@@ -24,7 +24,6 @@ import (
 	"github.com/hashicorp/nomad/client/driver/spawn"
 	cstructs "github.com/hashicorp/nomad/client/driver/structs"
 	"github.com/hashicorp/nomad/helper/args"
-	"github.com/hashicorp/nomad/helper/user-lookup"
 	"github.com/hashicorp/nomad/nomad/structs"
 )
 
@@ -124,7 +123,7 @@ func (e *LinuxExecutor) ID() (string, error) {
 // runAs takes a user id as a string and looks up the user, and sets the command
 // to execute as that user.
 func (e *LinuxExecutor) runAs(userid string) error {
-	u, err := userlookup.Lookup(userid)
+	u, err := user.Lookup(userid)
 	if err != nil {
 		return fmt.Errorf("Failed to identify user %v: %v", userid, err)
 	}

diff --git a/helper/user-lookup/user-lookup.go b/helper/user-lookup/user-lookup.go
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -44,6 +44,7 @@ gox \
     -arch="${XC_ARCH}" \
     -osarch="!linux/arm !darwin/386" \
     -ldflags "-X main.GitCommit ${GIT_COMMIT}${GIT_DIRTY}" \
+    -cgo \
     -output "pkg/{{.OS}}_{{.Arch}}/nomad" \
     .