-
Notifications
You must be signed in to change notification settings - Fork 663
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
Reference task to fetch latest version by default #5895
Open
featherchen
wants to merge
5
commits into
flyteorg:master
Choose a base branch
from
featherchen:issue-5825
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
1307b78
feat(task_repo): set default version to the latest
featherchen 7770c6a
fix(test): remove tests related to empty task version
featherchen 9c88b3e
feat(test): TestGetTask
featherchen 5341abf
fix: TestGetTask
featherchen fb6f97d
feat(test): Get integration test
featherchen 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,14 +49,22 @@ func (r *TaskRepo) Create(ctx context.Context, input models.Task, descriptionEnt | |
func (r *TaskRepo) Get(ctx context.Context, input interfaces.Identifier) (models.Task, error) { | ||
var task models.Task | ||
timer := r.metrics.GetDuration.Start() | ||
tx := r.db.WithContext(ctx).Where(&models.Task{ | ||
TaskKey: models.TaskKey{ | ||
Project: input.Project, | ||
Domain: input.Domain, | ||
Name: input.Name, | ||
Version: input.Version, | ||
}, | ||
}).Take(&task) | ||
var tx *gorm.DB | ||
if input.Version == "" { | ||
tx = r.db.WithContext(ctx).Where(`"tasks"."project" = ? AND "tasks"."domain" = ? AND "tasks"."name" = ?`, input.Project, input.Domain, input.Name).Limit(1) | ||
tx = tx.Order(`"tasks"."version" DESC`) | ||
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. Why do we order by version instead of time information such as created_at? |
||
tx.Find(&task) | ||
} else { | ||
tx = r.db.WithContext(ctx).Where(&models.Task{ | ||
TaskKey: models.TaskKey{ | ||
Project: input.Project, | ||
Domain: input.Domain, | ||
Name: input.Name, | ||
Version: input.Version, | ||
}, | ||
}).Take(&task) | ||
} | ||
|
||
timer.Stop() | ||
if errors.Is(tx.Error, gorm.ErrRecordNotFound) { | ||
return models.Task{}, flyteAdminDbErrors.GetMissingEntityError(core.ResourceType_TASK.String(), &core.Identifier{ | ||
|
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,6 +45,37 @@ var taskExecutionIdentifier = &core.TaskExecutionIdentifier{ | |
RetryAttempt: 1, | ||
} | ||
|
||
func TestGetTaskExecutions(t *testing.T) { | ||
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. Can we register more than one tasks and see if we get the latest one? |
||
truncateAllTablesForTestingOnly() | ||
populateWorkflowExecutionsForTestingOnly() | ||
|
||
ctx := context.Background() | ||
client, conn := GetTestAdminServiceClient() | ||
defer conn.Close() | ||
|
||
_, err := client.CreateTask(ctx, &admin.TaskCreateRequest{ | ||
Id: taskIdentifier, | ||
Spec: testutils.GetValidTaskRequest().Spec, | ||
}) | ||
require.NoError(t, err) | ||
|
||
resp, err := client.GetTask(ctx, &admin.ObjectGetRequest{ | ||
Id: &core.Identifier{ | ||
ResourceType: core.ResourceType_TASK, | ||
Project: project, | ||
Domain: "development", | ||
Name: "task name", | ||
}, | ||
}) | ||
|
||
assert.Nil(t, err) | ||
assert.Equal(t, resp.Id.Project, project) | ||
assert.Equal(t, resp.Id.Domain, "development") | ||
assert.Equal(t, resp.Id.Name, "task name") | ||
assert.Equal(t, resp.Id.Version, "task version") | ||
|
||
} | ||
|
||
func createTaskAndNodeExecution( | ||
ctx context.Context, t *testing.T, client service.AdminServiceClient, conn *grpc.ClientConn, | ||
occurredAtProto *timestamp.Timestamp) { | ||
|
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.
Just curious, are we able to use TaskKey here?