From 5bcc5b14c860465e1cd833dfb9764558d6130c58 Mon Sep 17 00:00:00 2001
From: Anbraten <anton@ju60.de>
Date: Wed, 26 Mar 2025 23:44:40 +0100
Subject: [PATCH] cleanup

---
 .../frontend/yaml/stepbuilder/step_builder.go | 10 +-------
 pipeline/frontend/yaml/stepbuilder/types.go   |  4 ++--
 server/pipeline/items.go                      | 24 -------------------
 server/pipeline/metadata/metadata.go          | 24 +++++++++----------
 4 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/pipeline/frontend/yaml/stepbuilder/step_builder.go b/pipeline/frontend/yaml/stepbuilder/step_builder.go
index cd904f068..25c9e2516 100644
--- a/pipeline/frontend/yaml/stepbuilder/step_builder.go
+++ b/pipeline/frontend/yaml/stepbuilder/step_builder.go
@@ -50,14 +50,6 @@ type StepBuilder struct {
 	DefaultLabels        map[string]string
 }
 
-type Item struct {
-	Workflow  *model.Workflow
-	Labels    map[string]string
-	DependsOn []string
-	RunsOn    []string
-	Config    *backend_types.Config
-}
-
 func (b *StepBuilder) Build() (items []*Item, errorsAndWarnings error) {
 	b.Yamls = forge_types.SortByName(b.Yamls)
 
@@ -201,7 +193,7 @@ func (b *StepBuilder) compileWorkflow(parsed *yaml_types.Workflow, environ map[s
 		compiler.WithEnviron(environ),
 		compiler.WithEnviron(b.Envs),
 		compiler.WithEscalated(b.PrivilegedPlugins...),
-		compiler.WithTrustedClonePlugins(b.TrustedClonePlugins), // TODO: append repo trusted clone plugins
+		compiler.WithTrustedClonePlugins(b.TrustedClonePlugins),
 		compiler.WithPrefix(
 			fmt.Sprintf(
 				"wp_%s_%d",
diff --git a/pipeline/frontend/yaml/stepbuilder/types.go b/pipeline/frontend/yaml/stepbuilder/types.go
index 9ff6ac55f..e39d45c8f 100644
--- a/pipeline/frontend/yaml/stepbuilder/types.go
+++ b/pipeline/frontend/yaml/stepbuilder/types.go
@@ -1,8 +1,8 @@
 package stepbuilder
 
 import (
-	backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )
 
 type Item struct {
diff --git a/server/pipeline/items.go b/server/pipeline/items.go
index 9da42ff99..2ce8b1709 100644
--- a/server/pipeline/items.go
+++ b/server/pipeline/items.go
@@ -66,21 +66,6 @@ func parsePipeline(forge forge.Forge, store store.Store, currentPipeline *model.
 		})
 	}
 
-	var secrets []compiler.Secret
-	for _, sec := range secs {
-		var events []string
-		for _, event := range sec.Events {
-			events = append(events, string(event))
-		}
-
-		secrets = append(secrets, compiler.Secret{
-			Name:           sec.Name,
-			Value:          sec.Value,
-			AllowedPlugins: sec.Images,
-			Events:         events,
-		})
-	}
-
 	registryService := server.Config.Services.Manager.RegistryServiceFromRepo(repo)
 	regs, err := registryService.RegistryListPipeline(repo, currentPipeline)
 	if err != nil {
@@ -95,15 +80,6 @@ func parsePipeline(forge forge.Forge, store store.Store, currentPipeline *model.
 		})
 	}
 
-	var registries []compiler.Registry
-	for _, reg := range regs {
-		registries = append(registries, compiler.Registry{
-			Hostname: reg.Address,
-			Username: reg.Username,
-			Password: reg.Password,
-		})
-	}
-
 	if envs == nil {
 		envs = map[string]string{}
 	}
diff --git a/server/pipeline/metadata/metadata.go b/server/pipeline/metadata/metadata.go
index 66e51fa99..d15ebd6d5 100644
--- a/server/pipeline/metadata/metadata.go
+++ b/server/pipeline/metadata/metadata.go
@@ -33,15 +33,15 @@ func MetadataFromStruct(forge metadata.ServerForge, repo *model.Repo, pipeline,
 	}
 
 	fForge := metadata.Forge{}
-	if m.forge != nil {
+	if forge != nil {
 		fForge = metadata.Forge{
-			Type: m.forge.Name(),
-			URL:  m.forge.URL(),
+			Type: forge.Name(),
+			URL:  forge.URL(),
 		}
 	}
 
 	fRepo := metadata.Repo{}
-	if m.repo != nil {
+	if repo != nil {
 		fRepo = metadata.Repo{
 			ID:          repo.ID,
 			Name:        repo.Name,
@@ -53,18 +53,18 @@ func MetadataFromStruct(forge metadata.ServerForge, repo *model.Repo, pipeline,
 			Private:     repo.IsSCMPrivate,
 			Branch:      repo.Branch,
 			Trusted: metadata.TrustedConfiguration{
-				Network:  m.repo.Trusted.Network,
-				Volumes:  m.repo.Trusted.Volumes,
-				Security: m.repo.Trusted.Security,
+				Network:  repo.Trusted.Network,
+				Volumes:  repo.Trusted.Volumes,
+				Security: repo.Trusted.Security,
 			},
 		}
 
-		if idx := strings.LastIndex(m.repo.FullName, "/"); idx != -1 {
-			if fRepo.Name == "" && m.repo.FullName != "" {
-				fRepo.Name = m.repo.FullName[idx+1:]
+		if idx := strings.LastIndex(repo.FullName, "/"); idx != -1 {
+			if fRepo.Name == "" && repo.FullName != "" {
+				fRepo.Name = repo.FullName[idx+1:]
 			}
-			if fRepo.Owner == "" && m.repo.FullName != "" {
-				fRepo.Owner = m.repo.FullName[:idx]
+			if fRepo.Owner == "" && repo.FullName != "" {
+				fRepo.Owner = repo.FullName[:idx]
 			}
 		}
 	}