diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 12:10:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 12:10:41 +0300 |
commit | edf0e5b64384499283b406f9087e890ac4fad13f (patch) | |
tree | 5b634c08f9324749ee06b85334e2fad8340092ac /doc | |
parent | dd4c30182c16fe27efbbf4c19594bb292fb4ac48 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/pipelines/pipeline_security.md | 14 | ||||
-rw-r--r-- | doc/development/graphql_guide/batchloader.md | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/ci/pipelines/pipeline_security.md b/doc/ci/pipelines/pipeline_security.md index f035779e665..d499da21b88 100644 --- a/doc/ci/pipelines/pipeline_security.md +++ b/doc/ci/pipelines/pipeline_security.md @@ -13,18 +13,18 @@ Secrets management is the systems that developers use to securely store sensitiv in a secure environment with strict access controls. A **secret** is a sensitive credential that should be kept confidential, and includes: -- Passwords -- SSH keys -- Access tokens -- Other types of credentials +- Passwords. +- SSH keys. +- Access tokens. +- Any other types of credentials where exposure would be harmful to an organization. ## Secrets storage ### Secrets management providers Secrets that are the most sensitive and under the strictest policies should be stored -in a separate secrets management provider such as [Vault](https://www.vaultproject.io). -The secrets are stored outside of the GitLab instance, which is the safest option. +in a secrets management. [Vault](https://www.vaultproject.io) is one provider in this space. +When using Vault, secrets are stored outside of the GitLab instance. You can use the GitLab [Vault integration](../secrets/index.md#use-vault-secrets-in-a-ci-job) to retrieve those secrets in CI/CD pipelines when they are needed. @@ -39,7 +39,7 @@ Variable values: to the settings have access to the variables. - Can be [overridden](../variables/index.md#override-a-defined-cicd-variable), making it hard to determine which value was used. -- Are more easily exposed by accidental pipeline misconfiguration. +- Can be exposed by accidental pipeline misconfiguration. Sensitive data should be stored in a secrets management solution. If there is low sensitivity data that you want to store in a CI/CD variable, be sure to always: diff --git a/doc/development/graphql_guide/batchloader.md b/doc/development/graphql_guide/batchloader.md index 6a716de61b8..7a0611fdb16 100644 --- a/doc/development/graphql_guide/batchloader.md +++ b/doc/development/graphql_guide/batchloader.md @@ -41,8 +41,8 @@ class UserResolver < BaseResolver end ``` -- `project_id` is the `ID` of the current project being queried -- `loader.call` is used to map the result back to the input key (here a project ID) +- `username` is the username we want to query. It can be one name or multiple names. +- `loader.call` is used to map the result back to the input key (here user is mapped to its username) - `BatchLoader::GraphQL` returns a lazy object (suspended promise to fetch the data) Here an [example MR](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46549) illustrating how to use our `BatchLoading` mechanism. |