From 1a39c14b359c4880f5ea00f8b5de26d38ed99e9e Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Fri, 13 Feb 2026 22:34:11 +0100 Subject: [PATCH] Rename crypto package to certmanager to resolve golangci-lint naming conflict - Renamed pkg/service/crypto to pkg/service/certmanager - Updated package declaration from 'crypto' to 'certmanager' - Fixed all import statements across the codebase - Updated type references from *crypto.CertificateManager to *certmanager.CertificateManager - Renamed files for consistency: crypto.go -> certmanager.go, crypto_test.go -> certmanager_test.go - Resolves golangci-lint var-naming issue about conflicting with Go standard library package names - All tests pass and linter reports 0 issues --- cmd/soundtouch-service/main.go | 6 +++--- .../crypto.go => certmanager/certmanager.go} | 4 ++-- .../certmanager_test.go} | 2 +- pkg/service/handlers/handlers_setup_test.go | 4 ++-- pkg/service/setup/setup.go | 6 +++--- pkg/service/setup/setup_test.go | 14 +++++++------- 6 files changed, 18 insertions(+), 18 deletions(-) rename pkg/service/{crypto/crypto.go => certmanager/certmanager.go} (98%) rename pkg/service/{crypto/crypto_test.go => certmanager/certmanager_test.go} (99%) diff --git a/cmd/soundtouch-service/main.go b/cmd/soundtouch-service/main.go index 43d25d1..d39655e 100644 --- a/cmd/soundtouch-service/main.go +++ b/cmd/soundtouch-service/main.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/gesellix/bose-soundtouch/pkg/service/crypto" + "github.com/gesellix/bose-soundtouch/pkg/service/certmanager" "github.com/gesellix/bose-soundtouch/pkg/service/datastore" "github.com/gesellix/bose-soundtouch/pkg/service/handlers" "github.com/gesellix/bose-soundtouch/pkg/service/proxy" @@ -173,8 +173,8 @@ func initDataStore(dataDir string) *datastore.DataStore { return ds } -func initCertificateManager(dataDir string) *crypto.CertificateManager { - cm := crypto.NewCertificateManager(filepath.Join(dataDir, "certs")) +func initCertificateManager(dataDir string) *certmanager.CertificateManager { + cm := certmanager.NewCertificateManager(filepath.Join(dataDir, "certs")) if err := cm.EnsureCA(); err != nil { log.Printf("Warning: Failed to ensure CA: %v", err) } diff --git a/pkg/service/crypto/crypto.go b/pkg/service/certmanager/certmanager.go similarity index 98% rename from pkg/service/crypto/crypto.go rename to pkg/service/certmanager/certmanager.go index b8092f4..5899563 100644 --- a/pkg/service/crypto/crypto.go +++ b/pkg/service/certmanager/certmanager.go @@ -1,5 +1,5 @@ -// Package crypto provides tools for managing Root CAs and generating SSL certificates. -package crypto +// Package certmanager provides tools for managing Root CAs and generating SSL certificates. +package certmanager import ( "crypto/rand" diff --git a/pkg/service/crypto/crypto_test.go b/pkg/service/certmanager/certmanager_test.go similarity index 99% rename from pkg/service/crypto/crypto_test.go rename to pkg/service/certmanager/certmanager_test.go index 987a978..5eaa167 100644 --- a/pkg/service/crypto/crypto_test.go +++ b/pkg/service/certmanager/certmanager_test.go @@ -1,4 +1,4 @@ -package crypto +package certmanager import ( "crypto/x509" diff --git a/pkg/service/handlers/handlers_setup_test.go b/pkg/service/handlers/handlers_setup_test.go index 05cda96..f91fc8c 100644 --- a/pkg/service/handlers/handlers_setup_test.go +++ b/pkg/service/handlers/handlers_setup_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/gesellix/bose-soundtouch/pkg/service/crypto" + "github.com/gesellix/bose-soundtouch/pkg/service/certmanager" "github.com/gesellix/bose-soundtouch/pkg/service/datastore" "github.com/gesellix/bose-soundtouch/pkg/service/setup" ) @@ -97,7 +97,7 @@ func TestMigrationAndCA(t *testing.T) { ds := datastore.NewDataStore(tempDir) _ = ds.Initialize() - cm := crypto.NewCertificateManager(filepath.Join(tempDir, "certs")) + cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs")) _ = cm.EnsureCA() sm := setup.NewManager("http://localhost:8000", ds, cm) diff --git a/pkg/service/setup/setup.go b/pkg/service/setup/setup.go index 55cb243..1f14f52 100644 --- a/pkg/service/setup/setup.go +++ b/pkg/service/setup/setup.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/gesellix/bose-soundtouch/pkg/service/crypto" + "github.com/gesellix/bose-soundtouch/pkg/service/certmanager" "github.com/gesellix/bose-soundtouch/pkg/service/datastore" "github.com/gesellix/bose-soundtouch/pkg/service/ssh" ) @@ -70,12 +70,12 @@ type SSHClient interface { type Manager struct { ServerURL string DataStore *datastore.DataStore - Crypto *crypto.CertificateManager + Crypto *certmanager.CertificateManager NewSSH func(host string) SSHClient } // NewManager creates a new Manager with the given base server URL. -func NewManager(serverURL string, ds *datastore.DataStore, cm *crypto.CertificateManager) *Manager { +func NewManager(serverURL string, ds *datastore.DataStore, cm *certmanager.CertificateManager) *Manager { return &Manager{ ServerURL: serverURL, DataStore: ds, diff --git a/pkg/service/setup/setup_test.go b/pkg/service/setup/setup_test.go index a9d78fe..5a6f9db 100644 --- a/pkg/service/setup/setup_test.go +++ b/pkg/service/setup/setup_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/gesellix/bose-soundtouch/pkg/service/crypto" + "github.com/gesellix/bose-soundtouch/pkg/service/certmanager" ) type mockSSH struct { @@ -38,7 +38,7 @@ func TestMigrateViaHosts(t *testing.T) { } defer os.RemoveAll(tempDir) - cm := crypto.NewCertificateManager(filepath.Join(tempDir, "certs")) + cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs")) if err := cm.EnsureCA(); err != nil { t.Fatalf("Failed to ensure CA: %v", err) } @@ -223,7 +223,7 @@ func TestCheckCACertTrusted(t *testing.T) { } defer os.RemoveAll(tempDir) - cm := crypto.NewCertificateManager(filepath.Join(tempDir, "certs")) + cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs")) if err := cm.EnsureCA(); err != nil { t.Fatalf("Failed to ensure CA: %v", err) } @@ -296,7 +296,7 @@ func TestTestConnection(t *testing.T) { } defer os.RemoveAll(tempDir) - cm := crypto.NewCertificateManager(filepath.Join(tempDir, "certs")) + cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs")) if err := cm.EnsureCA(); err != nil { t.Fatalf("Failed to ensure CA: %v", err) } @@ -383,7 +383,7 @@ func TestTestHostsRedirection(t *testing.T) { } defer os.RemoveAll(tempDir) - cm := crypto.NewCertificateManager(filepath.Join(tempDir, "certs")) + cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs")) if err := cm.EnsureCA(); err != nil { t.Fatalf("Failed to ensure CA: %v", err) } @@ -530,7 +530,7 @@ func TestMigrateViaHosts_SkipCAIfTrusted(t *testing.T) { } defer os.RemoveAll(tempDir) - cm := crypto.NewCertificateManager(filepath.Join(tempDir, "certs")) + cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs")) if err := cm.EnsureCA(); err != nil { t.Fatalf("Failed to ensure CA: %v", err) } @@ -579,7 +579,7 @@ func TestTrustCACert(t *testing.T) { } defer os.RemoveAll(tempDir) - cm := crypto.NewCertificateManager(filepath.Join(tempDir, "certs")) + cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs")) if err := cm.EnsureCA(); err != nil { t.Fatalf("Failed to ensure CA: %v", err) }