merge branch and re generate idl

Signed-off-by: Yee Hing Tong <[email protected]>
flyteorg · Oct 17, 2023 · f718e6c · f718e6c
2 parents a7605e4 + 067d0d2
commit f718e6c
Show file tree

Hide file tree

Showing 18 changed files with 152 additions and 209 deletions.
diff --git a/.github/workflows/bump-tags.yml b/.github/workflows/bump-tags.yml
@@ -42,6 +42,7 @@ jobs:
             const components = [
               "datacatalog",
               "flyteadmin",
+              "flyteartifacts",
               "flytecopilot",
               "flyteidl",
               "flyteplugins",

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -5,6 +5,7 @@ on:
     paths:
       - 'datacatalog/**'
       - 'flyteadmin/**'
+      - 'flyteartifacts/**'
       - 'flytecopilot/**'
       - 'flyteplugins/**'
       - 'flytepropeller/**'
@@ -15,6 +16,7 @@ on:
     paths:
       - 'datacatalog/**'
       - 'flyteadmin/**'
+      - 'flyteartifacts/**'
       - 'flytecopilot/**'
       - 'flyteidl/**'
       - 'flyteplugins/**'
@@ -80,6 +82,7 @@ jobs:
         component:
           - datacatalog
           - flyteadmin
+          - flyteartifacts
           - flytecopilot
           - flytepropeller
     name: Docker Build Images
@@ -162,6 +165,7 @@ jobs:
         component:
           - datacatalog
           - flyteadmin
+          - flyteartifacts
           - flytecopilot
           - flytepropeller
           - flytescheduler

diff --git a/flyteartifacts/Dockerfile → Dockerfile.flyteartifacts b/flyteartifacts/Dockerfile → Dockerfile.flyteartifacts
@@ -9,17 +9,16 @@ RUN apk add git openssh-client make curl
 # Create the artifacts directory
 RUN mkdir /artifacts
 
-
-# COPY only the go mod files for efficient caching
-COPY go.mod go.sum /go/src/github.com/flyteorg/flyte/flyteartifacts/
 WORKDIR /go/src/github.com/flyteorg/flyte/flyteartifacts/
 
-
-# Pull dependencies
-RUN go mod download
-
-# COPY the rest of the source code
-COPY . /go/src/github.com/flyteorg/flyte/flyteartifacts/
+COPY datacatalog ../datacatalog
+COPY flyteadmin ../flyteadmin
+COPY flyteartifacts .
+COPY flytecopilot ../flytecopilot
+COPY flyteidl ../flyteidl
+COPY flyteplugins ../flyteplugins
+COPY flytepropeller ../flytepropeller
+COPY flytestdlib ../flytestdlib
 
 # This 'linux_compile' target should compile binaries to the /artifacts directory
 # The main entrypoint should be compiled to /artifacts/flyteadmin

diff --git a/datacatalog/go.mod b/datacatalog/go.mod
@@ -9,15 +9,15 @@ require (
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/golang/glog v1.1.0
 	github.com/golang/protobuf v1.5.3
-	github.com/jackc/pgconn v1.10.1
+	github.com/jackc/pgconn v1.14.1
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
 	google.golang.org/grpc v1.56.1
-	gorm.io/driver/postgres v1.2.3
-	gorm.io/driver/sqlite v1.1.1
-	gorm.io/gorm v1.22.4
+	gorm.io/driver/postgres v1.5.3
+	gorm.io/driver/sqlite v1.5.4
+	gorm.io/gorm v1.25.4
 )
 
 require (
@@ -46,6 +46,7 @@ require (
 	github.com/flyteorg/stow v0.3.7 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/go-gormigrate/gormigrate/v2 v2.1.1 // indirect
 	github.com/go-logr/logr v0.4.0 // indirect
 	github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -58,17 +59,16 @@ require (
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.2.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.9.0 // indirect
-	github.com/jackc/pgx/v4 v4.14.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgx/v5 v5.4.3 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.4 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-sqlite3 v1.14.0 // indirect
+	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/ncw/swift v1.0.53 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
@@ -87,10 +87,10 @@ require (
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
-	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/oauth2 v0.7.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.1.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect