Skip to content

Commit 46dad04

Browse files
committed
Run all the integration tests - 2024-12-02 PT
1 parent 0898f38 commit 46dad04

File tree

5 files changed

+43
-19
lines changed

5 files changed

+43
-19
lines changed

json-logs/raw/audit/v1/actions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@
263263
"user_profile_deleted",
264264
"user_password_reset_slack_security",
265265
"quip_migration_user_mapping_removed",
266-
"quip_migration_user_mapping_added"
266+
"quip_migration_user_mapping_added",
267+
"user_sessions_reset_by_circuit_breaker"
267268
],
268269
"file": [
269270
"file_downloaded",

json-logs/samples/api/admin.functions.permissions.lookup.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,9 @@
6868
"messages": [
6969
""
7070
]
71+
},
72+
"metadata": {
73+
"Fn0000000000": {},
74+
"Fn0000000000_": {}
7175
}
7276
}

slack-api-client/src/main/java/com/slack/api/audit/Actions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ private User() {
279279
public static final String user_password_reset_slack_security = "user_password_reset_slack_security";
280280
public static final String quip_migration_user_mapping_removed = "quip_migration_user_mapping_removed";
281281
public static final String quip_migration_user_mapping_added = "quip_migration_user_mapping_added";
282+
public static final String user_sessions_reset_by_circuit_breaker = "user_sessions_reset_by_circuit_breaker";
282283
}
283284

284285
public static class File {

slack-api-client/src/main/java/com/slack/api/methods/response/admin/functions/AdminFunctionsPermissionsLookupResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class AdminFunctionsPermissionsLookupResponse implements SlackApiTextResp
1919
private transient Map<String, List<String>> httpResponseHeaders;
2020

2121
private Map<String, AppFunctionPermissions> permissions;
22+
private Map<String, Object> metadata;
2223
private ResponseMetadata responseMetadata;
2324
private Object errors; // TODO: typing
2425
}

slack-api-client/src/test/java/util/sample_json_generation/JsonDataRecorder.java

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -639,26 +639,43 @@ private void scanToNormalizeValues(String path, JsonElement parent, String name,
639639
message.add("room", GsonFactory.createSnakeCase().toJsonTree(SampleObjects.Room));
640640
}
641641
}
642-
if (name != null && name.equals("permissions") && path.equals("/api/admin.functions.permissions.lookup")) {
643-
JsonObject permissions = element.getAsJsonObject();
644-
try {
645-
// To avoid concurrent modification of the underlying objects
646-
List<String> oldKeys = new ArrayList<>();
647-
permissions.keySet().iterator().forEachRemaining(oldKeys::add);
648-
for (String key : oldKeys) {
649-
permissions.remove(key);
650-
}
642+
if (name != null && path.equals("/api/admin.functions.permissions.lookup")) {
643+
if (name.equals("permissions")) {
644+
JsonObject permissions = element.getAsJsonObject();
645+
try {
646+
// To avoid concurrent modification of the underlying objects
647+
List<String> oldKeys = new ArrayList<>();
648+
permissions.keySet().iterator().forEachRemaining(oldKeys::add);
649+
for (String key : oldKeys) {
650+
permissions.remove(key);
651+
}
651652

652-
} catch (Exception e) {
653-
log.error(e.getMessage(), e);
653+
} catch (Exception e) {
654+
log.error(e.getMessage(), e);
655+
}
656+
AppFunctionPermissions appFunctionPermissions = new AppFunctionPermissions();
657+
appFunctionPermissions.setDistribution(initProperties(new AppFunctionPermissions.Distribution()));
658+
appFunctionPermissions.setAllowedEntities(initProperties(new AppFunctionPermissions.AllowedEntities()));
659+
appFunctionPermissions.setAllowedByAdmin(initProperties(new AppFunctionPermissions.AllowedByAdmin()));
660+
JsonObject p = GsonFactory.createSnakeCase().toJsonTree(appFunctionPermissions).getAsJsonObject();
661+
permissions.add("Fn0000000000", p);
662+
permissions.add("Fn0000000000_", p);
663+
} else if (name.equals("metadata")) {
664+
JsonObject metadata = element.getAsJsonObject();
665+
try {
666+
// To avoid concurrent modification of the underlying objects
667+
List<String> oldKeys = new ArrayList<>();
668+
metadata.keySet().iterator().forEachRemaining(oldKeys::add);
669+
for (String key : oldKeys) {
670+
metadata.remove(key);
671+
}
672+
} catch (Exception e) {
673+
log.error(e.getMessage(), e);
674+
}
675+
JsonObject obj = GsonFactory.createSnakeCase().toJsonTree(new Object()).getAsJsonObject();
676+
metadata.add("Fn0000000000", obj);
677+
metadata.add("Fn0000000000_", obj);
654678
}
655-
AppFunctionPermissions appFunctionPermissions = new AppFunctionPermissions();
656-
appFunctionPermissions.setDistribution(initProperties(new AppFunctionPermissions.Distribution()));
657-
appFunctionPermissions.setAllowedEntities(initProperties(new AppFunctionPermissions.AllowedEntities()));
658-
appFunctionPermissions.setAllowedByAdmin(initProperties(new AppFunctionPermissions.AllowedByAdmin()));
659-
JsonObject p = GsonFactory.createSnakeCase().toJsonTree(appFunctionPermissions).getAsJsonObject();
660-
permissions.add("Fn0000000000", p);
661-
permissions.add("Fn0000000000_", p);
662679
}
663680
if (name != null && name.equals("prefs") && path.equals("/api/admin.conversations.getConversationPrefs")) {
664681
JsonObject prefs = element.getAsJsonObject();

0 commit comments

Comments
 (0)