diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-06 03:22:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-06 03:22:21 +0300 |
| commit | e622d769cea776ed0ba88321a87bcd3b8a359a4d (patch) | |
| tree | 8de73104658f8e963381f94cce9f77d2d48f8619 /app/validators/json_schemas | |
| parent | 6fd670b99b45d3374f8b429e87be51dd67d6ab39 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/validators/json_schemas')
| -rw-r--r-- | app/validators/json_schemas/build_metadata_secrets.json | 73 |
1 files changed, 62 insertions, 11 deletions
diff --git a/app/validators/json_schemas/build_metadata_secrets.json b/app/validators/json_schemas/build_metadata_secrets.json index ac34af3f107..e8d095e2921 100644 --- a/app/validators/json_schemas/build_metadata_secrets.json +++ b/app/validators/json_schemas/build_metadata_secrets.json @@ -8,33 +8,79 @@ "patternProperties": { "^vault$": { "type": "object", - "required": ["path", "field", "engine"], + "required": [ + "path", + "field", + "engine" + ], "properties": { - "path": { "type": "string" }, - "field": { "type": "string" }, + "path": { + "type": "string" + }, + "field": { + "type": "string" + }, "engine": { "type": "object", - "required": ["name", "path"], + "required": [ + "name", + "path" + ], "properties": { - "path": { "type": "string" }, - "name": { "type": "string" } + "path": { + "type": "string" + }, + "name": { + "type": "string" + } }, "additionalProperties": false } }, "additionalProperties": false }, + "^gcp_secret_manager$": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "version": { + "type": [ + "string", + "null" + ] + } + }, + "additionalProperties": false + }, "^azure_key_vault$": { "type": "object", - "required": ["name"], + "required": [ + "name" + ], "properties": { - "name": { "type": "string" }, - "version": { "type": ["string", "null"] } + "name": { + "type": "string" + }, + "version": { + "type": [ + "string", + "null" + ] + } }, "additionalProperties": false }, - "^file$": { "type": "boolean" }, - "^token$": { "type": "string" } + "^file$": { + "type": "boolean" + }, + "^token$": { + "type": "string" + } }, "anyOf": [ { @@ -44,6 +90,11 @@ }, { "required": [ + "gcp_secret_manager" + ] + }, + { + "required": [ "azure_key_vault" ] } |