From f5c493ea4ab938c98e2500524f29939c331039e1 Mon Sep 17 00:00:00 2001 From: shenlan Date: Tue, 30 Sep 2025 12:18:09 +0800 Subject: [PATCH] refactor: consolidate vultr deployment helpers --- iac_modules/pulumi/modules/vultr/__init__.py | 101 ++++++++++++++++++- iac_modules/pulumi/vultr/Pulumi.yaml | 3 - iac_modules/pulumi/vultr/__init__.py | 12 ++- iac_modules/pulumi/vultr/__main__.py | 53 ---------- 4 files changed, 110 insertions(+), 59 deletions(-) delete mode 100644 iac_modules/pulumi/vultr/Pulumi.yaml delete mode 100644 iac_modules/pulumi/vultr/__main__.py diff --git a/iac_modules/pulumi/modules/vultr/__init__.py b/iac_modules/pulumi/modules/vultr/__init__.py index 9624e2ad..1531047f 100644 --- a/iac_modules/pulumi/modules/vultr/__init__.py +++ b/iac_modules/pulumi/modules/vultr/__init__.py @@ -1,13 +1,112 @@ -"""Reusable Vultr landing zone modules.""" +"""Reusable Vultr landing zone modules and deployment helpers.""" +from __future__ import annotations + +import os +from pathlib import Path +from typing import Any, Dict, Mapping, MutableMapping + +import pulumi +import ediri_vultr as vultr + +from utils.config_loader import load_merged_config from .common import merge_tags from .compute import create_instances from .network import create_vpcs from .security import create_firewall_groups +DEFAULT_CONFIG_DIR = Path(__file__).resolve().parents[4] / "config" / "vultr" + + +def resolve_config_directory( + config_dir: str | os.PathLike[str] | None = None, +) -> Path: + """Resolve the configuration directory for Vultr deployments. + + When ``config_dir`` is ``None`` the ``CONFIG_PATH`` environment variable is + consulted and finally the repository default ``config/vultr`` directory is + used. + """ + + if config_dir is not None: + return Path(config_dir) + + env_dir = os.environ.get("CONFIG_PATH") + if env_dir: + return Path(env_dir) + + return DEFAULT_CONFIG_DIR + + +def load_configuration(config_dir: str | os.PathLike[str] | None = None) -> Dict[str, Any]: + """Load and merge Vultr configuration files from ``config_dir``.""" + + resolved_dir = resolve_config_directory(config_dir) + return load_merged_config(str(resolved_dir)) + + +def deploy_from_config(config: Mapping[str, Any]) -> Dict[str, Any]: + """Deploy Vultr landing zone resources from an in-memory configuration.""" + + vultr_conf: MutableMapping[str, Any] = {} + vultr_section = config.get("vultr") + if isinstance(vultr_section, MutableMapping): + vultr_conf = vultr_section + elif vultr_section is not None: + pulumi.log.warn("'vultr' 配置段不是映射类型，将忽略其中的内容") + + region = vultr_conf.get("region") + default_tags = vultr_conf.get("default_tags") + + if region: + vultr.config.region = region # type: ignore[assignment] + pulumi.export("region", region) + + pulumi.log.info("Loaded Vultr configuration") + + network_results = create_vpcs( + config.get("network", {}), + region, + ) + + firewall_results = create_firewall_groups( + config.get("security", {}), + ) + + instance_results = create_instances( + config.get("compute", {}), + region, + default_tags if isinstance(default_tags, Mapping) else None, + firewall_results, + network_results, + ) + + pulumi.export("vpc_count", len(network_results)) + pulumi.export("firewall_group_count", len(firewall_results)) + pulumi.export("instance_count", len(instance_results)) + + return { + "network": network_results, + "security": firewall_results, + "compute": instance_results, + } + + +def deploy_from_directory( + config_dir: str | os.PathLike[str] | None = None, +) -> Dict[str, Any]: + """Deploy Vultr landing zone resources from configuration files.""" + + return deploy_from_config(load_configuration(config_dir)) + + __all__ = [ "merge_tags", "create_instances", "create_vpcs", "create_firewall_groups", + "resolve_config_directory", + "load_configuration", + "deploy_from_config", + "deploy_from_directory", ] diff --git a/iac_modules/pulumi/vultr/Pulumi.yaml b/iac_modules/pulumi/vultr/Pulumi.yaml deleted file mode 100644 index 08685e6c..00000000 --- a/iac_modules/pulumi/vultr/Pulumi.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: vultr-landingzone-baseline -runtime: python -description: Pulumi baseline project for provisioning Vultr landing zone resources diff --git a/iac_modules/pulumi/vultr/__init__.py b/iac_modules/pulumi/vultr/__init__.py index 1df7e9c3..3d5abc6e 100644 --- a/iac_modules/pulumi/vultr/__init__.py +++ b/iac_modules/pulumi/vultr/__init__.py @@ -1,10 +1,14 @@ -"""Vultr landing zone baseline Pulumi modules.""" +"""Backwards compatible re-export of Vultr landing zone helpers.""" -from modules.vultr import ( # re-export for backwards compatibility +from modules.vultr import ( create_firewall_groups, create_instances, create_vpcs, + deploy_from_config, + deploy_from_directory, + load_configuration, merge_tags, + resolve_config_directory, ) __all__ = [ @@ -12,4 +16,8 @@ __all__ = [ "create_firewall_groups", "create_instances", "create_vpcs", + "resolve_config_directory", + "load_configuration", + "deploy_from_config", + "deploy_from_directory", ] diff --git a/iac_modules/pulumi/vultr/__main__.py b/iac_modules/pulumi/vultr/__main__.py deleted file mode 100644 index 480fde26..00000000 --- a/iac_modules/pulumi/vultr/__main__.py +++ /dev/null @@ -1,53 +0,0 @@ -from __future__ import annotations - -import os -import sys -from pathlib import Path -from typing import Any, Dict - -import pulumi -import ediri_vultr as vultr - -# 允许导入共享的工具模块 -PROJECT_DIR = Path(__file__).resolve().parent -PULUMI_ROOT = PROJECT_DIR.parent -REPO_ROOT = PULUMI_ROOT.parent.parent -sys.path.append(str(PULUMI_ROOT)) - -from utils.config_loader import load_merged_config # noqa: E402 -from modules.vultr import create_firewall_groups, create_instances, create_vpcs # noqa: E402 - - -def main() -> None: - default_config_dir = REPO_ROOT / "config" / "vultr" - config_dir = os.environ.get("CONFIG_PATH", str(default_config_dir)) - - config = load_merged_config(config_dir) - - vultr_conf: Dict[str, Any] = config.get("vultr", {}) # type: ignore[assignment] - region = vultr_conf.get("region") - default_tags = vultr_conf.get("default_tags", {}) - - if region: - vultr.config.region = region - pulumi.export("region", region) - - pulumi.log.info("Loaded Vultr configuration") - - network_results = create_vpcs(config.get("network", {}), region) - firewall_results = create_firewall_groups(config.get("security", {})) - instance_results = create_instances( - config.get("compute", {}), - region, - default_tags, - firewall_results, - network_results, - ) - - pulumi.export("vpc_count", len(network_results)) - pulumi.export("firewall_group_count", len(firewall_results)) - pulumi.export("instance_count", len(instance_results)) - - -if __name__ == "__main__": - main()