feat(ui): update UI

di/commons/config/config.go

@@ -28,11 +28,10 @@ import (
 	"github.com/alecthomas/units"
 	"google.golang.org/grpc/grpclog"
 
-	"runtime"
-
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	v1core "k8s.io/api/core/v1"
+	"runtime"
 )
 
 const (
@@ -147,6 +146,12 @@ const (
 	// learner pods should not be cleaned up
 	NoCleanup = "nocleanup"
 
+	MongoAddressKey             = "MONGO_ADDRESS"
+	MongoDatabaseKey            = "MONGO_DATABASE"
+	MongoUsernameKey            = "MONGO_USERNAME"
+	MongoPasswordKey            = "MONGO_PASSWORD"
+	MongoAuthenticationDatabase = "MONGO_Authentication_Database"
+
 	DlaasResourceLimit          = "resource.limit"
 	DlaasResourceLimitQuerySize = "resource.limit.query.size"
 
@@ -195,6 +200,7 @@ func InitViper() {
 		// FfDL Change:Most likely be "standard" in Minikube and "ibmc-s3fs-standard" in DIND, (other value is "default" or "")
 		viper.SetDefault(SharedVolumeStorageClassKey, "")
 
+
 		// enable ENV vars and defaults
 		viper.AutomaticEnv()
 		viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_"))
@@ -203,6 +209,11 @@ func InitViper() {
 		setLogLevel()
 		viper.SetDefault(PortKey, 8080)
 
+		viper.SetDefault(MongoAddressKey,os.Getenv(MongoAddressKey))
+		viper.SetDefault(MongoDatabaseKey,os.Getenv(MongoDatabaseKey))
+		viper.SetDefault(MongoUsernameKey,os.Getenv(MongoUsernameKey))
+		viper.SetDefault(MongoPasswordKey,os.Getenv(MongoPasswordKey))
+		viper.SetDefault(MongoAuthenticationDatabase,os.Getenv(MongoAuthenticationDatabase))
 		viper.SetDefault(ServicesTagKey, "prod") // or "latest" as the default?
 
 		viper.SetDefault(LearnerTagKey, "prod")
@@ -463,6 +474,11 @@ func GetDataStoreConfig() map[string]string {
 	if val != "" {
 		m[RegionKey] = val
 	}
+	// FfDL Change: This was in the older PR, supposing not needed?
+	//val = viper.GetString("objectstore." + UsernameKey)
+	//if val != "" {
+	//	m[UsernameKey] = val
+	//}
 
 	val = viper.GetString("objectstore." + ProjectKey)
 	if val != "" {
@@ -473,6 +489,7 @@ func GetDataStoreConfig() map[string]string {
 		m[StorageType] = val
 	}
 
+
 	return m
 }
 

di/commons/constants/constants.go

@@ -64,13 +64,13 @@ const (
 
 const TFOS = "tfos"
 
-// const BDAPSAFE_SS = "bdapsafe-ss"
-// const BDAP_SS = "bdap-ss"
-// const BDP_SS = "bdp-ss"
+const BDAPSAFE_SS = "bdapsafe-ss"
+const BDAP_SS = "bdap-ss"
+const BDP_SS = "bdp-ss"
 
-// const BDAP = "bdap"
-// const BDP = "bdp"
-// const SAFE = "safe"
+const BDAP = "bdap"
+const BDP = "bdp"
+const SAFE = "safe"
 
 const ENVIR = "envir"
 
@@ -79,11 +79,14 @@ const FLUENT_BIT_LOG_PATH string = "FLUENT_BIT_LOG_PATH"
 
 const JOBTYPE string = "jobType"
 const SINGLE string = "single"
-
-const MongoAddressKey = "mongo.address"
-const MongoDatabaseKey = "mongo.database"
-const MongoUsernameKey = "mongo.username"
-const MongoPasswordKey = "mongo.password"
+const DI_START_NODEPORT string = "DI_START_NODEPORT"
+const DI_END_NODEPORT string = "DI_END_NODEPORT"
+
+const MongoAddressKey = "MONGO_ADDRESS"
+const MongoDatabaseKey = "MONGO_DATABASE"
+const MongoUsernameKey = "MONGO_USERNAME"
+const MongoPasswordKey = "MONGO_PASSWORD"
+const MongoAuthenticationDatabase = "MONGO_Authentication_Database"
 
 const (
 	LOG_STORING_KEY       = "store_status"

di/commons/controlcenter/client/cc_client.go

@@ -30,6 +30,21 @@ type UserResponse struct {
 	Token     string `json:"token,omitempty"`
 }
 
+type ProxyUserResponse struct {
+	Name      string `json:"name"`
+	GID       int    `json:"gid"`
+	UID       int    `json:"uid"`
+	Token     string `json:"token,omitempty"`
+	UserId    int `json:"user_id,omitempty"`
+	Path      string `json:"path,omitempty"`
+}
+
+type ProxyUserCheckResponse struct {
+	Code    string `json:"code"`
+	Message int    `json:"message"`
+	Result  bool   `json:"result"`
+}
+
 const CcAuthToken = "MLSS-Token"
 
 // FIXME MLSS Change: get models filter by username and namespace
@@ -137,6 +152,50 @@ func (cc *CcClient) UserNamespaceCheck(token string, userName string, namespace
 	return nil
 }
 
+func (cc *CcClient) GetProxyUserFromCC(token string, proxyUserId string, userId string) (*ProxyUserResponse, error) {
+	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/proxyUser/%v/user/%v", proxyUserId, userId)
+	body, err := cc.accessCheckFromCc(token, apiUrl)
+	if err != nil {
+		return nil, err
+	}
+	var u = new(ProxyUserResponse)
+	//json.Unmarshal(body, &u)
+	err = models.GetResultData(body, &u)
+	if err != nil {
+		return nil,  errors.New("GetResultData failed" + err.Error())
+	}
+	log.Debugf("response=%+v, GID=%v, UID=%v", u, u.GID, u.UID)
+	if  (u.GID == 0 || u.UID == 0) {
+		return nil, errors.New("error GUIDCheck is on and GID or UID is 0")
+	}
+	//gid := strconv.Itoa(u.GID)
+	//uid := strconv.Itoa(u.UID)
+
+	return u, nil
+}
+
+func (cc *CcClient) GetGUIDFromProxyUserId(token string, proxyUserId string) (*string, *string, error) {
+	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/proxyUser/%v", proxyUserId)
+	body, err := cc.accessCheckFromCc(token, apiUrl)
+	if err != nil {
+		return nil, nil, err
+	}
+	var u = new(UserResponse)
+	//json.Unmarshal(body, &u)
+	err = models.GetResultData(body, &u)
+	if err != nil {
+		return nil, nil, errors.New("GetResultData failed")
+	}
+	log.Debugf("response=%+v, GID=%v, UID=%v", u, u.GID, u.UID)
+	if u.GUIDCheck && (u.GID == 0 || u.UID == 0) {
+		return nil, nil, errors.New("error GUIDCheck is on and GID or UID is 0")
+	}
+	gid := strconv.Itoa(u.GID)
+	uid := strconv.Itoa(u.UID)
+
+	return &gid, &uid, nil
+}
+
 func (cc *CcClient) GetGUIDFromUserId(token string, userId string) (*string, *string, error) {
 	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/users/name/%v", userId)
 	body, err := cc.accessCheckFromCc(token, apiUrl)
@@ -159,6 +218,7 @@ func (cc *CcClient) GetGUIDFromUserId(token string, userId string) (*string, *st
 	return &gid, &uid, nil
 }
 
+
 func (cc *CcClient) GetUserByName(token string, userId string) (*UserResponse, error) {
 	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/users/name/%v", userId)
 	body, err := cc.accessCheckFromCc(token, apiUrl)
@@ -176,6 +236,24 @@ func (cc *CcClient) GetUserByName(token string, userId string) (*UserResponse, e
 	return u, nil
 }
 
+func (cc *CcClient) ProxyUserCheck(token string, userId string, proxyUser string) (bool, error) {
+	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/proxyUserCheck/%v/%v", proxyUser, userId)
+	body, err := cc.accessCheckFromCc(token, apiUrl)
+	if err != nil {
+		return false, err
+	}
+	var auth bool
+	//json.Unmarshal(body, &u)
+	err = models.GetResultData(body, &auth)
+
+	if err != nil {
+		log.Error("Unmarshal Error", err)
+		return false, errors.New("Check Proxy User failed")
+	}
+
+	return auth, nil
+}
+
 func (cc *CcClient) AdminUserCheck(token string, adminUserId string, userId string) error {
 	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/auth/access/users/%v/users/%v", adminUserId, userId)
 	_, err := cc.accessCheckFromCc(token, apiUrl)
@@ -303,8 +381,8 @@ func (cc *CcClient) CheckNamespaceUser(token string, namespace string, user stri
 	return nil
 }
 
-func (cc *CcClient) GetCurrentUserNamespaceWithRole(token string, roleId string, clusterName string) ([]byte, error) {
-	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/groups/users/roles/%v/namespaces/clusterName/%v", roleId, clusterName)
+func (cc *CcClient) GetCurrentUserNamespaceWithRole(token string, roleId string) ([]byte, error) {
+	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/groups/users/roles/%v/namespaces", roleId)
 	log.Debugf("get apiUrl: %v", apiUrl)
 	req, err := http.NewRequest("GET", apiUrl, strings.NewReader(""))
 	if err != nil {
@@ -330,3 +408,49 @@ func (cc *CcClient) GetCurrentUserNamespaceWithRole(token string, roleId string,
 	defer resp.Body.Close()
 	return body, nil
 }
+
+
+type GetGroupFromUserRequest struct {
+
+}
+
+type GetGroupFromUserResponse struct {
+	ID         int64  `gorm:"column:id; PRIMARY_KEY" json:"id"`
+	Name       string `json:"name"`
+	EnableFlag int8   `json:"enable_flag"`
+	UserId     int64  `json:"user_id"`
+	RoleId     int64  `json:"role_id"`
+	GroupId    int64  `json:"group_id"`
+	Remarks    string `json:"remarks"`
+}
+
+
+
+func (cc *CcClient) GetGroupFromUser(username string) (*GetGroupFromUserResponse,error){
+	apiUrl := cc.ccUrl + fmt.Sprintf("/cc/v1/group/username/%v",  username)
+
+	req,err := http.NewRequest("GET",apiUrl,nil)
+	if err != nil {
+		return nil,err
+	}
+
+	res,err := cc.httpClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	resByte, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	group := GetGroupFromUserResponse{}
+	err = json.Unmarshal(resByte,&group)
+	if err != nil {
+		return nil, err
+	}
+
+	return &group,nil
+
+
+}

di/commons/logger/logger.go

@@ -60,6 +60,7 @@ const (
 	LogkeyRestAPIService       = "rest-api"
 	LogkeyStorageService       = "storage-service"
 	LogkeyTrainerService       = "trainer-service"
+	LogkeyStorerService        = "storer-service"
 	LogkeyVolumeManagerService = "volume-manager-service"
 
 	LogkeyJobMonitor = "jobmonitor"
@@ -225,23 +226,23 @@ func Config() {
 
 		loggingType := viper.GetString(config.LoggingType)
 		switch loggingType {
-		case config.LoggingTypeJson:
-			log.SetFormatter(&log.JSONFormatter{})
-		case config.LoggingTypeText:
-			log.SetFormatter(&log.TextFormatter{})
-		default: // any other env will use local settings (assuming outside SL)
-			env := viper.GetString(config.EnvKey)
-
-			switch env {
-			case config.DevelopmentEnv:
-				log.SetFormatter(&log.JSONFormatter{})
-			case config.StagingEnv:
-				log.SetFormatter(&log.JSONFormatter{})
-			case config.ProductionEnv:
+			case config.LoggingTypeJson:
 				log.SetFormatter(&log.JSONFormatter{})
+			case config.LoggingTypeText:
+				log.SetFormatter(&log.TextFormatter{})
 			default: // any other env will use local settings (assuming outside SL)
+				//env := viper.GetString(config.EnvKey)
 				log.SetFormatter(&log.JSONFormatter{})
-			}
+			//switch env {
+			//	case config.DevelopmentEnv:
+			//		log.SetFormatter(&log.JSONFormatter{})
+			//	case config.StagingEnv:
+			//		log.SetFormatter(&log.JSONFormatter{})
+			//	case config.ProductionEnv:
+			//		log.SetFormatter(&log.JSONFormatter{})
+			//	default: // any other env will use local settings (assuming outside SL)
+			//		log.SetFormatter(&log.JSONFormatter{})
+			//	}
 		}
 
 		viper.SetDefault(LogCategoryGetTrainingLogStream, LogCategoryGetTrainingLogStreamDefaultValue)

di/commons/models/experiment.go

@@ -21,6 +21,8 @@ type Experiment struct {
 	BaseModel
 	ExpDesc             *string         `json:"exp_desc"`
 	ExpName             *string         `json:"exp_name"`
+	GroupName           string        `json:"group_name"`
+	MlflowExpID         *string        `json:"mlflow_exp_id" gorm:"column:mlflow_exp_id"`
 	DssProjectID        int64           `json:"dss_project_id"`
 	DssProjectVersionID int64           `json:"dss_project_version"`
 	DssWorkspaceID      int64           `json:"dss_workspace_id"`

di/commons/service/client/lcm.go

@@ -76,7 +76,7 @@ func NewLcm(lcm service.LifecycleManagerClient) (LcmClient, error) {
 		if conn == nil{
 			log.Error("conn is nil")
 		}
-		log.Error("conn is not nil")
+		log.Debugf("conn is not nil")
 		return &lcmClient{
 			conn:   conn,
 			client: service.NewLifecycleManagerClient(conn),