Merge sync remote-tracking branch 'upstream/main' into tarilabs-20241…

…015-sync

.github/workflows/build-and-push-ui-images.yml

@@ -0,0 +1,65 @@
+name: Build and Push UI and BFF Images
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+    paths:
+      - 'clients/ui/**'
+env:
+  IMG_ORG: kubeflow
+  IMG_UI_REPO: model-registry-ui
+  IMG_BFF_REPO: model-registry-bff
+  DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
+  DOCKER_PWD: ${{ secrets.DOCKERHUB_TOKEN }}
+  PUSH_IMAGE: true
+jobs:
+  build-image:
+    runs-on: ubuntu-latest
+    steps:
+      # Assign context variable for various action contexts (main, CI)
+      - name: Assigning main context
+        if: github.head_ref == '' && github.ref == 'refs/heads/main'
+        run: echo "BUILD_CONTEXT=main" >> $GITHUB_ENV
+      # checkout branch
+      - uses: actions/checkout@v4
+      # set image version
+      - name: Set main-branch environment
+        if: env.BUILD_CONTEXT == 'main'
+        run: |
+          commit_sha=${{ github.event.after }}
+          tag=main-${commit_sha:0:7}
+          echo "VERSION=${tag}" >> $GITHUB_ENV
+      - name: Build and Push UI Image
+        shell: bash
+        env:
+          IMG_REPO: ${{ env.IMG_UI_REPO }}
+        run: ./scripts/build_deploy.sh
+      - name: Build and Push BFF Image
+        shell: bash
+        env:
+          IMG_REPO: ${{ env.IMG_BFF_REPO }}
+        run: ./scripts/build_deploy.sh
+      - name: Tag Latest UI Image
+        if: env.BUILD_CONTEXT == 'main'
+        shell: bash
+        env:
+          IMG_REPO: ${{ env.IMG_UI_REPO }}
+          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_UI_REPO }}
+          BUILD_IMAGE: false # image is already built in "Build and Push UI Image" step
+        run: |
+          docker tag ${{ env.IMG }}:$VERSION ${{ env.IMG }}:latest
+          # BUILD_IMAGE=false skip the build, just push the tag made above
+          VERSION=latest ./scripts/build_deploy.sh
+      - name: Tag Latest BFF Image
+        if: env.BUILD_CONTEXT == 'main'
+        shell: bash
+        env:
+          IMG_REPO: ${{ env.IMG_BFF_REPO }}
+          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_BFF_REPO }}
+          BUILD_IMAGE: false # image is already built in "Build and Push BFF Image" step
+        run: |
+          docker tag ${{ env.IMG }}:$VERSION ${{ env.IMG }}:latest
+          # BUILD_IMAGE=false skip the build, just push the tag made above
+          VERSION=latest ./scripts/build_deploy.sh

Makefile

@@ -3,6 +3,8 @@ MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
 PROJECT_BIN := $(PROJECT_PATH)/bin
 GO ?= "$(shell which go)"
+BFF_PATH := $(PROJECT_PATH)/clients/ui/bff
+UI_PATH := $(PROJECT_PATH)/clients/ui/frontend
 
 # add tools bin directory
 PATH := $(PROJECT_BIN):$(PATH)
@@ -21,13 +23,26 @@ IMG_ORG ?= opendatahub
 IMG_VERSION ?= main
 # container image repository
 IMG_REPO ?= model-registry
+# container image build path
+BUILD_PATH ?= .
 # container image
 ifdef IMG_REGISTRY
     IMG := ${IMG_REGISTRY}/${IMG_ORG}/${IMG_REPO}
 else
     IMG := ${IMG_ORG}/${IMG_REPO}
 endif
 
+# Change Dockerfile path depending on IMG_REPO
+ifeq ($(IMG_REPO),model-registry-ui)
+    DOCKERFILE := $(UI_PATH)/Dockerfile
+	BUILD_PATH := $(UI_PATH)
+endif
+
+ifeq ($(IMG_REPO),model-registry-bff)
+    DOCKERFILE := $(BFF_PATH)/Dockerfile
+	BUILD_PATH := $(BFF_PATH)
+endif
+
 model-registry: build
 
 # clean the ml-metadata protos and trigger a fresh new build which downloads
@@ -216,7 +231,7 @@ endif
 # build docker image
 .PHONY: image/build
 image/build:
-	${DOCKER} build . -f ${DOCKERFILE} -t ${IMG}:$(IMG_VERSION)
+	${DOCKER} build ${BUILD_PATH} -f ${DOCKERFILE} -t ${IMG}:$(IMG_VERSION)
 
 # build docker image using buildx
 # PLATFORMS defines the target platforms for the model registry image be built to provide support to multiple

clients/ui/bff/internal/mocks/model_registry_client_mock.go

@@ -1,11 +1,12 @@
 package mocks
 
 import (
+	"log/slog"
+	"net/url"
+
 	"github.com/kubeflow/model-registry/pkg/openapi"
 	"github.com/kubeflow/model-registry/ui/bff/internal/integrations"
 	"github.com/stretchr/testify/mock"
-	"log/slog"
-	"net/url"
 )
 
 type ModelRegistryClientMock struct {
@@ -26,7 +27,11 @@ func (m *ModelRegistryClientMock) CreateRegisteredModel(_ integrations.HTTPClien
 	return &mockData, nil
 }
 
-func (m *ModelRegistryClientMock) GetRegisteredModel(_ integrations.HTTPClientInterface, _ string) (*openapi.RegisteredModel, error) {
+func (m *ModelRegistryClientMock) GetRegisteredModel(_ integrations.HTTPClientInterface, id string) (*openapi.RegisteredModel, error) {
+	if id == "3" {
+		mockData := GetRegisteredModelMocks()[2]
+		return &mockData, nil
+	}
 	mockData := GetRegisteredModelMocks()[0]
 	return &mockData, nil
 }
@@ -36,7 +41,12 @@ func (m *ModelRegistryClientMock) UpdateRegisteredModel(_ integrations.HTTPClien
 	return &mockData, nil
 }
 
-func (m *ModelRegistryClientMock) GetModelVersion(_ integrations.HTTPClientInterface, _ string) (*openapi.ModelVersion, error) {
+func (m *ModelRegistryClientMock) GetModelVersion(_ integrations.HTTPClientInterface, id string) (*openapi.ModelVersion, error) {
+	if id == "3" {
+		mockData := GetModelVersionMocks()[2]
+		return &mockData, nil
+	}
+
 	mockData := GetModelVersionMocks()[0]
 	return &mockData, nil
 }

clients/ui/bff/internal/mocks/static_data_mock.go

@@ -184,6 +184,18 @@ func newCustomProperties() *map[string]openapi.MetadataValue {
 				MetadataType: "MetadataStringValue",
 			},
 		},
+		"AWS_KEY": {
+			MetadataStringValue: &openapi.MetadataStringValue{
+				StringValue:  "asdf89asdf098asdfa",
+				MetadataType: "MetadataStringValue",
+			},
+		},
+		"AWS_PASSWORD": {
+			MetadataStringValue: &openapi.MetadataStringValue{
+				StringValue:  "*AadfeDs34adf",
+				MetadataType: "MetadataStringValue",
+			},
+		},
 	}
 
 	return &result

clients/ui/frontend/package.json

@@ -35,7 +35,7 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.21.5",
     "@cypress/code-coverage": "^3.13.4",
-    "@mui/material": "^6.1.1",
+    "@mui/material": "^6.1.3",
     "@mui/icons-material": "^6.1.2",
     "@mui/types": "^7.2.17",
     "@testing-library/cypress": "^10.0.1",
@@ -84,7 +84,7 @@
     "ts-loader": "^9.5.1",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "tslib": "^2.7.0",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.3",
     "url-loader": "^4.1.1",
     "webpack": "^5.94.0",
     "webpack-bundle-analyzer": "^4.10.2",