feat: use lunchpail needs to install minio

Signed-off-by: aavarghese <avarghese@us.ibm.com>
IBM · Oct 12, 2024 · a1a866f · a1a866f
1 parent 3ffac8e
commit a1a866f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 97 deletions.
diff --git a/pkg/be/local/shell/install_darwin.go b/pkg/be/local/shell/install_darwin.go
diff --git a/pkg/be/local/shell/install_linux.go b/pkg/be/local/shell/install_linux.go
diff --git a/pkg/be/local/shell/workdir.go b/pkg/be/local/shell/workdir.go
@@ -2,16 +2,13 @@ package shell
 
 import (
 	base64 "encoding/base64"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 
 	"lunchpail.io/pkg/ir/hlir"
 	"lunchpail.io/pkg/ir/llir"
-	"lunchpail.io/pkg/lunchpail"
 )
 
 func PrepareWorkdirForComponent(c llir.ShellComponent, verbose bool) (string, string, error) {
@@ -32,37 +29,13 @@ func PrepareWorkdirForComponent(c llir.ShellComponent, verbose bool) (string, st
 
 	command := c.Application.Spec.Command
 
-	// hmm, hacky attempts to get intrinsic prereqs
-	switch c.C() {
-	case lunchpail.MinioComponent:
-		if err := ensureMinio(); err != nil {
-			return "", "", err
-		}
-	}
-
 	return workdir, command, nil
 }
 
 func saveCodeToWorkdir(workdir string, code hlir.Code) error {
 	return os.WriteFile(filepath.Join(workdir, code.Name), []byte(code.Source), 0700)
 }
 
-func ensureMinio() error {
-	if err := setenvForMinio(); err != nil {
-		return err
-	}
-
-	if _, err := exec.LookPath("minio"); err != nil {
-		if errors.Is(err, exec.ErrNotFound) {
-			return installMinio()
-		} else if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 func writeBlobsToWorkdir(c llir.ShellComponent, workdir string, verbose bool) error {
 	for idx, dataset := range c.Application.Spec.Datasets {
 		if dataset.Blob.Content != "" {

diff --git a/pkg/fe/transformer/api/minio/transpile.go b/pkg/fe/transformer/api/minio/transpile.go
@@ -20,8 +20,7 @@ func transpile(runname string, ir llir.LLIR) (hlir.Application, error) {
 	app.Spec.Expose = []string{fmt.Sprintf("%d:%d", ir.Queue.Port, ir.Queue.Port)}
 	app.Spec.Command = fmt.Sprintf("$LUNCHPAIL_EXE component minio server --port %d", ir.Queue.Port)
 
-	/*app.Spec.Needs = []hlir.Needs{
-	{Name: "minio", Version: "latest"}}*/
+	app.Spec.Needs = []hlir.Needs{{Name: "minio", Version: "latest"}}
 	prefixIncludingBucket := api.QueuePrefixPath(ir.Queue, runname)
 	A := strings.Split(prefixIncludingBucket, "/")
 	prefixExcludingBucket := filepath.Join(A[1:]...)

diff --git a/pkg/runtime/needs/install_linux.go b/pkg/runtime/needs/install_linux.go
@@ -32,7 +32,7 @@ func installMinio(ctx context.Context, version string, verbose bool) error {
 	}
 
 	//Todo: versions other than latest
-	cmd := exec.CommandContext(ctx, "/bin/sh", "-c", "apt update; apt -y install wget; wget https://dl.min.io/server/minio/release/linux-amd64/minio")
+	cmd := exec.CommandContext(ctx, "wget", "https://dl.min.io/server/minio/release/linux-amd64/minio")
 	cmd.Dir = dir
 	if verbose {
 		cmd.Stdout = os.Stdout

diff --git a/pkg/runtime/needs/minio.go b/pkg/runtime/needs/minio.go
@@ -9,7 +9,6 @@ import (
 func InstallMinio(ctx context.Context, version string, opts Options) error {
 	if _, err := exec.LookPath("minio"); err != nil {
 		if errors.Is(err, exec.ErrNotFound) {
-			//Todo: use context?
 			return installMinio(ctx, version, opts.Verbose)
 		}
 		return err