refactor: remove discovery package (#553)

pkg/provider/docker/container_list.go

@@ -6,7 +6,6 @@ import (
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/sablierapp/sablier/app/discovery"
 	"github.com/sablierapp/sablier/pkg/provider"
 	"github.com/sablierapp/sablier/pkg/sablier"
 	"strings"
@@ -14,7 +13,7 @@ import (
 
 func (p *DockerClassicProvider) InstanceList(ctx context.Context, options provider.InstanceListOptions) ([]sablier.InstanceConfiguration, error) {
 	args := filters.NewArgs()
-	args.Add("label", fmt.Sprintf("%s=true", discovery.LabelEnable))
+	args.Add("label", fmt.Sprintf("%s=true", "sablier.enable"))
 
 	containers, err := p.Client.ContainerList(ctx, container.ListOptions{
 		All:     options.All,
@@ -36,11 +35,11 @@ func (p *DockerClassicProvider) InstanceList(ctx context.Context, options provid
 func containerToInstance(c dockertypes.Container) sablier.InstanceConfiguration {
 	var group string
 
-	if _, ok := c.Labels[discovery.LabelEnable]; ok {
-		if g, ok := c.Labels[discovery.LabelGroup]; ok {
+	if _, ok := c.Labels["sablier.enable"]; ok {
+		if g, ok := c.Labels["sablier.group"]; ok {
 			group = g
 		} else {
-			group = discovery.LabelGroupDefaultValue
+			group = "default"
 		}
 	}
 
@@ -52,7 +51,7 @@ func containerToInstance(c dockertypes.Container) sablier.InstanceConfiguration
 
 func (p *DockerClassicProvider) InstanceGroups(ctx context.Context) (map[string][]string, error) {
 	args := filters.NewArgs()
-	args.Add("label", fmt.Sprintf("%s=true", discovery.LabelEnable))
+	args.Add("label", fmt.Sprintf("%s=true", "sablier.enable"))
 
 	containers, err := p.Client.ContainerList(ctx, container.ListOptions{
 		All:     true,
@@ -65,9 +64,9 @@ func (p *DockerClassicProvider) InstanceGroups(ctx context.Context) (map[string]
 
 	groups := make(map[string][]string)
 	for _, c := range containers {
-		groupName := c.Labels[discovery.LabelGroup]
+		groupName := c.Labels["sablier.group"]
 		if len(groupName) == 0 {
-			groupName = discovery.LabelGroupDefaultValue
+			groupName = "default"
 		}
 		group := groups[groupName]
 		group = append(group, strings.TrimPrefix(c.Names[0], "/"))

pkg/provider/dockerswarm/service_list.go

@@ -6,14 +6,13 @@ import (
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/sablierapp/sablier/app/discovery"
 	"github.com/sablierapp/sablier/pkg/provider"
 	"github.com/sablierapp/sablier/pkg/sablier"
 )
 
 func (p *DockerSwarmProvider) InstanceList(ctx context.Context, _ provider.InstanceListOptions) ([]sablier.InstanceConfiguration, error) {
 	args := filters.NewArgs()
-	args.Add("label", fmt.Sprintf("%s=true", discovery.LabelEnable))
+	args.Add("label", fmt.Sprintf("%s=true", "sablier.enable"))
 	args.Add("mode", "replicated")
 
 	services, err := p.Client.ServiceList(ctx, dockertypes.ServiceListOptions{
@@ -36,11 +35,11 @@ func (p *DockerSwarmProvider) InstanceList(ctx context.Context, _ provider.Insta
 func (p *DockerSwarmProvider) serviceToInstance(s swarm.Service) (i sablier.InstanceConfiguration) {
 	var group string
 
-	if _, ok := s.Spec.Labels[discovery.LabelEnable]; ok {
-		if g, ok := s.Spec.Labels[discovery.LabelGroup]; ok {
+	if _, ok := s.Spec.Labels["sablier.enable"]; ok {
+		if g, ok := s.Spec.Labels["sablier.group"]; ok {
 			group = g
 		} else {
-			group = discovery.LabelGroupDefaultValue
+			group = "default"
 		}
 	}
 
@@ -52,7 +51,7 @@ func (p *DockerSwarmProvider) serviceToInstance(s swarm.Service) (i sablier.Inst
 
 func (p *DockerSwarmProvider) InstanceGroups(ctx context.Context) (map[string][]string, error) {
 	f := filters.NewArgs()
-	f.Add("label", fmt.Sprintf("%s=true", discovery.LabelEnable))
+	f.Add("label", fmt.Sprintf("%s=true", "sablier.enable"))
 
 	services, err := p.Client.ServiceList(ctx, dockertypes.ServiceListOptions{
 		Filters: f,
@@ -64,9 +63,9 @@ func (p *DockerSwarmProvider) InstanceGroups(ctx context.Context) (map[string][]
 
 	groups := make(map[string][]string)
 	for _, service := range services {
-		groupName := service.Spec.Labels[discovery.LabelGroup]
+		groupName := service.Spec.Labels["sablier.group"]
 		if len(groupName) == 0 {
-			groupName = discovery.LabelGroupDefaultValue
+			groupName = "default"
 		}
 
 		group := groups[groupName]

pkg/provider/kubernetes/deployment_list.go

@@ -2,20 +2,19 @@ package kubernetes
 
 import (
 	"context"
-	"github.com/sablierapp/sablier/app/discovery"
 	"github.com/sablierapp/sablier/pkg/sablier"
 	v1 "k8s.io/api/apps/v1"
-	core_v1 "k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func (p *KubernetesProvider) DeploymentList(ctx context.Context) ([]sablier.InstanceConfiguration, error) {
 	labelSelector := metav1.LabelSelector{
 		MatchLabels: map[string]string{
-			discovery.LabelEnable: "true",
+			"sablier.enable": "true",
 		},
 	}
-	deployments, err := p.Client.AppsV1().Deployments(core_v1.NamespaceAll).List(ctx, metav1.ListOptions{
+	deployments, err := p.Client.AppsV1().Deployments(corev1.NamespaceAll).List(ctx, metav1.ListOptions{
 		LabelSelector: metav1.FormatLabelSelector(&labelSelector),
 	})
 	if err != nil {
@@ -34,11 +33,11 @@ func (p *KubernetesProvider) DeploymentList(ctx context.Context) ([]sablier.Inst
 func (p *KubernetesProvider) deploymentToInstance(d *v1.Deployment) sablier.InstanceConfiguration {
 	var group string
 
-	if _, ok := d.Labels[discovery.LabelEnable]; ok {
-		if g, ok := d.Labels[discovery.LabelGroup]; ok {
+	if _, ok := d.Labels["sablier.enable"]; ok {
+		if g, ok := d.Labels["sablier.group"]; ok {
 			group = g
 		} else {
-			group = discovery.LabelGroupDefaultValue
+			group = "default"
 		}
 	}
 
@@ -53,10 +52,10 @@ func (p *KubernetesProvider) deploymentToInstance(d *v1.Deployment) sablier.Inst
 func (p *KubernetesProvider) DeploymentGroups(ctx context.Context) (map[string][]string, error) {
 	labelSelector := metav1.LabelSelector{
 		MatchLabels: map[string]string{
-			discovery.LabelEnable: "true",
+			"sablier.enable": "true",
 		},
 	}
-	deployments, err := p.Client.AppsV1().Deployments(core_v1.NamespaceAll).List(ctx, metav1.ListOptions{
+	deployments, err := p.Client.AppsV1().Deployments(corev1.NamespaceAll).List(ctx, metav1.ListOptions{
 		LabelSelector: metav1.FormatLabelSelector(&labelSelector),
 	})
 
@@ -66,9 +65,9 @@ func (p *KubernetesProvider) DeploymentGroups(ctx context.Context) (map[string][
 
 	groups := make(map[string][]string)
 	for _, deployment := range deployments.Items {
-		groupName := deployment.Labels[discovery.LabelGroup]
+		groupName := deployment.Labels["sablier.group"]
 		if len(groupName) == 0 {
-			groupName = discovery.LabelGroupDefaultValue
+			groupName = "default"
 		}
 
 		group := groups[groupName]

pkg/provider/kubernetes/statefulset_list.go

@@ -2,20 +2,19 @@ package kubernetes
 
 import (
 	"context"
-	"github.com/sablierapp/sablier/app/discovery"
 	"github.com/sablierapp/sablier/pkg/sablier"
 	v1 "k8s.io/api/apps/v1"
-	core_v1 "k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func (p *KubernetesProvider) StatefulSetList(ctx context.Context) ([]sablier.InstanceConfiguration, error) {
 	labelSelector := metav1.LabelSelector{
 		MatchLabels: map[string]string{
-			discovery.LabelEnable: "true",
+			"sablier.enable": "true",
 		},
 	}
-	statefulSets, err := p.Client.AppsV1().StatefulSets(core_v1.NamespaceAll).List(ctx, metav1.ListOptions{
+	statefulSets, err := p.Client.AppsV1().StatefulSets(corev1.NamespaceAll).List(ctx, metav1.ListOptions{
 		LabelSelector: metav1.FormatLabelSelector(&labelSelector),
 	})
 	if err != nil {
@@ -34,11 +33,11 @@ func (p *KubernetesProvider) StatefulSetList(ctx context.Context) ([]sablier.Ins
 func (p *KubernetesProvider) statefulSetToInstance(ss *v1.StatefulSet) sablier.InstanceConfiguration {
 	var group string
 
-	if _, ok := ss.Labels[discovery.LabelEnable]; ok {
-		if g, ok := ss.Labels[discovery.LabelGroup]; ok {
+	if _, ok := ss.Labels["sablier.enable"]; ok {
+		if g, ok := ss.Labels["sablier.group"]; ok {
 			group = g
 		} else {
-			group = discovery.LabelGroupDefaultValue
+			group = "default"
 		}
 	}
 
@@ -53,10 +52,10 @@ func (p *KubernetesProvider) statefulSetToInstance(ss *v1.StatefulSet) sablier.I
 func (p *KubernetesProvider) StatefulSetGroups(ctx context.Context) (map[string][]string, error) {
 	labelSelector := metav1.LabelSelector{
 		MatchLabels: map[string]string{
-			discovery.LabelEnable: "true",
+			"sablier.enable": "true",
 		},
 	}
-	statefulSets, err := p.Client.AppsV1().StatefulSets(core_v1.NamespaceAll).List(ctx, metav1.ListOptions{
+	statefulSets, err := p.Client.AppsV1().StatefulSets(corev1.NamespaceAll).List(ctx, metav1.ListOptions{
 		LabelSelector: metav1.FormatLabelSelector(&labelSelector),
 	})
 	if err != nil {
@@ -65,9 +64,9 @@ func (p *KubernetesProvider) StatefulSetGroups(ctx context.Context) (map[string]
 
 	groups := make(map[string][]string)
 	for _, ss := range statefulSets.Items {
-		groupName := ss.Labels[discovery.LabelGroup]
+		groupName := ss.Labels["sablier.group"]
 		if len(groupName) == 0 {
-			groupName = discovery.LabelGroupDefaultValue
+			groupName = "default"
 		}
 
 		group := groups[groupName]

pkg/provider/types.go

@@ -1,6 +1,5 @@
 package provider
 
 type InstanceListOptions struct {
-	All    bool
-	Labels []string
+	All bool
 }

pkg/sablier/autostop.go

@@ -0,0 +1,53 @@
+package sablier
+
+import (
+	"context"
+	"errors"
+	"github.com/sablierapp/sablier/pkg/provider"
+	"github.com/sablierapp/sablier/pkg/store"
+	"golang.org/x/sync/errgroup"
+	"log/slog"
+)
+
+// StopAllUnregisteredInstances stops all auto-discovered running instances that are not yet registered
+// as running instances by Sablier.
+// By default, Sablier does not stop all already running instances. Meaning that you need to make an
+// initial request in order to trigger the scaling to zero.
+func (s *sablier) StopAllUnregisteredInstances(ctx context.Context) error {
+	instances, err := s.provider.InstanceList(ctx, provider.InstanceListOptions{
+		All: false, // Only running instances
+	})
+	if err != nil {
+		return err
+	}
+
+	unregistered := make([]string, 0)
+	for _, instance := range instances {
+		_, err = s.sessions.Get(ctx, instance.Name)
+		if errors.Is(err, store.ErrKeyNotFound) {
+			unregistered = append(unregistered, instance.Name)
+		}
+	}
+
+	s.l.DebugContext(ctx, "found instances to stop", slog.Any("instances", unregistered))
+
+	waitGroup := errgroup.Group{}
+
+	for _, name := range unregistered {
+		waitGroup.Go(s.stopFunc(ctx, name))
+	}
+
+	return waitGroup.Wait()
+}
+
+func (s *sablier) stopFunc(ctx context.Context, name string) func() error {
+	return func() error {
+		err := s.provider.InstanceStop(ctx, name)
+		if err != nil {
+			s.l.ErrorContext(ctx, "failed to stop instance", slog.String("instance", name), slog.Any("error", err))
+			return err
+		}
+		s.l.InfoContext(ctx, "stopped unregistered instance", slog.String("instance", name), slog.String("reason", "instance is enabled but not started by Sablier"))
+		return nil
+	}
+}

pkg/sablier/autostop_test.go

@@ -0,0 +1,69 @@
+package sablier_test
+
+import (
+	"errors"
+	"github.com/sablierapp/sablier/pkg/provider"
+	"github.com/sablierapp/sablier/pkg/sablier"
+	"github.com/sablierapp/sablier/pkg/store"
+	"gotest.tools/v3/assert"
+	"testing"
+)
+
+func TestStopAllUnregisteredInstances(t *testing.T) {
+	s, sessions, p := setupSablier(t)
+
+	ctx := t.Context()
+
+	// Define instances and registered instances
+	instances := []sablier.InstanceConfiguration{
+		{Name: "instance1"},
+		{Name: "instance2"},
+	}
+
+	sessions.EXPECT().Get(ctx, "instance1").Return(sablier.InstanceInfo{}, store.ErrKeyNotFound)
+	sessions.EXPECT().Get(ctx, "instance2").Return(sablier.InstanceInfo{
+		Name:   "instance2",
+		Status: sablier.InstanceStatusReady,
+	}, nil)
+
+	// Set up expectations for InstanceList
+	p.EXPECT().InstanceList(ctx, provider.InstanceListOptions{
+		All: false,
+	}).Return(instances, nil)
+
+	// Set up expectations for InstanceStop
+	p.EXPECT().InstanceStop(ctx, "instance1").Return(nil)
+
+	// Call the function under test
+	err := s.StopAllUnregisteredInstances(ctx)
+	assert.NilError(t, err)
+}
+
+func TestStopAllUnregisteredInstances_WithError(t *testing.T) {
+	s, sessions, p := setupSablier(t)
+	ctx := t.Context()
+
+	// Define instances and registered instances
+	instances := []sablier.InstanceConfiguration{
+		{Name: "instance1"},
+		{Name: "instance2"},
+	}
+
+	sessions.EXPECT().Get(ctx, "instance1").Return(sablier.InstanceInfo{}, store.ErrKeyNotFound)
+	sessions.EXPECT().Get(ctx, "instance2").Return(sablier.InstanceInfo{
+		Name:   "instance2",
+		Status: sablier.InstanceStatusReady,
+	}, nil)
+
+	// Set up expectations for InstanceList
+	p.EXPECT().InstanceList(ctx, provider.InstanceListOptions{
+		All: false,
+	}).Return(instances, nil)
+
+	// Set up expectations for InstanceStop with error
+	p.EXPECT().InstanceStop(ctx, "instance1").Return(errors.New("stop error"))
+
+	// Call the function under test
+	err := s.StopAllUnregisteredInstances(ctx)
+	assert.Error(t, err, "stop error")
+}

pkg/sablier/sablier.go

@@ -17,6 +17,7 @@ type Sablier interface {
 
 	RemoveInstance(ctx context.Context, name string) error
 	SetGroups(groups map[string][]string)
+	StopAllUnregisteredInstances(ctx context.Context) error
 }
 
 type sablier struct {

pkg/sablier/sablier_test.go

@@ -0,0 +1,21 @@
+package sablier_test
+
+import (
+	"github.com/neilotoole/slogt"
+	"github.com/sablierapp/sablier/pkg/provider/providertest"
+	"github.com/sablierapp/sablier/pkg/sablier"
+	"github.com/sablierapp/sablier/pkg/store/storetest"
+	"go.uber.org/mock/gomock"
+	"testing"
+)
+
+func setupSablier(t *testing.T) (sablier.Sablier, *storetest.MockStore, *providertest.MockProvider) {
+	t.Helper()
+	ctrl := gomock.NewController(t)
+
+	p := providertest.NewMockProvider(ctrl)
+	s := storetest.NewMockStore(ctrl)
+
+	m := sablier.New(slogt.New(t), s, p)
+	return m, s, p
+}

pkg/sablier/sabliertest/mocks_sablier.go

@@ -127,3 +127,17 @@ func (mr *MockSablierMockRecorder) SetGroups(groups any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetGroups", reflect.TypeOf((*MockSablier)(nil).SetGroups), groups)
 }
+
+// StopAllUnregisteredInstances mocks base method.
+func (m *MockSablier) StopAllUnregisteredInstances(ctx context.Context) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "StopAllUnregisteredInstances", ctx)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// StopAllUnregisteredInstances indicates an expected call of StopAllUnregisteredInstances.
+func (mr *MockSablierMockRecorder) StopAllUnregisteredInstances(ctx any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StopAllUnregisteredInstances", reflect.TypeOf((*MockSablier)(nil).StopAllUnregisteredInstances), ctx)
+}

pkg/sablier/session_request_test.go

@@ -2,10 +2,7 @@ package sablier_test
 
 import (
 	"context"
-	"github.com/neilotoole/slogt"
-	"github.com/sablierapp/sablier/pkg/provider/providertest"
 	"github.com/sablierapp/sablier/pkg/sablier"
-	"github.com/sablierapp/sablier/pkg/store/storetest"
 	"go.uber.org/mock/gomock"
 	"testing"
 	"time"
@@ -86,20 +83,9 @@ func createMap(instances []sablier.InstanceInfo) map[string]sablier.InstanceInfo
 	return states
 }
 
-func setupSessionManager(t *testing.T) (sablier.Sablier, *storetest.MockStore, *providertest.MockProvider) {
-	t.Helper()
-	ctrl := gomock.NewController(t)
-
-	p := providertest.NewMockProvider(ctrl)
-	s := storetest.NewMockStore(ctrl)
-
-	m := sablier.New(slogt.New(t), s, p)
-	return m, s, p
-}
-
 func TestSessionsManager(t *testing.T) {
 	t.Run("RemoveInstance", func(t *testing.T) {
-		manager, store, _ := setupSessionManager(t)
+		manager, store, _ := setupSablier(t)
 		store.EXPECT().Delete(gomock.Any(), "test")
 		err := manager.RemoveInstance(t.Context(), "test")
 		assert.NilError(t, err)
@@ -109,7 +95,7 @@ func TestSessionsManager(t *testing.T) {
 func TestSessionsManager_RequestReadySessionCancelledByUser(t *testing.T) {
 	t.Run("request ready session is cancelled by user", func(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
-		manager, store, provider := setupSessionManager(t)
+		manager, store, provider := setupSablier(t)
 		store.EXPECT().Get(gomock.Any(), gomock.Any()).Return(sablier.InstanceInfo{Name: "apache", Status: sablier.InstanceStatusNotReady}, nil).AnyTimes()
 		store.EXPECT().Put(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
 
@@ -131,7 +117,7 @@ func TestSessionsManager_RequestReadySessionCancelledByUser(t *testing.T) {
 func TestSessionsManager_RequestReadySessionCancelledByTimeout(t *testing.T) {
 
 	t.Run("request ready session is cancelled by timeout", func(t *testing.T) {
-		manager, store, provider := setupSessionManager(t)
+		manager, store, provider := setupSablier(t)
 		store.EXPECT().Get(gomock.Any(), gomock.Any()).Return(sablier.InstanceInfo{Name: "apache", Status: sablier.InstanceStatusNotReady}, nil).AnyTimes()
 		store.EXPECT().Put(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
 
@@ -150,7 +136,7 @@ func TestSessionsManager_RequestReadySessionCancelledByTimeout(t *testing.T) {
 func TestSessionsManager_RequestReadySession(t *testing.T) {
 
 	t.Run("request ready session is ready", func(t *testing.T) {
-		manager, store, _ := setupSessionManager(t)
+		manager, store, _ := setupSablier(t)
 		store.EXPECT().Get(gomock.Any(), gomock.Any()).Return(sablier.InstanceInfo{Name: "apache", Status: sablier.InstanceStatusReady}, nil).AnyTimes()
 		store.EXPECT().Put(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()