Merge pull request 'fix: handle non amd64 architecture via runtime identification' (#175) from fix/handle-non-amd64-architecture into main

Reviewed-on: https://gitea.obmondo.com/EnableIT/Linuxaid-cli/pulls/175

Author: ashish1099

.goreleaser.yaml

@@ -2,7 +2,6 @@ version: 2
 
 release:
   footer: >-
-    ---
     Released by [GoReleaser](https://github.com/goreleaser/goreleaser).
 
 changelog:
@@ -27,10 +26,9 @@ archives:
     # This name template makes the OS and Arch compatible with the results of uname.
     name_template: >-
       {{ .ProjectName }}_
-      {{- title .Os }}_
-      {{- if eq .Arch "amd64" }}x86_64
-      {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
+      {{ .Tag }}_
+      {{- .Os }}_
+      {{- .Arch }}_
       {{- if .Arm }}v{{ .Arm }}{{ end }}
 
 before:

Makefile

@@ -1,9 +1,7 @@
 PATH := ./bin:$(PATH)
 export NAME=linuxaid-cli
-export VERSION=v1.5.0
-export DIST=./dist
+export VERSION=$(shell ./scripts/latest-tag.sh)
 export MAINTAINER=Ashish Jaiswal <ashish@obmondo.com>
-export PREFIX=/opt/obmondo/bin/
 SOURCES := linuxaid
 
 .PHONY: all dep build clean test format vet lint

README.md

@@ -1,7 +1,72 @@
-# Go-Scripts
+# linuxaid-cli
 
-## obmondo-system-update Script
+> **Part of [Linuxaid](https://github.com/obmondo/linuxaid) by [Obmondo](https://obmondo.com)**
 
-## Flags
+A Linux system management toolkit that automates Puppet-based configuration management and system updates across Obmondo-managed infrastructure. The project provides two command-line applications for initial provisioning and ongoing system maintenance.
 
-- --no-reboot: Set this flag to prevent the system from rebooting after the update.
+## Applications
+
+### linuxaid-install
+
+Initial system provisioning tool that installs and configures the Puppet agent (openvox-agent). Requires an `TOKEN` environment variable for authentication.
+
+**Usage:**
+
+```bash
+TOKEN='your-token'
+linuxaid-install --certname web01.example --puppet-server your.openvoxserver.com
+```
+
+### linuxaid-cli
+
+System management CLI for Puppet-managed nodes with commands for automated maintenance operations.
+
+**Commands:**
+
+- `system-update` - Executes distribution-specific package updates with service window coordination
+- `run-openvox` - Runs Puppet agent with connectivity checks and status reporting
+
+**Usage:**
+
+```bash
+linuxaid-cli system-update --certname web01.example --no-reboot
+linuxaid-cli run-openvox --certname web01.example
+```
+
+## Features
+
+- **Automated Puppet Agent Management**: Complete lifecycle management including installation, configuration, and execution
+- **Remote Logging**: gRPC-based streaming of command execution output to Obmondo API
+- **Service Window Coordination**: Integrates with Obmondo backend for maintenance window management
+- **Multi-Distribution Support**: Ubuntu, Debian, RHEL, CentOS, SLES, and TurrisOS
+
+## Building
+
+```bash
+make build
+```
+
+This produces two binaries: `linuxaid-install` and `linuxaid-cli`.
+
+## Configuration
+
+Configuration uses a three-tier precedence system via Viper:
+
+1. Command-line flags (highest priority)
+2. Environment variables
+3. Default values
+
+**Key Parameters:**
+
+- `--certname` / `CERTNAME` - Certificate name (required)
+- `--puppet-server` / `PUPPET_SERVER` - Puppet server hostname
+- `--debug` / `DEBUG` - Enable debug logging
+- `--no-reboot` / `NO_REBOOT` - Disable automatic reboot after updates
+- `--skip-openvox` / `SKIP_OPENVOX` - Skip Puppet agent run
+
+## Dependencies
+
+- Cobra for CLI framework
+- Viper for configuration management
+- gRPC for remote logging
+- Bitfield/script for shell command execution

cmd/linuxaid-install/install.go

@@ -52,6 +52,40 @@ func compatibilityCheck(puppetService *puppet.Service) error {
 	return nil
 }
 
+// func shouldContinueAfterConfirmation determines if the installation process should continue after user confirmation.
+// If the user provides no input (white spaces, newline, tab, etc), the same confirmation question is asked again.
+//
+// Inputs for continuation:
+//   - y (case-insensitive)
+//   - yes (case-insensitive)
+//
+// Anything other than this is considered as "no", and the program will exit.
+func shouldContinueAfterConfirmation() bool {
+	// I'm really not a fan of infinite loops, but just for this time I'll pretend I didn't wrote this.
+	for {
+		prettyfmt.PrettyPrintf(" %s Please confirm to continue (Yes/No)? ", prettyfmt.IconQuestion)
+
+		// Accept user input for confirmation
+		reader := bufio.NewReader(os.Stdin)
+		input, _ := reader.ReadString('\n')
+		input = strings.ToLower(input)
+		input = strings.TrimSpace(input)
+
+		if input == "" {
+			continue
+		}
+
+		if input != "y" && input != "yes" {
+			prettyfmt.PrettyPrintf("\n Exiting the setup...\n")
+			return false
+		}
+
+		// Dummy new line for better clarity of things
+		prettyfmt.PrettyPrintln("")
+		return true
+	}
+}
+
 func Install() {
 	// Re-initialise the logger with progressbar writer to not disturb the
 	// progressbar if we print any logs. Everything is handled by progressbar's
@@ -69,21 +103,12 @@ func Install() {
 
 	webtee.RemoteLogObmondo([]string{"echo Starting Linuxaid Install Setup "}, certname)
 	prettyfmt.PrettyPrintf(" %s  %s %s %s %s\n", prettyfmt.IconGear, prettyfmt.FontWhite("Configuring Linuxaid on"), prettyfmt.FontYellow(certname), prettyfmt.FontWhite("with puppetserver"), prettyfmt.FontYellow(puppetServer))
-	prettyfmt.PrettyPrintf(" %s  Running this tool will install and configure %s in your system.\n %s Please confirm to continue (Yes/No)? ", prettyfmt.IconGear, prettyfmt.FontYellow("Openvox agent"), prettyfmt.IconQuestion)
+	prettyfmt.PrettyPrintf(" %s  Running this tool will install and configure %s in your system.\n", prettyfmt.IconGear, prettyfmt.FontYellow("Openvox agent"))
 
-	// Accept user input for confirmation
-	reader := bufio.NewReader(os.Stdin)
-	input, _ := reader.ReadString('\n')
-	input = strings.TrimSpace(input)
-
-	if input != "y" && input != "yes" {
-		prettyfmt.PrettyPrintf("\n Exiting the setup...\n")
+	if !shouldContinueAfterConfirmation() {
 		return
 	}
 
-	// Dummy new line for better clarity of things
-	prettyfmt.PrettyPrintln("")
-
 	if err := progress.NonDeterministicFunc("Verifying Token", func() error {
 		input := &api.InstallScriptInput{
 			Certname: certname,

cmd/linuxaid-install/main.go

@@ -52,7 +52,7 @@ var rootCmd = &cobra.Command{
 			errMsg := "Uh ho. I couldn't figure out the token, please provide one as an ENV"
 			prettyfmt.PrettyPrintf("\n %s %s %s\n", prettyfmt.IconCheckFail, prettyfmt.FontWhite(errMsg), prettyfmt.FontYellow(constant.InstallTokenEnv))
 
-			slog.Debug("install token is required. Provide via INSTALL_TOKEN environment variable")
+			slog.Debug("install token is required. Provide via TOKEN environment variable")
 			os.Exit(1)
 		}
 

helper/provisioner/provisioner.go

@@ -1,10 +1,12 @@
 package provisioner
 
 import (
+	"errors"
 	"fmt"
 	"log/slog"
 	"os"
 	"path/filepath"
+	"runtime"
 
 	"gitea.obmondo.com/EnableIT/linuxaid-cli/constant"
 	"gitea.obmondo.com/EnableIT/linuxaid-cli/helper"
@@ -13,7 +15,12 @@ import (
 	"gitea.obmondo.com/EnableIT/linuxaid-cli/pkg/webtee"
 )
 
-const tmpDir = "/tmp"
+const (
+	tmpDir = "/tmp"
+
+	archAmd64 = "amd64"
+	archArm64 = "arm64"
+)
 
 type Provisioner struct {
 	webtee    *webtee.Webtee
@@ -72,8 +79,14 @@ func (s *Provisioner) provisionForDebian() error {
 		ubuntuVersion = "ubuntu24.04"
 	}
 
+	switch runtime.GOARCH {
+	case archAmd64, archArm64:
+	default:
+		return errors.New("unsupported system architecture")
+	}
+
 	fullPuppetVersion := fmt.Sprintf("%s-1+%s", constant.PuppetVersion, ubuntuVersion)
-	packageName := fmt.Sprintf("openvox-agent_%s_amd64.deb", fullPuppetVersion)
+	packageName := fmt.Sprintf("openvox-agent_%s_%s.deb", fullPuppetVersion, runtime.GOARCH)
 	downloadPath := filepath.Join(tmpDir, packageName)
 	url := fmt.Sprintf("https://repos.obmondo.com/openvox/apt/pool/%s/o/openvox-agent/%s",
 		constant.PuppetMajorVersion, packageName)
@@ -93,11 +106,21 @@ func (s *Provisioner) provisionForRedHat() error {
 
 	majRelease := helper.GetMajorRelease()
 
+	runtimeArch := runtime.GOARCH
+	switch runtimeArch {
+	case archAmd64:
+		runtimeArch = "x86_64"
+	case archArm64:
+		runtimeArch = "aarch64"
+	default:
+		return errors.New("unsupported system architecture")
+	}
+
 	fullPuppetVersion := fmt.Sprintf("%s-1.el%s", constant.PuppetVersion, majRelease)
-	packageName := fmt.Sprintf("openvox-agent-%s.x86_64", fullPuppetVersion)
+	packageName := fmt.Sprintf("openvox-agent-%s.%s", fullPuppetVersion, runtimeArch)
 	downloadPath := filepath.Join(tmpDir, packageName+".rpm")
-	url := fmt.Sprintf("https://repos.obmondo.com/openvox/yum/%s/el/%s/x86_64/%s.rpm",
-		constant.PuppetMajorVersion, majRelease, packageName)
+	url := fmt.Sprintf("https://repos.obmondo.com/openvox/yum/%s/el/%s/%s/%s.rpm",
+		constant.PuppetMajorVersion, majRelease, runtimeArch, packageName)
 
 	if err := s.puppet.DownloadAgent(downloadPath, url); err != nil {
 		return err
@@ -115,11 +138,21 @@ func (s *Provisioner) provisionForSuse() error {
 
 	majRelease := helper.GetMajorRelease()
 
+	runtimeArch := runtime.GOARCH
+	switch runtimeArch {
+	case archAmd64:
+		runtimeArch = "x86_64"
+	case archArm64:
+		runtimeArch = "aarch64"
+	default:
+		return errors.New("unsupported system architecture")
+	}
+
 	fullPuppetVersion := fmt.Sprintf("%s-1.sles%s", constant.PuppetVersion, majRelease)
-	packageName := fmt.Sprintf("openvox-agent-%s.x86_64", fullPuppetVersion)
+	packageName := fmt.Sprintf("openvox-agent-%s.%s", fullPuppetVersion, runtimeArch)
 	downloadPath := filepath.Join(tmpDir, packageName+".rpm")
-	url := fmt.Sprintf("https://repos.obmondo.com/openvox/sles/%s/%s/x86_64/%s.rpm",
-		constant.PuppetMajorVersion, majRelease, packageName)
+	url := fmt.Sprintf("https://repos.obmondo.com/openvox/sles/%s/%s/%s/%s.rpm",
+		constant.PuppetMajorVersion, majRelease, runtimeArch, packageName)
 
 	if err := s.puppet.DownloadAgent(downloadPath, url); err != nil {
 		return err

scripts/latest-tag.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Exit on any error
+set -e
+
+# Get the most recent tag sorted by commit date (most recent first)
+git describe --tags --abbrev=0 "$(git rev-list --tags --max-count=1)"