Added package_name key

Author: alvagante

.kiro/specs/sai-cli-application/tasks.md

@@ -80,9 +80,9 @@
 
 ## Phase 4: Data Structure Consistency
 
-- [ ] 10. Standardize package naming across all components
-  - Update saidata-0.2-schema.json to require package_name field for packages
-  - Update all existing saidata samples to use package_name instead of name
+- [x] 10. Standardize package naming across all components
+  - Update saidata-0.2-schema.json to add package_name field for packages
+  - Update all existing saidata samples to add package_name (name is key to use for os overrides, package_name is the actual package name)
   - Update all provider templates to reference package_name consistently
   - Update template functions to use package_name field for package resolution
   - Verify all existing providers work with updated package_name structure

docs/saidata_samples/ap/apache/centos/8.yaml

@@ -7,9 +7,9 @@ metadata:
   name: "apache"
 
 packages:
-  - name: "httpd"  # CentOS uses 'httpd' instead of 'apache2'
+  - name: "apache"  # CentOS uses 'httpd' instead of 'apache2'
+    package_name: "httpd"
     version: "2.4.37-43.module_el8.5.0+1022+b541f3b1"
-    alternatives: ["apache", "apache2"]
     install_options: "--enablerepo=appstream"
     repository: "appstream"
 
@@ -90,6 +90,7 @@ providers:
   dnf:
     packages:
       - name: "httpd"
+        package_name: "httpd"
         version: "2.4.37-43.module_el8.5.0+1022+b541f3b1"
         alternatives: ["apache", "apache2"]
         install_options: "--enablerepo=appstream"

docs/saidata_samples/ap/apache/default.yaml

@@ -31,6 +31,7 @@ metadata:
 
 packages:
   - name: "apache2"
+    package_name: "apache2"
     version: "2.4.58"
     alternatives: ["httpd", "apache2-bin"]
     install_options: "--with-ssl --enable-rewrite"
@@ -167,6 +168,7 @@ providers:
     build_commands: ["./configure --enable-ssl", "make", "make install"]
     packages:
       - name: "apache2"
+        package_name: "apache2"
         version: "2.4.58-1ubuntu1"
         alternatives: ["apache2-bin", "apache2-utils"]
         install_options: "--no-install-recommends"
@@ -178,6 +180,7 @@ providers:
         repository: "ubuntu-main"
         packages:
           - name: "apache2"
+            package_name: "apache2"
             version: "2.4.58-1ubuntu1"
         notes: "Official Ubuntu repository package"
       - name: "backports"
@@ -186,6 +189,7 @@ providers:
         repository: "ubuntu-backports"
         packages:
           - name: "apache2"
+            package_name: "apache2"
             version: "2.4.59-1ubuntu1~22.04.1"
         notes: "Newer version from backports"
     repositories:
@@ -200,6 +204,7 @@ providers:
         notes: "Official Ubuntu repository"
         packages:
           - name: "apache2"
+            package_name: "apache2"
             version: "2.4.58-1ubuntu1"
         services:
           - name: "apache"
@@ -254,7 +259,8 @@ providers:
 
   brew:
     packages:
-      - name: "httpd"
+      - name: "apache"
+        package_name: "httpd"
         version: "2.4.58"
         alternatives: ["apache2"]
     services:
@@ -297,6 +303,7 @@ providers:
       - "make install"
     packages:
       - name: "httpd"
+        package_name: "httpd"
         version: "2.4.58"
         download_url: "https://archive.apache.org/dist/httpd/httpd-2.4.58.tar.gz"
         checksum: "sha256:fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5"

docs/saidata_samples/ap/apache/macos/13.yaml

@@ -7,7 +7,8 @@ metadata:
   name: "apache"
 
 packages:
-  - name: "httpd"  # macOS uses 'httpd' instead of 'apache2'
+  - name: "apache"  # macOS uses 'httpd' instead of 'apache2'
+    package_name: "httpd"
     version: "2.4.58"
     alternatives: ["apache2"]
 
