merge master and making compile

Signed-off-by: Yee Hing Tong <[email protected]>

flyte-single-binary-local.yaml

@@ -77,15 +77,6 @@ database:
     port: 30001
     dbname: flyte
     options: "sslmode=disable"
-  # Point to cloned repo instead.
-  #
-#  postgres:
-#    username: postgres
-#    password: xxx
-#    host: 127.0.0.1
-#    port: 54328
-#    dbname: app
-#    options: "sslmode=disable"
 cloudEvents:
   enable: true
   cloudEventVersion: v2

flyteadmin/pkg/artifacts/registry.go

@@ -82,14 +82,13 @@ func (a *ArtifactRegistry) GetClient() artifact.ArtifactRegistryClient {
 // if nil, should either call the default config or return an error
 func NewArtifactRegistry(ctx context.Context, connCfg *admin2.Config, _ ...grpc.DialOption) *ArtifactRegistry {
 
-	var cfg = connCfg
 	if connCfg == nil {
-		//cfg = admin2.GetConfig(ctx)
 		return &ArtifactRegistry{
 			client: nil,
 		}
 	}
-	clients, err := admin2.NewClientsetBuilder().WithConfig(cfg).Build(ctx)
+
+	clients, err := admin2.NewClientsetBuilder().WithConfig(connCfg).Build(ctx)
 	if err != nil {
 		logger.Errorf(ctx, "Failed to create Artifact client")
 		// too many calls to this function to update, just panic for now.

flyteadmin/pkg/async/cloudevent/implementations/cloudevent_publisher.go

@@ -307,18 +307,18 @@ func (c *CloudEventWrappedPublisher) TransformNodeExecutionEvent(ctx context.Con
 	// This will likely need to move to the artifact service side, given message size limits.
 	// Replace with call to GetNodeExecutionData
 	var inputs *core.LiteralMap
-	logger.Infof(ctx, "DEBUGART-0: id %v", rawEvent.Id)
+	logger.Debugf(ctx, "RawEvent id %v", rawEvent.Id)
 	if len(rawEvent.GetInputUri()) > 0 {
 		inputs, _, err = util.GetInputs(ctx, c.urlData, &c.remoteDataConfig,
 			c.storageClient, rawEvent.GetInputUri())
-		logger.Infof(ctx, "DEBUGART-2: input uri %v, %v", rawEvent.GetInputUri(), inputs)
+		logger.Debugf(ctx, "RawEvent input uri %v, %v", rawEvent.GetInputUri(), inputs)
 
 		if err != nil {
 			fmt.Printf("Error fetching input literal map %v", rawEvent)
 		}
 	} else if rawEvent.GetInputData() != nil {
 		inputs = rawEvent.GetInputData()
-		logger.Infof(ctx, "DEBUGART-1: input data %v, %v", rawEvent.GetInputData(), inputs)
+		logger.Debugf(ctx, "RawEvent input data %v, %v", rawEvent.GetInputData(), inputs)
 	} else {
 		logger.Infof(ctx, "Node execution for node exec [%+v] has no input data", rawEvent.Id)
 	}
@@ -369,7 +369,7 @@ func (c *CloudEventWrappedPublisher) TransformNodeExecutionEvent(ctx context.Con
 		taskExecID = lte.Id
 	}
 
-	logger.Infof(ctx, "DEBUGART: inputs %v", inputs)
+	logger.Debugf(ctx, "RawEvent inputs %v", inputs)
 	return &event.CloudEventNodeExecution{
 		RawEvent:        rawEvent,
 		TaskExecId:      taskExecID,

flyteadmin/pkg/manager/impl/validation/execution_validator.go

@@ -68,11 +68,6 @@ func ValidateExecutionRequest(ctx context.Context, request admin.ExecutionCreate
 			return err
 		}
 	}
-	// TODO: Remove redundant validation with the rest of the method.
-	// This final call to validating the request ensures the notification types are expected.
-	if err := request.Validate(); err != nil {
-		return err
-	}
 	return nil
 }
 

flyteadmin/pkg/manager/impl/validation/launch_plan_validator.go

@@ -61,11 +61,6 @@ func ValidateLaunchPlan(ctx context.Context,
 			return err
 		}
 	}
-	// TODO: Remove redundant validation that occurs with launch plan and the validate method for the message.
-	// Ensure the notification types are validated.
-	if err := request.Validate(); err != nil {
-		return err
-	}
 	return nil
 }
 

flyteartifacts/go.mod

@@ -1,6 +1,8 @@
 module github.com/flyteorg/flyte/flyteartifacts
 
-go 1.19
+go 1.21
+
+toolchain go1.21.4
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0
@@ -16,8 +18,8 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/jackc/pgx/v5 v5.4.3
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.12.1
-	github.com/spf13/cobra v1.4.0
+	github.com/prometheus/client_golang v1.16.0
+	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
 	google.golang.org/grpc v1.56.1
@@ -33,9 +35,9 @@ require (
 	cloud.google.com/go/iam v0.13.0 // indirect
 	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/Azure/azure-sdk-for-go v63.4.0+incompatible // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.23.1 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.2 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest v0.11.27 // indirect
 	github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
@@ -50,19 +52,19 @@ require (
 	github.com/coocood/freecache v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.13.0 // indirect
-	github.com/flyteorg/stow v0.3.7 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/flyteorg/stow v0.3.8 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/gofrs/uuid v4.2.0+incompatible // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.14.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
@@ -78,18 +80,18 @@ require (
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/ncw/swift v1.0.53 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
-	github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
@@ -100,22 +102,22 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/crypto v0.13.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/oauth2 v0.7.0 // indirect
+	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.114.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/sqlite v1.5.4 // indirect
-	k8s.io/apimachinery v0.24.1 // indirect
-	k8s.io/client-go v0.24.1 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	k8s.io/apimachinery v0.28.2 // indirect
+	k8s.io/client-go v0.28.1 // indirect
+	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
 )
 
 replace (