fix: Ensure TSP model names do not collide (#543)

Author: gmpinder

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<string>;
 }
 
-model Remove {
+model ApkRemove {
   /** List of packages to remove. */
   packages: Array<string>;
 }

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<string>;
 }
 
-model Remove {
+model AptRemove {
   /** List of packages to remove. */
   packages: Array<string>;
 }

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<string>;
 
   /** 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>;
+  replace?: Array<DnfReplace>;
 }
 
-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<string> | RepoFiles;
+  files?: Array<string> | DnfRepoFiles;
 
   /**
    * List of COPR project repos to add.
    * You can also specify 2 lists
    * instead to 'enable' or 'disable' COPR repos.
    */
-  copr?: Array<string | RepoCoprEnable> | RepoCopr;
+  copr?: Array<string | DnfRepoCoprEnable> | DnfRepoCopr;
 
   /** List of links to key files to import for installing from custom repositories. */
   keys?: Array<string>;
@@ -63,7 +63,7 @@ model Repo {
   nonfree?: "negativo17" | "rpmfusion";
 }
 
-model RepoFiles {
+model DnfRepoFiles {
   /** List of repo files/URLs to add. */
   add?: Array<string>;
 
@@ -75,58 +75,58 @@ model RepoFiles {
   remove?: Array<string>;
 }
 
-model RepoCopr {
+model DnfRepoCopr {
   /** List of COPR repos to enable */
-  enable?: Array<string | RepoCoprEnable>;
+  enable?: Array<string | DnfRepoCoprEnable>;
 
   /** List of COPR repos to disable */
   disable?: Array<string>;
 }
 
-model RepoCoprEnable {
+model DnfRepoCoprEnable {
   /** The COPR repo's name */
   name: string;
 
   /** The chroot for the COPR repo */
   chroot: string;
 }
 
-model Install {
+model DnfInstall {
   /** List of RPM packages to install. */
-  packages: Array<string | InstallRepo>;
+  packages: Array<string | DnfInstallRepo>;
 
-  ...InstallCommon;
+  ...DnfInstallCommon;
 }
 
-model InstallRepo {
+model DnfInstallRepo {
   /** The repo to use when installing packages */
   repo: string;
 
   /** List of RPM packages to install. */
   packages: Array<string>;
 
-  ...InstallCommon;
+  ...DnfInstallCommon;
 }
 
-model Remove {
+model DnfRemove {
   /** List of RPM packages to remove. */
   packages: Array<string>;
 
   /** Whether to remove unused dependencies during removal operation. */
   `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<string | Swap>;
+  packages: Array<string | DnfSwap>;
 
-  ...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<string>;
 
   /** Include optional packages from group. */
   `with-optional`?: boolean = false;
 
-  ...InstallCommon;
+  ...DnfInstallCommon;
 }
 
-model GroupRemove {
+model DnfGroupRemove {
   /** List of RPM groups to remove. */
   packages: Array<string>;
 }
 
-model InstallCommon {
+model DnfInstallCommon {
   /** Whether to install weak dependencies. */
   `install-weak-deps`?: boolean = true;
 

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<string>;
 }
 
-model Remove {
+model PacmanRemove {
   /** List of packages to remove. */
   packages: Array<string>;
 }

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<string>;
 }
 
-model Remove {
+model ZypperRemove {
   /** List of packages to remove. */
   packages: Array<string>;
 }