Merge pull request #391 from Interhyp/RELTEC-12347

feat(RELTEC-12347): search repository by url
Interhyp · Dec 20, 2024 · 838ef0f · 838ef0f
2 parents c6ae1e7 + 457f631
commit 838ef0f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/api/openapi-v3-spec.yaml b/api/openapi-v3-spec.yaml
@@ -722,6 +722,13 @@ paths:
       summary: get repositories
       description: 'Obtain a list of repositories, potentially filtered by owner alias or service name'
       parameters:
+        - name: url
+          in: query
+          description: 'Optional - allows filtering the output by repository url. Must match `^[a-z](-?:?@?.?\/?[a-z0-9]+)*$`.'
+          required: false
+          schema:
+            type: string
+          example: [email protected]:some-org/some-repo.git
         - name: owner
           in: query
           description: 'Optional - the alias of an owner. If present, only repositories with this owner are returned. Must match `^[a-z](-?[a-z0-9]+)*$`.'

diff --git a/internal/acorn/service/repositoriesint.go b/internal/acorn/service/repositoriesint.go
@@ -16,7 +16,8 @@ type Repositories interface {
 
 	GetRepositories(ctx context.Context,
 		ownerAliasFilter string, serviceNameFilter string,
-		nameFilter string, typeFilter string) (openapi.RepositoryListDto, error)
+		nameFilter string, typeFilter string,
+		urlFilter string) (openapi.RepositoryListDto, error)
 	GetRepository(ctx context.Context, repoKey string) (openapi.RepositoryDto, error)
 
 	// CreateRepository returns the repository as it was created, with commit hash and timestamp filled in.

diff --git a/internal/service/repositories/repositories.go b/internal/service/repositories/repositories.go
@@ -93,6 +93,7 @@ func (s *Impl) validRepositoryType(repoType string) bool {
 func (s *Impl) GetRepositories(ctx context.Context,
 	ownerAliasFilter string, serviceNameFilter string,
 	nameFilter string, typeFilter string,
+	urlFilter string,
 ) (openapi.RepositoryListDto, error) {
 	result := openapi.RepositoryListDto{
 		Repositories: make(map[string]openapi.RepositoryDto),
@@ -138,10 +139,12 @@ func (s *Impl) GetRepositories(ctx context.Context,
 					keyType = keyComponents[1]
 				}
 
-				if ownerAliasFilter == "" || ownerAliasFilter == repository.Owner {
-					if nameFilter == "" || nameFilter == keyName {
-						if typeFilter == "" || typeFilter == keyType {
-							result.Repositories[key] = repository
+				if urlFilter == "" || urlFilter == repository.Url {
+					if ownerAliasFilter == "" || ownerAliasFilter == repository.Owner {
+						if nameFilter == "" || nameFilter == keyName {
+							if typeFilter == "" || typeFilter == keyType {
+								result.Repositories[key] = repository
+							}
 						}
 					}
 				}

diff --git a/internal/service/vcswebhookshandler/vcswebhookshandler.go b/internal/service/vcswebhookshandler/vcswebhookshandler.go
@@ -237,7 +237,7 @@ func (h *Impl) verifyRepository(ctx context.Context, path string, contents strin
 }
 
 func (h *Impl) verifyRepositoryData(ctx context.Context, dtoKey string, dtoRepo *openapi.RepositoryDto) error {
-	repositories, err := h.Repositories.GetRepositories(ctx, "", "", "", "")
+	repositories, err := h.Repositories.GetRepositories(ctx, "", "", "", "", "")
 	if err == nil {
 		for repoKey, repo := range repositories.Repositories {
 			if repoKey == dtoKey {

diff --git a/internal/web/controller/repositoryctl/repositoryctl.go b/internal/web/controller/repositoryctl/repositoryctl.go
@@ -20,6 +20,7 @@ const ownerParam = "owner"
 const serviceParam = "service"
 const nameParam = "name"
 const typeParam = "type"
+const urlParam = "url"
 
 type Impl struct {
 	Configuration       librepo.Configuration
@@ -69,10 +70,12 @@ func (c *Impl) GetRepositories(w http.ResponseWriter, r *http.Request) {
 	serviceNameFilter := util.StringQueryParam(r, serviceParam)
 	nameFilter := util.StringQueryParam(r, nameParam)
 	typeFilter := util.StringQueryParam(r, typeParam)
+	urlFilter := util.StringQueryParam(r, urlParam)
 
 	repositories, err := c.Repositories.GetRepositories(ctx,
 		ownerAliasFilter, serviceNameFilter,
-		nameFilter, typeFilter)
+		nameFilter, typeFilter,
+		urlFilter)
 	if err != nil {
 		if apierrors.IsNotFoundError(err) {
 			// acceptable case - no matching repositories, so return empty list