fix from merge conflict

Author: gjtorikian

src/workos/audit_logs/_resource.py

@@ -193,7 +193,7 @@ def list_action_schemas(
             request_options=request_options,
         )
 
-    def create_action_schemas(
+    def create_schema(
         self,
         action_name: str,
         *,
@@ -239,7 +239,7 @@ def create_action_schemas(
             request_options=request_options,
         )
 
-    def create_events(
+    def create_event(
         self,
         *,
         organization_id: str,
@@ -287,7 +287,7 @@ def create_events(
             request_options=request_options,
         )
 
-    def create_exports(
+    def create_export(
         self,
         *,
         organization_id: str,
@@ -548,7 +548,7 @@ async def list_action_schemas(
             request_options=request_options,
         )
 
-    async def create_action_schemas(
+    async def create_schema(
         self,
         action_name: str,
         *,
@@ -594,7 +594,7 @@ async def create_action_schemas(
             request_options=request_options,
         )
 
-    async def create_events(
+    async def create_event(
         self,
         *,
         organization_id: str,
@@ -642,7 +642,7 @@ async def create_events(
             request_options=request_options,
         )
 
-    async def create_exports(
+    async def create_export(
         self,
         *,
         organization_id: str,

src/workos/authorization/_resource.py

@@ -28,7 +28,7 @@ class Authorization:
     def __init__(self, client: "WorkOSClient") -> None:
         self._client = client
 
-    def check_organization_membership(
+    def check(
         self,
         organization_membership_id: str,
         *,
@@ -195,7 +195,7 @@ def list_organization_membership_role_assignments(
             request_options=request_options,
         )
 
-    def create_organization_membership_role_assignments(
+    def assign_role(
         self,
         organization_membership_id: str,
         *,
@@ -246,7 +246,7 @@ def create_organization_membership_role_assignments(
             request_options=request_options,
         )
 
-    def delete_organization_membership_role_assignments(
+    def remove_role(
         self,
         organization_membership_id: str,
         *,
@@ -353,7 +353,7 @@ def list_organization_roles(
             request_options=request_options,
         )
 
-    def create_organization_roles(
+    def create_organization_role(
         self,
         organization_id: str,
         *,
@@ -898,7 +898,7 @@ def list_resources(
             request_options=request_options,
         )
 
-    def create_resources(
+    def create_resource(
         self,
         *,
         external_id: str,
@@ -1148,7 +1148,7 @@ def list_memberships_for_resource(
             request_options=request_options,
         )
 
-    def list_roles(
+    def list_environment_roles(
         self,
         *,
         request_options: Optional[RequestOptions] = None,
@@ -1173,7 +1173,7 @@ def list_roles(
             request_options=request_options,
         )
 
-    def create_roles(
+    def create_environment_role(
         self,
         *,
         slug: str,
@@ -1224,7 +1224,7 @@ def create_roles(
             request_options=request_options,
         )
 
-    def get_role(
+    def get_environment_role(
         self,
         slug: str,
         *,
@@ -1255,7 +1255,7 @@ def get_role(
             request_options=request_options,
         )
 
-    def update_role(
+    def update_environment_role(
         self,
         slug: str,
         *,
@@ -1301,7 +1301,7 @@ def update_role(
             request_options=request_options,
         )
 
-    def add_role_permission(
+    def add_environment_role_permission(
         self,
         slug: str,
         *,
@@ -1340,7 +1340,7 @@ def add_role_permission(
             request_options=request_options,
         )
 
-    def set_role_permissions(
+    def set_environment_role_permissions(
         self,
         slug: str,
         *,
@@ -1426,7 +1426,7 @@ def list_permissions(
             request_options=request_options,
         )
 
-    def create_permissions(
+    def create_permission(
         self,
         *,
         slug: str,
@@ -1585,7 +1585,7 @@ class AsyncAuthorization:
     def __init__(self, client: "AsyncWorkOSClient") -> None:
         self._client = client
 
-    async def check_organization_membership(
+    async def check(
         self,
         organization_membership_id: str,
         *,
@@ -1752,7 +1752,7 @@ async def list_organization_membership_role_assignments(
             request_options=request_options,
         )
 
-    async def create_organization_membership_role_assignments(
+    async def assign_role(
         self,
         organization_membership_id: str,
         *,
@@ -1803,7 +1803,7 @@ async def create_organization_membership_role_assignments(
             request_options=request_options,
         )
 
-    async def delete_organization_membership_role_assignments(
+    async def remove_role(
         self,
         organization_membership_id: str,
         *,
@@ -1910,7 +1910,7 @@ async def list_organization_roles(
             request_options=request_options,
         )
 
-    async def create_organization_roles(
+    async def create_organization_role(
         self,
         organization_id: str,
         *,
@@ -2455,7 +2455,7 @@ async def list_resources(
             request_options=request_options,
         )
 
-    async def create_resources(
+    async def create_resource(
         self,
         *,
         external_id: str,
@@ -2705,7 +2705,7 @@ async def list_memberships_for_resource(
             request_options=request_options,
         )
 
-    async def list_roles(
+    async def list_environment_roles(
         self,
         *,
         request_options: Optional[RequestOptions] = None,
@@ -2730,7 +2730,7 @@ async def list_roles(
             request_options=request_options,
         )
 
-    async def create_roles(
+    async def create_environment_role(
         self,
         *,
         slug: str,
@@ -2781,7 +2781,7 @@ async def create_roles(
             request_options=request_options,
         )
 
-    async def get_role(
+    async def get_environment_role(
         self,
         slug: str,
         *,
@@ -2812,7 +2812,7 @@ async def get_role(
             request_options=request_options,
         )
 
-    async def update_role(
+    async def update_environment_role(
         self,
         slug: str,
         *,
@@ -2858,7 +2858,7 @@ async def update_role(
             request_options=request_options,
         )
 
-    async def add_role_permission(
+    async def add_environment_role_permission(
         self,
         slug: str,
         *,
@@ -2897,7 +2897,7 @@ async def add_role_permission(
             request_options=request_options,
         )
 
-    async def set_role_permissions(
+    async def set_environment_role_permissions(
         self,
         slug: str,
         *,
@@ -2983,7 +2983,7 @@ async def list_permissions(
             request_options=request_options,
         )
 
-    async def create_permissions(
+    async def create_permission(
         self,
         *,
         slug: str,

src/workos/directory_sync/_resource.py

@@ -133,7 +133,7 @@ def delete_directory(
             request_options=request_options,
         )
 
-    def list_directory_groups(
+    def list_groups(
         self,
         *,
         limit: Optional[int] = None,
@@ -188,7 +188,7 @@ def list_directory_groups(
             request_options=request_options,
         )
 
-    def get_directory_group(
+    def get_group(
         self,
         id: str,
         *,
@@ -219,7 +219,7 @@ def get_directory_group(
             request_options=request_options,
         )
 
-    def list_directory_users(
+    def list_users(
         self,
         *,
         limit: Optional[int] = None,
@@ -274,7 +274,7 @@ def list_directory_users(
             request_options=request_options,
         )
 
-    def get_directory_user(
+    def get_user(
         self,
         id: str,
         *,
@@ -426,7 +426,7 @@ async def delete_directory(
             request_options=request_options,
         )
 
-    async def list_directory_groups(
+    async def list_groups(
         self,
         *,
         limit: Optional[int] = None,
@@ -481,7 +481,7 @@ async def list_directory_groups(
             request_options=request_options,
         )
 
-    async def get_directory_group(
+    async def get_group(
         self,
         id: str,
         *,
@@ -512,7 +512,7 @@ async def get_directory_group(
             request_options=request_options,
         )
 
-    async def list_directory_users(
+    async def list_users(
         self,
         *,
         limit: Optional[int] = None,
@@ -567,7 +567,7 @@ async def list_directory_users(
             request_options=request_options,
         )
 
-    async def get_directory_user(
+    async def get_user(
         self,
         id: str,
         *,

src/workos/feature_flags/_resource.py

@@ -162,7 +162,7 @@ def enable_feature_flag(
             request_options=request_options,
         )
 
-    def create_feature_flag_target(
+    def add_flag_target(
         self,
         resource_id: str,
         slug: str,
@@ -192,7 +192,7 @@ def create_feature_flag_target(
             request_options=request_options,
         )
 
-    def delete_feature_flag_target(
+    def remove_flag_target(
         self,
         resource_id: str,
         slug: str,
@@ -466,7 +466,7 @@ async def enable_feature_flag(
             request_options=request_options,
         )
 
-    async def create_feature_flag_target(
+    async def add_flag_target(
         self,
         resource_id: str,
         slug: str,
@@ -496,7 +496,7 @@ async def create_feature_flag_target(
             request_options=request_options,
         )
 
-    async def delete_feature_flag_target(
+    async def remove_flag_target(
         self,
         resource_id: str,
         slug: str,

src/workos/organizations/_resource.py

@@ -74,7 +74,7 @@ def list_organizations(
             request_options=request_options,
         )
 
-    def create_organizations(
+    def create_organization(
         self,
         *,
         name: str,
@@ -373,7 +373,7 @@ async def list_organizations(
             request_options=request_options,
         )
 
-    async def create_organizations(
+    async def create_organization(
         self,
         *,
         name: str,