From 3157dd4cf86d0406ee0d3b94814265cc2c2237a4 Mon Sep 17 00:00:00 2001 From: pat-s Date: Tue, 19 Nov 2024 20:36:13 +0100 Subject: [PATCH] netrc -> git --- cli/lint/lint.go | 2 +- cmd/server/flags.go | 2 +- docs/docs/20-usage/75-project-settings.md | 6 +++--- docs/docs/30-administration/10-server-config.md | 4 ++-- .../version-1.0/20-usage/71-project-settings.md | 2 +- .../version-2.5/20-usage/75-project-settings.md | 2 +- .../version-2.6/20-usage/75-project-settings.md | 2 +- .../version-2.7/20-usage/75-project-settings.md | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cli/lint/lint.go b/cli/lint/lint.go index d28a86033..3872ef093 100644 --- a/cli/lint/lint.go +++ b/cli/lint/lint.go @@ -45,7 +45,7 @@ var Command = &cli.Command{ &cli.StringSliceFlag{ Sources: cli.EnvVars("WOODPECKER_PLUGINS_TRUSTED_CLONE"), Name: "plugins-trusted-clone", - Usage: "Plugins which are trusted to handle the netrc info in clone steps", + Usage: "Plugins which are trusted to handle Git credentials in clone steps", Value: constant.TrustedClonePlugins, }, &cli.BoolFlag{ diff --git a/cmd/server/flags.go b/cmd/server/flags.go index 6ef1f37f0..86f7a9abb 100644 --- a/cmd/server/flags.go +++ b/cmd/server/flags.go @@ -192,7 +192,7 @@ var flags = append([]cli.Flag{ &cli.StringSliceFlag{ Sources: cli.EnvVars("WOODPECKER_PLUGINS_TRUSTED_CLONE"), Name: "plugins-trusted-clone", - Usage: "Plugins which are trusted to handle the netrc info in clone steps", + Usage: "Plugins which are trusted to handle Git credentials in clone steps", Value: constant.TrustedClonePlugins, }, &cli.StringSliceFlag{ diff --git a/docs/docs/20-usage/75-project-settings.md b/docs/docs/20-usage/75-project-settings.md index 26f2c0a1f..c15bba2ec 100644 --- a/docs/docs/20-usage/75-project-settings.md +++ b/docs/docs/20-usage/75-project-settings.md @@ -39,12 +39,12 @@ Only server admins can set this option. If you are not a server admin this optio ::: -## Only inject netrc credentials into trusted clone plugins +## Only inject Git credentials into trusted clone plugins -The clone step may require git credentials (e.g. for private repos) which are injected via `netrc`. +The clone step may require Git credentials (e.g. for private repos) which are injected via `netrc`. By default, they are only injected into trusted clone plugins listed in the env var `WOODPECKER_PLUGINS_TRUSTED_CLONE`. -If this option is disabled, the git credentials are injected into every clone plugin, regardless of whether it is trusted or not. +If this option is disabled, the Git credentials are injected into every clone plugin, regardless of whether it is trusted or not. :::note This option has no effect on steps other than the clone step. diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md index 2556ef664..902edf82c 100644 --- a/docs/docs/30-administration/10-server-config.md +++ b/docs/docs/30-administration/10-server-config.md @@ -396,8 +396,8 @@ You should specify the tag of your images too, as this enforces exact matches. > Defaults are defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go) -Plugins which are trusted to handle the netrc info in clone steps. -If a clone step use an image not in this list, the netrc will not be injected and an user has to use other methods (e.g. secrets) to clone non public repos. +Plugins which are trusted to handle the Git credential info in clone steps. +If a clone step use an image not in this list, Git credentials will not be injected and users have to use other methods (e.g. secrets) to clone non-public repos. You should specify the tag of your images too, as this enforces exact matches. diff --git a/docs/versioned_docs/version-1.0/20-usage/71-project-settings.md b/docs/versioned_docs/version-1.0/20-usage/71-project-settings.md index ef2d85d52..10b0b0301 100644 --- a/docs/versioned_docs/version-1.0/20-usage/71-project-settings.md +++ b/docs/versioned_docs/version-1.0/20-usage/71-project-settings.md @@ -33,7 +33,7 @@ Only server admins can set this option. If you are not a server admin this optio ::: -### Only inject netrc credentials into trusted clone plugins +### Only inject Git credentials into trusted clone plugins The clone step may require git credentials (e.g. for private repos) which are injected via `netrc`. diff --git a/docs/versioned_docs/version-2.5/20-usage/75-project-settings.md b/docs/versioned_docs/version-2.5/20-usage/75-project-settings.md index e9b21c0ad..9dcb9c9b6 100644 --- a/docs/versioned_docs/version-2.5/20-usage/75-project-settings.md +++ b/docs/versioned_docs/version-2.5/20-usage/75-project-settings.md @@ -40,7 +40,7 @@ Only server admins can set this option. If you are not a server admin this optio ::: -## Only inject netrc credentials into trusted clone plugins +## Only inject Git credentials into trusted clone plugins The clone step may require git credentials (e.g. for private repos) which are injected via `netrc`. diff --git a/docs/versioned_docs/version-2.6/20-usage/75-project-settings.md b/docs/versioned_docs/version-2.6/20-usage/75-project-settings.md index e9b21c0ad..9dcb9c9b6 100644 --- a/docs/versioned_docs/version-2.6/20-usage/75-project-settings.md +++ b/docs/versioned_docs/version-2.6/20-usage/75-project-settings.md @@ -40,7 +40,7 @@ Only server admins can set this option. If you are not a server admin this optio ::: -## Only inject netrc credentials into trusted clone plugins +## Only inject Git credentials into trusted clone plugins The clone step may require git credentials (e.g. for private repos) which are injected via `netrc`. diff --git a/docs/versioned_docs/version-2.7/20-usage/75-project-settings.md b/docs/versioned_docs/version-2.7/20-usage/75-project-settings.md index e9b21c0ad..9dcb9c9b6 100644 --- a/docs/versioned_docs/version-2.7/20-usage/75-project-settings.md +++ b/docs/versioned_docs/version-2.7/20-usage/75-project-settings.md @@ -40,7 +40,7 @@ Only server admins can set this option. If you are not a server admin this optio ::: -## Only inject netrc credentials into trusted clone plugins +## Only inject Git credentials into trusted clone plugins The clone step may require git credentials (e.g. for private repos) which are injected via `netrc`.