Merge pull request #5213 from hashicorp/b-api-separate

Slimmer /api package
hashicorp · Jan 19, 2019 · f7e7b99 · f7e7b99
2 parents 06e953c + 5e18538
commit f7e7b99
Show file tree

Hide file tree

Showing 19 changed files with 850 additions and 751 deletions.
diff --git a/api/allocations.go b/api/allocations.go
@@ -12,6 +12,20 @@ var (
 	NodeDownErr = fmt.Errorf("node down")
 )
 
+const (
+	AllocDesiredStatusRun   = "run"   // Allocation should run
+	AllocDesiredStatusStop  = "stop"  // Allocation should stop
+	AllocDesiredStatusEvict = "evict" // Allocation should stop, and was evicted
+)
+
+const (
+	AllocClientStatusPending  = "pending"
+	AllocClientStatusRunning  = "running"
+	AllocClientStatusComplete = "complete"
+	AllocClientStatusFailed   = "failed"
+	AllocClientStatusLost     = "lost"
+)
+
 // Allocations is used to query the alloc-related endpoints.
 type Allocations struct {
 	client *Client

diff --git a/api/allocations_test.go b/api/allocations_test.go
@@ -7,7 +7,6 @@ import (
 
 	"time"
 
-	"github.com/hashicorp/nomad/helper"
 	"github.com/hashicorp/nomad/helper/uuid"
 	"github.com/stretchr/testify/require"
 )
@@ -35,9 +34,9 @@ func TestAllocations_List(t *testing.T) {
 	return
 
 	//job := &Job{
-	//ID:   helper.StringToPtr("job1"),
-	//Name: helper.StringToPtr("Job #1"),
-	//Type: helper.StringToPtr(JobTypeService),
+	//ID:   stringToPtr("job1"),
+	//Name: stringToPtr("Job #1"),
+	//Type: stringToPtr(JobTypeService),
 	//}
 	//eval, _, err := c.Jobs().Register(job, nil)
 	//if err != nil {
@@ -82,9 +81,9 @@ func TestAllocations_PrefixList(t *testing.T) {
 	return
 
 	//job := &Job{
-	//ID:   helper.StringToPtr("job1"),
-	//Name: helper.StringToPtr("Job #1"),
-	//Type: helper.StringToPtr(JobTypeService),
+	//ID:   stringToPtr("job1"),
+	//Name: stringToPtr("Job #1"),
+	//Type: stringToPtr(JobTypeService),
 	//}
 
 	//eval, _, err := c.Jobs().Register(job, nil)
@@ -130,13 +129,13 @@ func TestAllocations_RescheduleInfo(t *testing.T) {
 	t.Parallel()
 	// Create a job, task group and alloc
 	job := &Job{
-		Name:      helper.StringToPtr("foo"),
-		Namespace: helper.StringToPtr(DefaultNamespace),
-		ID:        helper.StringToPtr("bar"),
-		ParentID:  helper.StringToPtr("lol"),
+		Name:      stringToPtr("foo"),
+		Namespace: stringToPtr(DefaultNamespace),
+		ID:        stringToPtr("bar"),
+		ParentID:  stringToPtr("lol"),
 		TaskGroups: []*TaskGroup{
 			{
-				Name: helper.StringToPtr("bar"),
+				Name: stringToPtr("bar"),
 				Tasks: []*Task{
 					{
 						Name: "task1",
@@ -176,17 +175,17 @@ func TestAllocations_RescheduleInfo(t *testing.T) {
 		{
 			desc: "no reschedule events",
 			reschedulePolicy: &ReschedulePolicy{
-				Attempts: helper.IntToPtr(3),
-				Interval: helper.TimeToPtr(15 * time.Minute),
+				Attempts: intToPtr(3),
+				Interval: timeToPtr(15 * time.Minute),
 			},
 			expAttempted: 0,
 			expTotal:     3,
 		},
 		{
 			desc: "all reschedule events within interval",
 			reschedulePolicy: &ReschedulePolicy{
-				Attempts: helper.IntToPtr(3),
-				Interval: helper.TimeToPtr(15 * time.Minute),
+				Attempts: intToPtr(3),
+				Interval: timeToPtr(15 * time.Minute),
 			},
 			time: time.Now(),
 			rescheduleTracker: &RescheduleTracker{
@@ -202,8 +201,8 @@ func TestAllocations_RescheduleInfo(t *testing.T) {
 		{
 			desc: "some reschedule events outside interval",
 			reschedulePolicy: &ReschedulePolicy{
-				Attempts: helper.IntToPtr(3),
-				Interval: helper.TimeToPtr(15 * time.Minute),
+				Attempts: intToPtr(3),
+				Interval: timeToPtr(15 * time.Minute),
 			},
 			time: time.Now(),
 			rescheduleTracker: &RescheduleTracker{
@@ -242,7 +241,7 @@ func TestAllocations_RescheduleInfo(t *testing.T) {
 
 func TestAllocations_ShouldMigrate(t *testing.T) {
 	t.Parallel()
-	require.True(t, DesiredTransition{Migrate: helper.BoolToPtr(true)}.ShouldMigrate())
+	require.True(t, DesiredTransition{Migrate: boolToPtr(true)}.ShouldMigrate())
 	require.False(t, DesiredTransition{}.ShouldMigrate())
-	require.False(t, DesiredTransition{Migrate: helper.BoolToPtr(false)}.ShouldMigrate())
+	require.False(t, DesiredTransition{Migrate: boolToPtr(false)}.ShouldMigrate())
 }
diff --git a/api/compose_test.go b/api/compose_test.go
@@ -3,8 +3,6 @@ package api
 import (
 	"reflect"
 	"testing"
-
-	"github.com/hashicorp/nomad/helper"
 )
 
 func TestCompose(t *testing.T) {
@@ -15,13 +13,13 @@ func TestCompose(t *testing.T) {
 		SetMeta("foo", "bar").
 		Constrain(NewConstraint("kernel.name", "=", "linux")).
 		Require(&Resources{
-			CPU:      helper.IntToPtr(1250),
-			MemoryMB: helper.IntToPtr(1024),
-			DiskMB:   helper.IntToPtr(2048),
+			CPU:      intToPtr(1250),
+			MemoryMB: intToPtr(1024),
+			DiskMB:   intToPtr(2048),
 			Networks: []*NetworkResource{
 				{
 					CIDR:          "0.0.0.0/0",
-					MBits:         helper.IntToPtr(100),
+					MBits:         intToPtr(100),
 					ReservedPorts: []Port{{"", 80}, {"", 443}},
 				},
 			},
@@ -47,11 +45,11 @@ func TestCompose(t *testing.T) {
 
 	// Check that the composed result looks correct
 	expect := &Job{
-		Region:   helper.StringToPtr("region1"),
-		ID:       helper.StringToPtr("job1"),
-		Name:     helper.StringToPtr("myjob"),
-		Type:     helper.StringToPtr(JobTypeService),
-		Priority: helper.IntToPtr(2),
+		Region:   stringToPtr("region1"),
+		ID:       stringToPtr("job1"),
+		Name:     stringToPtr("myjob"),
+		Type:     stringToPtr(JobTypeService),
+		Priority: intToPtr(2),
 		Datacenters: []string{
 			"dc1",
 		},
@@ -67,8 +65,8 @@ func TestCompose(t *testing.T) {
 		},
 		TaskGroups: []*TaskGroup{
 			{
-				Name:  helper.StringToPtr("grp1"),
-				Count: helper.IntToPtr(2),
+				Name:  stringToPtr("grp1"),
+				Count: intToPtr(2),
 				Constraints: []*Constraint{
 					{
 						LTarget: "kernel.name",
@@ -87,7 +85,7 @@ func TestCompose(t *testing.T) {
 				Spreads: []*Spread{
 					{
 						Attribute: "${node.datacenter}",
-						Weight:    helper.IntToPtr(30),
+						Weight:    intToPtr(30),
 						SpreadTarget: []*SpreadTarget{
 							{
 								Value:   "dc1",
@@ -105,13 +103,13 @@ func TestCompose(t *testing.T) {
 						Name:   "task1",
 						Driver: "exec",
 						Resources: &Resources{
-							CPU:      helper.IntToPtr(1250),
-							MemoryMB: helper.IntToPtr(1024),
-							DiskMB:   helper.IntToPtr(2048),
+							CPU:      intToPtr(1250),
+							MemoryMB: intToPtr(1024),
+							DiskMB:   intToPtr(2048),
 							Networks: []*NetworkResource{
 								{
 									CIDR:  "0.0.0.0/0",
-									MBits: helper.IntToPtr(100),
+									MBits: intToPtr(100),
 									ReservedPorts: []Port{
 										{"", 80},
 										{"", 443},

diff --git a/api/fs_test.go b/api/fs_test.go
@@ -10,7 +10,6 @@ import (
 	"time"
 
 	units "github.com/docker/go-units"
-	"github.com/hashicorp/nomad/helper"
 	"github.com/hashicorp/nomad/testutil"
 	"github.com/kr/pretty"
 	"github.com/stretchr/testify/assert"
@@ -62,13 +61,13 @@ func TestFS_Logs(t *testing.T) {
 	}
 
 	job := &Job{
-		ID:          helper.StringToPtr("TestFS_Logs"),
-		Region:      helper.StringToPtr("global"),
+		ID:          stringToPtr("TestFS_Logs"),
+		Region:      stringToPtr("global"),
 		Datacenters: []string{"dc1"},
-		Type:        helper.StringToPtr("batch"),
+		Type:        stringToPtr("batch"),
 		TaskGroups: []*TaskGroup{
 			{
-				Name: helper.StringToPtr("TestFS_LogsGroup"),
+				Name: stringToPtr("TestFS_LogsGroup"),
 				Tasks: []*Task{
 					{
 						Name:   "logger",