Merge pull request #14 from OpenSlides/feature/more-restructuring

4echow · web-flow · commit 247acf586b2b · 2026-02-10T15:04:32.000+01:00
Move k8s subdir helpers into central internal/utils package
diff --git a/README.md b/README.md
@@ -1098,8 +1098,6 @@ openslides-cli/
 │   │   │   ├── health.go
 │   │   │   ├── health_check.go
 │   │   │   ├── health_check_test.go
-│   │   │   ├── helpers.go
-│   │   │   ├── helpers_test.go
 │   │   │   ├── scale.go
 │   │   │   ├── start.go
 │   │   │   ├── stop.go
diff --git a/internal/k8s/actions/apply.go b/internal/k8s/actions/apply.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/OpenSlides/openslides-cli/internal/k8s/client"
 	"github.com/OpenSlides/openslides-cli/internal/logger"
+	"github.com/OpenSlides/openslides-cli/internal/utils"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -107,7 +108,7 @@ func applyDirectory(ctx context.Context, k8sClient *client.Client, dirPath strin
 			continue
 		}
 
-		if !isYAMLFile(file.Name()) {
+		if !utils.IsYAMLFile(file.Name()) {
 			logger.Debug("Skipping non-YAML file: %s", file.Name())
 			continue
 		}
diff --git a/internal/k8s/actions/health.go b/internal/k8s/actions/health.go
@@ -7,6 +7,7 @@ import (
 	"github.com/OpenSlides/openslides-cli/internal/constants"
 	"github.com/OpenSlides/openslides-cli/internal/k8s/client"
 	"github.com/OpenSlides/openslides-cli/internal/logger"
+	"github.com/OpenSlides/openslides-cli/internal/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -34,7 +35,7 @@ func HealthCmd() *cobra.Command {
 	cmd.RunE = func(cmd *cobra.Command, args []string) error {
 		logger.Info("=== K8S HEALTH CHECK ===")
 		instanceDir := args[0]
-		namespace := extractNamespace(instanceDir)
+		namespace := utils.ExtractNamespace(instanceDir)
 		logger.Debug("Namespace: %s", namespace)
 
 		k8sClient, err := client.New(*kubeconfig)
diff --git a/internal/k8s/actions/helpers.go b/internal/k8s/actions/helpers.go
diff --git a/internal/k8s/actions/helpers_test.go b/internal/k8s/actions/helpers_test.go
diff --git a/internal/k8s/actions/scale.go b/internal/k8s/actions/scale.go
@@ -9,6 +9,7 @@ import (
 	"github.com/OpenSlides/openslides-cli/internal/constants"
 	"github.com/OpenSlides/openslides-cli/internal/k8s/client"
 	"github.com/OpenSlides/openslides-cli/internal/logger"
+	"github.com/OpenSlides/openslides-cli/internal/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -49,7 +50,7 @@ func ScaleCmd() *cobra.Command {
 		logger.Debug("Instance directory: %s", instanceDir)
 		logger.Info("Service: %s", *service)
 
-		namespace := extractNamespace(instanceDir)
+		namespace := utils.ExtractNamespace(instanceDir)
 		logger.Info("Namespace: %s", namespace)
 
 		k8sClient, err := client.New(*kubeconfig)
diff --git a/internal/k8s/actions/start.go b/internal/k8s/actions/start.go
@@ -8,6 +8,7 @@ import (
 	"github.com/OpenSlides/openslides-cli/internal/constants"
 	"github.com/OpenSlides/openslides-cli/internal/k8s/client"
 	"github.com/OpenSlides/openslides-cli/internal/logger"
+	"github.com/OpenSlides/openslides-cli/internal/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -53,7 +54,11 @@ func StartCmd() *cobra.Command {
 		logger.Info("Applied namespace: %s", namespace)
 
 		tlsSecretPath := filepath.Join(instanceDir, constants.SecretsDirName, constants.TlsCertSecretYAML)
-		if fileExists(tlsSecretPath) {
+		tlsExists, err := utils.FileExists(tlsSecretPath)
+		if err != nil {
+			return fmt.Errorf("checking tls secret path %s: %w", tlsSecretPath, err)
+		}
+		if tlsExists {
 			logger.Info("Found and applying %s", tlsSecretPath)
 			if _, err := applyManifest(ctx, k8sClient, tlsSecretPath); err != nil {
 				return fmt.Errorf("applying TLS secret: %w", err)
diff --git a/internal/k8s/actions/stop.go b/internal/k8s/actions/stop.go
@@ -10,6 +10,7 @@ import (
 	"github.com/OpenSlides/openslides-cli/internal/constants"
 	"github.com/OpenSlides/openslides-cli/internal/k8s/client"
 	"github.com/OpenSlides/openslides-cli/internal/logger"
+	"github.com/OpenSlides/openslides-cli/internal/utils"
 	"github.com/spf13/cobra"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -49,7 +50,7 @@ func StopCmd() *cobra.Command {
 
 		ctx := context.Background()
 
-		namespace := extractNamespace(instanceDir)
+		namespace := utils.ExtractNamespace(instanceDir)
 		if err := saveTLSSecret(ctx, k8sClient, namespace, instanceDir); err != nil {
 			logger.Warn("Failed to save TLS secret: %v", err)
 		}
diff --git a/internal/k8s/actions/update_backendmanage.go b/internal/k8s/actions/update_backendmanage.go
@@ -9,6 +9,7 @@ import (
 	"github.com/OpenSlides/openslides-cli/internal/constants"
 	"github.com/OpenSlides/openslides-cli/internal/k8s/client"
 	"github.com/OpenSlides/openslides-cli/internal/logger"
+	"github.com/OpenSlides/openslides-cli/internal/utils"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -51,7 +52,7 @@ func UpdateBackendmanageCmd() *cobra.Command {
 
 		logger.Info("=== K8S UPDATE/REVERT BACKENDMANAGE ===")
 		instanceDir := args[0]
-		namespace := extractNamespace(instanceDir)
+		namespace := utils.ExtractNamespace(instanceDir)
 
 		logger.Info("Namespace: %s", namespace)
 
diff --git a/internal/k8s/actions/update_instance.go b/internal/k8s/actions/update_instance.go
@@ -8,6 +8,7 @@ import (
 	"github.com/OpenSlides/openslides-cli/internal/constants"
 	"github.com/OpenSlides/openslides-cli/internal/k8s/client"
 	"github.com/OpenSlides/openslides-cli/internal/logger"
+	"github.com/OpenSlides/openslides-cli/internal/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -39,7 +40,7 @@ func UpdateInstanceCmd() *cobra.Command {
 
 		logger.Debug("Instance directory: %s", instanceDir)
 
-		namespace := extractNamespace(instanceDir)
+		namespace := utils.ExtractNamespace(instanceDir)
 		logger.Info("Namespace: %s", namespace)
 
 		k8sClient, err := client.New(*kubeconfig)
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -7,6 +7,8 @@ import (
 	"io/fs"
 	"os"
 	"path"
+	"path/filepath"
+	"strings"
 
 	"github.com/OpenSlides/openslides-cli/internal/logger"
 )
@@ -16,7 +18,7 @@ import (
 func CreateFile(dir string, force bool, name string, content []byte, perm fs.FileMode) error {
 	p := path.Join(dir, name)
 
-	pExists, err := fileExists(p)
+	pExists, err := FileExists(p)
 	if err != nil {
 		return fmt.Errorf("checking file existance: %w", err)
 	}
@@ -33,7 +35,7 @@ func CreateFile(dir string, force bool, name string, content []byte, perm fs.Fil
 
 // fileExists is a small helper function to check if a file already exists. It is not
 // save in concurrent usage.
-func fileExists(p string) (bool, error) {
+func FileExists(p string) (bool, error) {
 	_, err := os.Stat(p)
 	if err == nil {
 		return true, nil
@@ -104,3 +106,17 @@ func ReadPassword(passwordFile string) (string, error) {
 	logger.Debug("Password read successfully (%d bytes)", len(password))
 	return password, nil
 }
+
+// extractNamespace gets the namespace from instance directory path
+// Example: "/real/path/to/my.instance.dir.url" -> "myinstancedirurl"
+func ExtractNamespace(instanceDir string) string {
+	dirName := filepath.Base(instanceDir)
+	namespace := strings.ReplaceAll(dirName, ".", "")
+	return namespace
+}
+
+// isYAMLFile checks if filename has YAML extension
+func IsYAMLFile(filename string) bool {
+	ext := filepath.Ext(filename)
+	return ext == ".yaml" || ext == ".yml"
+}
diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/OpenSlides/openslides-cli/internal/k8s/client"`
`10`	`10`	`"github.com/OpenSlides/openslides-cli/internal/logger"`
	`11`	`+ "github.com/OpenSlides/openslides-cli/internal/utils"`
`11`	`12`
`12`	`13`	`"k8s.io/apimachinery/pkg/api/meta"`
`13`	`14`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`@@ -107,7 +108,7 @@ func applyDirectory(ctx context.Context, k8sClient *client.Client, dirPath strin`
`107`	`108`	`continue`
`108`	`109`	`}`
`109`	`110`
`110`		`- if !isYAMLFile(file.Name()) {`
	`111`	`+ if !utils.IsYAMLFile(file.Name()) {`
`111`	`112`	`logger.Debug("Skipping non-YAML file: %s", file.Name())`
`112`	`113`	`continue`
`113`	`114`	`}`