summaryrefslogtreecommitdiff
path: root/spec/fixtures/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 07:08:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 07:08:36 +0000
commit48aff82709769b098321c738f3444b9bdaa694c6 (patch)
treee00c7c43e2d9b603a5a6af576b1685e400410dee /spec/fixtures/api
parent879f5329ee916a948223f8f43d77fba4da6cd028 (diff)
downloadgitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'spec/fixtures/api')
-rw-r--r--spec/fixtures/api/schemas/entities/group_group_link.json13
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request_basic.json1
-rw-r--r--spec/fixtures/api/schemas/entities/test_case.json1
-rw-r--r--spec/fixtures/api/schemas/entities/trigger.json39
-rw-r--r--spec/fixtures/api/schemas/environment.json7
-rw-r--r--spec/fixtures/api/schemas/feature_flag.json23
-rw-r--r--spec/fixtures/api/schemas/feature_flag_scope.json18
-rw-r--r--spec/fixtures/api/schemas/feature_flag_strategy.json13
-rw-r--r--spec/fixtures/api/schemas/feature_flags.json13
-rw-r--r--spec/fixtures/api/schemas/feature_flags_client_token.json10
-rw-r--r--spec/fixtures/api/schemas/group_member.json19
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/feature_flag.json15
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/feature_flag_detailed_scopes.json22
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json17
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/feature_flag_scopes.json9
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/feature_flag_strategy.json13
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/feature_flags.json9
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/operations/scope.json9
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/operations/strategy.json14
-rw-r--r--spec/fixtures/api/schemas/public_api/v4/packages/package.json3
-rw-r--r--spec/fixtures/api/schemas/registry/repository.json3
-rw-r--r--spec/fixtures/api/schemas/unleash/unleash.json20
-rw-r--r--spec/fixtures/api/schemas/unleash/unleash_feature.json27
-rw-r--r--spec/fixtures/api/schemas/unleash/unleash_strategy.json24
24 files changed, 335 insertions, 7 deletions
diff --git a/spec/fixtures/api/schemas/entities/group_group_link.json b/spec/fixtures/api/schemas/entities/group_group_link.json
index 4c9aae140d2..bf94bbb3ce4 100644
--- a/spec/fixtures/api/schemas/entities/group_group_link.json
+++ b/spec/fixtures/api/schemas/entities/group_group_link.json
@@ -1,10 +1,20 @@
{
"type": "object",
- "required": ["id", "created_at", "expires_at", "access_level"],
+ "required": [
+ "id",
+ "created_at",
+ "expires_at",
+ "can_update",
+ "can_remove",
+ "access_level",
+ "valid_roles"
+ ],
"properties": {
"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"],
@@ -13,6 +23,7 @@
"string_value": { "type": "string" }
}
},
+ "valid_roles": { "type": "object" },
"shared_with_group": {
"type": "object",
"required": ["id", "name", "full_name", "full_path", "avatar_url", "web_url"],
diff --git a/spec/fixtures/api/schemas/entities/merge_request_basic.json b/spec/fixtures/api/schemas/entities/merge_request_basic.json
index 3c19528d71b..b061176f6a7 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_basic.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_basic.json
@@ -1,6 +1,7 @@
{
"type": "object",
"properties" : {
+ "title": { "type": "string" },
"state": { "type": "string" },
"merge_status": { "type": "string" },
"source_branch_exists": { "type": "boolean" },
diff --git a/spec/fixtures/api/schemas/entities/test_case.json b/spec/fixtures/api/schemas/entities/test_case.json
index 0dd3c5d472f..d731d7eed0a 100644
--- a/spec/fixtures/api/schemas/entities/test_case.json
+++ b/spec/fixtures/api/schemas/entities/test_case.json
@@ -8,6 +8,7 @@
"status": { "type": "string" },
"name": { "type": "string" },
"classname": { "type": "string" },
+ "file": { "type": ["string", "null"] },
"execution_time": { "type": "float" },
"system_output": { "type": ["string", "null"] },
"stack_trace": { "type": ["string", "null"] },
diff --git a/spec/fixtures/api/schemas/entities/trigger.json b/spec/fixtures/api/schemas/entities/trigger.json
new file mode 100644
index 00000000000..5c46142673f
--- /dev/null
+++ b/spec/fixtures/api/schemas/entities/trigger.json
@@ -0,0 +1,39 @@
+{
+ "type": "object",
+ "required": [
+ "description",
+ "owner",
+ "last_used",
+ "has_token_exposed",
+ "token",
+ "can_access_project"
+ ],
+ "properties": {
+ "description": {
+ "type": ["string", "null"]
+ },
+ "owner": {
+ "type": "object",
+ "$ref": "user.json"
+ },
+ "last_used": {
+ "type": ["datetime", "null"]
+ },
+ "token": {
+ "type": "string"
+ },
+ "has_token_exposed": {
+ "type": "boolean"
+ },
+ "can_access_project": {
+ "type": "boolean"
+ },
+ "edit_project_trigger_path": {
+ "type": "string"
+ },
+ "project_trigger_path": {
+ "type": "string"
+ }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/environment.json b/spec/fixtures/api/schemas/environment.json
index d1274bea817..7c49b269994 100644
--- a/spec/fixtures/api/schemas/environment.json
+++ b/spec/fixtures/api/schemas/environment.json
@@ -41,8 +41,11 @@
{ "type": "null" },
{ "$ref": "deployment.json" },
{
- "name": { "type": "string" },
- "build_path": { "type": "string" }
+ "type": "object",
+ "properties" : {
+ "name": { "type": "string" },
+ "build_path": { "type": "string" }
+ }
}
]
},
diff --git a/spec/fixtures/api/schemas/feature_flag.json b/spec/fixtures/api/schemas/feature_flag.json
new file mode 100644
index 00000000000..5f8cedc1132
--- /dev/null
+++ b/spec/fixtures/api/schemas/feature_flag.json
@@ -0,0 +1,23 @@
+{
+ "type": "object",
+ "required" : [
+ "id",
+ "name"
+ ],
+ "properties" : {
+ "id": { "type": "integer" },
+ "iid": { "type": ["integer", "null"] },
+ "version": { "type": "string" },
+ "created_at": { "type": "date" },
+ "updated_at": { "type": "date" },
+ "name": { "type": "string" },
+ "active": { "type": "boolean" },
+ "description": { "type": ["string", "null"] },
+ "edit_path": { "type": ["string", "null"] },
+ "update_path": { "type": ["string", "null"] },
+ "destroy_path": { "type": ["string", "null"] },
+ "scopes": { "type": "array", "items": { "$ref": "feature_flag_scope.json" } },
+ "strategies": { "type": "array", "items": { "$ref": "feature_flag_strategy.json" } }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/feature_flag_scope.json b/spec/fixtures/api/schemas/feature_flag_scope.json
new file mode 100644
index 00000000000..07c5eed532a
--- /dev/null
+++ b/spec/fixtures/api/schemas/feature_flag_scope.json
@@ -0,0 +1,18 @@
+{
+ "type": "object",
+ "required" : [
+ "id",
+ "environment_scope",
+ "active"
+ ],
+ "properties" : {
+ "id": { "type": "integer" },
+ "environment_scope": { "type": "string" },
+ "active": { "type": "boolean" },
+ "percentage": { "type": ["integer", "null"] },
+ "created_at": { "type": "date" },
+ "updated_at": { "type": "date" },
+ "strategies": { "type": "array", "items": { "$ref": "feature_flag_strategy.json" } }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/feature_flag_strategy.json b/spec/fixtures/api/schemas/feature_flag_strategy.json
new file mode 100644
index 00000000000..5a2777dc8ea
--- /dev/null
+++ b/spec/fixtures/api/schemas/feature_flag_strategy.json
@@ -0,0 +1,13 @@
+{
+ "type": "object",
+ "required": [
+ "name"
+ ],
+ "properties": {
+ "name": { "type": "string" },
+ "parameters": {
+ "type": "object"
+ }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/feature_flags.json b/spec/fixtures/api/schemas/feature_flags.json
new file mode 100644
index 00000000000..fc5e668c8b0
--- /dev/null
+++ b/spec/fixtures/api/schemas/feature_flags.json
@@ -0,0 +1,13 @@
+{
+ "required": ["feature_flags", "count"],
+ "feature_flags": { "type": "array", "items": { "$ref": "feature_flag.json" } },
+ "count": {
+ "type": "object",
+ "properties" : {
+ "all": { "type": "integer" },
+ "enabled": { "type": "integer" },
+ "disabled": { "type": "integer" }
+ },
+ "additionalProperties": false
+ }
+}
diff --git a/spec/fixtures/api/schemas/feature_flags_client_token.json b/spec/fixtures/api/schemas/feature_flags_client_token.json
new file mode 100644
index 00000000000..115db422d12
--- /dev/null
+++ b/spec/fixtures/api/schemas/feature_flags_client_token.json
@@ -0,0 +1,10 @@
+{
+ "type": "object",
+ "required" : [
+ "token"
+ ],
+ "properties" : {
+ "token": { "type": ["string"] }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/group_member.json b/spec/fixtures/api/schemas/group_member.json
index 035c862d229..3425108e46e 100644
--- a/spec/fixtures/api/schemas/group_member.json
+++ b/spec/fixtures/api/schemas/group_member.json
@@ -7,9 +7,9 @@
"access_level",
"requested_at",
"source",
+ "valid_roles",
"can_update",
- "can_remove",
- "can_override"
+ "can_remove"
],
"properties": {
"id": { "type": "integer" },
@@ -18,7 +18,6 @@
"requested_at": { "type": ["date-time", "null"] },
"can_update": { "type": "boolean" },
"can_remove": { "type": "boolean" },
- "can_override": { "type": "boolean" },
"access_level": {
"type": "object",
"required": ["integer_value", "string_value"],
@@ -36,6 +35,7 @@
"web_url": { "type": "string" }
}
},
+ "valid_roles": { "type": "object" },
"created_by": {
"type": "object",
"required": ["name", "web_url"],
@@ -62,7 +62,18 @@
"avatar_url": { "type": ["string", "null"] },
"web_url": { "type": "string" },
"blocked": { "type": "boolean" },
- "two_factor_enabled": { "type": "boolean" }
+ "two_factor_enabled": { "type": "boolean" },
+ "status": {
+ "type": "object",
+ "required": [
+ "emoji",
+ "message_html"
+ ],
+ "properties": {
+ "emoji": { "type": "string" },
+ "message_html": { "type": "string" }
+ }
+ }
}
},
"invite": {
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag.json
new file mode 100644
index 00000000000..0f304e9ee73
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag.json
@@ -0,0 +1,15 @@
+{
+ "type": "object",
+ "required": ["name"],
+ "properties": {
+ "name": { "type": "string" },
+ "description": { "type": ["string", "null"] },
+ "active": {"type": "boolean" },
+ "version": { "type": "string" },
+ "created_at": { "type": "date" },
+ "updated_at": { "type": "date" },
+ "scopes": { "type": "array", "items": { "$ref": "feature_flag_scope.json" } },
+ "strategies": { "type": "array", "items": { "$ref": "operations/strategy.json" } }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag_detailed_scopes.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag_detailed_scopes.json
new file mode 100644
index 00000000000..a11ae5705cc
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag_detailed_scopes.json
@@ -0,0 +1,22 @@
+{
+ "type": "array",
+ "items": {
+ "type": "object",
+ "required" : [
+ "name",
+ "id",
+ "environment_scope",
+ "active"
+ ],
+ "properties" : {
+ "name": { "type": "string" },
+ "id": { "type": "integer" },
+ "environment_scope": { "type": "string" },
+ "active": { "type": "boolean" },
+ "created_at": { "type": "date" },
+ "updated_at": { "type": "date" },
+ "strategies": { "type": "array", "items": { "$ref": "feature_flag_strategy.json" } }
+ },
+ "additionalProperties": false
+ }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json
new file mode 100644
index 00000000000..18402af482e
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json
@@ -0,0 +1,17 @@
+{
+ "type": "object",
+ "required": [
+ "id",
+ "environment_scope",
+ "active"
+ ],
+ "properties": {
+ "id": { "type": "integer" },
+ "environment_scope": { "type": "string" },
+ "active": { "type": "boolean" },
+ "created_at": { "type": "date" },
+ "updated_at": { "type": "date" },
+ "strategies": { "type": "array", "items": { "$ref": "feature_flag_strategy.json" } }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag_scopes.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag_scopes.json
new file mode 100644
index 00000000000..b1a7021db8b
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag_scopes.json
@@ -0,0 +1,9 @@
+{
+ "type": "array",
+ "items": {
+ "type": "object",
+ "properties": {
+ "$ref": "./feature_flag_scope.json"
+ }
+ }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag_strategy.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag_strategy.json
new file mode 100644
index 00000000000..5a2777dc8ea
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag_strategy.json
@@ -0,0 +1,13 @@
+{
+ "type": "object",
+ "required": [
+ "name"
+ ],
+ "properties": {
+ "name": { "type": "string" },
+ "parameters": {
+ "type": "object"
+ }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flags.json b/spec/fixtures/api/schemas/public_api/v4/feature_flags.json
new file mode 100644
index 00000000000..c19df0443d9
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/feature_flags.json
@@ -0,0 +1,9 @@
+{
+ "type": "array",
+ "items": {
+ "type": "object",
+ "properties": {
+ "$ref": "./feature_flag.json"
+ }
+ }
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/operations/scope.json b/spec/fixtures/api/schemas/public_api/v4/operations/scope.json
new file mode 100644
index 00000000000..e2b6d1ad6f1
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/operations/scope.json
@@ -0,0 +1,9 @@
+{
+ "type": "object",
+ "required": ["environment_scope"],
+ "properties": {
+ "id": { "type": "integer" },
+ "environment_scope": { "type": "string" }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/operations/strategy.json b/spec/fixtures/api/schemas/public_api/v4/operations/strategy.json
new file mode 100644
index 00000000000..f572b1a4f9b
--- /dev/null
+++ b/spec/fixtures/api/schemas/public_api/v4/operations/strategy.json
@@ -0,0 +1,14 @@
+{
+ "type": "object",
+ "required": [
+ "name",
+ "parameters"
+ ],
+ "properties": {
+ "id": { "type": "integer" },
+ "name": { "type": "string" },
+ "parameters": { "type": "object" },
+ "scopes": { "type": "array", "items": { "$ref": "scope.json" } }
+ },
+ "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/package.json b/spec/fixtures/api/schemas/public_api/v4/packages/package.json
index 757e5fd26b6..08909efd10c 100644
--- a/spec/fixtures/api/schemas/public_api/v4/packages/package.json
+++ b/spec/fixtures/api/schemas/public_api/v4/packages/package.json
@@ -11,6 +11,9 @@
"name": {
"type": "string"
},
+ "conan_package_name": {
+ "type": "string"
+ },
"version": {
"type": "string"
},
diff --git a/spec/fixtures/api/schemas/registry/repository.json b/spec/fixtures/api/schemas/registry/repository.json
index 1f84e787b19..18d2c68ac2f 100644
--- a/spec/fixtures/api/schemas/registry/repository.json
+++ b/spec/fixtures/api/schemas/registry/repository.json
@@ -20,6 +20,9 @@
"created_at": {
"type": "date-time"
},
+ "cleanup_policy_started_at": {
+ "type": "date-time"
+ },
"tags_path": {
"type": "string"
},
diff --git a/spec/fixtures/api/schemas/unleash/unleash.json b/spec/fixtures/api/schemas/unleash/unleash.json
new file mode 100644
index 00000000000..6eaf316bb11
--- /dev/null
+++ b/spec/fixtures/api/schemas/unleash/unleash.json
@@ -0,0 +1,20 @@
+{
+ "additionalProperties": false,
+ "properties": {
+ "features": {
+ "items": {
+ "$ref": "unleash_feature.json"
+ },
+ "minItems": 0,
+ "type": "array"
+ },
+ "version": {
+ "type": "integer"
+ }
+ },
+ "required": [
+ "version",
+ "features"
+ ],
+ "type": "object"
+}
diff --git a/spec/fixtures/api/schemas/unleash/unleash_feature.json b/spec/fixtures/api/schemas/unleash/unleash_feature.json
new file mode 100644
index 00000000000..71d375a5371
--- /dev/null
+++ b/spec/fixtures/api/schemas/unleash/unleash_feature.json
@@ -0,0 +1,27 @@
+{
+ "type": "object",
+ "additionalProperties": false,
+ "required": [
+ "name",
+ "enabled",
+ "strategies"
+ ],
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "description": {
+ "type": "string"
+ },
+ "strategies": {
+ "items": {
+ "$ref": "unleash_strategy.json"
+ },
+ "minItems": 1,
+ "type": "array"
+ }
+ }
+}
diff --git a/spec/fixtures/api/schemas/unleash/unleash_strategy.json b/spec/fixtures/api/schemas/unleash/unleash_strategy.json
new file mode 100644
index 00000000000..7b48038ad15
--- /dev/null
+++ b/spec/fixtures/api/schemas/unleash/unleash_strategy.json
@@ -0,0 +1,24 @@
+{
+ "type": "object",
+ "additionalProperties": false,
+ "required": [
+ "name"
+ ],
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "parameters": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "groupId": {
+ "type": "string"
+ },
+ "percentage": {
+ "type": "integer"
+ }
+ }
+ }
+ }
+}