From 789ea2cc8c9355bf7be9471594be0ebf3fb91bfd Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Thu, 14 Dec 2023 10:50:00 +0000 Subject: [PATCH] Regenerate client from commit 43a99a56 of spec repo --- .apigentools-info | 8 ++--- .generator/schemas/v2/openapi.yaml | 13 +++++++ ...e-Scanning-Rule-returns-OK-response.frozen | 2 +- ...eate-Scanning-Rule-returns-OK-response.yml | 26 +++++++------- ...e-Scanning-Rule-returns-OK-response.frozen | 2 +- ...date-Scanning-Rule-returns-OK-response.yml | 34 +++++++++---------- .../CreateScanningRule.rb | 1 + .../UpdateScanningRule.rb | 1 + features/v2/sensitive_data_scanner.feature | 4 +-- .../sensitive_data_scanner_rule_attributes.rb | 34 ++++++++++++++++++- ...ata_scanner_standard_pattern_attributes.rb | 34 ++++++++++++++++++- 11 files changed, 119 insertions(+), 40 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index d7a617f3df1d..a73600feb589 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2023-12-13 18:05:03.218231", - "spec_repo_commit": "493effcf" + "regenerated": "2023-12-14 10:49:31.800938", + "spec_repo_commit": "43a99a56" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2023-12-13 18:05:03.266658", - "spec_repo_commit": "493effcf" + "regenerated": "2023-12-14 10:49:31.815282", + "spec_repo_commit": "43a99a56" } } } \ No newline at end of file diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 24d07840b45e..db6ac7f96c7b 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -16320,6 +16320,12 @@ components: pattern: description: Not included if there is a relationship to a standard pattern. type: string + priority: + description: Integer from 1 (high) to 5 (low) indicating rule issue severity. + format: int64 + maximum: 5 + minimum: 1 + type: integer tags: description: List of tags. items: @@ -16475,6 +16481,13 @@ components: pattern: description: Regex to match. type: string + priority: + description: Integer from 1 (high) to 5 (low) indicating standard pattern + issue severity. + format: int64 + maximum: 5 + minimum: 1 + type: integer tags: description: List of tags. items: diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.frozen index aaef0ebf711e..66d9a10b11ff 100644 --- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.frozen +++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.frozen @@ -1 +1 @@ -2023-01-24T13:12:12.388Z \ No newline at end of file +2023-12-13T09:06:38.820Z \ No newline at end of file diff --git a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.yml index fefc0c60b3d3..fa48d9b8fd3f 100644 --- a/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.yml +++ b/cassettes/features/v2/sensitive_data_scanner/Create-Scanning-Rule-returns-OK-response.yml @@ -1,5 +1,5 @@ http_interactions: -- recorded_at: Tue, 24 Jan 2023 13:12:12 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:38 GMT request: body: null headers: @@ -10,7 +10,7 @@ http_interactions: response: body: encoding: UTF-8 - string: '{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","attributes":{},"type":"sensitive_data_scanner_configuration","relationships":{"groups":{"data":[]}}},"meta":{"version":12574,"count_limit":100,"group_count_limit":20,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true}} + string: '{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","attributes":{},"type":"sensitive_data_scanner_configuration","relationships":{"groups":{"data":[{"id":"z9vY6YO8R-2q6dv_rTUOCA","type":"sensitive_data_scanner_group"},{"id":"01OnORacS5qHeVO7C97drg","type":"sensitive_data_scanner_group"}]}}},"meta":{"version":127243,"count_limit":100,"group_count_limit":20,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true},"included":[{"id":"z9vY6YO8R-2q6dv_rTUOCA","attributes":{"name":"Example-Update_Scanning_Group_returns_OK_response_1696199477","is_enabled":false,"filter":{"query":"*"},"product_list":["logs"]},"type":"sensitive_data_scanner_group","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},{"id":"01OnORacS5qHeVO7C97drg","attributes":{"name":"my-test-group","is_enabled":false,"filter":{"query":"*"},"product_list":["logs"]},"type":"sensitive_data_scanner_group","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}}]} ' headers: @@ -19,7 +19,7 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:12 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:38 GMT request: body: encoding: UTF-8 @@ -34,7 +34,7 @@ http_interactions: response: body: encoding: UTF-8 - string: '{"data":{"id":"z7iUhBfcSR6-1kTCPtmdpg","attributes":{"name":"my-test-group","is_enabled":false,"filter":{"query":"*"},"product_list":["logs"]},"type":"sensitive_data_scanner_group","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":12575}} + string: '{"data":{"id":"Dyurbbz2Tk23SMEr4fcHCw","attributes":{"name":"my-test-group","is_enabled":false,"filter":{"query":"*"},"product_list":["logs"]},"type":"sensitive_data_scanner_group","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":127244}} ' headers: @@ -43,11 +43,11 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:12 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:38 GMT request: body: encoding: UTF-8 - string: '{"data":{"attributes":{"excluded_namespaces":["admin.name"],"is_enabled":true,"name":"Test-Create_Scanning_Rule_returns_OK_response-1674565932","namespaces":["admin"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"z7iUhBfcSR6-1kTCPtmdpg","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}' + string: '{"data":{"attributes":{"excluded_namespaces":["admin.name"],"is_enabled":true,"name":"Test-Create_Scanning_Rule_returns_OK_response-1702458398","namespaces":["admin"],"pattern":"pattern","priority":1,"tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"Dyurbbz2Tk23SMEr4fcHCw","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}' headers: Accept: - application/json @@ -58,7 +58,7 @@ http_interactions: response: body: encoding: UTF-8 - string: '{"data":{"id":"r3NAGDIXQcSyNhfFPUZLSg","attributes":{"name":"Test-Create_Scanning_Rule_returns_OK_response-1674565932","namespaces":["admin"],"excluded_namespaces":["admin.name"],"pattern":"pattern","text_replacement":{"type":"none"},"tags":["sensitive_data:true"],"is_enabled":true},"type":"sensitive_data_scanner_rule","relationships":{"group":{"data":{"id":"z7iUhBfcSR6-1kTCPtmdpg","type":"sensitive_data_scanner_group"}}}},"meta":{"version":12576}} + string: '{"data":{"id":"Xp3fpaEhSGKqtDFmXvJZwQ","attributes":{"name":"Test-Create_Scanning_Rule_returns_OK_response-1702458398","namespaces":["admin"],"excluded_namespaces":["admin.name"],"pattern":"pattern","text_replacement":{"type":"none"},"tags":["sensitive_data:true"],"is_enabled":true,"priority":1},"type":"sensitive_data_scanner_rule","relationships":{"group":{"data":{"id":"Dyurbbz2Tk23SMEr4fcHCw","type":"sensitive_data_scanner_group"}}}},"meta":{"version":127245}} ' headers: @@ -67,7 +67,7 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:12 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:38 GMT request: body: encoding: UTF-8 @@ -78,11 +78,11 @@ http_interactions: Content-Type: - application/json method: DELETE - uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/r3NAGDIXQcSyNhfFPUZLSg + uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/Xp3fpaEhSGKqtDFmXvJZwQ response: body: encoding: UTF-8 - string: '{"meta":{"version":12577}} + string: '{"meta":{"version":127246}} ' headers: @@ -91,7 +91,7 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:12 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:38 GMT request: body: encoding: UTF-8 @@ -102,11 +102,11 @@ http_interactions: Content-Type: - application/json method: DELETE - uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/z7iUhBfcSR6-1kTCPtmdpg + uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/Dyurbbz2Tk23SMEr4fcHCw response: body: encoding: UTF-8 - string: '{"meta":{"version":12578}} + string: '{"meta":{"version":127247}} ' headers: diff --git a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.frozen b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.frozen index 1eec369071fe..da74cd47cfd4 100644 --- a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.frozen +++ b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.frozen @@ -1 +1 @@ -2023-01-24T13:12:20.575Z \ No newline at end of file +2023-12-13T09:06:40.913Z \ No newline at end of file diff --git a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.yml b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.yml index 4989fcd43fbe..13c22d317dc9 100644 --- a/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.yml +++ b/cassettes/features/v2/sensitive_data_scanner/Update-Scanning-Rule-returns-OK-response.yml @@ -1,5 +1,5 @@ http_interactions: -- recorded_at: Tue, 24 Jan 2023 13:12:20 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:40 GMT request: body: null headers: @@ -10,7 +10,7 @@ http_interactions: response: body: encoding: UTF-8 - string: '{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","attributes":{},"type":"sensitive_data_scanner_configuration","relationships":{"groups":{"data":[]}}},"meta":{"version":12586,"count_limit":100,"group_count_limit":20,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true}} + string: '{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","attributes":{},"type":"sensitive_data_scanner_configuration","relationships":{"groups":{"data":[{"id":"z9vY6YO8R-2q6dv_rTUOCA","type":"sensitive_data_scanner_group"},{"id":"01OnORacS5qHeVO7C97drg","type":"sensitive_data_scanner_group"}]}}},"meta":{"version":127247,"count_limit":100,"group_count_limit":20,"is_pci_compliant":false,"has_highlight_enabled":true,"has_multi_pass_enabled":true},"included":[{"id":"z9vY6YO8R-2q6dv_rTUOCA","attributes":{"name":"Example-Update_Scanning_Group_returns_OK_response_1696199477","is_enabled":false,"filter":{"query":"*"},"product_list":["logs"]},"type":"sensitive_data_scanner_group","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},{"id":"01OnORacS5qHeVO7C97drg","attributes":{"name":"my-test-group","is_enabled":false,"filter":{"query":"*"},"product_list":["logs"]},"type":"sensitive_data_scanner_group","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}}]} ' headers: @@ -19,7 +19,7 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:20 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:40 GMT request: body: encoding: UTF-8 @@ -34,7 +34,7 @@ http_interactions: response: body: encoding: UTF-8 - string: '{"data":{"id":"g0hUfjkqQEejgzkTN8J1sA","attributes":{"name":"my-test-group","is_enabled":false,"filter":{"query":"*"},"product_list":["logs"]},"type":"sensitive_data_scanner_group","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":12587}} + string: '{"data":{"id":"LAf2eSOlTQ6RTz2rwiQGsA","attributes":{"name":"my-test-group","is_enabled":false,"filter":{"query":"*"},"product_list":["logs"]},"type":"sensitive_data_scanner_group","relationships":{"configuration":{"data":{"id":"7957915c634d4dcb581fa154157f5ad9c2947f50be632fb5599862069f4d2d87","type":"sensitive_data_scanner_configuration"}},"rules":{"data":[]}}},"meta":{"version":127248}} ' headers: @@ -43,11 +43,11 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:20 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:40 GMT request: body: encoding: UTF-8 - string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_OK_response-1674565940","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"g0hUfjkqQEejgzkTN8J1sA","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}' + string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_OK_response-1702458400","namespaces":["admin.email"],"pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"relationships":{"group":{"data":{"id":"LAf2eSOlTQ6RTz2rwiQGsA","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}' headers: Accept: - application/json @@ -58,7 +58,7 @@ http_interactions: response: body: encoding: UTF-8 - string: '{"data":{"id":"miOWlXzWQXCJaJktLUW40g","attributes":{"name":"Test-Update_Scanning_Rule_returns_OK_response-1674565940","namespaces":["admin.email"],"excluded_namespaces":[],"pattern":"pattern","text_replacement":{"type":"none"},"tags":["sensitive_data:true"],"is_enabled":true},"type":"sensitive_data_scanner_rule","relationships":{"group":{"data":{"id":"g0hUfjkqQEejgzkTN8J1sA","type":"sensitive_data_scanner_group"}}}},"meta":{"version":12588}} + string: '{"data":{"id":"N7Hb8CgTRayW0VADXfo9Wg","attributes":{"name":"Test-Update_Scanning_Rule_returns_OK_response-1702458400","namespaces":["admin.email"],"excluded_namespaces":[],"pattern":"pattern","text_replacement":{"type":"none"},"tags":["sensitive_data:true"],"is_enabled":true},"type":"sensitive_data_scanner_rule","relationships":{"group":{"data":{"id":"LAf2eSOlTQ6RTz2rwiQGsA","type":"sensitive_data_scanner_group"}}}},"meta":{"version":127249}} ' headers: @@ -67,22 +67,22 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:20 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:40 GMT request: body: encoding: UTF-8 - string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_OK_response-1674565940","pattern":"pattern","tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"id":"miOWlXzWQXCJaJktLUW40g","relationships":{"group":{"data":{"id":"g0hUfjkqQEejgzkTN8J1sA","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}' + string: '{"data":{"attributes":{"is_enabled":true,"name":"Test-Update_Scanning_Rule_returns_OK_response-1702458400","pattern":"pattern","priority":5,"tags":["sensitive_data:true"],"text_replacement":{"type":"none"}},"id":"N7Hb8CgTRayW0VADXfo9Wg","relationships":{"group":{"data":{"id":"LAf2eSOlTQ6RTz2rwiQGsA","type":"sensitive_data_scanner_group"}}},"type":"sensitive_data_scanner_rule"},"meta":{}}' headers: Accept: - application/json Content-Type: - application/json method: PATCH - uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/miOWlXzWQXCJaJktLUW40g + uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/N7Hb8CgTRayW0VADXfo9Wg response: body: encoding: UTF-8 - string: '{"meta":{"version":12589}} + string: '{"meta":{"version":127250}} ' headers: @@ -91,7 +91,7 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:20 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:40 GMT request: body: encoding: UTF-8 @@ -102,11 +102,11 @@ http_interactions: Content-Type: - application/json method: DELETE - uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/miOWlXzWQXCJaJktLUW40g + uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/rules/N7Hb8CgTRayW0VADXfo9Wg response: body: encoding: UTF-8 - string: '{"meta":{"version":12590}} + string: '{"meta":{"version":127251}} ' headers: @@ -115,7 +115,7 @@ http_interactions: status: code: 200 message: OK -- recorded_at: Tue, 24 Jan 2023 13:12:20 GMT +- recorded_at: Wed, 13 Dec 2023 09:06:40 GMT request: body: encoding: UTF-8 @@ -126,11 +126,11 @@ http_interactions: Content-Type: - application/json method: DELETE - uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/g0hUfjkqQEejgzkTN8J1sA + uri: https://api.datadoghq.com/api/v2/sensitive-data-scanner/config/groups/LAf2eSOlTQ6RTz2rwiQGsA response: body: encoding: UTF-8 - string: '{"meta":{"version":12591}} + string: '{"meta":{"version":127252}} ' headers: diff --git a/examples/v2/sensitive-data-scanner/CreateScanningRule.rb b/examples/v2/sensitive-data-scanner/CreateScanningRule.rb index bac36d0d357d..b32f76531f4d 100644 --- a/examples/v2/sensitive-data-scanner/CreateScanningRule.rb +++ b/examples/v2/sensitive-data-scanner/CreateScanningRule.rb @@ -26,6 +26,7 @@ "sensitive_data:true", ], is_enabled: true, + priority: 1, }), relationships: DatadogAPIClient::V2::SensitiveDataScannerRuleRelationships.new({ group: DatadogAPIClient::V2::SensitiveDataScannerGroupData.new({ diff --git a/examples/v2/sensitive-data-scanner/UpdateScanningRule.rb b/examples/v2/sensitive-data-scanner/UpdateScanningRule.rb index a4cf6792ebdd..28c85998e663 100644 --- a/examples/v2/sensitive-data-scanner/UpdateScanningRule.rb +++ b/examples/v2/sensitive-data-scanner/UpdateScanningRule.rb @@ -24,6 +24,7 @@ "sensitive_data:true", ], is_enabled: true, + priority: 5, }), relationships: DatadogAPIClient::V2::SensitiveDataScannerRuleRelationships.new({ group: DatadogAPIClient::V2::SensitiveDataScannerGroupData.new({ diff --git a/features/v2/sensitive_data_scanner.feature b/features/v2/sensitive_data_scanner.feature index 3f1435d752d1..8513e27ce852 100644 --- a/features/v2/sensitive_data_scanner.feature +++ b/features/v2/sensitive_data_scanner.feature @@ -39,7 +39,7 @@ Feature: Sensitive Data Scanner Given a valid "configuration" in the system And there is a valid "scanning_group" in the system And new "CreateScanningRule" request - And body with value {"meta":{},"data":{"type":"sensitive_data_scanner_rule","attributes":{"name":"{{ unique }}","pattern":"pattern", "namespaces": ["admin"], "excluded_namespaces": ["admin.name"], "text_replacement":{"type":"none"},"tags":["sensitive_data:true"],"is_enabled":true},"relationships":{"group":{"data":{"type":"{{ group.data.type }}","id":"{{ group.data.id }}"}}}}} + And body with value {"meta":{},"data":{"type":"sensitive_data_scanner_rule","attributes":{"name":"{{ unique }}","pattern":"pattern", "namespaces": ["admin"], "excluded_namespaces": ["admin.name"], "text_replacement":{"type":"none"},"tags":["sensitive_data:true"],"is_enabled":true,"priority":1},"relationships":{"group":{"data":{"type":"{{ group.data.type }}","id":"{{ group.data.id }}"}}}}} When the request is sent Then the response status is 200 OK And the response "data.type" is equal to "sensitive_data_scanner_rule" @@ -196,6 +196,6 @@ Feature: Sensitive Data Scanner And the "scanning_group" has a "scanning_rule" And new "UpdateScanningRule" request And request contains "rule_id" parameter from "rule.data.id" - And body with value {"meta":{},"data":{"id": "{{ rule.data.id }}", "type":"sensitive_data_scanner_rule","attributes":{"name":"{{ unique }}","pattern":"pattern","text_replacement":{"type":"none"},"tags":["sensitive_data:true"],"is_enabled":true},"relationships":{"group":{"data":{"type":"{{ group.data.type }}","id":"{{ group.data.id }}"}}}}} + And body with value {"meta":{},"data":{"id": "{{ rule.data.id }}", "type":"sensitive_data_scanner_rule","attributes":{"name":"{{ unique }}","pattern":"pattern","text_replacement":{"type":"none"},"tags":["sensitive_data:true"],"is_enabled":true,"priority":5},"relationships":{"group":{"data":{"type":"{{ group.data.type }}","id":"{{ group.data.id }}"}}}}} When the request is sent Then the response status is 200 OK diff --git a/lib/datadog_api_client/v2/models/sensitive_data_scanner_rule_attributes.rb b/lib/datadog_api_client/v2/models/sensitive_data_scanner_rule_attributes.rb index 28c124171744..e0f4ac903f7b 100644 --- a/lib/datadog_api_client/v2/models/sensitive_data_scanner_rule_attributes.rb +++ b/lib/datadog_api_client/v2/models/sensitive_data_scanner_rule_attributes.rb @@ -40,6 +40,9 @@ class SensitiveDataScannerRuleAttributes # Not included if there is a relationship to a standard pattern. attr_accessor :pattern + # Integer from 1 (high) to 5 (low) indicating rule issue severity. + attr_reader :priority + # List of tags. attr_accessor :tags @@ -56,6 +59,7 @@ def self.attribute_map :'name' => :'name', :'namespaces' => :'namespaces', :'pattern' => :'pattern', + :'priority' => :'priority', :'tags' => :'tags', :'text_replacement' => :'text_replacement' } @@ -71,6 +75,7 @@ def self.openapi_types :'name' => :'String', :'namespaces' => :'Array', :'pattern' => :'String', + :'priority' => :'Integer', :'tags' => :'Array', :'text_replacement' => :'SensitiveDataScannerTextReplacement' } @@ -120,6 +125,10 @@ def initialize(attributes = {}) self.pattern = attributes[:'pattern'] end + if attributes.key?(:'priority') + self.priority = attributes[:'priority'] + end + if attributes.key?(:'tags') if (value = attributes[:'tags']).is_a?(Array) self.tags = value @@ -131,6 +140,28 @@ def initialize(attributes = {}) end end + # Check to see if the all the properties in the model are valid + # @return true if the model is valid + # @!visibility private + def valid? + return false if !@priority.nil? && @priority > 5 + return false if !@priority.nil? && @priority < 1 + true + end + + # Custom attribute writer method with validation + # @param priority [Object] Object to be assigned + # @!visibility private + def priority=(priority) + if !priority.nil? && priority > 5 + fail ArgumentError, 'invalid value for "priority", must be smaller than or equal to 5.' + end + if !priority.nil? && priority < 1 + fail ArgumentError, 'invalid value for "priority", must be greater than or equal to 1.' + end + @priority = priority + end + # Checks equality by comparing each attribute. # @param o [Object] Object to be compared # @!visibility private @@ -143,6 +174,7 @@ def ==(o) name == o.name && namespaces == o.namespaces && pattern == o.pattern && + priority == o.priority && tags == o.tags && text_replacement == o.text_replacement end @@ -151,7 +183,7 @@ def ==(o) # @return [Integer] Hash code # @!visibility private def hash - [description, excluded_namespaces, is_enabled, name, namespaces, pattern, tags, text_replacement].hash + [description, excluded_namespaces, is_enabled, name, namespaces, pattern, priority, tags, text_replacement].hash end end end diff --git a/lib/datadog_api_client/v2/models/sensitive_data_scanner_standard_pattern_attributes.rb b/lib/datadog_api_client/v2/models/sensitive_data_scanner_standard_pattern_attributes.rb index cd1f5bc62bfa..9275db422cae 100644 --- a/lib/datadog_api_client/v2/models/sensitive_data_scanner_standard_pattern_attributes.rb +++ b/lib/datadog_api_client/v2/models/sensitive_data_scanner_standard_pattern_attributes.rb @@ -33,6 +33,9 @@ class SensitiveDataScannerStandardPatternAttributes # Regex to match. attr_accessor :pattern + # Integer from 1 (high) to 5 (low) indicating standard pattern issue severity. + attr_reader :priority + # List of tags. attr_accessor :tags @@ -44,6 +47,7 @@ def self.attribute_map :'included_keywords' => :'included_keywords', :'name' => :'name', :'pattern' => :'pattern', + :'priority' => :'priority', :'tags' => :'tags' } end @@ -56,6 +60,7 @@ def self.openapi_types :'included_keywords' => :'Array', :'name' => :'String', :'pattern' => :'String', + :'priority' => :'Integer', :'tags' => :'Array' } end @@ -94,6 +99,10 @@ def initialize(attributes = {}) self.pattern = attributes[:'pattern'] end + if attributes.key?(:'priority') + self.priority = attributes[:'priority'] + end + if attributes.key?(:'tags') if (value = attributes[:'tags']).is_a?(Array) self.tags = value @@ -101,6 +110,28 @@ def initialize(attributes = {}) end end + # Check to see if the all the properties in the model are valid + # @return true if the model is valid + # @!visibility private + def valid? + return false if !@priority.nil? && @priority > 5 + return false if !@priority.nil? && @priority < 1 + true + end + + # Custom attribute writer method with validation + # @param priority [Object] Object to be assigned + # @!visibility private + def priority=(priority) + if !priority.nil? && priority > 5 + fail ArgumentError, 'invalid value for "priority", must be smaller than or equal to 5.' + end + if !priority.nil? && priority < 1 + fail ArgumentError, 'invalid value for "priority", must be greater than or equal to 1.' + end + @priority = priority + end + # Checks equality by comparing each attribute. # @param o [Object] Object to be compared # @!visibility private @@ -111,6 +142,7 @@ def ==(o) included_keywords == o.included_keywords && name == o.name && pattern == o.pattern && + priority == o.priority && tags == o.tags end @@ -118,7 +150,7 @@ def ==(o) # @return [Integer] Hash code # @!visibility private def hash - [description, included_keywords, name, pattern, tags].hash + [description, included_keywords, name, pattern, priority, tags].hash end end end