Publish IsInstalled method

container-tools · Mar 6, 2020 · bb83d8f · bb83d8f
1 parent 79727d3
commit bb83d8f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 
-build: vfs
+build: vfs test
 	go build -o snap ./cmd/
 
 vfs:

diff --git a/pkg/api/snap.go b/pkg/api/snap.go
@@ -129,6 +129,10 @@ func (s *Snap) Install(ctx context.Context) error {
 	return nil
 }
 
+func (s *Snap) IsInstalled(ctx context.Context) (bool, error) {
+	return s.installerModule.IsInstalled(ctx, s.namespace)
+}
+
 func (s *Snap) GetEndpoint(ctx context.Context) (string, error) {
 	host, err := s.installerModule.GetDirectConnectionHost(ctx, s.namespace)
 	if err != nil {

diff --git a/pkg/installer/installer.go b/pkg/installer/installer.go
@@ -54,7 +54,7 @@ func NewInstaller(config *restclient.Config, client ctrl.Client, stdOut, stdErr
 	}
 }
 
-func (i *Installer) isInstalled(ctx context.Context, ns string) (bool, error) {
+func (i *Installer) IsInstalled(ctx context.Context, ns string) (bool, error) {
 	deploymentList := appsv1.DeploymentList{}
 	if err := i.client.List(ctx, &deploymentList, ctrl.InNamespace(ns), ctrl.MatchingLabels(serverLabels)); err != nil {
 		return false, err
@@ -95,7 +95,7 @@ func (i *Installer) GetDirectConnectionHost(ctx context.Context, ns string) (str
 }
 
 func (i *Installer) EnsureInstalled(ctx context.Context, ns string) error {
-	if installed, err := i.isInstalled(ctx, ns); err != nil {
+	if installed, err := i.IsInstalled(ctx, ns); err != nil {
 		return err
 	} else if installed {
 		logger.Info("Snap is already installed: skipping")