Skip to content

fix concurrent writes to a framework in the custom framework tests #2833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2025-04-30 19:54:42.844276",
"spec_repo_commit": "4f95b6c2"
"regenerated": "2025-05-01 17:33:07.863390",
"spec_repo_commit": "3e323c5a"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2025-04-30 19:54:42.860713",
"spec_repo_commit": "4f95b6c2"
"regenerated": "2025-05-01 17:33:07.880062",
"spec_repo_commit": "3e323c5a"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void main(String[] args) {
.attributes(
new CustomFrameworkDataAttributes()
.name("name")
.handle("create-framework-new")
.handle("")
.version("10")
.iconUrl("test-url")
.requirements(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ public static void main(String[] args) {
SecurityMonitoringApi apiInstance = new SecurityMonitoringApi(defaultClient);

try {
DeleteCustomFrameworkResponse result =
apiInstance.deleteCustomFramework("create-framework-new", "10");
DeleteCustomFrameworkResponse result = apiInstance.deleteCustomFramework("", "10");
System.out.println(result);
} catch (ApiException e) {
System.err.println("Exception when calling SecurityMonitoringApi#deleteCustomFramework");
Expand Down
3 changes: 1 addition & 2 deletions examples/v2/security-monitoring/GetCustomFramework.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ public static void main(String[] args) {
SecurityMonitoringApi apiInstance = new SecurityMonitoringApi(defaultClient);

try {
GetCustomFrameworkResponse result =
apiInstance.getCustomFramework("create-framework-new", "10");
GetCustomFrameworkResponse result = apiInstance.getCustomFramework("", "10");
System.out.println(result);
} catch (ApiException e) {
System.err.println("Exception when calling SecurityMonitoringApi#getCustomFramework");
Expand Down
5 changes: 2 additions & 3 deletions examples/v2/security-monitoring/UpdateCustomFramework.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void main(String[] args) {
.attributes(
new CustomFrameworkDataAttributes()
.name("name")
.handle("create-framework-new")
.handle("")
.version("10")
.iconUrl("test-url")
.requirements(
Expand All @@ -41,8 +41,7 @@ public static void main(String[] args) {
"def-000-be9"))))))));

try {
UpdateCustomFrameworkResponse result =
apiInstance.updateCustomFramework("create-framework-new", "10", body);
UpdateCustomFrameworkResponse result = apiInstance.updateCustomFramework("", "10", body);
System.out.println(result);
} catch (ApiException e) {
System.err.println("Exception when calling SecurityMonitoringApi#updateCustomFramework");
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-22T19:24:37.090Z
2025-05-01T15:27:00.020Z
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-22T19:27:16.633Z
2025-05-01T15:27:00.163Z
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"httpRequest": {
"body": {
"type": "JSON",
"json": "{\"data\":{\"attributes\":{\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
"json": "{\"data\":{\"attributes\":{\"handle\":\"CreateacustomframeworkreturnsConflictresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
},
"headers": {},
"method": "POST",
Expand All @@ -12,7 +12,7 @@
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"handle\":\"create-framework-new\",\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"CreateacustomframeworkreturnsConflictresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"handle\":\"CreateacustomframeworkreturnsConflictresponse\",\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -27,13 +27,13 @@
"timeToLive": {
"unlimited": true
},
"id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
"id": "3586614e-1fc8-3300-ac44-adeb8d1bff61"
},
{
"httpRequest": {
"body": {
"type": "JSON",
"json": "{\"data\":{\"attributes\":{\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
"json": "{\"data\":{\"attributes\":{\"handle\":\"CreateacustomframeworkreturnsConflictresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
},
"headers": {},
"method": "POST",
Expand All @@ -42,7 +42,7 @@
"secure": true
},
"httpResponse": {
"body": "{\"errors\":[{\"status\":\"409\",\"title\":\"Status Conflict\",\"detail\":\"already_exists(Framework 'create-framework-new' already existed)\"}]}",
"body": "{\"errors\":[{\"status\":\"409\",\"title\":\"Status Conflict\",\"detail\":\"already_exists(Framework 'CreateacustomframeworkreturnsConflictresponse' already existed)\"}]}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -57,18 +57,18 @@
"timeToLive": {
"unlimited": true
},
"id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
"id": "3586614e-1fc8-3300-ac44-adeb8d1bff62"
},
{
"httpRequest": {
"headers": {},
"method": "DELETE",
"path": "/api/v2/cloud_security_management/custom_frameworks/create-framework-new/10",
"path": "/api/v2/cloud_security_management/custom_frameworks/CreateacustomframeworkreturnsConflictresponse/10",
"keepAlive": false,
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"created_at\":1744297581542,\"created_by\":\"[email protected]\",\"description\":\"\",\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"modified_at\":1745349916258,\"name\":\"name\",\"org_id\":321813,\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"CreateacustomframeworkreturnsConflictresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"description\":\"\",\"handle\":\"CreateacustomframeworkreturnsConflictresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -83,6 +83,6 @@
"timeToLive": {
"unlimited": true
},
"id": "e535722a-99e3-30cf-49f7-2d093bd78b3d"
"id": "09520365-ad57-0fe8-60d3-9878cd8eb9d8"
}
]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-22T20:53:54.694Z
2025-05-01T15:27:01.530Z
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"httpRequest": {
"body": {
"type": "JSON",
"json": "{\"data\":{\"attributes\":{\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
"json": "{\"data\":{\"attributes\":{\"handle\":\"CreateacustomframeworkreturnsOKresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
},
"headers": {},
"method": "POST",
Expand All @@ -12,7 +12,7 @@
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"handle\":\"create-framework-new\",\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"CreateacustomframeworkreturnsOKresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"handle\":\"CreateacustomframeworkreturnsOKresponse\",\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -27,18 +27,18 @@
"timeToLive": {
"unlimited": true
},
"id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
"id": "53c57601-a25d-ee10-2c6f-a313dc6d541d"
},
{
"httpRequest": {
"headers": {},
"method": "DELETE",
"path": "/api/v2/cloud_security_management/custom_frameworks/create-framework-new/10",
"path": "/api/v2/cloud_security_management/custom_frameworks/CreateacustomframeworkreturnsOKresponse/10",
"keepAlive": false,
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"created_at\":1744297581542,\"created_by\":\"[email protected]\",\"description\":\"\",\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"modified_at\":1745353074397,\"name\":\"name\",\"org_id\":321813,\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"CreateacustomframeworkreturnsOKresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"description\":\"\",\"handle\":\"CreateacustomframeworkreturnsOKresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -53,6 +53,6 @@
"timeToLive": {
"unlimited": true
},
"id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
"id": "9d34ad67-4a45-eede-e0c5-d08b12bc2914"
}
]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-28T15:24:28.339Z
2025-05-01T15:27:06.868Z
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-28T15:24:37.124Z
2025-05-01T15:27:06.969Z
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"httpRequest": {
"body": {
"type": "JSON",
"json": "{\"data\":{\"attributes\":{\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
"json": "{\"data\":{\"attributes\":{\"handle\":\"DeleteacustomframeworkreturnsOKresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
},
"headers": {},
"method": "POST",
Expand All @@ -12,7 +12,7 @@
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"handle\":\"create-framework-new\",\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"DeleteacustomframeworkreturnsOKresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"handle\":\"DeleteacustomframeworkreturnsOKresponse\",\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -27,18 +27,18 @@
"timeToLive": {
"unlimited": true
},
"id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
"id": "0e09d2e7-057f-8d1f-6bff-dfdc6c711ec3"
},
{
"httpRequest": {
"headers": {},
"method": "DELETE",
"path": "/api/v2/cloud_security_management/custom_frameworks/create-framework-new/10",
"path": "/api/v2/cloud_security_management/custom_frameworks/DeleteacustomframeworkreturnsOKresponse/10",
"keepAlive": false,
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"description\":\"\",\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"name\":\"name\",\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"DeleteacustomframeworkreturnsOKresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"description\":\"\",\"handle\":\"DeleteacustomframeworkreturnsOKresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -53,13 +53,13 @@
"timeToLive": {
"unlimited": true
},
"id": "e535722a-99e3-30cf-49f7-2d093bd78b3e"
"id": "46cf2559-24f0-bcb4-fe3e-41872272b811"
},
{
"httpRequest": {
"headers": {},
"method": "DELETE",
"path": "/api/v2/cloud_security_management/custom_frameworks/create-framework-new/10",
"path": "/api/v2/cloud_security_management/custom_frameworks/DeleteacustomframeworkreturnsOKresponse/10",
"keepAlive": false,
"secure": true
},
Expand All @@ -79,6 +79,6 @@
"timeToLive": {
"unlimited": true
},
"id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
"id": "46cf2559-24f0-bcb4-fe3e-41872272b812"
}
]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-27T22:14:15.789Z
2025-05-01T15:27:11.202Z
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-27T22:14:16.448Z
2025-05-01T15:27:11.335Z
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"httpRequest": {
"body": {
"type": "JSON",
"json": "{\"data\":{\"attributes\":{\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
"json": "{\"data\":{\"attributes\":{\"handle\":\"GetacustomframeworkreturnsOKresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}],\"name\":\"requirement\"}],\"version\":\"10\"},\"type\":\"custom_framework\"}}"
},
"headers": {},
"method": "POST",
Expand All @@ -12,7 +12,7 @@
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"handle\":\"create-framework-new\",\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"GetacustomframeworkreturnsOKresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"handle\":\"GetacustomframeworkreturnsOKresponse\",\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -27,18 +27,18 @@
"timeToLive": {
"unlimited": true
},
"id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
"id": "7e8cbf88-394a-7298-8c12-ed2fa4176d10"
},
{
"httpRequest": {
"headers": {},
"method": "GET",
"path": "/api/v2/cloud_security_management/custom_frameworks/create-framework-new/10",
"path": "/api/v2/cloud_security_management/custom_frameworks/GetacustomframeworkreturnsOKresponse/10",
"keepAlive": false,
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"description\":\"\",\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"name\":\"requirement\",\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}]}],\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"GetacustomframeworkreturnsOKresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"description\":\"\",\"handle\":\"GetacustomframeworkreturnsOKresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"requirements\":[{\"name\":\"requirement\",\"controls\":[{\"name\":\"control\",\"rules_id\":[\"def-000-be9\"]}]}],\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -53,18 +53,18 @@
"timeToLive": {
"unlimited": true
},
"id": "2d05687e-af69-d556-0b4d-5a69c2280ff4"
"id": "565b357c-5288-308b-3ec7-5c54a46f3fb4"
},
{
"httpRequest": {
"headers": {},
"method": "DELETE",
"path": "/api/v2/cloud_security_management/custom_frameworks/create-framework-new/10",
"path": "/api/v2/cloud_security_management/custom_frameworks/GetacustomframeworkreturnsOKresponse/10",
"keepAlive": false,
"secure": true
},
"httpResponse": {
"body": "{\"data\":{\"id\":\"create-framework-new-10\",\"type\":\"custom_framework\",\"attributes\":{\"description\":\"\",\"handle\":\"create-framework-new\",\"icon_url\":\"test-url\",\"name\":\"name\",\"version\":\"10\"}}}",
"body": "{\"data\":{\"id\":\"GetacustomframeworkreturnsOKresponse-10\",\"type\":\"custom_framework\",\"attributes\":{\"description\":\"\",\"handle\":\"GetacustomframeworkreturnsOKresponse\",\"icon_url\":\"test-url\",\"name\":\"name\",\"version\":\"10\"}}}",
"headers": {
"Content-Type": [
"application/vnd.api+json"
Expand All @@ -79,6 +79,6 @@
"timeToLive": {
"unlimited": true
},
"id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
"id": "b74c5ce4-d8e2-0f17-ae5b-5efb50600b63"
}
]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-22T20:18:00.917Z
2025-05-01T15:27:22.166Z
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"headers": {},
"method": "PUT",
"path": "/api/v2/cloud_security_management/custom_frameworks/create-framework-new/10",
"path": "/api/v2/cloud_security_management/custom_frameworks/UpdateacustomframeworkreturnsBadRequestresponse/10",
"keepAlive": false,
"secure": true
},
Expand All @@ -27,6 +27,6 @@
"timeToLive": {
"unlimited": true
},
"id": "32b0bd24-0336-5d0f-102b-3da1a84d7902"
"id": "c6478eb4-0d54-3c11-89f2-47a98f477460"
}
]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-04-22T20:17:53.528Z
2025-05-01T15:27:22.294Z
Loading
Loading