Skip to content

Commit

Permalink
Add CustomInfo field to ExternalResourceInfo
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Dye <[email protected]>
  • Loading branch information
andrewwdye committed Aug 9, 2024
1 parent 96bbf7e commit 14a66a3
Show file tree
Hide file tree
Showing 13 changed files with 272 additions and 64 deletions.
6 changes: 6 additions & 0 deletions flyteadmin/pkg/repositories/transformers/task_execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
_struct "github.com/golang/protobuf/ptypes/struct"
"google.golang.org/grpc/codes"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/structpb"

"github.com/flyteorg/flyte/flyteadmin/pkg/common"
"github.com/flyteorg/flyte/flyteadmin/pkg/errors"
Expand Down Expand Up @@ -310,6 +311,11 @@ func mergeExternalResource(existing, latest *event.ExternalResourceInfo) *event.
}
existing.Logs = mergeLogs(existing.Logs, latest.Logs)

// Overwrite custom info if provided
if latest.GetCustomInfo() != nil {
existing.CustomInfo = proto.Clone(latest.GetCustomInfo()).(*structpb.Struct)

Check warning on line 316 in flyteadmin/pkg/repositories/transformers/task_execution.go

View check run for this annotation

Codecov / codecov/patch

flyteadmin/pkg/repositories/transformers/task_execution.go#L316

Added line #L316 was not covered by tests
}

return existing
}

Expand Down
7 changes: 7 additions & 0 deletions flyteidl/clients/go/assets/admin.swagger.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions flyteidl/gen/pb-es/flyteidl/event/event_pb.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

164 changes: 110 additions & 54 deletions flyteidl/gen/pb-go/flyteidl/event/event.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions flyteidl/gen/pb-js/flyteidl.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 14a66a3

Please sign in to comment.