Merge 84423b25ab into 6bcd4a3060

peridot/cmd/v1/peridot/BUILD.bazel

@@ -13,8 +13,13 @@ go_library(
         "project.go",
         "project_info.go",
         "project_list.go",
+        "project_repo.go",
+        "project_repo_get.go",
+        "project_repo_list.go",
         "project_catalog_sync.go",
         "project_create_hashed_repos.go",
+        "project_external_repo.go",
+        "project_external_repo_list.go",
         "utils.go",
     ],
     data = [

peridot/cmd/v1/peridot/main.go

@@ -31,11 +31,12 @@
 package main
 
 import (
+	"log"
+	"strings"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"log"
-	"strings"
 )
 
 var root = &cobra.Command{
@@ -64,6 +65,14 @@ func init() {
 	project.AddCommand(projectCreateHashedRepos)
 	project.AddCommand(projectCatalogSync)
 
+	project.AddCommand(repo)
+	repo.AddCommand(projectRepoList)
+	repo.AddCommand(projectRepoGet)
+
+	project.AddCommand(externalRepo)
+	externalRepo.AddCommand(externalRepoList)
+	//externalRepo.AddCommand(externalRepoGet)
+
 	root.AddCommand(impCmd)
 
 	viper.SetEnvPrefix("PERIDOT")

peridot/cmd/v1/peridot/project_external_repo.go

@@ -0,0 +1,37 @@
+// Copyright (c) All respective contributors to the Peridot Project. All rights reserved.
+// Copyright (c) 2021-2022 Rocky Enterprise Software Foundation, Inc. All rights reserved.
+// Copyright (c) 2021-2022 Ctrl IQ, Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors
+// may be used to endorse or promote products derived from this software without
+// specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import "github.com/spf13/cobra"
+
+var externalRepo = &cobra.Command{
+	Use: "external-repo",
+}

peridot/cmd/v1/peridot/project_external_repo_list.go

@@ -0,0 +1,62 @@
+// Copyright (c) All respective contributors to the Peridot Project. All rights reserved.
+// Copyright (c) 2021-2022 Rocky Enterprise Software Foundation, Inc. All rights reserved.
+// Copyright (c) 2021-2022 Ctrl IQ, Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors
+// may be used to endorse or promote products derived from this software without
+// specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"openapi.peridot.resf.org/peridotopenapi"
+)
+
+var externalRepoList = &cobra.Command{
+	Use: "list",
+	Run: projectExternalRepoListMn,
+}
+
+func projectExternalRepoListMn(_ *cobra.Command, _ []string) {
+	projectID := mustGetProjectID()
+
+	cl := getClient(serviceProject).(peridotopenapi.ProjectServiceApi)
+
+	res, _, err := cl.ListExternalRepositories(getContext(), projectID).Execute()
+	if err != nil {
+		errFatal(err)
+	}
+
+	data, err := json.Marshal(res.Repositories)
+	if err != nil {
+		errFatal(err)
+	}
+
+	fmt.Println(string(data))
+}

peridot/cmd/v1/peridot/project_repo.go

@@ -0,0 +1,37 @@
+// Copyright (c) All respective contributors to the Peridot Project. All rights reserved.
+// Copyright (c) 2021-2022 Rocky Enterprise Software Foundation, Inc. All rights reserved.
+// Copyright (c) 2021-2022 Ctrl IQ, Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors
+// may be used to endorse or promote products derived from this software without
+// specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import "github.com/spf13/cobra"
+
+var repo = &cobra.Command{
+	Use: "repo",
+}

peridot/cmd/v1/peridot/project_repo_get.go

@@ -0,0 +1,75 @@
+// Copyright (c) All respective contributors to the Peridot Project. All rights reserved.
+// Copyright (c) 2021-2022 Rocky Enterprise Software Foundation, Inc. All rights reserved.
+// Copyright (c) 2021-2022 Ctrl IQ, Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors
+// may be used to endorse or promote products derived from this software without
+// specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"openapi.peridot.resf.org/peridotopenapi"
+)
+
+var projectRepoGet = &cobra.Command{
+	Use: "get",
+	Args: cobra.ExactArgs(1),
+	Run: projectRepoGetMn,
+}
+
+func projectRepoGetMn(_ *cobra.Command, args []string) {
+	projectID := mustGetProjectID()
+
+	cl := getClient(serviceProject).(peridotopenapi.ProjectServiceApi)
+
+	repositories, _, err := cl.ListRepositories(getContext(), projectID).Execute()
+	if err != nil {
+		errFatal(err)
+	}
+
+	var repoID string = ""
+	for _, repo := range *repositories.Repositories {
+		if *repo.Name  == args[0] {
+			repoID = *repo.Id
+		}
+	}
+
+	res, _, err := cl.GetRepository(getContext(), projectID, repoID).Execute()
+	if err != nil {
+		errFatal(err)
+	}
+
+	data, err := json.Marshal(res.Repository)
+	if err != nil {
+		errFatal(err)
+	}
+
+	fmt.Println(string(data))
+}

peridot/cmd/v1/peridot/project_repo_list.go

@@ -0,0 +1,62 @@
+// Copyright (c) All respective contributors to the Peridot Project. All rights reserved.
+// Copyright (c) 2021-2022 Rocky Enterprise Software Foundation, Inc. All rights reserved.
+// Copyright (c) 2021-2022 Ctrl IQ, Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors
+// may be used to endorse or promote products derived from this software without
+// specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"openapi.peridot.resf.org/peridotopenapi"
+)
+
+var projectRepoList = &cobra.Command{
+	Use: "list",
+	Run: projectRepoListMn,
+}
+
+func projectRepoListMn(_ *cobra.Command, _ []string) {
+	projectID := mustGetProjectID()
+
+	cl := getClient(serviceProject).(peridotopenapi.ProjectServiceApi)
+
+	res, _, err := cl.ListRepositories(getContext(), projectID).Execute()
+	if err != nil {
+		errFatal(err)
+	}
+
+	data, err := json.Marshal(res.Repositories)
+	if err != nil {
+		errFatal(err)
+	}
+
+	fmt.Println(string(data))
+}

