diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/fixtures/api/schemas | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/fixtures/api/schemas')
11 files changed, 137 insertions, 15 deletions
diff --git a/spec/fixtures/api/schemas/entities/test_case.json b/spec/fixtures/api/schemas/entities/test_case.json index d731d7eed0a..483fa881f8c 100644 --- a/spec/fixtures/api/schemas/entities/test_case.json +++ b/spec/fixtures/api/schemas/entities/test_case.json @@ -12,7 +12,13 @@ "execution_time": { "type": "float" }, "system_output": { "type": ["string", "null"] }, "stack_trace": { "type": ["string", "null"] }, - "attachment_url": { "type": ["string", "null"] } + "attachment_url": { "type": ["string", "null"] }, + "recent_failures": { + "oneOf": [ + { "type": "null" }, + { "$ref": "test_case/recent_failures.json" } + ] + } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/entities/test_case/recent_failures.json b/spec/fixtures/api/schemas/entities/test_case/recent_failures.json new file mode 100644 index 00000000000..7a753101472 --- /dev/null +++ b/spec/fixtures/api/schemas/entities/test_case/recent_failures.json @@ -0,0 +1,12 @@ +{ + "type": "object", + "required": [ + "count", + "base_branch" + ], + "properties": { + "count": { "type": "integer" }, + "base_branch": { "type": "string" } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/environment.json b/spec/fixtures/api/schemas/environment.json index 7c49b269994..b8c4253056e 100644 --- a/spec/fixtures/api/schemas/environment.json +++ b/spec/fixtures/api/schemas/environment.json @@ -16,6 +16,7 @@ ], "properties": { "id": { "type": "integer" }, + "global_id": { "type": "string" }, "name": { "type": "string" }, "state": { "type": "string" }, "external_url": { "$ref": "types/nullable_string.json" }, diff --git a/spec/fixtures/api/schemas/graphql/container_repositories.json b/spec/fixtures/api/schemas/graphql/container_repositories.json new file mode 100644 index 00000000000..8e8982ff8c7 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/container_repositories.json @@ -0,0 +1,12 @@ +{ + "type": "array", + "items": { + "type": "object", + "required": ["node"], + "properties": { + "node": { + "$ref": "./container_repository.json" + } + } + } +} diff --git a/spec/fixtures/api/schemas/graphql/container_repository.json b/spec/fixtures/api/schemas/graphql/container_repository.json new file mode 100644 index 00000000000..e252bedab82 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/container_repository.json @@ -0,0 +1,40 @@ +{ + "type": "object", + "required": ["id", "name", "path", "location", "createdAt", "updatedAt", "tagsCount", "canDelete", "expirationPolicyCleanupStatus"], + "properties": { + "id": { + "type": "string" + }, + "name": { + "type": "string" + }, + "path": { + "type": "string" + }, + "location": { + "type": "string" + }, + "createdAt": { + "type": "string" + }, + "updatedAt": { + "type": "string" + }, + "expirationPolicyStartedAt": { + "type": ["string", "null"] + }, + "status": { + "type": ["string", "null"] + }, + "tagsCount": { + "type": "integer" + }, + "canDelete": { + "type": "boolean" + }, + "expirationPolicyCleanupStatus": { + "type": "string", + "enum": ["UNSCHEDULED", "SCHEDULED", "UNFINISHED", "ONGOING"] + } + } +} diff --git a/spec/fixtures/api/schemas/graphql/container_repository_details.json b/spec/fixtures/api/schemas/graphql/container_repository_details.json new file mode 100644 index 00000000000..3db91796fc6 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/container_repository_details.json @@ -0,0 +1,49 @@ +{ + "type": "object", + "required": ["tags"], + "allOf": [{ "$ref": "./container_repository.json" }], + "properties": { + "tags": { + "type": "object", + "required": ["nodes"], + "properties": { + "nodes": { + "type": "array", + "items": { + "type": "object", + "required": ["name", "path", "location", "digest", "revision", "shortRevision", "totalSize", "createdAt", "canDelete"], + "properties": { + "name": { + "type": "string" + }, + "path": { + "type": "string" + }, + "location": { + "type": "string" + }, + "digest": { + "type": "string" + }, + "revision": { + "type": "string" + }, + "shortRevision": { + "type": "string" + }, + "totalSize": { + "type": "integer" + }, + "createdAt": { + "type": "string" + }, + "canDelete": { + "type": "boolean" + } + } + } + } + } + } + } +} diff --git a/spec/fixtures/api/schemas/internal/pages/lookup_path.json b/spec/fixtures/api/schemas/internal/pages/lookup_path.json index b2b3d3f9d0a..9d81ea495f1 100644 --- a/spec/fixtures/api/schemas/internal/pages/lookup_path.json +++ b/spec/fixtures/api/schemas/internal/pages/lookup_path.json @@ -14,8 +14,12 @@ "source": { "type": "object", "required": ["type", "path"], "properties" : { - "type": { "type": "string", "enum": ["file"] }, - "path": { "type": "string" } + "type": { "type": "string", "enum": ["file", "zip"] }, + "path": { "type": "string" }, + "global_id": { "type": "string" }, + "sha256": { "type": "string" }, + "file_size": { "type": "integer" }, + "file_count": { "type": ["integer", "null"] } }, "additionalProperties": false }, diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json b/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json index f057adba65c..93b6dcde080 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/package_files.json @@ -7,7 +7,10 @@ "id": { "type": "integer" }, "package_id": { "type": "integer" }, "file_name": { "type": "string" }, - "file_sha1": { "type": "string" } + "file_sha1": { "type": "string" }, + "pipelines": { + "items": { "$ref": "../pipeline.json" } + } } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package_with_build.json b/spec/fixtures/api/schemas/public_api/v4/packages/package_with_build.json index de3ef94138e..86b4e205c3e 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/package_with_build.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/package_with_build.json @@ -5,6 +5,9 @@ "name": { "type": "string" }, "version": { "type": "string" }, "package_type": { "type": "string" }, - "pipeline": { "$ref": "../pipeline.json" } + "pipeline": { "$ref": "../pipeline.json" }, + "pipelines": { + "items": { "$ref": "../pipeline.json" } + } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/release.json b/spec/fixtures/api/schemas/public_api/v4/release.json index 02e23d2732d..69ac383b7fd 100644 --- a/spec/fixtures/api/schemas/public_api/v4/release.json +++ b/spec/fixtures/api/schemas/public_api/v4/release.json @@ -21,7 +21,6 @@ }, "commit_path": { "type": "string" }, "tag_path": { "type": "string" }, - "name": { "type": "string" }, "evidences": { "type": "array", "items": { "$ref": "release/evidence.json" } @@ -42,11 +41,8 @@ "additionalProperties": false }, "_links": { - "required": ["merge_requests_url", "issues_url"], "properties": { - "merge_requests_url": { "type": "string" }, - "issues_url": { "type": "string" }, - "edit_url": { "type": "string"} + "edit_url": { "type": "string" } } } }, diff --git a/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json b/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json index 1a1e92ac778..058b7b4b4ed 100644 --- a/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json +++ b/spec/fixtures/api/schemas/public_api/v4/release/release_for_guest.json @@ -26,11 +26,7 @@ "additionalProperties": false }, "_links": { - "required": ["merge_requests_url", "issues_url"], - "properties": { - "merge_requests_url": { "type": "string" }, - "issues_url": { "type": "string" } - } + "properties": {} } }, "additionalProperties": false |