@@ -74,6 +75,7 @@ providers:
   brew:
     packages:
       - name: "httpd"
+        package_name: "httpd"
         version: "2.4.58"
         alternatives: ["apache2"]
         install_options: "--with-http2"  # macOS-specific build option

docs/saidata_samples/ap/apache/ubuntu/22.04.yaml

@@ -7,7 +7,8 @@ metadata:
   name: "apache"
 
 packages:
-  - name: "apache2"
+  - name: "apache"
+    package_name: "apache2"
     version: "2.4.52-1ubuntu4"  # Ubuntu 22.04 specific version
     alternatives: ["apache2-bin", "apache2-utils", "apache2-dev"]
     install_options: "--install-suggests"  # Ubuntu-specific install options
@@ -85,6 +86,7 @@ providers:
   apt:
     packages:
       - name: "apache2"
+        package_name: "apache2"
         version: "2.4.52-1ubuntu4"
         alternatives: ["apache2-bin", "apache2-utils", "apache2-dev"]
         install_options: "--install-suggests"

docs/saidata_samples/do/docker/default.yaml

@@ -26,12 +26,15 @@ metadata:
 
 packages:
   - name: "engine"
+    package_name: "docker-ce"
     version: "24.0.0"
     alternatives: ["docker-ce", "docker.io"]
   - name: "cli"
+    package_name: "docker-ce-cli"
     version: "24.0.0"
     alternatives: ["docker-ce-cli"]
   - name: "compose"
+    package_name: "docker-compose-plugin"
     version: "2.20.0"
     alternatives: ["docker-compose-plugin"]
 
@@ -109,20 +112,25 @@ providers:
         recommended: true
         packages:
           - name: "engine"
+            package_name: "docker-ce"
             version: "5:24.0.0-1~ubuntu.22.04~jammy"
             alternatives: ["docker-ce"]
           - name: "cli"
+            package_name: "docker-ce-cli"
             version: "5:24.0.0-1~ubuntu.22.04~jammy"
             alternatives: ["docker-ce-cli"]
           - name: "compose"
+            package_name: "docker-compose-plugin"
             version: "2.20.0-1~ubuntu.22.04~jammy"
             alternatives: ["docker-compose-plugin"]
       - name: "ubuntu-default"
         type: "os-default"
         packages:
           - name: "engine"
+            package_name: "docker.io"
             alternatives: ["docker.io"]
           - name: "compose"
+            package_name: "docker-compose"
             alternatives: ["docker-compose"]
         notes: "Older version, not recommended for production"
 
@@ -135,17 +143,22 @@ providers:
         recommended: true
         packages:
           - name: "engine"
+            package_name: "docker-ce"
             alternatives: ["docker-ce"]
           - name: "cli"
+            package_name: "docker-ce-cli"
             alternatives: ["docker-ce-cli"]
           - name: "compose"
+            package_name: "docker-compose-plugin"
             alternatives: ["docker-compose-plugin"]
 
   brew:
     packages:
       - name: "engine"
+        package_name: "docker"
         alternatives: ["docker"]
       - name: "compose"
+        package_name: "docker-compose"
         alternatives: ["docker-compose"]
 
   docker:

docs/saidata_samples/el/elasticsearch/default.yaml

@@ -26,6 +26,7 @@ metadata:
 
 packages:
   - name: "elasticsearch"
+    package_name: "elasticsearch"
     version: "8.9.0"
     alternatives: ["elasticsearch"]
 
@@ -115,6 +116,7 @@ providers:
         recommended: true
         packages:
           - name: "elasticsearch"
+            package_name: "elasticsearch"
             version: "8.9.0"
 
   dnf:
@@ -126,11 +128,13 @@ providers:
         recommended: true
         packages:
           - name: "elasticsearch"
+            package_name: "elasticsearch"
             version: "8.9.0"
 
   brew:
     packages:
       - name: "elasticsearch"
+        package_name: "elasticsearch"
         alternatives: ["elasticsearch@8"]
 
   docker:
