Fixed create project (#277)

* Fixed create project Signed-off-by: Yuvraj <[email protected]> * Fixed unit test Signed-off-by: Yuvraj <[email protected]>
flyteorg · Feb 12, 2022 · f3f6765 · f3f6765
1 parent 6947a2a
commit f3f6765
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/flytectl/clierrors/errors.go b/flytectl/clierrors/errors.go
@@ -3,7 +3,7 @@ package clierrors
 var (
 	ErrInvalidStateUpdate = "Invalid state passed. Specify either activate or archive\n"
 
-	ErrProjectNotPassed     = "Project not passed\n"
+	ErrProjectNotPassed     = "Project id not passed\n" // #nosec
 	ErrProjectNameNotPassed = "project name is required flag"
 	ErrFailedProjectUpdate  = "Project %v failed to get updated due to %v\n"
 

diff --git a/flytectl/cmd/config/subcommand/project/project_config.go b/flytectl/cmd/config/subcommand/project/project_config.go
@@ -56,6 +56,10 @@ func (c *ConfigProject) GetProjectSpec(id string) (*admin.Project, error) {
 		if err != nil {
 			return nil, err
 		}
+		if projectSpec.Id == id {
+			return &projectSpec, nil
+		}
+		projectSpec.Id = id
 		return &projectSpec, nil
 	}
 

diff --git a/flytectl/cmd/create/project.go b/flytectl/cmd/create/project.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 
 	"github.com/flyteorg/flytectl/clierrors"
-	"github.com/flyteorg/flytectl/cmd/config"
-
 	"github.com/flyteorg/flytectl/cmd/config/subcommand/project"
 	"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/admin"
 
@@ -41,7 +39,7 @@ Create a project by definition file. Note: The name shouldn't contain any whites
 )
 
 func createProjectsCommand(ctx context.Context, args []string, cmdCtx cmdCore.CommandContext) error {
-	projectSpec, err := project.DefaultProjectConfig.GetProjectSpec(config.GetConfig().Project)
+	projectSpec, err := project.DefaultProjectConfig.GetProjectSpec(project.DefaultProjectConfig.ID)
 	if err != nil {
 		return err
 	}

diff --git a/flytectl/cmd/create/project_test.go b/flytectl/cmd/create/project_test.go
@@ -62,7 +62,7 @@ func TestEmptyProjectID(t *testing.T) {
 	project.DefaultProjectConfig = &project.ConfigProject{}
 	mockClient.OnRegisterProjectMatch(ctx, projectRegisterRequest).Return(nil, nil)
 	err := createProjectsCommand(ctx, args, cmdCtx)
-	assert.Equal(t, errors.New(clierrors.ErrProjectNameNotPassed), err)
+	assert.Equal(t, errors.New(clierrors.ErrProjectNotPassed), err)
 	mockClient.AssertNotCalled(t, "RegisterProject", ctx, mock.Anything)
 }
 

diff --git a/flytectl/cmd/update/project.go b/flytectl/cmd/update/project.go
@@ -91,9 +91,6 @@ func updateProjectsFunc(ctx context.Context, args []string, cmdCtx cmdCore.Comma
 	if projectSpec.Id == "" {
 		return fmt.Errorf(clierrors.ErrProjectNotPassed)
 	}
-	if projectSpec.Name == "" {
-		return fmt.Errorf(clierrors.ErrProjectNameNotPassed)
-	}
 
 	state, err := project.DefaultProjectConfig.MapToAdminState()
 	if err != nil {