diff options
Diffstat (limited to 'spec/fixtures')
-rw-r--r-- | spec/fixtures/api/schemas/entities/codequality_degradation.json | 3 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/job/job.json | 1 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/ml/search_runs.json | 82 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/integration.json | 3 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/operations/strategy.json | 3 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/operations/user_list.json | 16 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/status/ci_detailed_status.json | 2 | ||||
-rw-r--r-- | spec/fixtures/ci_secure_files/sample.p12 | bin | 3352 -> 3219 bytes | |||
-rw-r--r-- | spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event.yml | 14 | ||||
-rw-r--r-- | spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event_ee.yml | 10 | ||||
-rw-r--r-- | spec/fixtures/packages/nuget/symbol/package.pdb | bin | 0 -> 10588 bytes | |||
-rw-r--r-- | spec/fixtures/security_reports/master/gl-common-scanning-report.json | 48 |
12 files changed, 137 insertions, 45 deletions
diff --git a/spec/fixtures/api/schemas/entities/codequality_degradation.json b/spec/fixtures/api/schemas/entities/codequality_degradation.json index ac772873daf..ac1a556e33c 100644 --- a/spec/fixtures/api/schemas/entities/codequality_degradation.json +++ b/spec/fixtures/api/schemas/entities/codequality_degradation.json @@ -10,6 +10,9 @@ "description": { "type": "string" }, + "fingerprint": { + "type": "string" + }, "severity": { "type": "string" }, diff --git a/spec/fixtures/api/schemas/job/job.json b/spec/fixtures/api/schemas/job/job.json index f3d5e9b038a..34668f309a6 100644 --- a/spec/fixtures/api/schemas/job/job.json +++ b/spec/fixtures/api/schemas/job/job.json @@ -5,7 +5,6 @@ "id", "name", "started", - "build_path", "playable", "created_at", "updated_at", diff --git a/spec/fixtures/api/schemas/ml/search_runs.json b/spec/fixtures/api/schemas/ml/search_runs.json new file mode 100644 index 00000000000..c1db2c9f15c --- /dev/null +++ b/spec/fixtures/api/schemas/ml/search_runs.json @@ -0,0 +1,82 @@ +{ + "type": "object", + "required": [ + "runs", + "next_page_token" + ], + "properties": { + "runs": { + "type": "array", + "items": { + "type": "object", + "required": [ + "info", + "data" + ], + "properties": { + "info": { + "type": "object", + "required": [ + "run_id", + "run_uuid", + "user_id", + "experiment_id", + "status", + "start_time", + "artifact_uri", + "lifecycle_stage" + ], + "optional": [ + "end_time" + ], + "properties": { + "run_id": { + "type": "string" + }, + "run_uuid": { + "type": "string" + }, + "experiment_id": { + "type": "string" + }, + "artifact_uri": { + "type": "string" + }, + "start_time": { + "type": "integer" + }, + "end_time": { + "type": "integer" + }, + "user_id": { + "type": "string" + }, + "status": { + "type": "string", + "enum": [ + "RUNNING", + "SCHEDULED", + "FINISHED", + "FAILED", + "KILLED" + ] + }, + "lifecycle_stage": { + "type": "string", + "enum": [ + "active" + ] + } + } + }, + "data": { + "type": "object" + } + } + } + }, + "next_page_token": { + "type": "string" + } + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/integration.json b/spec/fixtures/api/schemas/public_api/v4/integration.json index 8902196a2c4..2b16e44eb85 100644 --- a/spec/fixtures/api/schemas/public_api/v4/integration.json +++ b/spec/fixtures/api/schemas/public_api/v4/integration.json @@ -65,6 +65,9 @@ }, "comment_on_event_enabled": { "type": "boolean" + }, + "vulnerability_events": { + "type": "boolean" } }, "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 index f572b1a4f9b..a72260af145 100644 --- a/spec/fixtures/api/schemas/public_api/v4/operations/strategy.json +++ b/spec/fixtures/api/schemas/public_api/v4/operations/strategy.json @@ -8,7 +8,8 @@ "id": { "type": "integer" }, "name": { "type": "string" }, "parameters": { "type": "object" }, - "scopes": { "type": "array", "items": { "$ref": "scope.json" } } + "scopes": { "type": "array", "items": { "$ref": "scope.json" } }, + "user_list": { "type": ["object", "null"], "$ref": "user_list.json" } }, "additionalProperties": false } diff --git a/spec/fixtures/api/schemas/public_api/v4/operations/user_list.json b/spec/fixtures/api/schemas/public_api/v4/operations/user_list.json new file mode 100644 index 00000000000..6a9f977e37d --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/operations/user_list.json @@ -0,0 +1,16 @@ +{ + "type": ["object", "null"], + "required": [ + "id", + "iid", + "name", + "user_xids" + ], + "properties": { + "id": { "type": "integer" }, + "iid": { "type": "integer" }, + "name": { "type": "string" }, + "user_xids": { "type": "string" } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/status/ci_detailed_status.json b/spec/fixtures/api/schemas/status/ci_detailed_status.json index 8d0f1e4a6af..0d9e4975858 100644 --- a/spec/fixtures/api/schemas/status/ci_detailed_status.json +++ b/spec/fixtures/api/schemas/status/ci_detailed_status.json @@ -17,7 +17,7 @@ "group": { "type": "string" }, "tooltip": { "type": "string" }, "has_details": { "type": "boolean" }, - "details_path": { "type": "string" }, + "details_path": { "oneOf": [{ "type": "null" }, {"type": "string" }] }, "favicon": { "type": "string" }, "illustration": { "$ref": "illustration.json" }, "action": { "$ref": "action.json" } diff --git a/spec/fixtures/ci_secure_files/sample.p12 b/spec/fixtures/ci_secure_files/sample.p12 Binary files differindex c74df26a8d4..84c7bf6a2f5 100644 --- a/spec/fixtures/ci_secure_files/sample.p12 +++ b/spec/fixtures/ci_secure_files/sample.p12 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 index 1c1ad65796c..6c3a0ef5ed6 100644 --- 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 @@ -1,6 +1,6 @@ --- description: -category: Groups::EmailCampaignsController +category: Projects::Pipelines::EmailCampaignsController action: click label_description: property_description: @@ -13,12 +13,12 @@ identifiers: product_section: product_stage: product_group: -milestone: "13.11" +milestone: '13.11' introduced_by_url: distributions: -- ce -- ee + - ce + - ee tiers: -- free -- premium -- ultimate + - 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 index 174468028b8..3381c73f23e 100644 --- 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 @@ -1,6 +1,6 @@ --- description: -category: Groups::EmailCampaignsController +category: Projects::Pipelines::EmailCampaignsController action: click label_description: property_description: @@ -13,10 +13,10 @@ identifiers: product_section: product_stage: product_group: -milestone: "13.11" +milestone: '13.11' introduced_by_url: distributions: -- ee + - ee tiers: -#- premium -- ultimate + #- premium + - ultimate diff --git a/spec/fixtures/packages/nuget/symbol/package.pdb b/spec/fixtures/packages/nuget/symbol/package.pdb Binary files differnew file mode 100644 index 00000000000..dc82bf418a2 --- /dev/null +++ b/spec/fixtures/packages/nuget/symbol/package.pdb diff --git a/spec/fixtures/security_reports/master/gl-common-scanning-report.json b/spec/fixtures/security_reports/master/gl-common-scanning-report.json index 4c494963a79..31a86d3a8ae 100644 --- a/spec/fixtures/security_reports/master/gl-common-scanning-report.json +++ b/spec/fixtures/security_reports/master/gl-common-scanning-report.json @@ -1,11 +1,11 @@ { "vulnerabilities": [ { + "id": "vulnerability-1", "category": "dependency_scanning", "name": "Vulnerability for remediation testing 1", "message": "This vulnerability should have ONE remediation", "description": "", - "cve": "CVE-2137", "severity": "High", "solution": "Upgrade to latest version.", "scanner": { @@ -43,11 +43,11 @@ } }, { + "id": "vulnerability-2", "category": "dependency_scanning", "name": "Vulnerability for remediation testing 2", "message": "This vulnerability should have ONE remediation", "description": "", - "cve": "CVE-2138", "severity": "High", "solution": "Upgrade to latest version.", "scanner": { @@ -85,11 +85,11 @@ } }, { + "id": "vulnerability-3", "category": "dependency_scanning", "name": "Vulnerability for remediation testing 3", "message": "Remediation for this vulnerability should remediate CVE-2140 as well", "description": "", - "cve": "CVE-2139", "severity": "High", "solution": "Upgrade to latest version.", "scanner": { @@ -127,11 +127,11 @@ } }, { + "id": "vulnerability-4", "category": "dependency_scanning", "name": "Vulnerability for remediation testing 4", "message": "Remediation for this vulnerability should remediate CVE-2139 as well", "description": "", - "cve": "CVE-2140", "severity": "High", "solution": "Upgrade to latest version.", "scanner": { @@ -169,11 +169,11 @@ } }, { + "id": "vulnerability-5", "category": "dependency_scanning", "name": "Vulnerabilities in libxml2", "message": "Vulnerabilities in libxml2 in nokogiri", "description": "", - "cve": "CVE-1020", "severity": "High", "solution": "Upgrade to latest version.", "scanner": { @@ -281,12 +281,11 @@ } }, { - "id": "bb2fbeb1b71ea360ce3f86f001d4e84823c3ffe1a1f7d41ba7466b14cfa953d3", + "id": "vulnerability-6", "category": "dependency_scanning", "name": "Regular Expression Denial of Service", "message": "Regular Expression Denial of Service in debug", "description": "", - "cve": "CVE-1030", "severity": "Unknown", "solution": "Upgrade to latest versions.", "scanner": { @@ -387,6 +386,7 @@ ] }, { + "id": "vulnerability-7", "category": "dependency_scanning", "name": "Authentication bypass via incorrect DOM traversal and canonicalization", "message": "Authentication bypass via incorrect DOM traversal and canonicalization in saml2-js", @@ -421,47 +421,46 @@ { "fixes": [ { - "cve": "CVE-2137" + "id": "vulnerability-1" } ], - "summary": "this remediates CVE-2137", + "summary": "this remediates the first vulnerability", "diff": "dG90YWxseSBsZWdpdCBkaWZm" }, { "fixes": [ { - "cve": "CVE-2138" + "id": "vulnerability-2" } ], - "summary": "this remediates CVE-2138", + "summary": "this remediates the second vulnerability", "diff": "dG90YWxseSBsZWdpdCBkaWZm" }, { "fixes": [ { - "cve": "CVE-2139" + "id": "vulnerability-3" }, { - "cve": "CVE-2140" + "id": "vulnerability-4" } ], - "summary": "this remediates CVE-2139 and CVE-2140", + "summary": "this remediates the third and fourth vulnerability", "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5" }, { "fixes": [ { - "cve": "CVE-1020" + "id": "vulnerability-5" } ], - "summary": "this fixes CVE-1020", + "summary": "this fixes the fifth vulnerability", "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5" }, { "fixes": [ { - "cve": "CVE", - "id": "bb2fbeb1b71ea360ce3f86f001d4e84823c3ffe1a1f7d41ba7466b14cfa953d3" + "id": "vulnerability-6" } ], "summary": "this fixes CVE", @@ -470,22 +469,11 @@ { "fixes": [ { - "cve": "CVE", - "id": "bb2fbeb1b71ea360ce3f86f001d4e84823c3ffe1a1f7d41ba7466b14cfa953d3" + "id": "vulnerability-6" } ], "summary": "this fixed CVE", "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5" - }, - { - "fixes": [ - { - "id": "2134", - "cve": "CVE-1" - } - ], - "summary": "this fixes CVE-1", - "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5" } ], "dependency_files": [], |