Implement service and model changes for global/organization registries

cmd/server/docs/docs.go

@@ -4376,9 +4376,15 @@ const docTemplate = `{
                 "id": {
                     "type": "integer"
                 },
+                "org_id": {
+                    "type": "integer"
+                },
                 "password": {
                     "type": "string"
                 },
+                "repo_id": {
+                    "type": "integer"
+                },
                 "username": {
                     "type": "string"
                 }

server/model/registry.go

@@ -29,8 +29,9 @@ var (
 // Registry represents a docker registry with credentials.
 type Registry struct {
 	ID       int64  `json:"id"       xorm:"pk autoincr 'id'"`
-	RepoID   int64  `json:"-"        xorm:"UNIQUE(s) INDEX 'repo_id'"`
-	Address  string `json:"address"  xorm:"UNIQUE(s) INDEX 'address'"`
+	OrgID    int64  `json:"org_id"   xorm:"NOT NULL DEFAULT 0 UNIQUE(s) INDEX 'org_id'"`
+	RepoID   int64  `json:"repo_id"  xorm:"NOT NULL DEFAULT 0 UNIQUE(s) INDEX 'repo_id'"`
+	Address  string `json:"address"  xorm:"NOT NULL UNIQUE(s) INDEX 'address'"`
 	Username string `json:"username" xorm:"varchar(2000) 'username'"`
 	Password string `json:"password" xorm:"TEXT 'password'"`
 } //	@name Registry
@@ -39,6 +40,21 @@ func (r Registry) TableName() string {
 	return "registries"
 }
 
+// Global secret.
+func (r Registry) IsGlobal() bool {
+	return r.RepoID == 0 && r.OrgID == 0
+}
+
+// Organization secret.
+func (r Registry) IsOrganization() bool {
+	return r.RepoID == 0 && r.OrgID != 0
+}
+
+// Repository secret.
+func (r Registry) IsRepository() bool {
+	return r.RepoID != 0 && r.OrgID == 0
+}
+
 // Validate validates the registry information.
 func (r *Registry) Validate() error {
 	switch {
@@ -58,6 +74,7 @@ func (r *Registry) Validate() error {
 func (r *Registry) Copy() *Registry {
 	return &Registry{
 		ID:       r.ID,
+		OrgID:    r.OrgID,
 		RepoID:   r.RepoID,
 		Address:  r.Address,
 		Username: r.Username,

server/pipeline/items.go

@@ -44,13 +44,13 @@ func parsePipeline(forge forge.Forge, store store.Store, currentPipeline *model.
 	}
 
 	secretService := server.Config.Services.Manager.SecretServiceFromRepo(repo)
-	secs, err := secretService.SecretListPipeline(repo, currentPipeline, &model.ListOptions{All: true})
+	secs, err := secretService.SecretListPipeline(repo, currentPipeline)
 	if err != nil {
 		log.Error().Err(err).Msgf("error getting secrets for %s#%d", repo.FullName, currentPipeline.Number)
 	}
 
 	registryService := server.Config.Services.Manager.RegistryServiceFromRepo(repo)
-	regs, err := registryService.RegistryList(repo, &model.ListOptions{All: true})
+	regs, err := registryService.RegistryListPipeline(repo, currentPipeline)
 	if err != nil {
 		log.Error().Err(err).Msgf("error getting registry credentials for %s#%d", repo.FullName, currentPipeline.Number)
 	}