Initial gofmt run

kplgr · cloudlena · commit 326220b4e65e · 2025-12-29T14:25:11.000+01:00
diff --git a/internal/app/s3manager/instance_handlers.go b/internal/app/s3manager/instance_handlers.go
@@ -18,22 +18,22 @@ func HandleGetS3Instances(manager *MultiS3Manager) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		instances := manager.GetAllInstances()
 		current := manager.GetCurrentInstance()
-		
+
 		response := struct {
 			Instances []S3InstanceInfo `json:"instances"`
 			Current   string           `json:"current"`
 		}{
 			Instances: make([]S3InstanceInfo, len(instances)),
 			Current:   current.ID,
 		}
-		
+
 		for i, instance := range instances {
 			response.Instances[i] = S3InstanceInfo{
 				ID:   instance.ID,
 				Name: instance.Name,
 			}
 		}
-		
+
 		w.Header().Set("Content-Type", "application/json")
 		json.NewEncoder(w).Encode(response)
 	}
@@ -44,25 +44,25 @@ func HandleSwitchS3Instance(manager *MultiS3Manager) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		vars := mux.Vars(r)
 		instanceID := vars["instanceId"]
-		
+
 		if instanceID == "" {
 			http.Error(w, "instance ID is required", http.StatusBadRequest)
 			return
 		}
-		
+
 		err := manager.SetCurrentInstance(instanceID)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusNotFound)
 			return
 		}
-		
+
 		current := manager.GetCurrentInstance()
 		response := S3InstanceInfo{
 			ID:   current.ID,
 			Name: current.Name,
 		}
-		
+
 		w.Header().Set("Content-Type", "application/json")
 		json.NewEncoder(w).Encode(response)
 	}
