From 99a6c12f98f92d48a6299d9b4c7aaacab1d2b5a1 Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Tue, 2 Apr 2019 11:06:45 +0200 Subject: [PATCH] project delete: use project ref --- cmd/agola/cmd/projectdelete.go | 18 +++++------------- .../services/configstore/command/command.go | 3 ++- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/cmd/agola/cmd/projectdelete.go b/cmd/agola/cmd/projectdelete.go index 57dfc45..49132fa 100644 --- a/cmd/agola/cmd/projectdelete.go +++ b/cmd/agola/cmd/projectdelete.go @@ -17,9 +17,9 @@ package cmd import ( "context" - "github.com/pkg/errors" "github.com/sorintlab/agola/internal/services/gateway/api" + "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -34,8 +34,7 @@ var cmdProjectDelete = &cobra.Command{ } type projectDeleteOptions struct { - name string - organizationName string + projectRef string } var projectDeleteOpts projectDeleteOptions @@ -43,10 +42,9 @@ var projectDeleteOpts projectDeleteOptions func init() { flags := cmdProjectDelete.Flags() - flags.StringVarP(&projectDeleteOpts.name, "name", "n", "", "project name") - flags.StringVar(&projectDeleteOpts.organizationName, "orgname", "", "organization name where the project should be deleted") + flags.StringVar(&projectDeleteOpts.projectRef, "project", "", "project id or full path") - cmdProjectDelete.MarkFlagRequired("name") + cmdProjectDelete.MarkFlagRequired("project") cmdProject.AddCommand(cmdProjectDelete) } @@ -56,13 +54,7 @@ func projectDelete(cmd *cobra.Command, args []string) error { log.Infof("deleting project") - var err error - if projectDeleteOpts.organizationName != "" { - _, err = gwclient.DeleteOrgProject(context.TODO(), projectDeleteOpts.organizationName, projectDeleteOpts.name) - } else { - _, err = gwclient.DeleteCurrentUserProject(context.TODO(), projectDeleteOpts.name) - } - if err != nil { + if _, err := gwclient.DeleteProject(context.TODO(), projectDeleteOpts.projectRef); err != nil { return errors.Wrapf(err, "failed to delete project") } diff --git a/internal/services/configstore/command/command.go b/internal/services/configstore/command/command.go index d3c56a7..cd9f3eb 100644 --- a/internal/services/configstore/command/command.go +++ b/internal/services/configstore/command/command.go @@ -205,7 +205,7 @@ func (s *CommandHandler) DeleteProject(ctx context.Context, projectRef string) e var err error // check project existance - project, err := s.readDB.GetProject(tx, projectRef) + project, err = s.readDB.GetProject(tx, projectRef) if err != nil { return err } @@ -229,6 +229,7 @@ func (s *CommandHandler) DeleteProject(ctx context.Context, projectRef string) e return err } + // TODO(sgotti) delete project secrets/variables actions := []*wal.Action{ { ActionType: wal.ActionTypeDelete,