Fix extension flag names (#6329)

cmd/server/flags.go

@@ -275,17 +275,18 @@ var flags = append([]cli.Flag{
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("WOODPECKER_CONFIG_EXTENSION_ENDPOINT", "WOODPECKER_CONFIG_SERVICE_ENDPOINT"), // TODO remove _SERVICE_ var in 4.0.0
-		Name:    "config-service-endpoint",
+		Name:    "config-extension-endpoint",
+		Aliases: []string{"config-service-endpoint"}, // TODO: remove in v4.0.0
 		Usage:   "url used for calling global configuration service endpoint",
 	},
 	&cli.BoolFlag{
 		Sources: cli.EnvVars("WOODPECKER_CONFIG_EXTENSION_EXCLUSIVE"),
-		Name:    "config-service-exclusive",
+		Name:    "config-extension-exclusive",
 		Usage:   "whether global configuration service endpoint should be exclusive (skip forge)",
 	},
 	&cli.StringFlag{
 		Sources: cli.EnvVars("WOODPECKER_REGISTRY_EXTENSION_ENDPOINT"),
-		Name:    "registry-service-endpoint",
+		Name:    "registry-extension-endpoint",
 		Usage:   "url used for calling registry service endpoint",
 	},
 	&cli.StringFlag{

docs/src/pages/migrations.md

@@ -18,6 +18,10 @@ To enhance the usability of Woodpecker and meet evolving security standards, occ
 
 Extension HTTP calls (as of now the configuration extension) will by default only be allowed to contact external hosts. Set `WOODPECKER_EXTENSIONS_ALLOWED_HOSTS` accordingly to allow additional hosts as needed.
 
+### Internal changes
+
+- Renamed the server flag `config-service-endpoint` to `config-extension-endpoint`
+
 ## 3.0.0
 
 ### User-facing migrations

server/services/manager.go

@@ -88,7 +88,7 @@ func NewManager(c *cli.Command, store store.Store, setupForge SetupForge) (Manag
 		signaturePublicKey:  signaturePublicKey,
 		store:               store,
 		secret:              setupSecretService(store),
-		registry:            setupRegistryService(store, c.String("docker-config"), c.String("registry-service-endpoint"), client),
+		registry:            setupRegistryService(store, c.String("docker-config"), c.String("registry-extension-endpoint"), client),
 		config:              configService,
 		environment:         environment.Parse(c.StringSlice("environment")),
 		forgeCache:          ttlcache.New(ttlcache.WithDisableTouchOnHit[int64, forge.Forge]()),

server/services/setup.go

@@ -74,9 +74,9 @@ func setupConfigService(c *cli.Command, client *utils.Client) (config.Service, e
 	}
 	configFetcher := config.NewForge(timeout, retries)
 
-	if endpoint := c.String("config-service-endpoint"); endpoint != "" {
+	if endpoint := c.String("config-extension-endpoint"); endpoint != "" {
 		httpFetcher := config.NewHTTP(endpoint, client)
-		if c.Bool("config-service-exclusive") {
+		if c.Bool("config-extension-exclusive") {
 			return httpFetcher, nil
 		}
 		return config.NewCombined(configFetcher, httpFetcher), nil