diff options
Diffstat (limited to 'spec/fixtures/api')
-rw-r--r-- | spec/fixtures/api/schemas/entities/codequality_mr_diff_report.json | 21 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/entities/member.json | 4 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/entities/member_user.json | 1 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/graphql/packages/package_composer_details.json | 12 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/graphql/packages/package_composer_metadata.json | 21 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/graphql/packages/package_details.json | 38 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/group_group_links.json | 6 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/group_link/group_group_link.json | 16 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/group_link/group_group_links.json | 6 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/group_link/group_link.json (renamed from spec/fixtures/api/schemas/entities/group_group_link.json) | 10 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/group_link/project_group_link.json | 16 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/group_link/project_group_links.json | 6 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/job.json | 4 |
13 files changed, 132 insertions, 29 deletions
diff --git a/spec/fixtures/api/schemas/entities/codequality_mr_diff_report.json b/spec/fixtures/api/schemas/entities/codequality_mr_diff_report.json new file mode 100644 index 00000000000..63e0c68e9cd --- /dev/null +++ b/spec/fixtures/api/schemas/entities/codequality_mr_diff_report.json @@ -0,0 +1,21 @@ +{ + "type": "object", + "description": "The schema used to display codequality report in mr diff", + "required": ["files"], + "properties": { + "patternProperties": { + ".*.": { + "type": "array", + "items": { + "required": ["line", "description", "severity"], + "properties": { + "line": { "type": "integer" }, + "description": { "type": "string" }, + "severity": { "type": "string" } + }, + "additionalProperties": false + } + } + } + } +} diff --git a/spec/fixtures/api/schemas/entities/member.json b/spec/fixtures/api/schemas/entities/member.json index e8b40745803..03b1872632e 100644 --- a/spec/fixtures/api/schemas/entities/member.json +++ b/spec/fixtures/api/schemas/entities/member.json @@ -9,7 +9,8 @@ "source", "valid_roles", "can_update", - "can_remove" + "can_remove", + "is_direct_member" ], "properties": { "id": { "type": "integer" }, @@ -18,6 +19,7 @@ "requested_at": { "type": ["date-time", "null"] }, "can_update": { "type": "boolean" }, "can_remove": { "type": "boolean" }, + "is_direct_member": { "type": "boolean" }, "access_level": { "type": "object", "required": ["integer_value", "string_value"], diff --git a/spec/fixtures/api/schemas/entities/member_user.json b/spec/fixtures/api/schemas/entities/member_user.json index 983cdb7b9d9..ebd26bfaaaa 100644 --- a/spec/fixtures/api/schemas/entities/member_user.json +++ b/spec/fixtures/api/schemas/entities/member_user.json @@ -9,6 +9,7 @@ "web_url": { "type": "string" }, "blocked": { "type": "boolean" }, "two_factor_enabled": { "type": "boolean" }, + "availability": { "type": ["string", "null"] }, "status": { "type": "object", "required": ["emoji"], diff --git a/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json b/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json deleted file mode 100644 index bcf64a6e567..00000000000 --- a/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "object", - "allOf": [{ "$ref": "./package_details.json" }], - "properties": { - "target_sha": { - "type": "string" - }, - "composer_json": { - "type": "object" - } - } -} diff --git a/spec/fixtures/api/schemas/graphql/packages/package_composer_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_composer_metadata.json new file mode 100644 index 00000000000..db9b25889be --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/packages/package_composer_metadata.json @@ -0,0 +1,21 @@ +{ + "type": "object", + "additionalProperties": false, + "required": ["targetSha", "composerJson"], + "properties": { + "targetSha": { + "type": "string" + }, + "composerJson": { + "type": "object", + "additionalProperties": false, + "required": ["name", "type", "license", "version"], + "properties": { + "name": { "type": "string" }, + "type": { "type": "string" }, + "license": { "type": "string" }, + "version": { "type": "string" } + } + } + } +} diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json index 4f90285183c..d2e2e65db54 100644 --- a/spec/fixtures/api/schemas/graphql/packages/package_details.json +++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json @@ -1,5 +1,10 @@ { "type": "object", + "additionalProperties": false, + "required": [ + "id", "name", "createdAt", "updatedAt", "version", "packageType", + "project", "tags", "pipelines", "versions", "metadata" + ], "properties": { "id": { "type": "string" @@ -16,21 +21,46 @@ "version": { "type": ["string", "null"] }, - "package_type": { + "packageType": { "type": ["string"], "enum": ["MAVEN", "NPM", "CONAN", "NUGET", "PYPI", "COMPOSER", "GENERIC", "GOLANG", "DEBIAN"] }, "tags": { - "type": "object" + "type": "object", + "additionalProperties": false, + "properties": { + "pageInfo": { "type": "object" }, + "edges": { "type": "array" }, + "nodes": { "type": "array" } + } }, "project": { "type": "object" }, "pipelines": { - "type": "object" + "type": "object", + "additionalProperties": false, + "properties": { + "pageInfo": { "type": "object" }, + "count": { "type": "integer" }, + "edges": { "type": "array" }, + "nodes": { "type": "array" } + } }, "versions": { - "type": "object" + "type": "object", + "additionalProperties": false, + "properties": { + "pageInfo": { "type": "object" }, + "edges": { "type": "array" }, + "nodes": { "type": "array" } + } + }, + "metadata": { + "anyOf": [ + { "$ref": "./package_composer_metadata.json" }, + { "type": "null" } + ] } } } diff --git a/spec/fixtures/api/schemas/group_group_links.json b/spec/fixtures/api/schemas/group_group_links.json deleted file mode 100644 index f8b4e7f035b..00000000000 --- a/spec/fixtures/api/schemas/group_group_links.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "array", - "items": { - "$ref": "entities/group_group_link.json" - } -} diff --git a/spec/fixtures/api/schemas/group_link/group_group_link.json b/spec/fixtures/api/schemas/group_link/group_group_link.json new file mode 100644 index 00000000000..bfca5c885e3 --- /dev/null +++ b/spec/fixtures/api/schemas/group_link/group_group_link.json @@ -0,0 +1,16 @@ +{ + "type": "object", + "allOf": [ + { "$ref": "group_link.json" }, + { + "required": [ + "can_update", + "can_remove" + ], + "properties": { + "can_update": { "type": "boolean" }, + "can_remove": { "type": "boolean" } + } + } + ] +} diff --git a/spec/fixtures/api/schemas/group_link/group_group_links.json b/spec/fixtures/api/schemas/group_link/group_group_links.json new file mode 100644 index 00000000000..2c0bf20f524 --- /dev/null +++ b/spec/fixtures/api/schemas/group_link/group_group_links.json @@ -0,0 +1,6 @@ +{ + "type": "array", + "items": { + "$ref": "group_group_link.json" + } +} diff --git a/spec/fixtures/api/schemas/entities/group_group_link.json b/spec/fixtures/api/schemas/group_link/group_link.json index bf94bbb3ce4..300790728a8 100644 --- a/spec/fixtures/api/schemas/entities/group_group_link.json +++ b/spec/fixtures/api/schemas/group_link/group_link.json @@ -4,8 +4,6 @@ "id", "created_at", "expires_at", - "can_update", - "can_remove", "access_level", "valid_roles" ], @@ -13,15 +11,14 @@ "id": { "type": "integer" }, "created_at": { "type": "date-time" }, "expires_at": { "type": ["date-time", "null"] }, - "can_update": { "type": "boolean" }, - "can_remove": { "type": "boolean" }, "access_level": { "type": "object", "required": ["integer_value", "string_value"], "properties": { "integer_value": { "type": "integer" }, "string_value": { "type": "string" } - } + }, + "additionalProperties": false }, "valid_roles": { "type": "object" }, "shared_with_group": { @@ -34,7 +31,8 @@ "full_path": { "type": "string" }, "avatar_url": { "type": ["string", "null"] }, "web_url": { "type": "string" } - } + }, + "additionalProperties": false } } } diff --git a/spec/fixtures/api/schemas/group_link/project_group_link.json b/spec/fixtures/api/schemas/group_link/project_group_link.json new file mode 100644 index 00000000000..bfca5c885e3 --- /dev/null +++ b/spec/fixtures/api/schemas/group_link/project_group_link.json @@ -0,0 +1,16 @@ +{ + "type": "object", + "allOf": [ + { "$ref": "group_link.json" }, + { + "required": [ + "can_update", + "can_remove" + ], + "properties": { + "can_update": { "type": "boolean" }, + "can_remove": { "type": "boolean" } + } + } + ] +} diff --git a/spec/fixtures/api/schemas/group_link/project_group_links.json b/spec/fixtures/api/schemas/group_link/project_group_links.json new file mode 100644 index 00000000000..fc024d67f36 --- /dev/null +++ b/spec/fixtures/api/schemas/group_link/project_group_links.json @@ -0,0 +1,6 @@ +{ + "type": "array", + "items": { + "$ref": "project_group_link.json" + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/job.json b/spec/fixtures/api/schemas/public_api/v4/job.json index c038ae0a664..b50479841a9 100644 --- a/spec/fixtures/api/schemas/public_api/v4/job.json +++ b/spec/fixtures/api/schemas/public_api/v4/job.json @@ -18,6 +18,7 @@ "web_url", "artifacts", "artifacts_expire_at", + "tag_list", "runner" ], "properties": { @@ -53,6 +54,9 @@ ] }, "artifacts_expire_at": { "type": ["null", "string"] }, + "tag_list": { + "type": "array" + }, "runner": { "oneOf": [ { "type": "null" }, |