SVR-241: Add org to datacatalog datasetId key (#82)

flyteorg · Feb 20, 2024 · 2d7282d · 2d7282d
1 parent 8ee9ae0
commit 2d7282d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer.go b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer.go
@@ -169,7 +169,7 @@ func DatasetIDToIdentifier(id *datacatalog.DatasetID) *core.Identifier {
 	if id == nil {
 		return nil
 	}
-	return &core.Identifier{ResourceType: core.ResourceType_DATASET, Name: id.Name, Project: id.Project, Domain: id.Domain, Version: id.Version}
+	return &core.Identifier{ResourceType: core.ResourceType_DATASET, Name: id.Name, Project: id.Project, Domain: id.Domain, Version: id.Version, Org: id.Org}
 }
 
 // With Node-Node relationship this is bound to change. So lets keep it extensible

diff --git a/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer_test.go b/flytepropeller/pkg/controller/nodes/catalog/datacatalog/transformer_test.go
@@ -328,10 +328,11 @@ func TestEventCatalogMetadata(t *testing.T) {
 }
 
 func TestDatasetIDToIdentifier(t *testing.T) {
-	id := DatasetIDToIdentifier(&datacatalog.DatasetID{Project: "p", Domain: "d", Name: "n", Version: "v"})
+	id := DatasetIDToIdentifier(&datacatalog.DatasetID{Project: "p", Domain: "d", Name: "n", Version: "v", Org: "o"})
 	assert.Equal(t, core.ResourceType_DATASET, id.ResourceType)
 	assert.Equal(t, "n", id.Name)
 	assert.Equal(t, "p", id.Project)
 	assert.Equal(t, "d", id.Domain)
 	assert.Equal(t, "v", id.Version)
+	assert.Equal(t, "o", id.Org)
 }