@@ -167,6 +171,7 @@ providers:
         recommended: true
         packages:
           - name: "elasticsearch"
+            package_name: "elasticsearch"
             alternatives: ["elasticsearch"]
 
 compatibility:

docs/saidata_samples/gr/grafana/default.yaml

@@ -26,6 +26,7 @@ metadata:
 
 packages:
   - name: "grafana"
+    package_name: "grafana"
     version: "10.0.0"
     alternatives: ["grafana"]
 
@@ -122,6 +123,7 @@ providers:
         recommended: true
         packages:
           - name: "grafana"
+            package_name: "grafana"
             version: "10.0.0"
 
   dnf:
@@ -133,11 +135,13 @@ providers:
         recommended: true
         packages:
           - name: "grafana"
+            package_name: "grafana"
             version: "10.0.0"
 
   brew:
     packages:
       - name: "grafana"
+        package_name: "grafana"
         alternatives: ["grafana"]
 
   docker:
@@ -159,6 +163,7 @@ providers:
         recommended: true
         packages:
           - name: "grafana"
+            package_name: "grafana"
             alternatives: ["grafana"]
 
 compatibility:

docs/saidata_samples/je/jenkins/default.yaml

@@ -26,6 +26,7 @@ metadata:
 
 packages:
   - name: "jenkins"
+    package_name: "jenkins"
     version: "2.414.0"
     alternatives: ["jenkins"]
 
@@ -117,6 +118,7 @@ providers:
         recommended: true
         packages:
           - name: "jenkins"
+            package_name: "jenkins"
             version: "2.414.0"
 
   dnf:
@@ -128,11 +130,13 @@ providers:
         recommended: true
         packages:
           - name: "jenkins"
+            package_name: "jenkins"
             version: "2.414.0"
 
   brew:
     packages:
       - name: "jenkins"
+        package_name: "jenkins-lts"
         alternatives: ["jenkins-lts"]
 
   docker:
@@ -154,6 +158,7 @@ providers:
         recommended: true
         packages:
           - name: "jenkins"
+            package_name: "jenkins"
             alternatives: ["jenkins"]
 
 compatibility:

docs/saidata_samples/ku/kubernetes/default.yaml

@@ -26,15 +26,19 @@ metadata:
 
 packages:
   - name: "kubelet"
+    package_name: "kubelet"
     version: "1.28.0"
     alternatives: ["kubelet"]
   - name: "kubeadm"
+    package_name: "kubeadm"
     version: "1.28.0"
     alternatives: ["kubeadm"]
   - name: "kubectl"
+    package_name: "kubectl"
     version: "1.28.0"
     alternatives: ["kubectl"]
   - name: "kube-proxy"
+    package_name: "kube-proxy"
     version: "1.28.0"
     alternatives: ["kube-proxy"]
 
@@ -164,10 +168,13 @@ providers:
         recommended: true
         packages:
           - name: "kubelet"
+            package_name: "kubelet"
             version: "1.28.0-00"
           - name: "kubeadm"
+            package_name: "kubeadm"
             version: "1.28.0-00"
           - name: "kubectl"
+            package_name: "kubectl"
             version: "1.28.0-00"
 
   dnf:
@@ -179,17 +186,22 @@ providers:
         recommended: true
         packages:
           - name: "kubelet"
+            package_name: "kubelet"
             version: "1.28.0-0"
           - name: "kubeadm"
+            package_name: "kubeadm"
             version: "1.28.0-0"
           - name: "kubectl"
+            package_name: "kubectl"
             version: "1.28.0-0"
 
   brew:
     packages:
       - name: "kubectl"
+        package_name: "kubectl"
         alternatives: ["kubectl"]
       - name: "kubeadm"
+        package_name: "kubeadm"
         alternatives: ["kubeadm"]
 
   helm:
@@ -199,6 +211,7 @@ providers:
         type: "third-party"
         packages:
           - name: "kubernetes"
+            package_name: "kubernetes"
             alternatives: ["kubernetes"]
 
   docker: