Run all the integration tests - 2024-12-02 PT

slackapi · Dec 3, 2024 · 46dad04 · 46dad04
1 parent 0898f38
commit 46dad04
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 19 deletions.
diff --git 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
@@ -68,5 +68,9 @@
     "messages": [
       ""
     ]
+  },
+  "metadata": {
+    "Fn0000000000": {},
+    "Fn0000000000_": {}
   }
 }
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
@@ -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/...m/slack/api/methods/response/admin/functions/AdminFunctionsPermissionsLookupResponse.java b/...m/slack/api/methods/response/admin/functions/AdminFunctionsPermissionsLookupResponse.java
@@ -19,6 +19,7 @@ public class AdminFunctionsPermissionsLookupResponse implements SlackApiTextResp
     private transient Map<String, List<String>> httpResponseHeaders;
 
     private Map<String, AppFunctionPermissions> permissions;
+    private Map<String, Object> metadata;
     private ResponseMetadata responseMetadata;
     private Object errors; // TODO: typing
 }
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
@@ -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<String> 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<String> 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<String> 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();