Cleanup and Pre-release checks

Makefile

@@ -1,7 +1,7 @@
 .PHONY: help fmt fmt-check lint check test install dev-install type-check clean all venv activate
 
 PYTHON := python3
-SRC_DIR := src/tfe
+SRC_DIR := src/pytfe
 TEST_DIR := tests
 VENV := .venv
 VENV_PYTHON := $(VENV)/bin/python

README.md

@@ -2,7 +2,7 @@
 
 [![PyPI](https://img.shields.io/pypi/v/pytfe.svg)](https://pypi.org/project/pytfe/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/pytfe.svg)](https://pypi.org/project/pytfe/)
-[![CI](https://github.com/hashicorp/python-tfe/actions/workflows/ci.yml/badge.svg)](https://github.com/hashicorp/python-tfe/actions/workflows/ci.yml)
+[![Test](https://github.com/hashicorp/python-tfe/actions/workflows/test.yml/badge.svg)](https://github.com/hashicorp/python-tfe/actions/workflows/test.yml)
 [![License](https://img.shields.io/github/license/hashicorp/python-tfe.svg)](./LICENSE)
 [![Issues](https://img.shields.io/github/issues/hashicorp/python-tfe.svg)](https://github.com/hashicorp/python-tfe/issues)
 

examples/agent.py

@@ -17,15 +17,15 @@
 Usage:
     export TFE_TOKEN="your-token-here"
     export TFE_ORG="your-organization"
-    python examples/agent_simple.py
+    python examples/agent.py
 """
 
 import os
 
-from tfe.client import TFEClient
-from tfe.config import TFEConfig
-from tfe.errors import NotFound
-from tfe.models.agent import AgentListOptions
+from pytfe.client import TFEClient
+from pytfe.config import TFEConfig
+from pytfe.errors import NotFound
+from pytfe.models import AgentListOptions
 
 
 def main():
@@ -45,7 +45,7 @@ def main():
 
     # Create TFE client
     config = TFEConfig(token=token, address=address)
-    client = TFEClient(config=config)
+    client = TFEClient(config)
 
     print(f"🔗 Connected to: {address}")
     print(f"🏢 Organization: {org}")

examples/agent_pool.py

@@ -14,15 +14,15 @@
 Usage:
     export TFE_TOKEN="your-token-here"
     export TFE_ORG="your-organization"
-    python examples/agent_pool_simple.py
+    python examples/agent_pool.py
 """
 
 import os
 import uuid
 
-from tfe import TFEClient, TFEConfig
-from tfe.errors import NotFound
-from tfe.models.agent import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.errors import NotFound
+from pytfe.models import (
     AgentPoolAllowedWorkspacePolicy,
     AgentPoolCreateOptions,
     AgentPoolListOptions,

examples/apply.py

@@ -3,7 +3,7 @@
 import argparse
 import os
 
-from tfe import TFEClient, TFEConfig
+from pytfe import TFEClient, TFEConfig
 
 
 def _print_header(title: str):

examples/configuration_version_complete_test.py → examples/configuration_version.py

@@ -2,7 +2,7 @@
 """
 Complete Configuration Version Testing Suite
 
-This file contains individual tests for all 12 configuration version functions implemented in src/tfe/resources/configuration_version.py:
+This file contains individual tests for all 12 configuration version functions:
 
 CONFIGURATION VERSION FUNCTIONS AVAILABLE FOR TESTING:
 1.  list() - List configuration versions for a workspace
@@ -35,8 +35,8 @@
 # Add the src directory to the path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
 
-from tfe import TFEClient, TFEConfig
-from tfe.models import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import (
     ConfigurationVersionCreateOptions,
     ConfigurationVersionListOptions,
     ConfigurationVersionReadOptions,

examples/oauth_client_complete_test.py → examples/oauth_client.py

@@ -2,7 +2,7 @@
 """
 Complete OAuth Client Testing Suite
 
-This file contains individual tests for all 8 OAuth client functions implemented in src/tfe/resources/oauth_client.py:
+This file contains individual tests for all 8 OAuth client functions:
 
 PUBLIC FUNCTIONS AVAILABLE FOR TESTING:
 1. list() - List all OAuth clients for an organization
@@ -35,9 +35,9 @@
 # Add the src directory to the path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
 
-from tfe import TFEClient, TFEConfig
-from tfe.errors import NotFound
-from tfe.models.oauth_client import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.errors import NotFound
+from pytfe.models import (
     OAuthClientAddProjectsOptions,
     OAuthClientCreateOptions,
     OAuthClientIncludeOpt,

examples/oauth_token_complete_test.py → examples/oauth_token.py

@@ -2,7 +2,7 @@
 """
 Complete OAuth Token Testing Suite
 
-This file contains individual tests for all 4 OAuth token functions implemented in src/tfe/resources/oauth_token.py:
+This file contains individual tests for all 4 OAuth token functions:
 
 FUNCTIONS AVAILABLE FOR TESTING:
 1. list() - List OAuth tokens for an organization
@@ -28,9 +28,9 @@
 # Add the src directory to the path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
 
-from tfe import TFEClient, TFEConfig
-from tfe.errors import NotFound
-from tfe.models.oauth_token import OAuthTokenListOptions, OAuthTokenUpdateOptions
+from pytfe import TFEClient, TFEConfig
+from pytfe.errors import NotFound
+from pytfe.models import OAuthTokenListOptions, OAuthTokenUpdateOptions
 
 
 def main():

examples/org.py

@@ -1,5 +1,5 @@
-from tfe import TFEClient, TFEConfig
-from tfe.types import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import (
     DataRetentionPolicyDeleteOlderSetOptions,
     DataRetentionPolicyDontDeleteSetOptions,
     OrganizationCreateOptions,

examples/plan.py

@@ -4,7 +4,7 @@
 import json
 import os
 
-from tfe import TFEClient, TFEConfig
+from pytfe import TFEClient, TFEConfig
 
 
 def _print_header(title: str):

examples/policy.py

@@ -22,14 +22,14 @@
 import os
 from pathlib import Path
 
-from tfe import TFEClient, TFEConfig
-from tfe.models.policy import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import (
     EnforcementLevel,
     PolicyCreateOptions,
+    PolicyKind,
     PolicyListOptions,
     PolicyUpdateOptions,
 )
-from tfe.models.policy_set import PolicyKind
 
 
 def _print_header(title: str):

examples/policy_check.py

@@ -3,8 +3,8 @@
 import argparse
 import os
 
-from tfe import TFEClient, TFEConfig
-from tfe.models.policy_check import PolicyCheckListOptions
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import PolicyCheckListOptions
 
 
 def _print_header(title: str):

examples/project.py

@@ -1,7 +1,7 @@
 """
 Comprehensive Integration Test for python-tfe Projects CRUD Operations
 
-This file tests all CRUD operations from src/tfe/resources/projects.py:
+This file tests all CRUD operations:
 - List: Get all projects in an organization
 - Create: Add new projects with validation
 - Read: Get specific project details
@@ -29,16 +29,16 @@
 
 import pytest
 
-from tfe._http import HTTPTransport
-from tfe.config import TFEConfig
-from tfe.resources.projects import Projects
-from tfe.types import (
+from pytfe._http import HTTPTransport
+from pytfe.config import TFEConfig
+from pytfe.models import (
     ProjectAddTagBindingsOptions,
     ProjectCreateOptions,
     ProjectListOptions,
     ProjectUpdateOptions,
     TagBinding,
 )
+from pytfe.resources.projects import Projects
 
 
 @pytest.fixture

examples/query_run.py

@@ -30,8 +30,8 @@
 import time
 from datetime import datetime
 
-from tfe import TFEClient, TFEConfig
-from tfe.models.query_run import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import (
     QueryRunCancelOptions,
     QueryRunCreateOptions,
     QueryRunForceCancelOptions,

examples/registry_module_complete_test.py → examples/registry_module.py

@@ -2,7 +2,7 @@
 """
 Complete Registry Module Testing Suite
 
-This file contains individual tests for all 15 registry module functions implemented in src/tfe/resources/registry_module.py:
+This file contains individual tests for all 15 registry module functions:
 
 PUBLIC FUNCTIONS AVAILABLE FOR TESTING:
 1.  list() - List registry modules in organization
@@ -39,9 +39,9 @@
 # Add the src directory to the path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
 
-from tfe import TFEClient, TFEConfig
-from tfe.errors import NotFound
-from tfe.models.registry_module_types import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.errors import NotFound
+from pytfe.models import (
     AgentExecutionMode,
     RegistryModuleCreateOptions,
     RegistryModuleCreateVersionOptions,

examples/registry_provider_individual.py → examples/registry_provider.py

@@ -23,8 +23,8 @@
 # Add the src directory to the path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
 
-from tfe import TFEClient
-from tfe.models.registry_provider_types import (
+from pytfe import TFEClient
+from pytfe.models import (
     RegistryName,
     RegistryProviderCreateOptions,
     RegistryProviderID,

examples/reserved_tag_key.py

@@ -18,9 +18,9 @@
 # Add the source directory to the path for direct execution
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
 
-from tfe import TFEClient, TFEConfig
-from tfe.errors import TFEError
-from tfe.models import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.errors import TFEError
+from pytfe.models import (
     ReservedTagKeyCreateOptions,
     ReservedTagKeyListOptions,
     ReservedTagKeyUpdateOptions,

examples/run.py

@@ -4,8 +4,8 @@
 import os
 from datetime import datetime
 
-from tfe import TFEClient, TFEConfig
-from tfe.models.run import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import (
     RunCreateOptions,
     RunIncludeOpt,
     RunListForOrganizationOptions,
@@ -141,7 +141,7 @@ def main():
                 workspace_data = client.workspaces.read_by_id(args.workspace_id)
 
                 # Create the workspace object that run models expect
-                from tfe.models.workspace import Workspace
+                from pytfe.models.workspace import Workspace
 
                 workspace = Workspace(
                     id=workspace_data.id,

examples/run_events.py

@@ -37,8 +37,8 @@
 import argparse
 import os
 
-from tfe import TFEClient, TFEConfig
-from tfe.models.run_event import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import (
     RunEventIncludeOpt,
     RunEventListOptions,
     RunEventReadOptions,

examples/run_task.py

@@ -1,8 +1,8 @@
 import time
 import traceback
 
-from tfe import TFEClient, TFEConfig
-from tfe.models.run_task import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import (
     RunTaskCreateOptions,
     RunTaskIncludeOptions,
     RunTaskListOptions,

examples/run_trigger.py

@@ -1,14 +1,14 @@
 import time
 import traceback
 
-from tfe import TFEClient, TFEConfig
-from tfe.models.run_trigger import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.models import (
     RunTriggerCreateOptions,
     RunTriggerFilterOp,
     RunTriggerIncludeOp,
     RunTriggerListOptions,
+    Workspace,
 )
-from tfe.models.workspace import Workspace
 
 
 def run_trigger_list(client, workspace_id):

examples/ssh_keys.py

@@ -28,9 +28,9 @@
 # Add the source directory to the path for direct execution
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "src"))
 
-from tfe import TFEClient, TFEConfig
-from tfe.errors import NotFound, TFEError
-from tfe.models import SSHKeyCreateOptions, SSHKeyListOptions, SSHKeyUpdateOptions
+from pytfe import TFEClient, TFEConfig
+from pytfe.errors import NotFound, TFEError
+from pytfe.models import SSHKeyCreateOptions, SSHKeyListOptions, SSHKeyUpdateOptions
 
 # Configuration
 TFE_TOKEN = os.getenv("TFE_TOKEN")

examples/state_versions.py

@@ -4,14 +4,14 @@
 import os
 from pathlib import Path
 
-from tfe import TFEClient, TFEConfig
-from tfe.errors import ErrStateVersionUploadNotSupported
-from tfe.models.state_version import (
+from pytfe import TFEClient, TFEConfig
+from pytfe.errors import ErrStateVersionUploadNotSupported
+from pytfe.models import (
     StateVersionCreateOptions,
     StateVersionCurrentOptions,
     StateVersionListOptions,
+    StateVersionOutputsListOptions,
 )
-from tfe.models.state_version_output import StateVersionOutputsListOptions
 
 
 def _print_header(title: str):