-}
+}
diff --git a/internal/app/s3manager/manager_handlers.go b/internal/app/s3manager/manager_handlers.go
@@ -15,13 +15,13 @@ import (
 // HandleBucketsViewWithManager renders all buckets on an HTML page using MultiS3Manager.
 func HandleBucketsViewWithManager(manager *MultiS3Manager, templates fs.FS, allowDelete bool, rootURL string) http.HandlerFunc {
 	type pageData struct {
-		RootURL       string
-		Buckets       []interface{}
-		AllowDelete   bool
-		CurrentS3     *S3Instance
-		S3Instances   []*S3Instance
-		HasError      bool
-		ErrorMessage  string
+		RootURL      string
+		Buckets      []interface{}
+		AllowDelete  bool
+		CurrentS3    *S3Instance
+		S3Instances  []*S3Instance
+		HasError     bool
+		ErrorMessage string
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -30,7 +30,7 @@ func HandleBucketsViewWithManager(manager *MultiS3Manager, templates fs.FS, allo
 		instances := manager.GetAllInstances()
 
 		buckets, err := s3.ListBuckets(r.Context())
-		
+
 		data := pageData{
 			RootURL:     rootURL,
 			AllowDelete: allowDelete,
@@ -70,7 +70,7 @@ func HandleBucketViewWithManager(manager *MultiS3Manager, templates fs.FS, allow
 		s3 := manager.GetCurrentClient()
 		current := manager.GetCurrentInstance()
 		instances := manager.GetAllInstances()
-		
+
 		// Create a modified handler that includes S3 instance data
 		handler := createBucketViewWithS3Data(s3, templates, allowDelete, listRecursive, rootURL, current, instances)
 		handler(w, r)
@@ -150,16 +150,16 @@ func createBucketViewWithS3Data(s3 S3, templates fs.FS, allowDelete bool, listRe
 	}
 
 	type pageData struct {
-		RootURL       string
-		BucketName    string
-		Objects       []objectWithIcon
-		AllowDelete   bool
-		Paths         []string
-		CurrentPath   string
-		CurrentS3     *S3Instance
-		S3Instances   []*S3Instance
-		HasError      bool
-		ErrorMessage  string
+		RootURL      string
+		BucketName   string
+		Objects      []objectWithIcon
+		AllowDelete  bool
+		Paths        []string
+		CurrentPath  string
+		CurrentS3    *S3Instance
+		S3Instances  []*S3Instance
+		HasError     bool
+		ErrorMessage string
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -171,7 +171,7 @@ func createBucketViewWithS3Data(s3 S3, templates fs.FS, allowDelete bool, listRe
 		var objs []objectWithIcon
 		hasError := false
 		errorMessage := ""
-		
+
 		opts := minio.ListObjectsOptions{
 			Recursive: listRecursive,
 			Prefix:    path,
@@ -202,7 +202,7 @@ func createBucketViewWithS3Data(s3 S3, templates fs.FS, allowDelete bool, listRe
 			}
 			objs = append(objs, obj)
 		}
-		
+
 		data := pageData{
 			RootURL:      rootURL,
 			BucketName:   bucketName,
@@ -227,4 +227,4 @@ func createBucketViewWithS3Data(s3 S3, templates fs.FS, allowDelete bool, listRe
 			return
 		}
 	}
-}
+}
diff --git a/internal/app/s3manager/multi_s3_manager.go b/internal/app/s3manager/multi_s3_manager.go
@@ -20,10 +20,10 @@ type S3Instance struct {
 
 // MultiS3Manager manages multiple S3 instances
 type MultiS3Manager struct {
-	instances      map[string]*S3Instance
-	currentID      string
-	instanceOrder  []string
-	mu             sync.RWMutex
+	instances     map[string]*S3Instance
+	currentID     string
+	instanceOrder []string
+	mu            sync.RWMutex
 }
 
 // S3InstanceConfig holds configuration for a single S3 instance
@@ -49,17 +49,17 @@ func NewMultiS3Manager(configs []S3InstanceConfig) (*MultiS3Manager, error) {
 
 	for i, config := range configs {
 		instanceID := fmt.Sprintf("%d", i+1)
-		
+
 		// Set up S3 client options
 		opts := &minio.Options{
 			Secure: config.UseSSL,
 		}
-		
+
 		if config.UseIam {
 			opts.Creds = credentials.NewIAM(config.IamEndpoint)
 		} else {
 			var signatureType credentials.SignatureType
-			
+
 			switch config.SignatureType {
 			case "V2":
 				signatureType = credentials.SignatureV2
@@ -72,43 +72,43 @@ func NewMultiS3Manager(configs []S3InstanceConfig) (*MultiS3Manager, error) {
 			default:
 				return nil, fmt.Errorf("invalid SIGNATURE_TYPE: %s", config.SignatureType)
 			}
-			
+
 			opts.Creds = credentials.NewStatic(config.AccessKeyID, config.SecretAccessKey, "", signatureType)
 		}
-		
+
 		if config.Region != "" {
 			opts.Region = config.Region
 		}
-		
+
 		if config.UseSSL && config.SkipSSLVerification {
 			opts.Transport = &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}} //nolint:gosec
 		}
-		
+
 		// Create S3 client
 		s3Client, err := minio.New(config.Endpoint, opts)
 		if err != nil {
 			return nil, fmt.Errorf("error creating s3 client for instance %s: %w", config.Name, err)
 		}
-		
+
 		instance := &S3Instance{
 			ID:     instanceID,
 			Name:   config.Name,
 			Client: s3Client,
 		}
-		
+
 		manager.instances[instanceID] = instance
 		manager.instanceOrder = append(manager.instanceOrder, instanceID)
-		
+
 		// Set the first instance as current
 		if i == 0 {
 			manager.currentID = instanceID
 		}
 	}
-	
+
 	if len(manager.instances) == 0 {
 		return nil, fmt.Errorf("no S3 instances configured")
 	}
-	
+
 	log.Printf("Initialized MultiS3Manager with %d instances", len(manager.instances))
 	return manager, nil
 }
@@ -117,7 +117,7 @@ func NewMultiS3Manager(configs []S3InstanceConfig) (*MultiS3Manager, error) {
 func (m *MultiS3Manager) GetCurrentClient() S3 {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
-	
+
 	instance, exists := m.instances[m.currentID]
 	if !exists && len(m.instances) > 0 {
 		// Fallback to first instance if current doesn't exist
@@ -131,7 +131,7 @@ func (m *MultiS3Manager) GetCurrentClient() S3 {
 func (m *MultiS3Manager) GetCurrentInstance() *S3Instance {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
-	
+
 	instance, exists := m.instances[m.currentID]
 	if !exists && len(m.instances) > 0 {
 		// Fallback to first instance if current doesn't exist
@@ -145,11 +145,11 @@ func (m *MultiS3Manager) GetCurrentInstance() *S3Instance {
 func (m *MultiS3Manager) SetCurrentInstance(instanceID string) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	
+
 	if _, exists := m.instances[instanceID]; !exists {
 		return fmt.Errorf("S3 instance with ID %s not found", instanceID)
 	}
-	
+
 	m.currentID = instanceID
 	log.Printf("Switched to S3 instance: %s (%s)", instanceID, m.instances[instanceID].Name)
 	return nil
@@ -159,10 +159,10 @@ func (m *MultiS3Manager) SetCurrentInstance(instanceID string) error {
 func (m *MultiS3Manager) GetAllInstances() []*S3Instance {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
-	
+
 	instances := make([]*S3Instance, 0, len(m.instanceOrder))
 	for _, id := range m.instanceOrder {
 		instances = append(instances, m.instances[id])
 	}
 	return instances
-}
+}
diff --git a/main.go b/main.go
@@ -36,14 +36,14 @@ type s3InstanceConfig struct {
 }
 
 type configuration struct {
-	S3Instances     []s3InstanceConfig
-	AllowDelete     bool
-	ForceDownload   bool
-	ListRecursive   bool
-	Port            string
-	Timeout         int32
-	SseType         string
-	SseKey          string
+	S3Instances   []s3InstanceConfig
+	AllowDelete   bool
+	ForceDownload bool
+	ListRecursive bool
+	Port          string
+	Timeout       int32
+	SseType       string
+	SseKey        string
 }
 
 func parseConfiguration() configuration {
@@ -55,7 +55,7 @@ func parseConfiguration() configuration {
 		prefix := fmt.Sprintf("%d_", i)
 		name := viper.GetString(prefix + "NAME")
 		endpoint := viper.GetString(prefix + "ENDPOINT")
-		
+
 		// If NAME or ENDPOINT is not found, stop parsing
 		if name == "" || endpoint == "" {
 			break
@@ -66,13 +66,13 @@ func parseConfiguration() configuration {
 		useIam := viper.GetBool(prefix + "USE_IAM")
 		iamEndpoint := viper.GetString(prefix + "IAM_ENDPOINT")
 		region := viper.GetString(prefix + "REGION")
-		
+
 		viper.SetDefault(prefix+"USE_SSL", true)
 		useSSL := viper.GetBool(prefix + "USE_SSL")
-		
+
 		viper.SetDefault(prefix+"SKIP_SSL_VERIFICATION", false)
 		skipSSLVerification := viper.GetBool(prefix + "SKIP_SSL_VERIFICATION")
-		
+
 		viper.SetDefault(prefix+"SIGNATURE_TYPE", "V4")
 		signatureType := viper.GetString(prefix + "SIGNATURE_TYPE")
 
@@ -185,11 +185,11 @@ func main() {
 	r := mux.NewRouter()
 	r.Handle("/", http.RedirectHandler("/buckets", http.StatusPermanentRedirect)).Methods(http.MethodGet)
 	r.PathPrefix("/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.FS(statics)))).Methods(http.MethodGet)
-	
+
 	// S3 instance management endpoints
 	r.Handle("/api/s3-instances", s3manager.HandleGetS3Instances(s3Manager)).Methods(http.MethodGet)
 	r.Handle("/api/s3-instances/{instanceId}/switch", s3manager.HandleSwitchS3Instance(s3Manager)).Methods(http.MethodPost)
-	
+
 	// S3 management endpoints (using current instance)
 	r.Handle("/buckets", s3manager.HandleBucketsViewWithManager(s3Manager, templates, configuration.AllowDelete, rootURL)).Methods(http.MethodGet)
 	r.PathPrefix("/buckets/").Handler(s3manager.HandleBucketViewWithManager(s3Manager, templates, configuration.AllowDelete, configuration.ListRecursive, rootURL)).Methods(http.MethodGet)
