Artifact fixes (#193)

Signed-off-by: Yee Hing Tong <wild-endeavor@users.noreply.github.com>

flyteadmin/pkg/manager/impl/execution_manager.go

@@ -799,16 +799,8 @@ func (m *ExecutionManager) fillInTemplateArgs(ctx context.Context, query core.Ar
 			return query, errors.NewFlyteAdminErrorf(codes.InvalidArgument, "id doesn't have key")
 		}
 		var project, domain string
-		if ak.GetProject() == "" {
-			project = contextutils.Value(ctx, contextutils.ProjectKey)
-		} else {
-			project = ak.GetProject()
-		}
-		if ak.GetDomain() == "" {
-			domain = contextutils.Value(ctx, contextutils.DomainKey)
-		} else {
-			domain = ak.GetDomain()
-		}
+		project = contextutils.Value(ctx, contextutils.ProjectKey)
+		domain = contextutils.Value(ctx, contextutils.DomainKey)
 
 		var partitions map[string]*core.LabelValue
 

flyteadmin/pkg/manager/impl/execution_manager_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 	"strings"
 	"testing"
 	"time"
@@ -5968,6 +5969,12 @@ func TestQueryTemplate(t *testing.T) {
 		Name:    "testname",
 	}
 
+	akNameOnly := &core.ArtifactKey{
+		Project: "",
+		Domain:  "",
+		Name:    "testname",
+	}
+
 	t.Run("test all present, nothing to fill in", func(t *testing.T) {
 		pMap := map[string]*core.LabelValue{
 			"partition1": {Value: &core.LabelValue_StaticValue{StaticValue: "my value"}},
@@ -5978,7 +5985,7 @@ func TestQueryTemplate(t *testing.T) {
 		q := core.ArtifactQuery{
 			Identifier: &core.ArtifactQuery_ArtifactId{
 				ArtifactId: &core.ArtifactID{
-					ArtifactKey:   ak,
+					ArtifactKey:   akNameOnly,
 					Partitions:    p,
 					TimePartition: nil,
 				},
@@ -5988,6 +5995,12 @@ func TestQueryTemplate(t *testing.T) {
 		filledQuery, err := m.fillInTemplateArgs(ctx, q, otherInputs.Literals)
 		assert.NoError(t, err)
 		assert.True(t, proto.Equal(&q, &filledQuery))
+
+		q.GetArtifactId().ArtifactKey = ak
+		ctx = contextutils.WithProjectDomain(ctx, "project", "domain")
+		filledQuery, err = m.fillInTemplateArgs(ctx, q, otherInputs.Literals)
+		assert.NoError(t, err)
+		assert.True(t, proto.Equal(&q, &filledQuery))
 	})
 
 	t.Run("template date-times, both in explicit tp and not", func(t *testing.T) {