Removed deprecated starlark API calls

Author: akclace

internal/app/app.go

@@ -33,6 +33,7 @@ import (
 	"github.com/openrundev/openrun/internal/types"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
+	"go.starlark.net/syntax"
 )
 
 // App is the main object that represents a OpenRun app. It is created when the app is loaded
@@ -827,14 +828,21 @@ func (a *App) loadStarlark(thread *starlark.Thread, module string, cache map[str
 		if err != nil {
 			return nil, err
 		}
-		globals, err := starlark.ExecFile(thread, module, buf, builtin)
+		globals, err := starlark.ExecFileOptions(AppFileOptions(), thread, module, buf, builtin)
 		cacheEntry = &starlarkCacheEntry{globals, err}
 		// Update the cache.
 		cache[module] = cacheEntry
 	}
 	return cacheEntry.globals, cacheEntry.err
 }
 
+func AppFileOptions() *syntax.FileOptions {
+	return &syntax.FileOptions{
+		While:     true,
+		Recursion: true,
+	}
+}
+
 // updateAppConfig updates the app defaults from the metadata
 // It creates a TOML intermediate string so that the TOML parsing can be used
 func (a *App) updateAppConfig() error {

internal/app/apptype/param_loader.go

@@ -14,6 +14,7 @@ import (
 	"github.com/openrundev/openrun/internal/types"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
+	"go.starlark.net/syntax"
 )
 
 const (
@@ -191,7 +192,7 @@ func LoadParamInfo(fileName string, data []byte, serverConfig *types.ServerConfi
 		Print: func(_ *starlark.Thread, msg string) { fmt.Println(msg) },
 	}
 
-	_, err := starlark.ExecFile(thread, fileName, data, builtins)
+	_, err := starlark.ExecFileOptions(&syntax.FileOptions{}, thread, fileName, data, builtins)
 	if err != nil {
 		if evalErr, ok := err.(*starlark.EvalError); ok {
 			fmt.Printf("Error loading app params: %s\n", evalErr.Backtrace()) // TODO: log

internal/app/apptype/schema_loader.go

@@ -10,6 +10,7 @@ import (
 	"github.com/openrundev/openrun/internal/app/starlark_type"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
+	"go.starlark.net/syntax"
 )
 
 const (
@@ -114,7 +115,7 @@ func LoadStoreInfo(fileName string, data []byte) (*starlark_type.StoreInfo, erro
 		Print: func(_ *starlark.Thread, msg string) { fmt.Println(msg) },
 	}
 
-	_, err := starlark.ExecFile(thread, fileName, data, builtins)
+	_, err := starlark.ExecFileOptions(&syntax.FileOptions{}, thread, fileName, data, builtins)
 	if err != nil {
 		if evalErr, ok := err.(*starlark.EvalError); ok {
 			fmt.Printf("Error loading app schema: %s\n", evalErr.Backtrace()) // TODO: log

internal/app/audit.go

@@ -81,7 +81,7 @@ func (a *App) Audit() (*types.ApproveResult, error) {
 		return nil, err
 	}
 
-	_, prog, err := starlark.SourceProgram(a.getStarPath(apptype.APP_FILE_NAME), buf, builtin.Has)
+	_, prog, err := starlark.SourceProgramOptions(AppFileOptions(), a.getStarPath(apptype.APP_FILE_NAME), buf, builtin.Has)
 	if err != nil {
 		return nil, fmt.Errorf("parsing source failed %v", err)
 	}

internal/app/setup.go

@@ -27,15 +27,10 @@ import (
 	"github.com/openrundev/openrun/internal/app/dev"
 	"github.com/openrundev/openrun/internal/app/starlark_type"
 	"github.com/openrundev/openrun/internal/types"
-	"go.starlark.net/resolve"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
 )
 
-func init() {
-	resolve.AllowRecursion = true
-}
-
 func (a *App) loadStarlarkConfig(dryRun types.DryRun) error {
 	a.Info().Str("path", a.Path).Str("domain", a.Domain).Msg("Loading app")
 
@@ -56,7 +51,7 @@ func (a *App) loadStarlarkConfig(dryRun types.DryRun) error {
 		return err
 	}
 
-	a.globals, err = starlark.ExecFile(thread, a.getStarPath(apptype.APP_FILE_NAME), buf, builtin)
+	a.globals, err = starlark.ExecFileOptions(AppFileOptions(), thread, a.getStarPath(apptype.APP_FILE_NAME), buf, builtin)
 	if err != nil {
 		if evalErr, ok := err.(*starlark.EvalError); ok {
 			a.Error().Err(err).Str("trace", evalErr.Backtrace()).Msg("Error loading app")