-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow lookups based on short identifiers #575
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
7ae975e
Allow lookups based on short identifiers
iverberk cec0170
Bring up-to-date with master
iverberk 91075e1
Short identifiers functionality
iverberk bdf4347
Allow short job identifiers for stop command
iverberk 5d3bd1b
On cli node status list print the short Node ID when possible
arminc 23bfbbf
Allow short identifiers for node-drain command
iverberk 7d2f1c6
Some comment corrections and additions
iverberk dcecac1
Bring up-to-date with master
iverberk 2a809b9
Bring up-to-date with master
iverberk 1af7c57
Revert "On cli node status list print the short Node ID when possible"
iverberk e89b5af
Refactoring
iverberk 9057422
Refactoring continued
iverberk db82564
Bring up-to-date with master
iverberk 8218442
Fix test (due to merge)
iverberk a73aaf1
Documentation updates for short identifiers in the CLI
iverberk c65fdc3
Bring up-to-date with master
iverberk 6295108
Improvements for short identifiers
iverberk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,14 +45,65 @@ func TestHTTP_AllocsList(t *testing.T) { | |
t.Fatalf("missing last contact") | ||
} | ||
|
||
// Check the job | ||
// Check the alloc | ||
n := obj.([]*structs.AllocListStub) | ||
if len(n) != 2 { | ||
t.Fatalf("bad: %#v", n) | ||
} | ||
}) | ||
} | ||
|
||
func TestHTTP_AllocsPrefixList(t *testing.T) { | ||
httpTest(t, nil, func(s *TestServer) { | ||
// Directly manipulate the state | ||
state := s.Agent.server.State() | ||
alloc1 := mock.Alloc() | ||
alloc1.ID = "aaaaaaaa-e8f7-fd38-c855-ab94ceb89706" | ||
alloc2 := mock.Alloc() | ||
alloc2.ID = "aaabbbbb-e8f7-fd38-c855-ab94ceb89706" | ||
err := state.UpsertAllocs(1000, | ||
[]*structs.Allocation{alloc1, alloc2}) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
|
||
// Make the HTTP request | ||
req, err := http.NewRequest("GET", "/v1/allocations?prefix=aaab", nil) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
respW := httptest.NewRecorder() | ||
|
||
// Make the request | ||
obj, err := s.Server.AllocsRequest(respW, req) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
|
||
// Check for the index | ||
if respW.HeaderMap.Get("X-Nomad-Index") == "" { | ||
t.Fatalf("missing index") | ||
} | ||
if respW.HeaderMap.Get("X-Nomad-KnownLeader") != "true" { | ||
t.Fatalf("missing known leader") | ||
} | ||
if respW.HeaderMap.Get("X-Nomad-LastContact") == "" { | ||
t.Fatalf("missing last contact") | ||
} | ||
|
||
// Check the alloc | ||
n := obj.([]*structs.AllocListStub) | ||
if len(n) != 1 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would also test that you get the right ID |
||
t.Fatalf("bad: %#v", n) | ||
} | ||
|
||
// Check the identifier | ||
if n[0].ID != alloc2.ID { | ||
t.Fatalf("expected alloc ID: %v, Actual: %v", alloc2.ID, n[0].ID) | ||
} | ||
}) | ||
} | ||
|
||
func TestHTTP_AllocQuery(t *testing.T) { | ||
httpTest(t, nil, func(s *TestServer) { | ||
// Directly manipulate the state | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is also added in the structs. Once this PR is done I will take a look at removing the api specific structs and using those in the structs package as specified in issue #329 .