Skip to content

Commit 9dbe9e3

Browse files
lint issue fixed
1 parent 280dccf commit 9dbe9e3

6 files changed

Lines changed: 53 additions & 13 deletions

File tree

src/tfe/resources/registry_module.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
RegistryModuleListOptions,
2222
RegistryModulePermissions,
2323
RegistryModuleUpdateOptions,
24+
RegistryModuleVCSRepo,
2425
RegistryModuleVersion,
2526
RegistryModuleVersionStatuses,
2627
RegistryName,
2728
TerraformRegistryModule,
2829
TestConfig,
29-
VCSRepo,
3030
)
3131
from ..utils import valid_string, valid_string_id, valid_version
3232
from ._base import _Service
@@ -453,7 +453,7 @@ def _parse_registry_module(self, data: dict[str, Any]) -> RegistryModule:
453453
vcs_repo = None
454454
if "vcs-repo" in attributes:
455455
vcs_data = attributes["vcs-repo"]
456-
vcs_repo = VCSRepo(
456+
vcs_repo = RegistryModuleVCSRepo(
457457
branch=vcs_data.get("branch"),
458458
display_identifier=vcs_data.get("display-identifier"),
459459
identifier=vcs_data.get("identifier"),

src/tfe/resources/variable.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
ERR_REQUIRED_CATEGORY,
1010
ERR_REQUIRED_KEY,
1111
)
12-
from ..types import (
12+
from ..types import ( # type: ignore[attr-defined]
1313
Variable,
1414
VariableCreateOptions,
1515
VariableListOptions,

src/tfe/resources/workspaces.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
WorkspaceMinimumLimitError,
1717
WorkspaceRequiredError,
1818
)
19-
from ..types import (
19+
from ..types import ( # type: ignore[attr-defined]
2020
DataRetentionPolicy,
2121
DataRetentionPolicyChoice,
2222
DataRetentionPolicyDeleteOlder,
@@ -69,7 +69,7 @@ def _em_safe(v: Any) -> ExecutionMode | None:
6969
# Only accept strings; map to enum if known, else None
7070
if not isinstance(v, str):
7171
return None
72-
return ExecutionMode._value2member_map_.get(v) # type: ignore[return-value]
72+
return ExecutionMode._value2member_map_.get(v)
7373

7474

7575
def _ws_from(d: dict[str, Any], org: str | None = None) -> Workspace:
@@ -1174,4 +1174,4 @@ def readme(self, workspace_id: str) -> str | None:
11741174
if inc.get("type") == "workspace-readme" and inc.get("id") == readme_id:
11751175
return (inc.get("attributes") or {}).get("raw-markdown")
11761176

1177-
return None
1177+
return None

src/tfe/types/__init__.py

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
RegistryModulePermissions,
2525
RegistryModuleStatus,
2626
RegistryModuleUpdateOptions,
27+
RegistryModuleVCSRepo,
2728
RegistryModuleVCSRepoOptions,
2829
RegistryModuleVCSRepoUpdateOptions,
2930
RegistryModuleVersion,
@@ -32,8 +33,8 @@
3233
RegistryName,
3334
Resource,
3435
Root,
36+
TerraformRegistryModule,
3537
TestConfig,
36-
VCSRepo,
3738
)
3839

3940
# Define what should be available when importing with *
@@ -57,6 +58,7 @@
5758
"RegistryModulePermissions",
5859
"RegistryModuleStatus",
5960
"RegistryModuleUpdateOptions",
61+
"RegistryModuleVCSRepo",
6062
"RegistryModuleVCSRepoOptions",
6163
"RegistryModuleVCSRepoUpdateOptions",
6264
"RegistryModuleVersion",
@@ -66,7 +68,7 @@
6668
"Resource",
6769
"Root",
6870
"TestConfig",
69-
"VCSRepo",
71+
"TerraformRegistryModule",
7072
# Main types from types.py (will be dynamically added below)
7173
"Capacity",
7274
"DataRetentionPolicy",
@@ -76,8 +78,10 @@
7678
"DataRetentionPolicyDontDelete",
7779
"DataRetentionPolicyDontDeleteSetOptions",
7880
"DataRetentionPolicySetOptions",
81+
"EffectiveTagBinding",
7982
"Entitlements",
8083
"ExecutionMode",
84+
"LockedByChoice",
8185
"Organization",
8286
"OrganizationCreateOptions",
8387
"OrganizationUpdateOptions",
@@ -87,7 +91,37 @@
8791
"Run",
8892
"RunQueue",
8993
"RunStatus",
94+
"Tag",
95+
"TagBinding",
96+
"TagList",
97+
"Variable",
98+
"VariableCreateOptions",
99+
"VariableListOptions",
100+
"VariableUpdateOptions",
101+
"VCSRepo",
90102
"Workspace",
103+
"WorkspaceActions",
104+
"WorkspaceAddRemoteStateConsumersOptions",
105+
"WorkspaceAddTagBindingsOptions",
106+
"WorkspaceAddTagsOptions",
107+
"WorkspaceAssignSSHKeyOptions",
108+
"WorkspaceCreateOptions",
109+
"WorkspaceIncludeOpt",
110+
"WorkspaceList",
111+
"WorkspaceListOptions",
112+
"WorkspaceListRemoteStateConsumersOptions",
113+
"WorkspaceLockOptions",
114+
"WorkspaceOutputs",
115+
"WorkspacePermissions",
116+
"WorkspaceReadOptions",
117+
"WorkspaceRemoveRemoteStateConsumersOptions",
118+
"WorkspaceRemoveTagsOptions",
119+
"WorkspaceRemoveVCSConnectionOptions",
120+
"WorkspaceSettingOverwrites",
121+
"WorkspaceSource",
122+
"WorkspaceTagListOptions",
123+
"WorkspaceUpdateOptions",
124+
"WorkspaceUpdateRemoteStateConsumersOptions",
91125
]
92126

93127
# Load the main types.py file that's at the same level as this types/ directory

src/tfe/types/registry_module_types.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ class RegistryModulePermissions(BaseModel):
8787
can_retry: bool
8888

8989

90-
class VCSRepo(BaseModel):
91-
"""VCS repository configuration."""
90+
class RegistryModuleVCSRepo(BaseModel):
91+
"""VCS repository configuration for registry modules."""
9292

9393
branch: str | None = None
9494
display_identifier: str | None = None
@@ -101,6 +101,7 @@ class VCSRepo(BaseModel):
101101
tags: bool | None = None
102102
source_directory: str | None = None
103103
tag_prefix: str | None = None
104+
organization_name: str | None = None
104105

105106

106107
class TestConfig(BaseModel):
@@ -132,7 +133,7 @@ class RegistryModule(BaseModel):
132133
publishing_mechanism: PublishingMechanism | None = None
133134
status: RegistryModuleStatus | None = None
134135
test_config: TestConfig | None = None
135-
vcs_repo: VCSRepo | None = None
136+
vcs_repo: RegistryModuleVCSRepo | None = None
136137
version_statuses: list[RegistryModuleVersionStatuses] = Field(default_factory=list)
137138
created_at: str | None = None
138139
updated_at: str | None = None

src/tfe/utils.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
UnsupportedBothTriggerPatternsAndPrefixesError,
1616
UnsupportedOperationsError,
1717
)
18-
from .types import VCSRepo, WorkspaceCreateOptions, WorkspaceUpdateOptions
18+
from .types import ( # type: ignore[attr-defined]
19+
VCSRepo,
20+
WorkspaceCreateOptions,
21+
WorkspaceUpdateOptions,
22+
)
1923

2024
_STRING_ID_PATTERN = re.compile(r"^[a-zA-Z0-9][a-zA-Z0-9_-]{2,}$")
2125
_VERSION_PATTERN = re.compile(
@@ -50,7 +54,8 @@ def valid_string_id(v: str | None) -> bool:
5054
def valid_version(v: str | None) -> bool:
5155
"""Validate semantic version string."""
5256
return v is not None and _VERSION_PATTERN.match(str(v)) is not None
53-
57+
58+
5459
def is_valid_workspace_name(name: str | None) -> bool:
5560
"""
5661
Check if a workspace name is valid.

0 commit comments

Comments
 (0)