Merge pull request #37 from hashicorp/HCD-35-namespace-based-allocs

Show only tasks for a given Namespace
hashicorp · Sep 13, 2022 · e79c4a3 · e79c4a3
2 parents 45c0c38 + a62bbc9
commit e79c4a3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 2 deletions.
diff --git a/component/allocations.go b/component/allocations.go
@@ -21,6 +21,7 @@ var (
 		LabelTaskGroup,
 		LabelJobID,
 		LabelType,
+		LabelNamespace,
 		LabelNodeID,
 		LabelNodeName,
 		LabelDesiredStatus,
@@ -106,6 +107,7 @@ func (t *AllocationTable) renderRows() {
 			a.TaskGroup,
 			a.JobID,
 			a.JobType,
+			a.Namespace,
 			a.NodeID,
 			a.NodeName,
 			a.DesiredStatus,

diff --git a/component/allocations_test.go b/component/allocations_test.go
@@ -29,6 +29,7 @@ func TestAllocation_Happy(t *testing.T) {
 				TaskGroup:     "tokio",
 				JobID:         "japan",
 				JobType:       "manga",
+				Namespace:     "namespace",
 				NodeID:        "node",
 				NodeName:      "node",
 				DesiredStatus: "run",
@@ -38,6 +39,7 @@ func TestAllocation_Happy(t *testing.T) {
 				TaskGroup:     "tokio",
 				JobID:         "japan",
 				JobType:       "manga",
+				Namespace:     "namespace",
 				NodeID:        "node",
 				NodeName:      "node",
 				DesiredStatus: "stop",
@@ -77,8 +79,8 @@ func TestAllocation_Happy(t *testing.T) {
 
 		row1, index1, c1 := fakeTable.RenderRowArgsForCall(0)
 		row2, index2, c2 := fakeTable.RenderRowArgsForCall(1)
-		expectedRow1 := []string{"ichi", "tokio", "japan", "manga", "node", "node", "run"}
-		expectedRow2 := []string{"ni", "tokio", "japan", "manga", "node", "node", "stop"}
+		expectedRow1 := []string{"ichi", "tokio", "japan", "manga", "namespace", "node", "node", "run"}
+		expectedRow2 := []string{"ni", "tokio", "japan", "manga", "namespace", "node", "node", "stop"}
 
 		// It render the correct data for the rows
 		r.Equal(expectedRow1, row1)
@@ -105,6 +107,7 @@ func TestAllocation_Happy(t *testing.T) {
 				TaskGroup:     "tokio",
 				JobID:         "japan",
 				JobType:       "manga",
+				Namespace:     "namespace",
 				NodeID:        "node",
 				NodeName:      "node",
 				DesiredStatus: "run",

diff --git a/models/models.go b/models/models.go
@@ -79,6 +79,7 @@ type TaskGroupStatus struct {
 type Alloc struct {
 	ID            string
 	Name          string
+	Namespace     string
 	TaskGroup     string
 	Tasks         []AllocTask
 	TaskNames     []string

diff --git a/nomad/alloc.go b/nomad/alloc.go
@@ -50,6 +50,7 @@ func toAllocs(list []*api.AllocationListStub) []*models.Alloc {
 	for _, el := range list {
 		alloc := &models.Alloc{
 			ID:            el.ID,
+			Namespace:     el.Namespace,
 			TaskGroup:     el.TaskGroup,
 			JobID:         el.JobID,
 			JobType:       el.JobType,

diff --git a/nomad/alloc_test.go b/nomad/alloc_test.go
@@ -26,6 +26,7 @@ func TestJobAllocs(t *testing.T) {
 			{
 				ID:            "id-one",
 				TaskGroup:     "the-group",
+				Namespace:     "namespace",
 				JobID:         "the-job",
 				JobType:       "the-type",
 				NodeID:        "node-id",
@@ -50,6 +51,7 @@ func TestJobAllocs(t *testing.T) {
 			{
 				ID:            "id-two",
 				TaskGroup:     "the-group",
+				Namespace:     "namespace",
 				JobID:         "the-job",
 				JobType:       "the-type",
 				NodeID:        "node-id",
@@ -84,6 +86,7 @@ func TestJobAllocs(t *testing.T) {
 			{
 				ID:            "id-one",
 				TaskGroup:     "the-group",
+				Namespace:     "namespace",
 				JobID:         "the-job",
 				JobType:       "the-type",
 				NodeID:        "node-id",
@@ -110,6 +113,7 @@ func TestJobAllocs(t *testing.T) {
 			{
 				ID:            "id-two",
 				TaskGroup:     "the-group",
+				Namespace:     "namespace",
 				JobID:         "the-job",
 				JobType:       "the-type",
 				NodeID:        "node-id",

diff --git a/view/allocations.go b/view/allocations.go
@@ -59,6 +59,7 @@ func (v *View) Allocations(jobID string) {
 
 func (v *View) filterAllocs(jobID string) []*models.Alloc {
 	data := v.filterAllocsForJob(jobID)
+	data = v.namespaceFilterAllocs(data)
 	filter := v.state.Filter.Allocations
 	if filter != "" {
 		rx, _ := regexp.Compile(filter)
@@ -92,3 +93,15 @@ func (v *View) filterAllocsForJob(jobID string) []*models.Alloc {
 	}
 	return result
 }
+
+func (v *View) namespaceFilterAllocs(allocs []*models.Alloc) []*models.Alloc {
+	rx, _ := regexp.Compile(v.state.SelectedNamespace)
+	result := []*models.Alloc{}
+	for _, a := range allocs {
+		switch true {
+		case rx.MatchString(a.Namespace):
+			result = append(result, a)
+		}
+	}
+	return result
+}