plumbing through deckURI

Signed-off-by: Daniel Rammer <[email protected]>
flyteorg · Nov 28, 2024 · 5964cc1 · 5964cc1
1 parent 5b29bbe
commit 5964cc1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/flyteadmin/pkg/repositories/transformers/task_execution.go b/flyteadmin/pkg/repositories/transformers/task_execution.go
@@ -309,6 +309,9 @@ func mergeExternalResource(existing, latest *event.ExternalResourceInfo) *event.
 		existing.CacheStatus = latest.GetCacheStatus()
 	}
 	existing.Logs = mergeLogs(existing.GetLogs(), latest.GetLogs())
+	if latest.GetDeckUri() != "" && existing.GetDeckUri() != latest.GetDeckUri() {
+		existing.DeckUri = latest.GetDeckUri()
+	}
 
 	return existing
 }

diff --git a/flyteidl/gen/pb-es/flyteidl/event/event_pb.ts b/flyteidl/gen/pb-es/flyteidl/event/event_pb.ts
diff --git a/flyteidl/gen/pb-go/flyteidl/event/event.pb.go b/flyteidl/gen/pb-go/flyteidl/event/event.pb.go
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json
diff --git a/flyteidl/gen/pb_rust/flyteidl.event.rs b/flyteidl/gen/pb_rust/flyteidl.event.rs
diff --git a/flyteidl/protos/flyteidl/event/event.proto b/flyteidl/protos/flyteidl/event/event.proto
@@ -288,7 +288,8 @@ message ExternalResourceInfo {
     // log information for the external resource execution
     repeated core.TaskLog logs = 6;
 
-    // TODO @hamersaw - docs
+    // String location uniquely identifying where the deck HTML file is
+    // NativeUrl specifies the url in the format of the configured storage provider (e.g. s3://my-bucket/randomstring/suffix.tar)
     string deck_uri = 7;
 }
 

diff --git a/flytepropeller/pkg/controller/nodes/array/event_recorder.go b/flytepropeller/pkg/controller/nodes/array/event_recorder.go
@@ -92,13 +92,18 @@ func (e *externalResourcesEventRecorder) process(ctx context.Context, nCtx inter
 
 	// process events
 	cacheStatus := idlcore.CatalogCacheStatus_CACHE_DISABLED
+	var deckURI string
 	for _, nodeExecutionEvent := range e.nodeEvents {
 		switch target := nodeExecutionEvent.GetTargetMetadata().(type) {
 		case *event.NodeExecutionEvent_TaskNodeMetadata:
 			if target.TaskNodeMetadata != nil {
 				cacheStatus = target.TaskNodeMetadata.GetCacheStatus()
 			}
 		}
+
+		if len(nodeExecutionEvent.DeckUri) > 0 {
+			deckURI = nodeExecutionEvent.DeckUri
+		}
 	}
 
 	// fastcache will not emit task events for cache hits. we need to manually detect a
@@ -110,6 +115,7 @@ func (e *externalResourcesEventRecorder) process(ctx context.Context, nCtx inter
 			RetryAttempt: retryAttempt,
 			Phase:        idlcore.TaskExecution_SUCCEEDED,
 			CacheStatus:  cacheStatus,
+			DeckUri:      deckURI,
 		})
 	}
 
@@ -143,6 +149,7 @@ func (e *externalResourcesEventRecorder) process(ctx context.Context, nCtx inter
 			RetryAttempt: retryAttempt,
 			Phase:        taskExecutionEvent.GetPhase(),
 			CacheStatus:  cacheStatus,
+			DeckUri:      deckURI,
 		})
 	}