peridot/db/db.go

@@ -125,6 +125,7 @@ type Access interface {
 	GetPluginsForProject(projectId string) (models.Plugins, error)
 
 	GetExternalRepositoriesForProject(projectId string) (models.ExternalRepositories, error)
+	GetExternalRepository(projectId string, id string) (models.ExternalRepository, error)
 	DeleteExternalRepositoryForProject(projectId string, externalRepositoryId string) error
 	CreateExternalRepositoryForProject(projectId string, repoURL string, priority *int32, moduleHotfixes bool) (*models.ExternalRepository, error)
 	FindRepositoriesForPackage(projectId string, pkg string, internalOnly bool) (models.Repositories, error)

peridot/db/psql/repository.go

@@ -45,6 +45,16 @@ func (a *Access) GetExternalRepositoriesForProject(projectId string) (ret models
 	return ret, nil
 }
 
+func (a *Access) GetExternalRepository(projectId string, repoId string) (*models.ExternalRepository, error) {
+	var r models.ExternalRepository
+	err := a.query.Select(&r, "select id, created_at, project_id, url, priority, module_hotfixes from external_repositories where project_id = $1 and id = $2 order by created_at desc", projectId, repoId)
+	if err != nil {
+		return nil, err
+	}
+
+	return &r, nil
+}
+
 func (a *Access) DeleteExternalRepositoryForProject(projectId string, id string) error {
 	_, err := a.query.Exec("delete from external_repositories where project_id = $1 and id = $2", projectId, id)
 	return err

peridot/impl/v1/project.go

@@ -236,6 +236,47 @@ func (s *Server) GetRepository(ctx context.Context, req *peridotpb.GetRepository
 	}, nil
 }
 
+func (s *Server) ListExternalRepositories(ctx context.Context, req *peridotpb.ListExternalRepositoriesRequest) (*peridotpb.ListExternalRepositoriesResponse, error) {
+	if err := req.ValidateAll(); err != nil {
+		return nil, err
+	}
+	if err := s.checkPermission(ctx, ObjectProject, req.ProjectId.Value, PermissionView); err != nil {
+		return nil, err
+	}
+
+	repos, err := s.db.GetExternalRepositoriesForProject(req.ProjectId.Value)
+	if err != nil {
+		s.log.Errorf("could not list repositories: %v", err)
+		return nil, utils.CouldNotRetrieveObjects
+	}
+
+	return &peridotpb.ListExternalRepositoriesResponse {
+		Repositories: repos.ToProto(),
+	}, nil
+}
+
+func (s *Server) GetExternalRepository(ctx context.Context, req *peridotpb.GetExternalRepositoryRequest) (*peridotpb.GetExternalRepositoryResponse, error) {
+	if err := req.ValidateAll(); err != nil {
+		return nil, err
+	}
+	if err := s.checkPermission(ctx, ObjectProject, req.ProjectId.Value, PermissionView); err != nil {
+		return nil, err
+	}
+
+	repos, err := s.db.GetExternalRepositoryForProject(req.ProjectId.Value, &req.Id.Value, false)
+	if err != nil {
+		s.log.Errorf("could not list repositories: %v", err)
+		return nil, utils.CouldNotRetrieveObjects
+	}
+	if len(repos) == 0 {
+		return nil, utils.CouldNotFindObject
+	}
+
+	return &peridotpb.GetRepositoryResponse{
+		Repository: repos[0].ToProto(),
+	}, nil
+}
+
 func (s *Server) GetProjectCredentials(ctx context.Context, req *peridotpb.GetProjectCredentialsRequest) (*peridotpb.GetProjectCredentialsResponse, error) {
 	if err := req.ValidateAll(); err != nil {
 		return nil, err