mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2026-04-15 01:41:56 +00:00
def714cecd
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com> Co-authored-by: qwerty287 <qwerty287@posteo.de>
137 lines
4.1 KiB
Go
137 lines
4.1 KiB
Go
// Copyright 2026 Woodpecker Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package secret
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/rs/zerolog/log"
|
|
|
|
"go.woodpecker-ci.org/woodpecker/v3/server/model"
|
|
)
|
|
|
|
type combined struct {
|
|
base Service
|
|
extension *httpExtension
|
|
}
|
|
|
|
// NewCombined returns a secret service that combines a base service with an HTTP extension.
|
|
// The extension is called during SecretListPipeline to fetch additional secrets and
|
|
// the extension secrets taking priority.
|
|
func NewCombined(base Service, extension *httpExtension) Service {
|
|
return &combined{base, extension}
|
|
}
|
|
|
|
func (c *combined) SecretListPipeline(ctx context.Context, repo *model.Repo, pipeline *model.Pipeline, netrc *model.Netrc) ([]*model.Secret, error) {
|
|
// Get secrets from base service
|
|
baseSecrets, err := c.base.SecretListPipeline(ctx, repo, pipeline, netrc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Get secrets from HTTP extension
|
|
extensionSecrets, err := c.extension.SecretListPipeline(ctx, repo, pipeline, netrc)
|
|
if err != nil {
|
|
// Log the error but don't fail - use base secrets only
|
|
log.Warn().Err(err).Msg("failed to fetch secrets from extension")
|
|
return baseSecrets, nil
|
|
}
|
|
|
|
if len(extensionSecrets) == 0 {
|
|
return baseSecrets, nil
|
|
}
|
|
|
|
// Merge secrets, with extension secrets taking priority (no duplicates by name)
|
|
exists := make(map[string]struct{}, len(extensionSecrets))
|
|
for _, s := range extensionSecrets {
|
|
exists[s.Name] = struct{}{}
|
|
}
|
|
|
|
merged := make([]*model.Secret, 0, len(baseSecrets)+len(extensionSecrets))
|
|
merged = append(merged, extensionSecrets...)
|
|
|
|
for _, s := range baseSecrets {
|
|
if _, ok := exists[s.Name]; ok {
|
|
continue
|
|
}
|
|
exists[s.Name] = struct{}{}
|
|
merged = append(merged, s)
|
|
}
|
|
|
|
return merged, nil
|
|
}
|
|
|
|
// All other methods delegate to the base service.
|
|
|
|
func (c *combined) SecretFind(repo *model.Repo, name string) (*model.Secret, error) {
|
|
return c.base.SecretFind(repo, name)
|
|
}
|
|
|
|
func (c *combined) SecretList(repo *model.Repo, p *model.ListOptions) ([]*model.Secret, error) {
|
|
return c.base.SecretList(repo, p)
|
|
}
|
|
|
|
func (c *combined) SecretCreate(repo *model.Repo, secret *model.Secret) error {
|
|
return c.base.SecretCreate(repo, secret)
|
|
}
|
|
|
|
func (c *combined) SecretUpdate(repo *model.Repo, secret *model.Secret) error {
|
|
return c.base.SecretUpdate(repo, secret)
|
|
}
|
|
|
|
func (c *combined) SecretDelete(repo *model.Repo, name string) error {
|
|
return c.base.SecretDelete(repo, name)
|
|
}
|
|
|
|
func (c *combined) OrgSecretFind(orgID int64, name string) (*model.Secret, error) {
|
|
return c.base.OrgSecretFind(orgID, name)
|
|
}
|
|
|
|
func (c *combined) OrgSecretList(orgID int64, p *model.ListOptions) ([]*model.Secret, error) {
|
|
return c.base.OrgSecretList(orgID, p)
|
|
}
|
|
|
|
func (c *combined) OrgSecretCreate(orgID int64, secret *model.Secret) error {
|
|
return c.base.OrgSecretCreate(orgID, secret)
|
|
}
|
|
|
|
func (c *combined) OrgSecretUpdate(orgID int64, secret *model.Secret) error {
|
|
return c.base.OrgSecretUpdate(orgID, secret)
|
|
}
|
|
|
|
func (c *combined) OrgSecretDelete(orgID int64, name string) error {
|
|
return c.base.OrgSecretDelete(orgID, name)
|
|
}
|
|
|
|
func (c *combined) GlobalSecretFind(name string) (*model.Secret, error) {
|
|
return c.base.GlobalSecretFind(name)
|
|
}
|
|
|
|
func (c *combined) GlobalSecretList(p *model.ListOptions) ([]*model.Secret, error) {
|
|
return c.base.GlobalSecretList(p)
|
|
}
|
|
|
|
func (c *combined) GlobalSecretCreate(secret *model.Secret) error {
|
|
return c.base.GlobalSecretCreate(secret)
|
|
}
|
|
|
|
func (c *combined) GlobalSecretUpdate(secret *model.Secret) error {
|
|
return c.base.GlobalSecretUpdate(secret)
|
|
}
|
|
|
|
func (c *combined) GlobalSecretDelete(name string) error {
|
|
return c.base.GlobalSecretDelete(name)
|
|
}
|