Merge pull request #47 from jsuchome/delete-codeset

Delete codeset

Author: Jiří Suchomel

design/codeset.go

@@ -106,7 +106,7 @@ var _ = Service("codeset", func() {
 	})
 
 	Method("get", func() {
-		Description("Retrieve an Codeset from FuseML.")
+		Description("Retrieve a Codeset from FuseML.")
 
 		Payload(func() {
 			Field(1, "project", String, "Project name", func() {
@@ -140,6 +140,38 @@ var _ = Service("codeset", func() {
 			Response("NotFound", CodeNotFound)
 		})
 	})
+
+	Method("delete", func() {
+		Description("Delete a Codeset registered by FuseML.")
+
+		Payload(func() {
+			Field(1, "project", String, "Project name", func() {
+				Example("mlflow-project-01")
+			})
+			Field(2, "name", String, "Codeset name", func() {
+				Example("mlflow-app-01")
+			})
+			Required("project", "name")
+		})
+
+		Error("BadRequest", func() {
+			Description("If neither name or project is not given, should return 400 Bad Request.")
+		})
+		Error("NotFound", func() {
+			Description("If there is no codeset with the given name and project, should return 404 Not Found.")
+		})
+
+		HTTP(func() {
+			DELETE("/codesets/{project}/{name}")
+			Response(StatusCreated)
+			Response("BadRequest", StatusBadRequest)
+		})
+		GRPC(func() {
+			Response(CodeOK)
+			Response("BadRequest", CodeInvalidArgument)
+		})
+	})
+
 })
 
 // Codeset describes the Codeset

pkg/core/codeset_store.go

@@ -14,6 +14,7 @@ type GitAdmin interface {
 	CreateRepoWebhook(string, string, *string) error
 	GetRepositories(org, label *string) ([]*domain.Codeset, error)
 	GetRepository(org, name string) (*domain.Codeset, error)
+	DeleteRepository(org, name string) error
 }
 
 // GitCodesetStore describes a stucture that accesses codeset store implemented in git
@@ -37,6 +38,16 @@ func (cs *GitCodesetStore) Find(ctx context.Context, project, name string) (*dom
 	return result, nil
 }
 
+// Delete removes a codeset identified by project and name
+func (cs *GitCodesetStore) Delete(ctx context.Context, project, name string) error {
+	err := cs.gitAdmin.DeleteRepository(project, name)
+	// TODO should we delete the project+user too? If it does not contain any repos?
+	if err != nil {
+		return errors.Wrap(err, "Deleting Codeset failed")
+	}
+	return nil
+}
+
 // GetAll returns all codesets matching given project and label
 func (cs *GitCodesetStore) GetAll(ctx context.Context, project, label *string) ([]*domain.Codeset, error) {
 	result, err := cs.gitAdmin.GetRepositories(project, label)

pkg/core/gitea/client.go

@@ -17,6 +17,7 @@ type AdminClient interface {
 	CreateRepoWebhook(string, string, *string) error
 	GetRepositories(org, label *string) ([]*domain.Codeset, error)
 	GetRepository(org, name string) (*domain.Codeset, error)
+	DeleteRepository(org, name string) error
 }
 
 // Client describes the interface of Gitea Client
@@ -35,6 +36,7 @@ type Client interface {
 	CreateRepoHook(string, string, gitea.CreateHookOption) (*gitea.Hook, *gitea.Response, error)
 	ListRepoTopics(string, string, gitea.ListRepoTopicsOptions) ([]string, *gitea.Response, error)
 	ListMyOrgs(gitea.ListOrgsOptions) ([]*gitea.Organization, *gitea.Response, error)
+	DeleteRepo(string, string) (*gitea.Response, error)
 }
 
 // giteaAdminClient is the struct holding information about gitea client
@@ -352,3 +354,24 @@ func (gac giteaAdminClient) GetRepository(org, name string) (*domain.Codeset, er
 
 	return &ret, nil
 }
+
+// Delete the repository
+func (gac giteaAdminClient) DeleteRepository(org, name string) error {
+	gac.logger.Printf("Going to delete repo %s for org '%s'...", name, org)
+
+	_, resp, err := gac.giteaClient.GetRepo(org, name)
+
+	if resp.StatusCode == 404 {
+		gac.logger.Printf("Repo does not exist, no need to delete")
+		return nil
+	}
+	if err != nil {
+		return errors.Wrap(err, "Failed to get repo")
+	}
+
+	_, err = gac.giteaClient.DeleteRepo(org, name)
+	if err != nil {
+		return errors.Wrap(err, "Failed to delete repository")
+	}
+	return nil
+}

pkg/core/gitea/client_test.go

@@ -12,9 +12,8 @@ import (
 )
 
 type TestStore struct {
-	repositories   map[string]gitea.Repository
 	projects       map[string]gitea.Organization
-	projects2repos map[string][]*gitea.Repository
+	projects2repos map[string]map[string]gitea.Repository
 	teams          map[int64][]string
 }
 
@@ -26,9 +25,8 @@ type testGiteaClient struct {
 
 func NewTestStore() *TestStore {
 	return &TestStore{
-		repositories:   make(map[string]gitea.Repository),
 		projects:       make(map[string]gitea.Organization),
-		projects2repos: make(map[string][]*gitea.Repository),
+		projects2repos: make(map[string]map[string]gitea.Repository),
 		teams:          make(map[int64][]string),
 	}
 }
@@ -55,15 +53,14 @@ func (tc testGiteaClient) AddRepoTopic(string, string, string) (*gitea.Response,
 }
 func (tc testGiteaClient) GetOrg(orgname string) (*gitea.Organization, *gitea.Response, error) {
 	if org, ok := tc.testStore.projects[orgname]; ok {
-		httpResp := http.Response{StatusCode: 200}
-		return &org, &gitea.Response{Response: &httpResp}, nil
+		return &org, &gitea.Response{Response: &httpResp200}, nil
 	}
 	return nil, nil, nil
 }
 func (tc testGiteaClient) CreateOrg(opt gitea.CreateOrgOption) (*gitea.Organization, *gitea.Response, error) {
 	org := gitea.Organization{UserName: opt.Name}
 	tc.testStore.projects[opt.Name] = org
-	tc.testStore.projects2repos[opt.Name] = make([]*gitea.Repository, 0)
+	tc.testStore.projects2repos[opt.Name] = make(map[string]gitea.Repository)
 	return &org, nil, nil
 }
 func (tc testGiteaClient) GetUserInfo(string) (*gitea.User, *gitea.Response, error) {
@@ -82,26 +79,26 @@ func (tc testGiteaClient) AddTeamMember(id int64, username string) (*gitea.Respo
 	return nil, nil
 }
 func (tc testGiteaClient) GetRepo(owner, reponame string) (*gitea.Repository, *gitea.Response, error) {
-	if repo, ok := tc.testStore.repositories[reponame]; ok {
-		return &repo, nil, nil
+	if repo, ok := tc.testStore.projects2repos[owner][reponame]; ok {
+		return &repo, &gitea.Response{Response: &httpResp200}, nil
 	}
-	return nil, nil, nil
-
+	return nil, &gitea.Response{Response: &httpResp404}, nil
 }
 func (tc testGiteaClient) CreateOrgRepo(org string, repo gitea.CreateRepoOption) (*gitea.Repository, *gitea.Response, error) {
 	r := gitea.Repository{Name: repo.Name}
-	tc.testStore.repositories[repo.Name] = r
-	tc.testStore.projects2repos[org] = append(tc.testStore.projects2repos[org], &r)
+	tc.testStore.projects2repos[org][repo.Name] = r
 	return &r, nil, nil
 }
 func (tc testGiteaClient) ListRepoHooks(string, string, gitea.ListHooksOptions) ([]*gitea.Hook, *gitea.Response, error) {
 	return nil, nil, nil
 }
 func (tc testGiteaClient) ListOrgRepos(org string, opt gitea.ListOrgReposOptions) ([]*gitea.Repository, *gitea.Response, error) {
-	if repos, ok := tc.testStore.projects2repos[org]; ok {
-		return repos, nil, nil
+	repos := make([]*gitea.Repository, 0)
+	for _, repo := range tc.testStore.projects2repos[org] {
+		r := repo
+		repos = append(repos, &r)
 	}
-	return nil, nil, nil
+	return repos, nil, nil
 }
 
 func (tc testGiteaClient) CreateRepoHook(string, string, gitea.CreateHookOption) (*gitea.Hook, *gitea.Response, error) {
@@ -113,18 +110,26 @@ func (tc testGiteaClient) ListRepoTopics(org, repo string, opt gitea.ListRepoTop
 func (tc testGiteaClient) ListMyOrgs(gitea.ListOrgsOptions) ([]*gitea.Organization, *gitea.Response, error) {
 	allOrgs := make([]*gitea.Organization, 0)
 	for _, org := range tc.testStore.projects {
-		allOrgs = append(allOrgs, &org)
+		o := org
+		allOrgs = append(allOrgs, &o)
 	}
 	return allOrgs, nil, nil
 }
 
+func (tc testGiteaClient) DeleteRepo(owner, repo string) (*gitea.Response, error) {
+	delete(tc.testStore.projects2repos[owner], repo)
+	return nil, nil
+}
+
 var (
 	project1              = "test-project1"
 	project2              = "test-project2"
 	name                  = "test"
 	testURL               = "http://gitea.example.io"
 	testListenerStringURL = "tekton-listener"
 	testListenerURL       = &testListenerStringURL
+	httpResp200           = http.Response{StatusCode: 200}
+	httpResp404           = http.Response{StatusCode: 404}
 )
 
 func getTestCodeset() *domain.Codeset {
@@ -205,6 +210,40 @@ func TestGetRepository(t *testing.T) {
 	}
 }
 
+func TestDeleteRepository(t *testing.T) {
+
+	testGiteaAdminClient := newTestGiteaAdminClient(NewTestStore())
+
+	// Reading repo that was not added should throw error
+	_, err := testGiteaAdminClient.GetRepository(project1, name)
+
+	assertError(t, err, errRepoNotFound)
+
+	// Prepare new repo
+	testGiteaAdminClient.PrepareRepository(getTestCodeset(), testListenerURL)
+
+	// Get the repo now
+	_, err = testGiteaAdminClient.GetRepository(project1, name)
+	if err != nil {
+		t.Errorf("Error geting repository that was just created")
+	}
+
+	err = testGiteaAdminClient.DeleteRepository(project1, name)
+	if err != nil {
+		t.Errorf("Error deleting repository")
+	}
+
+	c, err := testGiteaAdminClient.GetRepository(project1, name)
+	if c != nil {
+		t.Errorf("Repository still present after deleting")
+	}
+
+	err = testGiteaAdminClient.DeleteRepository(project1, name)
+	if err != nil {
+		t.Errorf("Error: deleting non existent repository should not fail")
+	}
+}
+
 func TestGetRepositories(t *testing.T) {
 
 	testGiteaAdminClient := newTestGiteaAdminClient(NewTestStore())

pkg/domain/codeset.go

@@ -24,4 +24,5 @@ type CodesetStore interface {
 	GetAll(ctx context.Context, project, label *string) ([]*Codeset, error)
 	Add(ctx context.Context, c *Codeset) (*Codeset, error)
 	CreateWebhook(context.Context, *Codeset, string) error
+	Delete(ctx context.Context, project, name string) error
 }

pkg/svc/codeset.go

@@ -76,3 +76,8 @@ func (s *codesetsrvc) Get(ctx context.Context, p *codeset.GetPayload) (res *code
 	}
 	return codesetDomainToRest(c), nil
 }
+
+func (s *codesetsrvc) Delete(ctx context.Context, p *codeset.DeletePayload) error {
+	s.logger.Print("codeset.delete")
+	return s.store.Delete(ctx, p.Project, p.Name)
+}