From 9b19ac09bda6c447ed441745d8b47b3eccb3c103 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Sun, 1 Feb 2026 14:28:42 -0500 Subject: [PATCH] fix: Ensure TSP model names do not collide --- modules/apk/apk.tsp | 8 +++--- modules/apt/apt.tsp | 8 +++--- modules/dnf/dnf.tsp | 54 +++++++++++++++++++-------------------- modules/pacman/pacman.tsp | 8 +++--- modules/zypper/zypper.tsp | 8 +++--- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/modules/apk/apk.tsp b/modules/apk/apk.tsp index c8b2b013..45953b60 100644 --- a/modules/apk/apk.tsp +++ b/modules/apk/apk.tsp @@ -15,18 +15,18 @@ model ApkModuleV1 { type: "apk" | "apk@v1" | "apk@latest"; /** Configuration of packages removal. */ - remove?: Remove; + remove?: ApkRemove; /** Configuration of packages install. */ - install?: Install; + install?: ApkInstall; } -model Install { +model ApkInstall { /** List of packages to install. */ packages: Array; } -model Remove { +model ApkRemove { /** List of packages to remove. */ packages: Array; } diff --git a/modules/apt/apt.tsp b/modules/apt/apt.tsp index 3c852843..451d3247 100644 --- a/modules/apt/apt.tsp +++ b/modules/apt/apt.tsp @@ -15,18 +15,18 @@ model AptModuleV1 { type: "apt" | "apt@v1" | "apt@latest"; /** Configuration of packages removal. */ - remove?: Remove; + remove?: AptRemove; /** Configuration of packages install. */ - install?: Install; + install?: AptInstall; } -model Install { +model AptInstall { /** List of packages to install. */ packages: Array; } -model Remove { +model AptRemove { /** List of packages to remove. */ packages: Array; } diff --git a/modules/dnf/dnf.tsp b/modules/dnf/dnf.tsp index 5088f7bb..b8138795 100644 --- a/modules/dnf/dnf.tsp +++ b/modules/dnf/dnf.tsp @@ -15,40 +15,40 @@ model DnfModuleV1 { type: "dnf" | "dnf@v1" | "dnf@latest"; /** List of links to .repo files to download into /etc/yum.repos.d/. */ - repos?: Repo; + repos?: DnfRepo; /** DEPRECATED: List of folder names under /opt/ to enable for installing into. */ optfix?: Array; /** Configuration of RPM groups removal. */ - `group-remove`?: GroupRemove; + `group-remove`?: DnfGroupRemove; /** Configuration of RPM groups install. */ - `group-install`?: GroupInstall; + `group-install`?: DnfGroupInstall; /** Configuration of RPM packages removal. */ - remove?: Remove; + remove?: DnfRemove; /** Configuration of RPM packages install. */ - install?: Install; + install?: DnfInstall; /** List of configurations for replacing packages from another repo. */ - replace?: Array; + replace?: Array; } -model Repo { +model DnfRepo { /** Cleans up the repos added in the same step after packages are installed. */ cleanup?: boolean = false; /** List of paths or URLs to .repo files to import */ - files?: Array | RepoFiles; + files?: Array | DnfRepoFiles; /** * List of COPR project repos to add. * You can also specify 2 lists * instead to 'enable' or 'disable' COPR repos. */ - copr?: Array | RepoCopr; + copr?: Array | DnfRepoCopr; /** List of links to key files to import for installing from custom repositories. */ keys?: Array; @@ -63,7 +63,7 @@ model Repo { nonfree?: "negativo17" | "rpmfusion"; } -model RepoFiles { +model DnfRepoFiles { /** List of repo files/URLs to add. */ add?: Array; @@ -75,15 +75,15 @@ model RepoFiles { remove?: Array; } -model RepoCopr { +model DnfRepoCopr { /** List of COPR repos to enable */ - enable?: Array; + enable?: Array; /** List of COPR repos to disable */ disable?: Array; } -model RepoCoprEnable { +model DnfRepoCoprEnable { /** The COPR repo's name */ name: string; @@ -91,24 +91,24 @@ model RepoCoprEnable { chroot: string; } -model Install { +model DnfInstall { /** List of RPM packages to install. */ - packages: Array; + packages: Array; - ...InstallCommon; + ...DnfInstallCommon; } -model InstallRepo { +model DnfInstallRepo { /** The repo to use when installing packages */ repo: string; /** List of RPM packages to install. */ packages: Array; - ...InstallCommon; + ...DnfInstallCommon; } -model Remove { +model DnfRemove { /** List of RPM packages to remove. */ packages: Array; @@ -116,17 +116,17 @@ model Remove { `auto-remove`?: boolean = true; } -model Replace { +model DnfReplace { /** URL to the source COPR repo for the new packages. */ `from-repo`: string; /** List of packages to replace using packages from the defined repo. */ - packages: Array; + packages: Array; - ...InstallCommon; + ...DnfInstallCommon; } -model Swap { +model DnfSwap { /** The package to be replaced. */ old: string; @@ -137,22 +137,22 @@ model Swap { `allow-erasing`?: boolean = false; } -model GroupInstall { +model DnfGroupInstall { /** List of RPM groups to install. */ packages: Array; /** Include optional packages from group. */ `with-optional`?: boolean = false; - ...InstallCommon; + ...DnfInstallCommon; } -model GroupRemove { +model DnfGroupRemove { /** List of RPM groups to remove. */ packages: Array; } -model InstallCommon { +model DnfInstallCommon { /** Whether to install weak dependencies. */ `install-weak-deps`?: boolean = true; diff --git a/modules/pacman/pacman.tsp b/modules/pacman/pacman.tsp index be04541e..736d6733 100644 --- a/modules/pacman/pacman.tsp +++ b/modules/pacman/pacman.tsp @@ -15,18 +15,18 @@ model PacmanModuleV1 { type: "pacman" | "pacman@v1" | "pacman@latest"; /** Configuration of packages removal. */ - remove?: Remove; + remove?: PacmanRemove; /** Configuration of packages install. */ - install?: Install; + install?: PacmanInstall; } -model Install { +model PacmanInstall { /** List of packages to install. */ packages: Array; } -model Remove { +model PacmanRemove { /** List of packages to remove. */ packages: Array; } diff --git a/modules/zypper/zypper.tsp b/modules/zypper/zypper.tsp index a7794c39..3e5650f3 100644 --- a/modules/zypper/zypper.tsp +++ b/modules/zypper/zypper.tsp @@ -15,18 +15,18 @@ model ZypperModuleV1 { type: "zypper" | "zypper@v1" | "zypper@latest"; /** Configuration of packages removal. */ - remove?: Remove; + remove?: ZypperRemove; /** Configuration of packages install. */ - install?: Install; + install?: ZypperInstall; } -model Install { +model ZypperInstall { /** List of packages to install. */ packages: Array; } -model Remove { +model ZypperRemove { /** List of packages to remove. */ packages: Array; }