refactor: rename ApplicationInstanceSpec -> ShellSpec

starpit · starpit · commit f80246289a2d · 2024-08-20T12:48:17.000-04:00
Signed-off-by: Nick Mitchell &lt;nickm@us.ibm.com&gt;
diff --git a/pkg/fe/transformer/api/dispatch/lower.go b/pkg/fe/transformer/api/dispatch/lower.go
@@ -9,7 +9,7 @@ import (
 )
 
 // HLIR -> LLIR for []hlir.ParameterSweep, ...
-func Lower(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) ([]llir.Component, error) {
+func Lower(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ShellSpec, opts compilation.Options, verbose bool) ([]llir.Component, error) {
 	components := []llir.Component{}
 
 	for _, r := range model.ParameterSweeps {
diff --git a/pkg/fe/transformer/api/dispatch/parametersweep/lower.go b/pkg/fe/transformer/api/dispatch/parametersweep/lower.go
@@ -7,7 +7,7 @@ import (
 	"lunchpail.io/pkg/ir/llir"
 )
 
-func Lower(compilationName, runname, namespace string, sweep hlir.ParameterSweep, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
+func Lower(compilationName, runname, namespace string, sweep hlir.ParameterSweep, spec llir.ShellSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
 	app, err := transpile(sweep)
 	if err != nil {
 		return llir.Component{}, err
diff --git a/pkg/fe/transformer/api/dispatch/s3/lower.go b/pkg/fe/transformer/api/dispatch/s3/lower.go
@@ -7,7 +7,7 @@ import (
 	"lunchpail.io/pkg/ir/llir"
 )
 
-func Lower(compilationName, runname, namespace string, s3 hlir.ProcessS3Objects, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
+func Lower(compilationName, runname, namespace string, s3 hlir.ProcessS3Objects, spec llir.ShellSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
 	app, err := transpile(s3)
 	if err != nil {
 		return llir.Component{}, err
diff --git a/pkg/fe/transformer/api/minio/lower.go b/pkg/fe/transformer/api/minio/lower.go
@@ -8,7 +8,7 @@ import (
 	"lunchpail.io/pkg/lunchpail"
 )
 
-func Lower(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
+func Lower(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ShellSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
 	app, err := transpile(runname, spec)
 	if err != nil {
 		return llir.Component{}, err
diff --git a/pkg/fe/transformer/api/minio/transpile.go b/pkg/fe/transformer/api/minio/transpile.go
@@ -12,7 +12,7 @@ import (
 )
 
 // Transpile minio to hlir.Application
-func transpile(runname string, spec llir.ApplicationInstanceSpec) (hlir.Application, error) {
+func transpile(runname string, spec llir.ShellSpec) (hlir.Application, error) {
 	app := hlir.NewApplication(runname + "-minio")
 
 	app.Spec.Image = "docker.io/minio/minio:RELEASE.2024-07-04T14-25-45Z"
diff --git a/pkg/fe/transformer/api/shell/lower.go b/pkg/fe/transformer/api/shell/lower.go
@@ -14,7 +14,7 @@ import (
 	"lunchpail.io/pkg/util"
 )
 
-func Lower(compilationName, runname, namespace string, app hlir.Application, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
+func Lower(compilationName, runname, namespace string, app hlir.Application, spec llir.ShellSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
 	var component lunchpail.Component
 	switch app.Spec.Role {
 	case "worker":
@@ -26,7 +26,7 @@ func Lower(compilationName, runname, namespace string, app hlir.Application, spe
 	return LowerAsComponent(compilationName, runname, namespace, app, spec, opts, verbose, component)
 }
 
-func LowerAsComponent(compilationName, runname, namespace string, app hlir.Application, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool, component lunchpail.Component) (llir.Component, error) {
+func LowerAsComponent(compilationName, runname, namespace string, app hlir.Application, spec llir.ShellSpec, opts compilation.Options, verbose bool, component lunchpail.Component) (llir.Component, error) {
 	sizing := spec.Sizing
 	if sizing.Workers == 0 {
 		sizing = api.ApplicationSizing(app, opts)
diff --git a/pkg/fe/transformer/api/workerpool/lower.go b/pkg/fe/transformer/api/workerpool/lower.go
@@ -12,7 +12,7 @@ import (
 	"lunchpail.io/pkg/lunchpail"
 )
 
-func Lower(compilationName, runname, namespace string, app hlir.Application, pool hlir.WorkerPool, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
+func Lower(compilationName, runname, namespace string, app hlir.Application, pool hlir.WorkerPool, spec llir.ShellSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
 	spec.RunAsJob = true
 	spec.Sizing = api.WorkerpoolSizing(pool, app, opts)
 	spec.InstanceName = pool.Metadata.Name
diff --git a/pkg/fe/transformer/api/workerpool/lowerall.go b/pkg/fe/transformer/api/workerpool/lowerall.go
@@ -9,7 +9,7 @@ import (
 )
 
 // HLIR -> LLIR for []hlir.WorkerPool
-func LowerAll(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) ([]llir.Component, error) {
+func LowerAll(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ShellSpec, opts compilation.Options, verbose bool) ([]llir.Component, error) {
 	components := []llir.Component{}
 
 	app, found := model.GetApplicationByRole(hlir.WorkerRole)
diff --git a/pkg/fe/transformer/api/workstealer/lower.go b/pkg/fe/transformer/api/workstealer/lower.go
@@ -8,7 +8,7 @@ import (
 	"lunchpail.io/pkg/lunchpail"
 )
 
-func Lower(compilationName, runname, namespace string, app hlir.Application, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
+func Lower(compilationName, runname, namespace string, app hlir.Application, spec llir.ShellSpec, opts compilation.Options, verbose bool) (llir.Component, error) {
 	app, err := transpile(runname)
 	if err != nil {
 		return llir.Component{}, err
diff --git a/pkg/fe/transformer/application.go b/pkg/fe/transformer/application.go
@@ -9,7 +9,7 @@ import (
 )
 
 // HLIR -> LLIR for []hlir.Application
-func lowerApplications(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) ([]llir.Component, error) {
+func lowerApplications(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ShellSpec, opts compilation.Options, verbose bool) ([]llir.Component, error) {
 	components := []llir.Component{}
 
 	for _, r := range model.Applications {
diff --git a/pkg/fe/transformer/lower.go b/pkg/fe/transformer/lower.go
@@ -14,7 +14,7 @@ import (
 
 // HLIR -> LLIR
 func Lower(compilationName, runname, namespace string, model hlir.AppModel, queueSpec queue.Spec, yamlValues string, opts compilation.Options, verbose bool) (llir.LLIR, error) {
-	spec := llir.ApplicationInstanceSpec{Queue: queueSpec, Values: llir.Values{Yaml: yamlValues}}
+	spec := llir.ShellSpec{Queue: queueSpec, Values: llir.Values{Yaml: yamlValues}}
 
 	minio, err := minio.Lower(compilationName, runname, namespace, model, spec, opts, verbose)
 	if err != nil {
diff --git a/pkg/ir/llir/shell.go b/pkg/ir/llir/shell.go
@@ -8,7 +8,7 @@ type Values struct {
 	Yaml string
 }
 
-type ApplicationInstanceSpec struct {
+type ShellSpec struct {
 	// Use a Job-style (versus Pod-style) of deployment?
 	RunAsJob bool
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// HLIR -> LLIR for []hlir.ParameterSweep, ...`
`12`		`-func Lower(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) ([]llir.Component, error) {`
	`12`	`+func Lower(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ShellSpec, opts compilation.Options, verbose bool) ([]llir.Component, error) {`
`13`	`13`	`components := []llir.Component{}`
`14`	`14`
`15`	`15`	`for _, r := range model.ParameterSweeps {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"lunchpail.io/pkg/ir/llir"`
`8`	`8`	`)`
`9`	`9`
`10`		`-func Lower(compilationName, runname, namespace string, sweep hlir.ParameterSweep, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) (llir.Component, error) {`
	`10`	`+func Lower(compilationName, runname, namespace string, sweep hlir.ParameterSweep, spec llir.ShellSpec, opts compilation.Options, verbose bool) (llir.Component, error) {`
`11`	`11`	`app, err := transpile(sweep)`
`12`	`12`	`if err != nil {`
`13`	`13`	`return llir.Component{}, err`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"lunchpail.io/pkg/lunchpail"`
`9`	`9`	`)`
`10`	`10`
`11`		`-func Lower(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ApplicationInstanceSpec, opts compilation.Options, verbose bool) (llir.Component, error) {`
	`11`	`+func Lower(compilationName, runname, namespace string, model hlir.AppModel, spec llir.ShellSpec, opts compilation.Options, verbose bool) (llir.Component, error) {`
`12`	`12`	`app, err := transpile(runname, spec)`
`13`	`13`	`if err != nil {`
`14`	`14`	`return llir.Component{}, err`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// Transpile minio to hlir.Application`
`15`		`-func transpile(runname string, spec llir.ApplicationInstanceSpec) (hlir.Application, error) {`
	`15`	`+func transpile(runname string, spec llir.ShellSpec) (hlir.Application, error) {`
`16`	`16`	`app := hlir.NewApplication(runname + "-minio")`
`17`	`17`
`18`	`18`	`app.Spec.Image = "docker.io/minio/minio:RELEASE.2024-07-04T14-25-45Z"`