Skip to content

Commit e468fd9

Browse files
redundant function fix
1 parent 0ed56da commit e468fd9

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

src/tfe/resources/oauth_client.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
OAuthClientUpdateOptions,
1616
)
1717
from ..utils import (
18-
valid_oauth_client_id,
1918
valid_string_id,
2019
validate_oauth_client_add_projects_options,
2120
validate_oauth_client_create_options,
@@ -89,7 +88,7 @@ def read_with_options(
8988
self, oauth_client_id: str, options: OAuthClientReadOptions | None
9089
) -> OAuthClient:
9190
"""Read an OAuth client by its ID with options."""
92-
if not valid_oauth_client_id(oauth_client_id):
91+
if not valid_string_id(oauth_client_id):
9392
raise ValueError(ERR_INVALID_OAUTH_CLIENT_ID)
9493

9594
path = f"/api/v2/oauth-clients/{quote(oauth_client_id)}"
@@ -107,7 +106,7 @@ def update(
107106
self, oauth_client_id: str, options: OAuthClientUpdateOptions
108107
) -> OAuthClient:
109108
"""Update an OAuth client by its ID."""
110-
if not valid_oauth_client_id(oauth_client_id):
109+
if not valid_string_id(oauth_client_id):
111110
raise ValueError(ERR_INVALID_OAUTH_CLIENT_ID)
112111

113112
body = {
@@ -129,7 +128,7 @@ def update(
129128

130129
def delete(self, oauth_client_id: str) -> None:
131130
"""Delete an OAuth client by its ID."""
132-
if not valid_oauth_client_id(oauth_client_id):
131+
if not valid_string_id(oauth_client_id):
133132
raise ValueError(ERR_INVALID_OAUTH_CLIENT_ID)
134133

135134
path = f"/api/v2/oauth-clients/{quote(oauth_client_id)}"
@@ -139,7 +138,7 @@ def add_projects(
139138
self, oauth_client_id: str, options: OAuthClientAddProjectsOptions
140139
) -> None:
141140
"""Add projects to a given OAuth client."""
142-
if not valid_oauth_client_id(oauth_client_id):
141+
if not valid_string_id(oauth_client_id):
143142
raise ValueError(ERR_INVALID_OAUTH_CLIENT_ID)
144143

145144
validate_oauth_client_add_projects_options(options)
@@ -151,7 +150,7 @@ def remove_projects(
151150
self, oauth_client_id: str, options: OAuthClientRemoveProjectsOptions
152151
) -> None:
153152
"""Remove projects from an OAuth client."""
154-
if not valid_oauth_client_id(oauth_client_id):
153+
if not valid_string_id(oauth_client_id):
155154
raise ValueError(ERR_INVALID_OAUTH_CLIENT_ID)
156155

157156
validate_oauth_client_remove_projects_options(options)

src/tfe/utils.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,6 @@ def validate_workspace_update_options(options: WorkspaceUpdateOptions) -> None:
214214
raise UnsupportedBothTagsRegexAndFileTriggersEnabledError()
215215

216216

217-
def valid_oauth_client_id(v: str | None) -> bool:
218-
"""Validate OAuth client ID format."""
219-
return valid_string_id(v)
220-
221-
222217
def validate_oauth_client_create_options(options: OAuthClientCreateOptions) -> None:
223218
"""
224219
Validate OAuth client create options similar to Go implementation.

0 commit comments

Comments
 (0)