Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: cleanup unused code
Kyle Mendell4d72e83f0217
diff --git a/backend/internal/huma/handlers/templates_fetch_test.go b/backend/internal/huma/handlers/templates_fetch_test.goindex dc27da555..39cd51d7b 100644--- a/backend/internal/huma/handlers/templates_fetch_test.go+++ b/backend/internal/huma/handlers/templates_fetch_test.go@@ -17,7 +17,6 @@ import (humamiddleware "github.com/getarcaneapp/arcane/backend/internal/huma/middleware""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/services"- httputils "github.com/getarcaneapp/arcane/backend/pkg/utils/httpx""github.com/gin-gonic/gin"glsqlite "github.com/glebarez/sqlite""github.com/golang-jwt/jwt/v5"@@ -26,7 +25,7 @@ import ()func TestFetchTemplateRegistryRequiresAuthentication(t *testing.T) {- router := newTemplateFetchTestRouter(t, http.DefaultClient, httputils.DefaultLookupIP)+ router := newTemplateFetchTestRouter(t, http.DefaultClient)req := httptest.NewRequest(http.MethodGet, "/api/templates/fetch?url=http://example.com/registry.json", nil)rec := httptest.NewRecorder()@@ -44,8 +43,8 @@ func TestFetchTemplateRegistryAuthenticatedSuccess(t *testing.T) {}))defer server.Close()- client, lookupIP, registryURL := makeTemplateFetchRemote(t, server)- router := newTemplateFetchTestRouter(t, client, lookupIP)+ client, registryURL := makeTemplateFetchRemote(t, server)+ router := newTemplateFetchTestRouter(t, client)req := httptest.NewRequest(http.MethodGet, "/api/templates/fetch?url="+url.QueryEscape(registryURL), nil)req.Header.Set("Authorization", "Bearer "+makeTemplateFetchToken(t, "test-secret", "user-1", "alice"))@@ -59,7 +58,7 @@ func TestFetchTemplateRegistryAuthenticatedSuccess(t *testing.T) {}func TestFetchTemplateRegistryAuthenticatedUnsafeTargetIsSanitized(t *testing.T) {- router := newTemplateFetchTestRouter(t, http.DefaultClient, httputils.DefaultLookupIP)+ router := newTemplateFetchTestRouter(t, http.DefaultClient)req := httptest.NewRequest(http.MethodGet, "/api/templates/fetch?url="+url.QueryEscape("http://127.0.0.1:8080/registry.json"), nil)req.Header.Set("Authorization", "Bearer "+makeTemplateFetchToken(t, "test-secret", "user-1", "alice"))@@ -74,7 +73,7 @@ func TestFetchTemplateRegistryAuthenticatedUnsafeTargetIsSanitized(t *testing.T)require.NotContains(t, rec.Body.String(), "Invalid JSON response")}-func newTemplateFetchTestRouter(t *testing.T, httpClient *http.Client, lookupIP httputils.LookupIPFunc) *gin.Engine {+func newTemplateFetchTestRouter(t *testing.T, httpClient *http.Client) *gin.Engine {t.Helper()originalDir, err := os.Getwd()@@ -98,7 +97,7 @@ func newTemplateFetchTestRouter(t *testing.T, httpClient *http.Client, lookupIPrequire.NoError(t, err)authService := services.NewAuthService(userService, nil, nil, "test-secret", &config.Config{})- templateService := services.NewTemplateService(context.Background(), nil, httpClient, nil).WithLookupIPResolver(lookupIP)+ templateService := services.NewTemplateService(context.Background(), nil, httpClient, nil)router := gin.New()apiGroup := router.Group("/api")@@ -146,7 +145,7 @@ func makeTemplateFetchToken(t *testing.T, secret string, userID, username stringreturn signed}-func makeTemplateFetchRemote(t *testing.T, server *httptest.Server) (*http.Client, httputils.LookupIPFunc, string) {+func makeTemplateFetchRemote(t *testing.T, server *httptest.Server) (*http.Client, string) {t.Helper()parsedURL, err := url.Parse(server.URL)@@ -164,9 +163,5 @@ func makeTemplateFetchRemote(t *testing.T, server *httptest.Server) (*http.ClienTimeout: 10 * time.Second,}- lookupIP := func(ctx context.Context, host string) ([]net.IP, error) {- return []net.IP{net.ParseIP("93.184.216.34")}, nil- }-- return client, lookupIP, "http://templates.example.test:" + parsedURL.Port() + "/registry.json"+ return client, "http://93.184.216.34:" + parsedURL.Port() + "/registry.json"}diff --git a/backend/internal/services/template_service.go b/backend/internal/services/template_service.goindex 8df950f61..d3ea32a9b 100644--- a/backend/internal/services/template_service.go+++ b/backend/internal/services/template_service.go@@ -96,12 +96,6 @@ func NewTemplateService(ctx context.Context, db *database.DB, httpClient *http.Creturn service}-func (s *TemplateService) WithLookupIPResolver(lookupIP httputils.LookupIPFunc) *TemplateService {- s.lookupIP = lookupIP- s.safeHTTPClient = s.newSafeHTTPClientInternal()- return s-}-func (s *TemplateService) ensureRemoteTemplatesLoaded(ctx context.Context) error {s.remoteMu.Lock()diff --git a/backend/pkg/fswatch/watcher_test.go b/backend/pkg/fswatch/watcher_test.goindex def4c437d..b7b0ed7ef 100644--- a/backend/pkg/fswatch/watcher_test.go+++ b/backend/pkg/fswatch/watcher_test.go@@ -79,7 +79,7 @@ func TestWatcher_StartIgnoresNonProjectFileWritesInsideProjectDir(t *testing.T)// Simulate ESPHome / PlatformIO churning through build artifacts inside a// watched project tree. None of these writes touch a compose or env file,// so the sync callback must never fire.- for i := 0; i < 5; i++ {+ for range 5 {require.NoError(t, os.WriteFile(filepath.Join(buildDir, "artifact.bin"), []byte{0x01, 0x02, 0x03}, 0o644))}diff --git a/backend/pkg/projects/fs_util.go b/backend/pkg/projects/fs_util.goindex 858be430a..db8803a2d 100644--- a/backend/pkg/projects/fs_util.go+++ b/backend/pkg/projects/fs_util.go@@ -169,7 +169,7 @@ func projectScanSkipDirectorySetInternal(skipDirectories string) map[string]bool}dirs := map[string]bool{}- for _, dir := range strings.Split(skipDirectories, ",") {+ for dir := range strings.SplitSeq(skipDirectories, ",") {dir = strings.TrimSpace(dir)if dir != "" {dirs[dir] = true