From 46dad044b508e87bf7a50713d011f9b86a5bedfe Mon Sep 17 00:00:00 2001 From: Kazuhiro Sera Date: Tue, 3 Dec 2024 10:54:23 +0900 Subject: [PATCH] Run all the integration tests - 2024-12-02 PT --- json-logs/raw/audit/v1/actions.json | 3 +- .../admin.functions.permissions.lookup.json | 4 ++ .../java/com/slack/api/audit/Actions.java | 1 + ...minFunctionsPermissionsLookupResponse.java | 1 + .../JsonDataRecorder.java | 53 ++++++++++++------- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/json-logs/raw/audit/v1/actions.json b/json-logs/raw/audit/v1/actions.json index a23cac826..5a3abc836 100644 --- a/json-logs/raw/audit/v1/actions.json +++ b/json-logs/raw/audit/v1/actions.json @@ -263,7 +263,8 @@ "user_profile_deleted", "user_password_reset_slack_security", "quip_migration_user_mapping_removed", - "quip_migration_user_mapping_added" + "quip_migration_user_mapping_added", + "user_sessions_reset_by_circuit_breaker" ], "file": [ "file_downloaded", diff --git a/json-logs/samples/api/admin.functions.permissions.lookup.json b/json-logs/samples/api/admin.functions.permissions.lookup.json index 968e3a72b..b68d5a208 100644 --- a/json-logs/samples/api/admin.functions.permissions.lookup.json +++ b/json-logs/samples/api/admin.functions.permissions.lookup.json @@ -68,5 +68,9 @@ "messages": [ "" ] + }, + "metadata": { + "Fn0000000000": {}, + "Fn0000000000_": {} } } \ No newline at end of file diff --git a/slack-api-client/src/main/java/com/slack/api/audit/Actions.java b/slack-api-client/src/main/java/com/slack/api/audit/Actions.java index 92318fda5..5a3dc01bb 100644 --- a/slack-api-client/src/main/java/com/slack/api/audit/Actions.java +++ b/slack-api-client/src/main/java/com/slack/api/audit/Actions.java @@ -279,6 +279,7 @@ private User() { public static final String user_password_reset_slack_security = "user_password_reset_slack_security"; public static final String quip_migration_user_mapping_removed = "quip_migration_user_mapping_removed"; public static final String quip_migration_user_mapping_added = "quip_migration_user_mapping_added"; + public static final String user_sessions_reset_by_circuit_breaker = "user_sessions_reset_by_circuit_breaker"; } public static class File { diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/admin/functions/AdminFunctionsPermissionsLookupResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/functions/AdminFunctionsPermissionsLookupResponse.java index 0d2a9ea08..ac706786a 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/response/admin/functions/AdminFunctionsPermissionsLookupResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/response/admin/functions/AdminFunctionsPermissionsLookupResponse.java @@ -19,6 +19,7 @@ public class AdminFunctionsPermissionsLookupResponse implements SlackApiTextResp private transient Map> httpResponseHeaders; private Map permissions; + private Map metadata; private ResponseMetadata responseMetadata; private Object errors; // TODO: typing } \ No newline at end of file diff --git a/slack-api-client/src/test/java/util/sample_json_generation/JsonDataRecorder.java b/slack-api-client/src/test/java/util/sample_json_generation/JsonDataRecorder.java index 07b75ea10..83d174abc 100644 --- a/slack-api-client/src/test/java/util/sample_json_generation/JsonDataRecorder.java +++ b/slack-api-client/src/test/java/util/sample_json_generation/JsonDataRecorder.java @@ -639,26 +639,43 @@ private void scanToNormalizeValues(String path, JsonElement parent, String name, message.add("room", GsonFactory.createSnakeCase().toJsonTree(SampleObjects.Room)); } } - if (name != null && name.equals("permissions") && path.equals("/api/admin.functions.permissions.lookup")) { - JsonObject permissions = element.getAsJsonObject(); - try { - // To avoid concurrent modification of the underlying objects - List oldKeys = new ArrayList<>(); - permissions.keySet().iterator().forEachRemaining(oldKeys::add); - for (String key : oldKeys) { - permissions.remove(key); - } + if (name != null && path.equals("/api/admin.functions.permissions.lookup")) { + if (name.equals("permissions")) { + JsonObject permissions = element.getAsJsonObject(); + try { + // To avoid concurrent modification of the underlying objects + List oldKeys = new ArrayList<>(); + permissions.keySet().iterator().forEachRemaining(oldKeys::add); + for (String key : oldKeys) { + permissions.remove(key); + } - } catch (Exception e) { - log.error(e.getMessage(), e); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + AppFunctionPermissions appFunctionPermissions = new AppFunctionPermissions(); + appFunctionPermissions.setDistribution(initProperties(new AppFunctionPermissions.Distribution())); + appFunctionPermissions.setAllowedEntities(initProperties(new AppFunctionPermissions.AllowedEntities())); + appFunctionPermissions.setAllowedByAdmin(initProperties(new AppFunctionPermissions.AllowedByAdmin())); + JsonObject p = GsonFactory.createSnakeCase().toJsonTree(appFunctionPermissions).getAsJsonObject(); + permissions.add("Fn0000000000", p); + permissions.add("Fn0000000000_", p); + } else if (name.equals("metadata")) { + JsonObject metadata = element.getAsJsonObject(); + try { + // To avoid concurrent modification of the underlying objects + List oldKeys = new ArrayList<>(); + metadata.keySet().iterator().forEachRemaining(oldKeys::add); + for (String key : oldKeys) { + metadata.remove(key); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + } + JsonObject obj = GsonFactory.createSnakeCase().toJsonTree(new Object()).getAsJsonObject(); + metadata.add("Fn0000000000", obj); + metadata.add("Fn0000000000_", obj); } - AppFunctionPermissions appFunctionPermissions = new AppFunctionPermissions(); - appFunctionPermissions.setDistribution(initProperties(new AppFunctionPermissions.Distribution())); - appFunctionPermissions.setAllowedEntities(initProperties(new AppFunctionPermissions.AllowedEntities())); - appFunctionPermissions.setAllowedByAdmin(initProperties(new AppFunctionPermissions.AllowedByAdmin())); - JsonObject p = GsonFactory.createSnakeCase().toJsonTree(appFunctionPermissions).getAsJsonObject(); - permissions.add("Fn0000000000", p); - permissions.add("Fn0000000000_", p); } if (name != null && name.equals("prefs") && path.equals("/api/admin.conversations.getConversationPrefs")) { JsonObject prefs = element.getAsJsonObject();