diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/fixtures | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
| download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/fixtures')
91 files changed, 579 insertions, 215 deletions
diff --git a/spec/fixtures/api/schemas/entities/dag_job.json b/spec/fixtures/api/schemas/entities/dag_job.json index 171ac23ca06..1b1e16f6655 100644 --- a/spec/fixtures/api/schemas/entities/dag_job.json +++ b/spec/fixtures/api/schemas/entities/dag_job.json @@ -3,7 +3,7 @@ "required": ["name", "scheduling_type"], "properties": { "name": { "type": "string" }, - "scheduling_type": { "type": ["string", null] }, + "scheduling_type": { "type": ["string", "null"] }, "needs": { "type": "array" } }, "additionalProperties": false diff --git a/spec/fixtures/api/schemas/entities/discussion.json b/spec/fixtures/api/schemas/entities/discussion.json index 1a5b8150ed2..efc31a4f833 100644 --- a/spec/fixtures/api/schemas/entities/discussion.json +++ b/spec/fixtures/api/schemas/entities/discussion.json @@ -29,7 +29,7 @@ "web_url": { "type": "uri" }, "status_tooltip_html": { "type": ["string", "null"] }, "path": { "type": "string" } - }, + }, "required": [ "id", "state", @@ -39,8 +39,8 @@ "username" ] }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "system": { "type": "boolean" }, "noteable_id": { "type": "integer" }, "noteable_iid": { "type": ["integer", "null"] }, @@ -48,7 +48,7 @@ "resolved": { "type": "boolean" }, "resolvable": { "type": "boolean" }, "resolved_by": { "type": ["string", "null"] }, - "resolved_at": { "type": ["date", "null"] }, + "resolved_at": { "type": ["string", "null"], "format": "date-time" }, "note": { "type": "string" }, "note_html": { "type": "string" }, "current_user": { "type": "object" }, diff --git a/spec/fixtures/api/schemas/entities/downloadable_artifact.json b/spec/fixtures/api/schemas/entities/downloadable_artifact.json new file mode 100644 index 00000000000..01f355f8b55 --- /dev/null +++ b/spec/fixtures/api/schemas/entities/downloadable_artifact.json @@ -0,0 +1,19 @@ +{ + "type": "object", + "required": ["artifacts"], + "properties": { + "artifacts": { + "type": "array", + "items": { + "type": "object", + "properties": { + "name": { "type": "string" }, + "expire_at": { "type": ["string", "null"], "format": "date-time" }, + "expired": { "type": "boolean" }, + "path": { "type": "string" } + } + } + } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/entities/github/commit.json b/spec/fixtures/api/schemas/entities/github/commit.json index 698d933be07..a8fa11e5317 100644 --- a/spec/fixtures/api/schemas/entities/github/commit.json +++ b/spec/fixtures/api/schemas/entities/github/commit.json @@ -37,7 +37,7 @@ "properties" : { "name": { "type": "string" }, "email": { "type": "string" }, - "date": { "type": "date" }, + "date": { "type": "string", "format": "date-time" }, "type": { "type": "string" } }, "additionalProperties": false @@ -48,7 +48,7 @@ "properties" : { "name": { "type": "string" }, "email": { "type": "string" }, - "date": { "type": "date" }, + "date": { "type": "string", "format": "date-time" }, "type": { "type": "string" } }, "additionalProperties": false diff --git a/spec/fixtures/api/schemas/entities/github/pull_request.json b/spec/fixtures/api/schemas/entities/github/pull_request.json index 6c24879b800..beefc1e3fb7 100644 --- a/spec/fixtures/api/schemas/entities/github/pull_request.json +++ b/spec/fixtures/api/schemas/entities/github/pull_request.json @@ -28,21 +28,9 @@ "merged": { "type": "boolean" }, - "merged_at": { - "type": [ - "date", - "null" - ] - }, - "closed_at": { - "type": [ - "date", - "null" - ] - }, - "updated_at": { - "type": "date" - }, + "merged_at": { "type": [ "string", "null" ], "format": "date-time" }, + "closed_at": { "type": [ "string", "null" ], "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "assignee": { "$ref": "user.json" }, diff --git a/spec/fixtures/api/schemas/entities/issue.json b/spec/fixtures/api/schemas/entities/issue.json index 9898819ef75..31743b58d98 100644 --- a/spec/fixtures/api/schemas/entities/issue.json +++ b/spec/fixtures/api/schemas/entities/issue.json @@ -24,7 +24,7 @@ "created_at": { "type": "date-time" }, "updated_at": { "type": "date-time" }, "branch_name": { "type": ["string", "null"] }, - "due_date": { "type": "date" }, + "due_date": { "type": ["string", "null"], "format": "date-time" }, "confidential": { "type": "boolean" }, "discussion_locked": { "type": ["boolean", "null"] }, "updated_by_id": { "type": ["integer", "null"] }, diff --git a/spec/fixtures/api/schemas/entities/issue_board.json b/spec/fixtures/api/schemas/entities/issue_board.json index d7e3c45b13b..56298cb124d 100644 --- a/spec/fixtures/api/schemas/entities/issue_board.json +++ b/spec/fixtures/api/schemas/entities/issue_board.json @@ -6,7 +6,7 @@ "title": { "type": "string" }, "confidential": { "type": "boolean" }, "closed": { "type": "boolean" }, - "due_date": { "type": "date" }, + "due_date": { "type": ["string", "null"] }, "project_id": { "type": "integer" }, "relative_position": { "type": ["integer", "null"] }, "time_estimate": { "type": "integer" }, diff --git a/spec/fixtures/api/schemas/entities/issue_sidebar.json b/spec/fixtures/api/schemas/entities/issue_sidebar.json index 717eb4992ea..1ab0a1144ab 100644 --- a/spec/fixtures/api/schemas/entities/issue_sidebar.json +++ b/spec/fixtures/api/schemas/entities/issue_sidebar.json @@ -6,7 +6,7 @@ "author_id": { "type": "integer" }, "project_id": { "type": "integer" }, "discussion_locked": { "type": ["boolean", "null"] }, - "due_date": { "type": "date" }, + "due_date": { "type": ["string", "null"], "format": "date-time" }, "confidential": { "type": "boolean" }, "reference": { "type": "string" }, "current_user": { diff --git a/spec/fixtures/api/schemas/entities/lint_job_entity.json b/spec/fixtures/api/schemas/entities/lint_job_entity.json index b85f58d4291..77fed2258b5 100644 --- a/spec/fixtures/api/schemas/entities/lint_job_entity.json +++ b/spec/fixtures/api/schemas/entities/lint_job_entity.json @@ -39,18 +39,18 @@ "type": ["boolean"] }, "environment": { - "type": ["string", null] + "type": ["string", "null"] }, "tag_list": { "type": ["array"], "items": { "type": "string" } }, "only": { - "type": ["array", "object", null], + "type": ["array", "object", "null"], "items": { "type": ["string", "array"]} }, "except": { - "type": ["array", "object", null], + "type": ["array", "object", "null"], "items": { "type": ["string", "array"]} } }, diff --git a/spec/fixtures/api/schemas/entities/lint_result_entity.json b/spec/fixtures/api/schemas/entities/lint_result_entity.json index 502e1dac1ac..1564d4c0a17 100644 --- a/spec/fixtures/api/schemas/entities/lint_result_entity.json +++ b/spec/fixtures/api/schemas/entities/lint_result_entity.json @@ -14,7 +14,7 @@ "type": "boolean" }, "jobs": { - "type": ["array", null], + "type": ["array", "null"], "items": { "type": "object", "$ref": "lint_job_entity.json" diff --git a/spec/fixtures/api/schemas/evidences/issue.json b/spec/fixtures/api/schemas/evidences/issue.json index 628c4c89312..71d11443154 100644 --- a/spec/fixtures/api/schemas/evidences/issue.json +++ b/spec/fixtures/api/schemas/evidences/issue.json @@ -17,8 +17,8 @@ "state": { "type": "string" }, "iid": { "type": "integer" }, "confidential": { "type": "boolean" }, - "created_at": { "type": "date" }, - "due_date": { "type": ["date", "null"] } + "created_at": { "type": "string", "format": "date-time" }, + "due_date": { "type": ["string", "null"], "format": "date-time" } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/evidences/milestone.json b/spec/fixtures/api/schemas/evidences/milestone.json index ab27fdecde2..7fb54843d07 100644 --- a/spec/fixtures/api/schemas/evidences/milestone.json +++ b/spec/fixtures/api/schemas/evidences/milestone.json @@ -16,8 +16,8 @@ "description": { "type": ["string", "null"] }, "state": { "type": "string" }, "iid": { "type": "integer" }, - "created_at": { "type": "date" }, - "due_date": { "type": ["date", "null"] }, + "created_at": { "type": "string" }, + "due_date": { "type": ["string", "null"] }, "issues": { "type": "array", "items": { "$ref": "issue.json" } diff --git a/spec/fixtures/api/schemas/evidences/project.json b/spec/fixtures/api/schemas/evidences/project.json index 3a094bd276f..3e9fff723c1 100644 --- a/spec/fixtures/api/schemas/evidences/project.json +++ b/spec/fixtures/api/schemas/evidences/project.json @@ -10,7 +10,7 @@ "id": { "type": "integer" }, "name": { "type": "string" }, "description": { "type": ["string", "null"] }, - "created_at": { "type": "date" } + "created_at": { "type": "string", "format": "date-time" } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/evidences/release.json b/spec/fixtures/api/schemas/evidences/release.json index 529abfe490e..eef408e34e1 100644 --- a/spec/fixtures/api/schemas/evidences/release.json +++ b/spec/fixtures/api/schemas/evidences/release.json @@ -14,7 +14,7 @@ "tag_name": { "type": "string" }, "name": { "type": ["string", "null"] }, "description": { "type": "string" }, - "created_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, "project": { "$ref": "project.json" }, "milestones": { "type": "array", diff --git a/spec/fixtures/api/schemas/feature_flag.json b/spec/fixtures/api/schemas/feature_flag.json index 5f8cedc1132..45b704e4b84 100644 --- a/spec/fixtures/api/schemas/feature_flag.json +++ b/spec/fixtures/api/schemas/feature_flag.json @@ -8,8 +8,8 @@ "id": { "type": "integer" }, "iid": { "type": ["integer", "null"] }, "version": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "name": { "type": "string" }, "active": { "type": "boolean" }, "description": { "type": ["string", "null"] }, diff --git a/spec/fixtures/api/schemas/feature_flag_scope.json b/spec/fixtures/api/schemas/feature_flag_scope.json index 07c5eed532a..8e8fb0b3d40 100644 --- a/spec/fixtures/api/schemas/feature_flag_scope.json +++ b/spec/fixtures/api/schemas/feature_flag_scope.json @@ -10,8 +10,8 @@ "environment_scope": { "type": "string" }, "active": { "type": "boolean" }, "percentage": { "type": ["integer", "null"] }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string" }, + "updated_at": { "type": "string" }, "strategies": { "type": "array", "items": { "$ref": "feature_flag_strategy.json" } } }, "additionalProperties": false diff --git a/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json index 31bb861ced5..acfef595b08 100644 --- a/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json +++ b/spec/fixtures/api/schemas/graphql/packages/package_conan_metadata.json @@ -8,29 +8,28 @@ "packageUsername", "packageChannel", "recipe", - "recipePath", - "packageName" + "recipePath" ], "properties": { "id": { "type": "string" }, - "created_at": { + "createdAt": { "type": "string" }, - "updated_at": { + "updatedAt": { "type": "string" }, - "package_username": { + "packageUsername": { "type": "string" }, - "package_channel": { + "packageChannel": { "type": "string" }, "recipe": { "type": "string" }, - "recipe_path": { + "recipePath": { "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 87b173eefc7..ca08e005e9d 100644 --- a/spec/fixtures/api/schemas/graphql/packages/package_details.json +++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json @@ -12,7 +12,8 @@ "tags", "pipelines", "versions", - "metadata" + "metadata", + "status" ], "properties": { "id": { @@ -80,6 +81,8 @@ "anyOf": [ { "$ref": "./package_composer_metadata.json" }, { "$ref": "./package_conan_metadata.json" }, + { "$ref": "./package_maven_metadata.json" }, + { "$ref": "./package_nuget_metadata.json" }, { "type": "null" } ] }, @@ -91,6 +94,10 @@ "edges": { "type": "array" }, "nodes": { "type": "array" } } + }, + "status": { + "type": ["string"], + "enum": ["DEFAULT", "HIDDEN", "PROCESSING", "ERROR"] } } } diff --git a/spec/fixtures/api/schemas/graphql/packages/package_maven_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_maven_metadata.json new file mode 100644 index 00000000000..64d482b2551 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/packages/package_maven_metadata.json @@ -0,0 +1,28 @@ +{ + "type": "object", + "additionalProperties": false, + "required": ["id", "createdAt", "updatedAt", "path", "appGroup", "appName"], + "properties": { + "id": { + "type": "string" + }, + "createdAt": { + "type": "string" + }, + "updatedAt": { + "type": "string" + }, + "path": { + "type": "string" + }, + "appGroup": { + "type": "string" + }, + "appVersion": { + "type": ["string", "null"] + }, + "appName": { + "type": "string" + } + } +} diff --git a/spec/fixtures/api/schemas/graphql/packages/package_nuget_metadata.json b/spec/fixtures/api/schemas/graphql/packages/package_nuget_metadata.json new file mode 100644 index 00000000000..131b9e97287 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/packages/package_nuget_metadata.json @@ -0,0 +1,19 @@ +{ + "type": "object", + "additionalProperties": false, + "required": ["id", "licenseUrl", "projectUrl", "iconUrl"], + "properties": { + "id": { + "type": "string" + }, + "licenseUrl": { + "type": "string" + }, + "projectUrl": { + "type": "string" + }, + "iconUrl": { + "type": "string" + } + } +} diff --git a/spec/fixtures/api/schemas/issue.json b/spec/fixtures/api/schemas/issue.json index 84c39ad65e9..aefba89d9e2 100644 --- a/spec/fixtures/api/schemas/issue.json +++ b/spec/fixtures/api/schemas/issue.json @@ -11,9 +11,10 @@ "project_id": { "type": ["integer", "null"] }, "title": { "type": "string" }, "confidential": { "type": "boolean" }, - "due_date": { "type": ["date", "null"] }, + "due_date": { "type": ["string", "null"] }, "relative_position": { "type": ["integer", "null"] }, "time_estimate": { "type": "integer" }, + "type": { "type": "string", "enum": ["ISSUE", "INCIDENT", "TEST_CASE", "REQUIREMENT"] }, "issue_sidebar_endpoint": { "type": "string" }, "toggle_subscription_endpoint": { "type": "string" }, "assignable_labels_endpoint": { "type": "string" }, diff --git a/spec/fixtures/api/schemas/pipeline_schedule.json b/spec/fixtures/api/schemas/pipeline_schedule.json index d01801a15fa..8a175ba081f 100644 --- a/spec/fixtures/api/schemas/pipeline_schedule.json +++ b/spec/fixtures/api/schemas/pipeline_schedule.json @@ -6,17 +6,21 @@ "ref": { "type": "string" }, "cron": { "type": "string" }, "cron_timezone": { "type": "string" }, - "next_run_at": { "type": "date" }, + "next_run_at": { "type": "string" }, "active": { "type": "boolean" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, - "last_pipeline": { + "created_at": { "type": ["string", "null"], "format": "date-time" }, + "updated_at": { "type": ["string", "null"], "format": "date-time" }, + "last_pipeline": { "type": ["object", "null"], "properties": { "id": { "type": "integer" }, + "project_id": { "type": "integer" }, "sha": { "type": "string" }, "ref": { "type": "string" }, - "status": { "type": "string" } + "status": { "type": "string" }, + "web_url": { "type": ["string", "null"] }, + "created_at": { "type": ["string", "null"], "format": "date-time" }, + "updated_at": { "type": ["string", "null"], "format": "date-time" } }, "additionalProperties": false }, @@ -40,7 +44,7 @@ } }, "required": [ - "id", "description", "ref", "cron", "cron_timezone", "next_run_at", + "id", "description", "ref", "cron", "cron_timezone", "next_run_at", "active", "created_at", "updated_at", "owner" ], "additionalProperties": false diff --git a/spec/fixtures/api/schemas/public_api/v4/board.json b/spec/fixtures/api/schemas/public_api/v4/board.json index 89a21c29969..c3a140c1bd7 100644 --- a/spec/fixtures/api/schemas/public_api/v4/board.json +++ b/spec/fixtures/api/schemas/public_api/v4/board.json @@ -30,6 +30,7 @@ "properties": { "id": { "type": "integer" }, "avatar_url": { "type": ["string", "null"] }, + "readme_url": { "type": ["string", "null"] }, "description": { "type": ["string", "null"] }, "default_branch": { "type": ["string", "null"] }, "tag_list": { "type": "array" }, @@ -42,8 +43,9 @@ "path_with_namespace": { "type": "string" }, "star_count": { "type": "integer" }, "forks_count": { "type": "integer" }, - "created_at": { "type": "date" }, - "last_activity_at": { "type": "date" } + "created_at": { "type": "string", "format": "date-time" }, + "namespace": {"type": "object" }, + "last_activity_at": { "type": "string", "format": "date-time" } }, "additionalProperties": false }, @@ -70,7 +72,7 @@ "id": { "type": "integer" }, "color": { "type": "string", - "pattern": "^#[0-9A-Fa-f]{3}{1,2}+$" + "pattern": "#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})" }, "description": { "type": ["string", "null"] }, "name": { "type": "string" } diff --git a/spec/fixtures/api/schemas/public_api/v4/commit/basic.json b/spec/fixtures/api/schemas/public_api/v4/commit/basic.json index da99e99c692..227b5a20af3 100644 --- a/spec/fixtures/api/schemas/public_api/v4/commit/basic.json +++ b/spec/fixtures/api/schemas/public_api/v4/commit/basic.json @@ -19,7 +19,7 @@ "id": { "type": ["string", "null"] }, "short_id": { "type": ["string", "null"] }, "title": { "type": "string" }, - "created_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, "parent_ids": { "type": ["array", "null"], "items": { @@ -30,10 +30,10 @@ "message": { "type": "string" }, "author_name": { "type": "string" }, "author_email": { "type": "string" }, - "authored_date": { "type": "date" }, + "authored_date": { "type": "string", "format": "date-time" }, "committer_name": { "type": "string" }, "committer_email": { "type": "string" }, - "committed_date": { "type": "date" }, + "committed_date": { "type": "string", "format": "date-time" }, "web_url": { "type": "string" } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/commit_note.json b/spec/fixtures/api/schemas/public_api/v4/commit_note.json index 02081989271..305febea75c 100644 --- a/spec/fixtures/api/schemas/public_api/v4/commit_note.json +++ b/spec/fixtures/api/schemas/public_api/v4/commit_note.json @@ -14,6 +14,6 @@ "line": { "type": ["integer", "null"] }, "line_type": { "type": ["string", "null"] }, "author": { "$ref": "user/basic.json" }, - "created_at": { "type": "date" } + "created_at": { "type": "string", "format": "date-time" } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/deploy_token.json b/spec/fixtures/api/schemas/public_api/v4/deploy_token.json index 7cb9f136b0d..c4d3f944aea 100644 --- a/spec/fixtures/api/schemas/public_api/v4/deploy_token.json +++ b/spec/fixtures/api/schemas/public_api/v4/deploy_token.json @@ -17,9 +17,7 @@ "username": { "type": "string" }, - "expires_at": { - "type": "date" - }, + "expires_at": { "type": "string" }, "scopes": { "type": "array", "items": { diff --git a/spec/fixtures/api/schemas/public_api/v4/environment.json b/spec/fixtures/api/schemas/public_api/v4/environment.json index 57352017f03..b90bfe8de55 100644 --- a/spec/fixtures/api/schemas/public_api/v4/environment.json +++ b/spec/fixtures/api/schemas/public_api/v4/environment.json @@ -18,7 +18,10 @@ { "$ref": "deployment.json" } ] }, - "state": { "type": "string" } + "state": { "type": "string" }, + "enable_advanced_logs_querying": { "type": "boolean" }, + "logs_api_path": { "type": "string" }, + "gitlab_managed_apps_logs_path": { "type": "string" } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/public_api/v4/feature_flag.json b/spec/fixtures/api/schemas/public_api/v4/feature_flag.json index 0f304e9ee73..1de19419a30 100644 --- a/spec/fixtures/api/schemas/public_api/v4/feature_flag.json +++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag.json @@ -6,8 +6,8 @@ "description": { "type": ["string", "null"] }, "active": {"type": "boolean" }, "version": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "scopes": { "type": "array", "items": { "$ref": "feature_flag_scope.json" } }, "strategies": { "type": "array", "items": { "$ref": "operations/strategy.json" } } }, 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 index a11ae5705cc..64237ee1a6d 100644 --- 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 @@ -13,8 +13,8 @@ "id": { "type": "integer" }, "environment_scope": { "type": "string" }, "active": { "type": "boolean" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "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 index 18402af482e..c8e77e2418c 100644 --- a/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json +++ b/spec/fixtures/api/schemas/public_api/v4/feature_flag_scope.json @@ -9,8 +9,8 @@ "id": { "type": "integer" }, "environment_scope": { "type": "string" }, "active": { "type": "boolean" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "strategies": { "type": "array", "items": { "$ref": "feature_flag_strategy.json" } } }, "additionalProperties": false diff --git a/spec/fixtures/api/schemas/public_api/v4/issue.json b/spec/fixtures/api/schemas/public_api/v4/issue.json index 69ecba8b6f3..3173a8ebfb5 100644 --- a/spec/fixtures/api/schemas/public_api/v4/issue.json +++ b/spec/fixtures/api/schemas/public_api/v4/issue.json @@ -8,9 +8,9 @@ "description": { "type": ["string", "null"] }, "state": { "type": "string" }, "discussion_locked": { "type": ["boolean", "null"] }, - "closed_at": { "type": "date" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "closed_at": { "type": ["string", "null"] }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "labels": { "type": "array", "items": { @@ -27,10 +27,10 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, - "due_date": { "type": "date" }, - "start_date": { "type": "date" } + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, + "due_date": { "type": "string" , "format": "date-time" }, + "start_date": { "type": "string", "format": "date-time" } }, "additionalProperties": false }, @@ -83,7 +83,7 @@ "user_notes_count": { "type": "integer" }, "upvotes": { "type": "integer" }, "downvotes": { "type": "integer" }, - "due_date": { "type": ["date", "null"] }, + "due_date": { "type": ["string", "null"] }, "confidential": { "type": "boolean" }, "web_url": { "type": "uri" }, "time_stats": { diff --git a/spec/fixtures/api/schemas/public_api/v4/issue_link.json b/spec/fixtures/api/schemas/public_api/v4/issue_link.json index 588d63c2dcf..33184be07c3 100644 --- a/spec/fixtures/api/schemas/public_api/v4/issue_link.json +++ b/spec/fixtures/api/schemas/public_api/v4/issue_link.json @@ -15,8 +15,8 @@ "type": "string", "enum": ["relates_to", "blocks", "is_blocked_by"] }, - "link_created_at": { "type": "date" }, - "link_updated_at": { "type": "date" } + "link_created_at": { "type": "string" }, + "link_updated_at": { "type": "string" } }, "required" : [ "source_issue", "target_issue", "link_type" ] } diff --git a/spec/fixtures/api/schemas/public_api/v4/job.json b/spec/fixtures/api/schemas/public_api/v4/job.json index b50479841a9..afed4f23017 100644 --- a/spec/fixtures/api/schemas/public_api/v4/job.json +++ b/spec/fixtures/api/schemas/public_api/v4/job.json @@ -12,6 +12,7 @@ "started_at", "finished_at", "duration", + "queued_duration", "user", "commit", "pipeline", @@ -34,6 +35,7 @@ "started_at": { "type": ["null", "string"] }, "finished_at": { "type": ["null", "string"] }, "duration": { "type": ["null", "number"] }, + "queued_duration": { "type": ["null", "number"] }, "user": { "$ref": "user/basic.json" }, "commit": { "oneOf": [ diff --git a/spec/fixtures/api/schemas/public_api/v4/label_basic.json b/spec/fixtures/api/schemas/public_api/v4/label_basic.json index a501bc2ec56..a4653c67ed2 100644 --- a/spec/fixtures/api/schemas/public_api/v4/label_basic.json +++ b/spec/fixtures/api/schemas/public_api/v4/label_basic.json @@ -6,7 +6,8 @@ "color", "description", "description_html", - "text_color" + "text_color", + "remove_on_close" ], "properties": { "id": { "type": "integer" }, @@ -20,7 +21,8 @@ "text_color": { "type": "string", "pattern": "^#[0-9A-Fa-f]{3}{1,2}$" - } + }, + "remove_on_close": { "type": "boolean" } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/public_api/v4/members.json b/spec/fixtures/api/schemas/public_api/v4/members.json index 695f00b0040..adfc3c519ca 100644 --- a/spec/fixtures/api/schemas/public_api/v4/members.json +++ b/spec/fixtures/api/schemas/public_api/v4/members.json @@ -10,7 +10,7 @@ "avatar_url": { "type": ["string", "null"] }, "web_url": { "type": ["string", "null"] }, "access_level": { "type": "integer" }, - "expires_at": { "type": ["date", "null"] }, + "expires_at": { "type": ["string", "null"], "format": "date-time" }, "is_using_seat": { "type": "boolean" } }, "required": [ diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_request.json b/spec/fixtures/api/schemas/public_api/v4/merge_request.json index 3bf1299a1d8..c31e91cfef8 100644 --- a/spec/fixtures/api/schemas/public_api/v4/merge_request.json +++ b/spec/fixtures/api/schemas/public_api/v4/merge_request.json @@ -20,7 +20,7 @@ }, "additionalProperties": false }, - "merged_at": { "type": ["date", "null"] }, + "merged_at": { "type": ["string", "null"] }, "closed_by": { "type": ["object", "null"], "properties": { @@ -33,9 +33,9 @@ }, "additionalProperties": false }, - "closed_at": { "type": ["date", "null"] }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "closed_at": { "type": ["string", "null"], "format": "date-time" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "target_branch": { "type": "string" }, "source_branch": { "type": "string" }, "upvotes": { "type": "integer" }, @@ -88,10 +88,10 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, - "due_date": { "type": "date" }, - "start_date": { "type": "date" } + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, + "due_date": { "type": "string", "format": "date-time" }, + "start_date": { "type": "string", "format": "date-time" } }, "additionalProperties": false }, diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_request_simple.json b/spec/fixtures/api/schemas/public_api/v4/merge_request_simple.json index 45507e3e400..f176e5ee261 100644 --- a/spec/fixtures/api/schemas/public_api/v4/merge_request_simple.json +++ b/spec/fixtures/api/schemas/public_api/v4/merge_request_simple.json @@ -8,8 +8,8 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "web_url": { "type": "uri" } }, "required": [ diff --git a/spec/fixtures/api/schemas/public_api/v4/milestone.json b/spec/fixtures/api/schemas/public_api/v4/milestone.json index c8c6a7b6ae1..e7e0e57f02f 100644 --- a/spec/fixtures/api/schemas/public_api/v4/milestone.json +++ b/spec/fixtures/api/schemas/public_api/v4/milestone.json @@ -8,10 +8,10 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, - "start_date": { "type": "date" }, - "due_date": { "type": "date" }, + "created_at": { "type": "string" }, + "updated_at": { "type": "string" }, + "start_date": { "type": ["string", "null"], "format": "date-time" }, + "due_date": { "type": ["string", "null"], "format": "date-time" }, "expired": { "type": ["boolean", "null"] }, "web_url": { "type": "string" } }, diff --git a/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json b/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json index f008ed7d55f..d09d1634eb9 100644 --- a/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json +++ b/spec/fixtures/api/schemas/public_api/v4/milestone_with_stats.json @@ -8,10 +8,10 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, - "start_date": { "type": "date" }, - "due_date": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, + "start_date": { "type": ["string", "null"], "format": "date-time" }, + "due_date": { "type": ["string", "null"], "format": "date-time" }, "expired": { "type": ["boolean", "null"] }, "web_url": { "type": "string" }, "issue_stats": { diff --git a/spec/fixtures/api/schemas/public_api/v4/notes.json b/spec/fixtures/api/schemas/public_api/v4/notes.json index c4510207882..25e8f9cbed6 100644 --- a/spec/fixtures/api/schemas/public_api/v4/notes.json +++ b/spec/fixtures/api/schemas/public_api/v4/notes.json @@ -22,8 +22,8 @@ ] }, "commands_changes": { "type": "object", "additionalProperties": true }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "system": { "type": "boolean" }, "noteable_id": { "type": "integer" }, "noteable_iid": { "type": "integer" }, @@ -31,7 +31,7 @@ "resolved": { "type": "boolean" }, "resolvable": { "type": "boolean" }, "resolved_by": { "type": ["string", "null"] }, - "resolved_at": { "type": ["date", "null"] }, + "resolved_at": { "type": ["string", "null"] }, "confidential": { "type": ["boolean", "null"] } }, "required": [ diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json index 724df5a437d..0fa59bc3bec 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/nuget/packages_metadata.json @@ -2,7 +2,6 @@ "type": "object", "required": ["count", "items"], "properties": { - "count": { "const": 0 }, "items": { "type": "array", "items": { 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 08909efd10c..607e0df1886 100644 --- a/spec/fixtures/api/schemas/public_api/v4/packages/package.json +++ b/spec/fixtures/api/schemas/public_api/v4/packages/package.json @@ -4,6 +4,7 @@ "name", "version", "package_type", + "status", "_links", "versions" ], @@ -20,6 +21,9 @@ "package_type": { "type": "string" }, + "status": { + "type": "string" + }, "_links": { "type": "object", "required": [ 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 93b6dcde080..332e42fdbe5 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 @@ -8,6 +8,8 @@ "package_id": { "type": "integer" }, "file_name": { "type": "string" }, "file_sha1": { "type": "string" }, + "file_sha256": { "type": "string" }, + "file_md5": { "type": "string" }, "pipelines": { "items": { "$ref": "../pipeline.json" } } diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/module.json b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/module.json new file mode 100644 index 00000000000..f0e2c8e1765 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/module.json @@ -0,0 +1,12 @@ +{ + "type": "object", + "required" : ["versions"], + "optional" : ["source"], + "properties" : { + "source": { "type": "string" }, + "versions": { + "minItems": 0, + "items": { "$ref": "./version.json" } + } + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/modules.json b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/modules.json new file mode 100644 index 00000000000..f31a41b17de --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/modules.json @@ -0,0 +1,4 @@ +{ + "type": "array", + "items": { "$ref": "./module.json" } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/version.json b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/version.json new file mode 100644 index 00000000000..4fd5595c423 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/version.json @@ -0,0 +1,38 @@ +{ + "type": "object", + "required": ["version", "submodules", "root"], + "properties": { + "version": { + "type": "string" + }, + "submodules": { + "type": "array", + "maxItems": 0 + }, + "root": { + "type": "object", + "required": ["dependencies", "providers"], + "properties": { + "dependencies": { + "type": "array", + "maxItems": 0 + }, + "providers": { + "type": "array", + "items": { + "type": "object", + "required": ["name", "version"], + "properties": { + "name": { + "type": "string" + }, + "version": { + "type": "string" + } + } + } + } + } + } + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/versions.json b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/versions.json new file mode 100644 index 00000000000..647e9d11d8b --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/packages/terraform/modules/v1/versions.json @@ -0,0 +1,9 @@ +{ + "type": "object", + "required" : ["modules"], + "properties" : { + "modules": { + "items": { "$ref": "./module.json" } + } + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json b/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json index 721b8d4641f..66d4be529b1 100644 --- a/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json +++ b/spec/fixtures/api/schemas/public_api/v4/pages_domain/basic.json @@ -6,7 +6,7 @@ "project_id": { "type": "integer" }, "verified": { "type": "boolean" }, "verification_code": { "type": ["string", "null"] }, - "enabled_until": { "type": ["date", "null"] }, + "enabled_until": { "type": ["string", "null"], "format": "date-time" }, "auto_ssl_enabled": { "type": "boolean" }, "certificate_expiration": { "type": "object", diff --git a/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json b/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json index 3dd80a6f11b..bbbc610eb27 100644 --- a/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json +++ b/spec/fixtures/api/schemas/public_api/v4/pages_domain/detail.json @@ -5,7 +5,7 @@ "url": { "type": "uri" }, "verified": { "type": "boolean" }, "verification_code": { "type": ["string", "null"] }, - "enabled_until": { "type": ["date", "null"] }, + "enabled_until": { "type": ["string", "null"] }, "auto_ssl_enabled": { "type": "boolean" }, "certificate": { "type": "object", diff --git a/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json b/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json index 63e130d4055..d3cabdde45c 100644 --- a/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json +++ b/spec/fixtures/api/schemas/public_api/v4/pipeline/detail.json @@ -13,11 +13,11 @@ { "$ref": "../user/basic.json" } ] }, - "created_at": { "type": ["date", "null"] }, - "updated_at": { "type": ["date", "null"] }, - "started_at": { "type": ["date", "null"] }, - "finished_at": { "type": ["date", "null"] }, - "committed_at": { "type": ["date", "null"] }, + "created_at": { "type": ["string", "null"], "format": "date-time" }, + "updated_at": { "type": ["string", "null"], "format": "date-time" }, + "started_at": { "type": ["string", "null"], "format": "date-time" }, + "finished_at": { "type": ["string", "null"], "format": "date-time" }, + "committed_at": { "type": ["string", "null"], "format": "date-time" }, "duration": { "type": ["number", "null"] }, "coverage": { "type": ["string", "null"] }, "detailed_status": { diff --git a/spec/fixtures/api/schemas/public_api/v4/project.json b/spec/fixtures/api/schemas/public_api/v4/project.json new file mode 100644 index 00000000000..4a3149f2bdc --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/project.json @@ -0,0 +1,45 @@ +{ + "type": "object", + "properties" : { + "id": { "type": "integer" }, + "name": { "type": "string" }, + "name_with_namespace": { "type": "string" }, + "description": { "type": ["string", "null"] }, + "path": { "type": "string" }, + "path_with_namespace": { "type": "string" }, + "created_at": { "type": "string", "format": "date-time" }, + "default_branch": { "type": ["string", "null"] }, + "tag_list": { + "type": "array", + "items": { + "type": "string" + } + }, + "ssh_url_to_repo": { "type": "string" }, + "http_url_to_repo": { "type": "string" }, + "web_url": { "type": "string" }, + "readme_url": { "type": ["string", "null"] }, + "avatar_url": { "type": ["string", "null"] }, + "star_count": { "type": "integer" }, + "forks_count": { "type": "integer" }, + "last_activity_at": { "type": "string", "format": "date-time" }, + "namespace": { + "type": "object", + "properties" : { + "id": { "type": "integer" }, + "name": { "type": "string" }, + "path": { "type": "string" }, + "kind": { "type": "string" }, + "full_path": { "type": "string" }, + "parent_id": { "type": ["integer", "null"] } + } + } + }, + "required": [ + "id", "name", "name_with_namespace", "description", "path", + "path_with_namespace", "created_at", "default_branch", "tag_list", + "ssh_url_to_repo", "http_url_to_repo", "web_url", "readme_url", "avatar_url", + "star_count", "forks_count", "last_activity_at", "namespace" + ], + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/public_api/v4/project/identity.json b/spec/fixtures/api/schemas/public_api/v4/project/identity.json index e35ab023d44..138c0142d02 100644 --- a/spec/fixtures/api/schemas/public_api/v4/project/identity.json +++ b/spec/fixtures/api/schemas/public_api/v4/project/identity.json @@ -16,6 +16,6 @@ "name_with_namespace": { "type": "string" }, "path": { "type": "string" }, "path_with_namespace": { "type": "string" }, - "created_at": { "type": "date" } + "created_at": { "type": "string", "format": "date-time" } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json b/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json index 6f8a2ff58e5..cfaa1c28bb7 100644 --- a/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json +++ b/spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json @@ -10,7 +10,7 @@ ], "properties" : { "id": { "type": "integer" }, - "created_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, "state": { "type": "string" }, "source_storage_name": { "type": "string" }, "destination_storage_name": { "type": "string" }, diff --git a/spec/fixtures/api/schemas/public_api/v4/projects.json b/spec/fixtures/api/schemas/public_api/v4/projects.json index af5670ebd33..20f26a7f805 100644 --- a/spec/fixtures/api/schemas/public_api/v4/projects.json +++ b/spec/fixtures/api/schemas/public_api/v4/projects.json @@ -1,48 +1,4 @@ { "type": "array", - "items": { - "type": "object", - "properties" : { - "id": { "type": "integer" }, - "name": { "type": "string" }, - "name_with_namespace": { "type": "string" }, - "description": { "type": ["string", "null"] }, - "path": { "type": "string" }, - "path_with_namespace": { "type": "string" }, - "created_at": { "type": "date" }, - "default_branch": { "type": ["string", "null"] }, - "tag_list": { - "type": "array", - "items": { - "type": "string" - } - }, - "ssh_url_to_repo": { "type": "string" }, - "http_url_to_repo": { "type": "string" }, - "web_url": { "type": "string" }, - "readme_url": { "type": ["string", "null"] }, - "avatar_url": { "type": ["string", "null"] }, - "star_count": { "type": "integer" }, - "forks_count": { "type": "integer" }, - "last_activity_at": { "type": "date" }, - "namespace": { - "type": "object", - "properties" : { - "id": { "type": "integer" }, - "name": { "type": "string" }, - "path": { "type": "string" }, - "kind": { "type": "string" }, - "full_path": { "type": "string" }, - "parent_id": { "type": ["integer", "null"] } - } - } - }, - "required": [ - "id", "name", "name_with_namespace", "description", "path", - "path_with_namespace", "created_at", "default_branch", "tag_list", - "ssh_url_to_repo", "http_url_to_repo", "web_url", "avatar_url", - "star_count", "last_activity_at", "namespace" - ], - "additionalProperties": false - } + "items": { "$ref": "project.json" } } diff --git a/spec/fixtures/api/schemas/public_api/v4/release.json b/spec/fixtures/api/schemas/public_api/v4/release.json index 69ac383b7fd..463924147be 100644 --- a/spec/fixtures/api/schemas/public_api/v4/release.json +++ b/spec/fixtures/api/schemas/public_api/v4/release.json @@ -6,8 +6,8 @@ "tag_name": { "type": "string" }, "description": { "type": "string" }, "description_html": { "type": "string" }, - "created_at": { "type": "date" }, - "released_at": { "type": "date" }, + "created_at": { "type": "string" , "format": "date-time"}, + "released_at": { "type": "string", "format": "date-time" }, "upcoming_release": { "type": "boolean" }, "commit": { "oneOf": [{ "type": "null" }, { "$ref": "commit/basic.json" }] diff --git a/spec/fixtures/api/schemas/public_api/v4/release/evidence.json b/spec/fixtures/api/schemas/public_api/v4/release/evidence.json index fbebac0acaa..2f3dfc40aec 100644 --- a/spec/fixtures/api/schemas/public_api/v4/release/evidence.json +++ b/spec/fixtures/api/schemas/public_api/v4/release/evidence.json @@ -8,7 +8,7 @@ "properties" : { "sha": { "type": "string" }, "filepath": { "type": "string" }, - "collected_at": { "type": "date" } + "collected_at": { "type": "string", "format": "date-time" } }, "additionalProperties": false } 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 058b7b4b4ed..465e1193a64 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 @@ -5,8 +5,8 @@ "name": { "type": "string" }, "description": { "type": "string" }, "description_html": { "type": "string" }, - "created_at": { "type": "date" }, - "released_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "released_at": { "type": "string", "format": "date-time" }, "upcoming_release": { "type": "boolean" }, "milestones": { "type": "array", diff --git a/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json index f51e7e8edc5..b0633a6ff2d 100644 --- a/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json +++ b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json @@ -10,7 +10,7 @@ ], "properties" : { "id": { "type": "integer" }, - "created_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, "state": { "type": "string" }, "source_storage_name": { "type": "string" }, "destination_storage_name": { "type": "string" }, diff --git a/spec/fixtures/api/schemas/public_api/v4/snippets.json b/spec/fixtures/api/schemas/public_api/v4/snippets.json index de658e01657..65299901128 100644 --- a/spec/fixtures/api/schemas/public_api/v4/snippets.json +++ b/spec/fixtures/api/schemas/public_api/v4/snippets.json @@ -21,8 +21,8 @@ "visibility": { "type": "string" }, "web_url": { "type": "string" }, "raw_url": { "type": "string" }, - "created_at": { "type": "date" }, - "updated_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, + "updated_at": { "type": "string", "format": "date-time" }, "author": { "type": "object", "properties": { diff --git a/spec/fixtures/api/schemas/public_api/v4/user/public.json b/spec/fixtures/api/schemas/public_api/v4/user/public.json index ee848eda9ed..0955c70aef0 100644 --- a/spec/fixtures/api/schemas/public_api/v4/user/public.json +++ b/spec/fixtures/api/schemas/public_api/v4/user/public.json @@ -41,7 +41,7 @@ }, "avatar_url": { "type": "string" }, "web_url": { "type": "string" }, - "created_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, "bio": { "type": ["string", "null"] }, "location": { "type": ["string", "null"] }, "skype": { "type": "string" }, @@ -49,11 +49,11 @@ "twitter": { "type": "string "}, "website_url": { "type": "string" }, "organization": { "type": ["string", "null"] }, - "last_sign_in_at": { "type": "date" }, - "confirmed_at": { "type": ["date", "null"] }, + "last_sign_in_at": { "type": ["string", "null"], "format": "date-time" }, + "confirmed_at": { "type": ["string", "null"] }, "color_scheme_id": { "type": "integer" }, "projects_limit": { "type": "integer" }, - "current_sign_in_at": { "type": "date" }, + "current_sign_in_at": { "type": ["string", "null"], "format": "date-time" }, "identities": { "type": "array", "items": { diff --git a/spec/fixtures/api/schemas/registry/tag.json b/spec/fixtures/api/schemas/registry/tag.json index 48f8402b65b..3667f42136d 100644 --- a/spec/fixtures/api/schemas/registry/tag.json +++ b/spec/fixtures/api/schemas/registry/tag.json @@ -29,9 +29,7 @@ "total_size": { "type": "integer" }, - "created_at": { - "type": "date" - }, + "created_at": { "type": "string", "format": "date-time" }, "destroy_path": { "type": "string" } diff --git a/spec/fixtures/api/schemas/release.json b/spec/fixtures/api/schemas/release.json index b0296e5e62d..fe4f8cd2157 100644 --- a/spec/fixtures/api/schemas/release.json +++ b/spec/fixtures/api/schemas/release.json @@ -7,7 +7,7 @@ "ref": { "type": "string "}, "description": { "type": "string" }, "description_html": { "type": "string" }, - "created_at": { "type": "date" }, + "created_at": { "type": "string", "format": "date-time" }, "commit": { "oneOf": [{ "type": "null" }, { "$ref": "public_api/v4/commit/basic.json" }] }, diff --git a/spec/fixtures/bulk_imports/labels.ndjson.gz b/spec/fixtures/bulk_imports/labels.ndjson.gz Binary files differnew file mode 100644 index 00000000000..6bb10a53346 --- /dev/null +++ b/spec/fixtures/bulk_imports/labels.ndjson.gz diff --git a/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event.yml b/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event.yml new file mode 100644 index 00000000000..704e94a04d8 --- /dev/null +++ b/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event.yml @@ -0,0 +1,25 @@ +--- +description: +category: Groups::EmailCampaignsController +action: click +label_description: +property_description: +value_description: +extra_properties: +identifiers: +#- project +#- user +#- namespace +product_section: +product_stage: +product_group: +product_category: +milestone: "13.11" +introduced_by_url: +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate diff --git a/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event_ee.yml b/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event_ee.yml new file mode 100644 index 00000000000..b20bb9702d2 --- /dev/null +++ b/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event_ee.yml @@ -0,0 +1,23 @@ +--- +description: +category: Groups::EmailCampaignsController +action: click +label_description: +property_description: +value_description: +extra_properties: +identifiers: +#- project +#- user +#- namespace +product_section: +product_stage: +product_group: +product_category: +milestone: "13.11" +introduced_by_url: +distributions: +- ee +tiers: +#- premium +- ultimate diff --git a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml new file mode 100644 index 00000000000..c51b5bf6e01 --- /dev/null +++ b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml @@ -0,0 +1,19 @@ +--- +key_path: counts_weekly.test_metric +name: test metric name +description: +product_section: +product_stage: +product_group: +product_category: +value_type: number +status: implemented +milestone: "13.9" +introduced_by_url: +time_frame: 7d +data_source: +distribution: +- ee +tier: +#- premium +- ultimate diff --git a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_name_suggestions.yml b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_name_suggestions.yml index 47fc1d7e376..c1ed9783308 100644 --- a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_name_suggestions.yml +++ b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_name_suggestions.yml @@ -15,8 +15,8 @@ time_frame: 7d data_source: distribution: - ce -# Add here corresponding tiers -# tier: -# - free -# - premium -# - ultimate +- ee +tier: +- free +- premium +- ultimate diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json index ed8fa58393f..7d98179789f 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [], "properties": { diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json index e251e59de29..c40befcf8ce 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [ "type", "options" @@ -6,7 +7,7 @@ "properties": { "type": { "enum": ["custom"] }, "label": { "type": "string" }, - "options": { "$ref": "custom_variable_options.json" } + "options": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json" } }, "additionalProperties": false } diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json index f351d3ba340..de72b947eed 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json @@ -1,10 +1,11 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": ["values"], "properties": { "values": { "type": "array", - "items": { "$ref": "custom_variable_values.json" } + "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_values.json" } } }, "additionalProperties": false diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_values.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_values.json index 430d66a9691..f3b801fa979 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_values.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_values.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": ["value"], "properties": { diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json index 259c41bf091..40453c61a65 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [ "dashboard", diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json index 7d2b409a0f6..b47b81fc103 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": ["panel_groups"], "properties": { diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json index bf05c054e2f..063016c22fd 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json @@ -1,10 +1,11 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": ["panels"], "properties": { "panels": { "type": "array", - "items": { "$ref": "panels.json" } + "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json" } } }, "additionalProperties": false diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json index be180114052..ca67cfa4b0e 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "array", "required": ["url"], "properties": { diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json index 6eb2c0e51e2..a74b557dabe 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [ "type", "options" @@ -6,7 +7,7 @@ "properties": { "type": { "enum": "metric_label_values" }, "label": { "type": "string" }, - "options": { "$ref": "metric_label_values_variable_options.json" } + "options": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_options.json" } }, "additionalProperties": false } diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_options.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_options.json index 304372ed876..5662cc625a3 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_options.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_options.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [ "series_selector", "label", "prometheus_endpoint_path" diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json index b23b0ea15d2..8ee207b7ebf 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [ "label", diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json index 71c0981d9ec..392aa0e4480 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [ "group", @@ -8,7 +9,7 @@ "group": { "type": "string" }, "panels": { "type": "array", - "items": { "$ref": "panels.json" } + "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json" } }, "has_custom_metrics": { "type": "boolean" } }, diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json index b4809a85101..3224e7cfe3f 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [ "title", @@ -10,11 +11,11 @@ "id": { "type": "string" }, "type": { "type": "string" }, "y_label": { "type": "string" }, - "y_axis": { "$ref": "axis.json" }, + "y_axis": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json" }, "max_value": { "type": "number" }, "metrics": { "type": "array", - "items": { "$ref": "metrics.json" } + "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json" } } }, "additionalProperties": false diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json index c82d2fcb02c..439f7b6b044 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json @@ -1,8 +1,9 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": ["variables"], "properties": { - "variables": { "$ref": "variables.json" } + "variables": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json" } }, "additionalProperties": false } diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json index 1818b2775f0..c4382326854 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "required": [ "type", "options" @@ -6,7 +7,7 @@ "properties": { "type": { "enum": ["text"] }, "label": { "type": "string" }, - "options": { "$ref": "text_variable_options.json" } + "options": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json" } }, "additionalProperties": false } diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json index ccb2e168fd1..ee998e46a7e 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json @@ -1,4 +1,5 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "properties": { "default_value": { "type": "string" } diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json index aec129111e0..1cf5ae2eaa4 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json @@ -1,16 +1,17 @@ { + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "patternProperties": { "^[a-zA-Z0-9_]*$": { "anyOf": [ - { "$ref": "text_variable_full_syntax.json" }, + { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json" }, { "type": "string" }, { "type": "array", "items": { "type": "string" } }, - { "$ref": "custom_variable_full_syntax.json" }, - { "$ref": "metric_label_values_variable_full_syntax.json" } + { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json" }, + { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json" } ] } }, diff --git a/spec/fixtures/packages/helm/rook-ceph-v1.5.8.tgz b/spec/fixtures/packages/helm/rook-ceph-v1.5.8.tgz Binary files differnew file mode 100644 index 00000000000..85e1c2d1ca4 --- /dev/null +++ b/spec/fixtures/packages/helm/rook-ceph-v1.5.8.tgz diff --git a/spec/fixtures/packages/terraform_module/module-system-v1.0.0.tgz b/spec/fixtures/packages/terraform_module/module-system-v1.0.0.tgz Binary files differnew file mode 100644 index 00000000000..42f1e7d9924 --- /dev/null +++ b/spec/fixtures/packages/terraform_module/module-system-v1.0.0.tgz diff --git a/spec/fixtures/pipeline_artifacts/code_quality_mr_diff.json b/spec/fixtures/pipeline_artifacts/code_quality_mr_diff.json index c3ee2bc4cac..5489330fc1d 100644 --- a/spec/fixtures/pipeline_artifacts/code_quality_mr_diff.json +++ b/spec/fixtures/pipeline_artifacts/code_quality_mr_diff.json @@ -1,23 +1,25 @@ { - "files": { - "file_a.rb": [ - { - "line": 10, - "description": "Avoid parameter lists longer than 5 parameters. [12/5]", - "severity": "major" - }, - { - "line": 10, - "description": "Method `new_array` has 12 arguments (exceeds 4 allowed). Consider refactoring.", - "severity": "minor" - } - ], - "file_b.rb": [ - { - "line": 10, - "description": "This cop checks for methods with too many parameters.\nThe maximum number of parameters is configurable.\nKeyword arguments can optionally be excluded from the total count.", - "severity": "minor" - } - ] + "merge_request_123456789": { + "files": { + "file_a.rb": [ + { + "line": 10, + "description": "Avoid parameter lists longer than 5 parameters. [12/5]", + "severity": "major" + }, + { + "line": 10, + "description": "Method `new_array` has 12 arguments (exceeds 4 allowed). Consider refactoring.", + "severity": "minor" + } + ], + "file_b.rb": [ + { + "line": 10, + "description": "This cop checks for methods with too many parameters.\nThe maximum number of parameters is configurable.\nKeyword arguments can optionally be excluded from the total count.", + "severity": "minor" + } + ] + } } } diff --git a/spec/fixtures/product_intelligence/survey_response_schema.json b/spec/fixtures/product_intelligence/survey_response_schema.json new file mode 100644 index 00000000000..11454116d83 --- /dev/null +++ b/spec/fixtures/product_intelligence/survey_response_schema.json @@ -0,0 +1,52 @@ +{ + "description": "Schema for a Gitlab survey_response event", + "self": { + "vendor": "com.gitlab", + "name": "survey_response", + "version": "1-0-0", + "format": "jsonschema" + }, + "type": "object", + "additionalProperties": false, + "required": ["survey_id", "response"], + "properties": { + "survey_id": { + "description": "Survey ID", + "type": "integer", + "minimum": 0, + "maximum": 2147483647 + }, + "response": { + "description": "Response", + "type": "string", + "maxLength": 10000 + }, + "instance_id": { + "description": "Instance ID", + "type": ["integer", "null"], + "minimum": 0, + "maximum": 2147483647 + }, + "user_id": { + "description": "User ID", + "type": ["integer", "null"], + "minimum": 0, + "maximum": 2147483647 + }, + "email": { + "description": "Email", + "type": ["string", "null"], + "maxLength": 255 + }, + "name": { + "description": "Name", + "type": ["string", "null"], + "maxLength": 255 + }, + "username": { + "description": "Username", + "type": ["string", "null"], + "maxLength": 255 + } + } +} diff --git a/spec/fixtures/security_reports/master/gl-sast-report-minimal.json b/spec/fixtures/security_reports/master/gl-sast-report-minimal.json new file mode 100644 index 00000000000..60a67453c9b --- /dev/null +++ b/spec/fixtures/security_reports/master/gl-sast-report-minimal.json @@ -0,0 +1,68 @@ +{ + "version": "14.0.0", + "vulnerabilities": [ + { + "category": "sast", + "name": "Cipher with no integrity", + "message": "Cipher with no integrity", + "cve": "groovy/src/main/java/com/gitlab/security_products/tests/App.groovy:29:CIPHER_INTEGRITY", + "severity": "Medium", + "confidence": "High", + "scanner": { + "id": "find_sec_bugs", + "name": "Find Security Bugs" + }, + "location": { + "file": "groovy/src/main/java/com/gitlab/security_products/tests/App.groovy", + "start_line": 29, + "end_line": 29, + "class": "com.gitlab.security_products.tests.App", + "method": "insecureCypher" + }, + "identifiers": [ + { + "type": "find_sec_bugs_type", + "name": "Find Security Bugs-CIPHER_INTEGRITY", + "value": "CIPHER_INTEGRITY", + "url": "https://find-sec-bugs.github.io/bugs.htm#CIPHER_INTEGRITY" + } + ], + "tracking": { + "type": "source", + "items": [ + { + "file": "groovy/src/main/java/com/gitlab/security_products/tests/App.groovy", + "start_line": 29, + "end_line": 29, + "signatures": [ + { + "algorithm": "hash", + "value": "HASHVALUE" + }, + { + "algorithm": "scope_offset", + "value": "groovy/src/main/java/com/gitlab/security_products/tests/App.groovy:App[0]:insecureCypher[0]:2" + } + ] + } + ] + } + } + ], + "remediations": [], + "scan": { + "scanner": { + "id": "find_sec_bugs", + "name": "Find Security Bugs", + "url": "https://spotbugs.github.io", + "vendor": { + "name": "GitLab" + }, + "version": "4.0.2" + }, + "type": "sast", + "status": "success", + "start_time": "placeholder-value", + "end_time": "placeholder-value" + } +} diff --git a/spec/fixtures/security_reports/master/gl-sast-report.json b/spec/fixtures/security_reports/master/gl-sast-report.json index 9da9fdc3832..3323c1fffe3 100644 --- a/spec/fixtures/security_reports/master/gl-sast-report.json +++ b/spec/fixtures/security_reports/master/gl-sast-report.json @@ -154,8 +154,8 @@ "items": [ { "file": "groovy/src/main/java/com/gitlab/security_products/tests/App.groovy", - "start_line": 47, - "end_line": 47, + "start_line": 29, + "end_line": 29, "signatures": [ { "algorithm": "hash", diff --git a/spec/fixtures/whats_new/20201225_01_04.yml b/spec/fixtures/whats_new/20201225_01_04.yml new file mode 100644 index 00000000000..0dfd0d780c7 --- /dev/null +++ b/spec/fixtures/whats_new/20201225_01_04.yml @@ -0,0 +1,19 @@ +--- +- title: View epics on a board + body: | + ## View epics on a board + self-managed: true + gitlab-com: false + packages: ["Free", "Premium", "Ultimate"] +- title: View Jira issue details in GitLab + body: | + ## View Jira issue details in GitLab + self-managed: true + gitlab-com: false + packages: ["Premium", "Ultimate"] +- title: Integrate any IT alerting tool with GitLab + body: | + ## Integrate any IT alerting tool with GitLab + self-managed: true + gitlab-com: false + packages: ["Ultimate"]
\ No newline at end of file |