Merge pull request #2257 from ibuildthecloud/aml

Bump aml

Author: ibuildthecloud

go.mod

@@ -13,8 +13,8 @@ replace (
 require (
 	cuelang.org/go v0.6.0
 	github.com/AlecAivazis/survey/v2 v2.3.6
-	github.com/acorn-io/aml v0.0.0-20231009045340-a31c45f6d100
-	github.com/acorn-io/aml/cli v0.0.0-20231009055509-3c83c1247cf8
+	github.com/acorn-io/aml v0.0.0-20231017143906-5a6098a42249
+	github.com/acorn-io/aml/cli v0.0.0-20231018040203-8b7022061cc2
 	github.com/acorn-io/aml/legacy v0.0.0-20230929081514-1e9f3394432e
 	github.com/acorn-io/baaah v0.0.0-20231009165317-af2b68361b8a
 	github.com/acorn-io/mink v0.0.0-20230804175412-8d121aae112c

go.sum

@@ -107,10 +107,10 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpH
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
 github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
-github.com/acorn-io/aml v0.0.0-20231009045340-a31c45f6d100 h1:BXiQnq8aT780sd6T3Hs1+BJgsJcl/MTz00QZbiJfylE=
-github.com/acorn-io/aml v0.0.0-20231009045340-a31c45f6d100/go.mod h1:I1qN++bfN+6sOV/FiACluqj2Eu5YaHOy82cTAnjLMf0=
-github.com/acorn-io/aml/cli v0.0.0-20231009055509-3c83c1247cf8 h1:eQhRTIMBGbufCcww4Shqenh3nhPjl2l87Itxecl9Qjk=
-github.com/acorn-io/aml/cli v0.0.0-20231009055509-3c83c1247cf8/go.mod h1:CQ8Bc6t6xgu/K8vU8rl5LBz45aTzTj1eL4yQYZy6zh8=
+github.com/acorn-io/aml v0.0.0-20231017143906-5a6098a42249 h1:Mclb6bw5z+L78eRW7qAZKVxDnGrWw9F1iabSaIK9Dtg=
+github.com/acorn-io/aml v0.0.0-20231017143906-5a6098a42249/go.mod h1:I1qN++bfN+6sOV/FiACluqj2Eu5YaHOy82cTAnjLMf0=
+github.com/acorn-io/aml/cli v0.0.0-20231018040203-8b7022061cc2 h1:NtTkTnXDg2EnZTxwUi27LytYy/dSqBWPC97ERZ+rgRU=
+github.com/acorn-io/aml/cli v0.0.0-20231018040203-8b7022061cc2/go.mod h1:/BeWMP1u6zv/s3x+hWxm+buKqKXnFKuEbqEBGpzcKi4=
 github.com/acorn-io/aml/legacy v0.0.0-20230929081514-1e9f3394432e h1:W67DG9AcoNvBwIOR9OFUCZlSJBaHuvM2kXQ2+C6EnLk=
 github.com/acorn-io/aml/legacy v0.0.0-20230929081514-1e9f3394432e/go.mod h1:XnJZSZq/tG/jWPE/tmm2zy90gOZrJRIaOyKpoMulxfE=
 github.com/acorn-io/baaah v0.0.0-20231009165317-af2b68361b8a h1:0bHfiYUw4ojXCUfGHUPmRewrgJ/EpLQ4BaR4yEy8BC4=

pkg/appdefinition/appdefinition.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/acorn-io/aml"
-	"github.com/acorn-io/aml/cli/pkg/amlreadhelper"
 	amllegacy "github.com/acorn-io/aml/legacy"
 	"github.com/acorn-io/aml/pkg/eval"
 	"github.com/acorn-io/aml/pkg/schema"
@@ -364,7 +363,7 @@ func addAcorns(fileSet map[string]bool, builds map[string]v1.AcornBuilderSpec, c
 		if build.Build == nil {
 			continue
 		}
-		data, err := amlreadhelper.ReadFile(filepath.Join(cwd, build.Build.Acornfile))
+		data, err := aml.ReadFile(filepath.Join(cwd, build.Build.Acornfile))
 		if err != nil {
 			return
 		}

pkg/build/build.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/acorn-io/aml/cli/pkg/amlreadhelper"
+	"github.com/acorn-io/aml"
 	"github.com/acorn-io/baaah/pkg/typed"
 	apiv1 "github.com/acorn-io/runtime/pkg/apis/api.acorn.io/v1"
 	v1 "github.com/acorn-io/runtime/pkg/apis/internal.acorn.io/v1"
@@ -30,7 +30,7 @@ import (
 )
 
 func ResolveAndParse(file string) (*appdefinition.AppDefinition, error) {
-	fileData, err := amlreadhelper.ReadFile(file)
+	fileData, err := aml.ReadFile(file)
 	if err != nil {
 		return nil, err
 	}

pkg/buildclient/client.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/acorn-io/aml/cli/pkg/amlreadhelper"
+	"github.com/acorn-io/aml"
 	apiv1 "github.com/acorn-io/runtime/pkg/apis/api.acorn.io/v1"
 	v1 "github.com/acorn-io/runtime/pkg/apis/internal.acorn.io/v1"
 	"github.com/acorn-io/runtime/pkg/streams"
@@ -119,7 +119,7 @@ func Stream(ctx context.Context, cwd string, streams *streams.Output, dialer Web
 				return nil, err
 			}
 		} else if msg.Acornfile != "" {
-			data, err := amlreadhelper.ReadFile(filepath.Join(cwd, msg.Acornfile))
+			data, err := aml.ReadFile(filepath.Join(cwd, msg.Acornfile))
 			if err != nil {
 				return nil, err
 			}

pkg/cli/secret_create.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/acorn-io/aml/cli/pkg/amlreadhelper"
+	"github.com/acorn-io/aml"
 	apiv1 "github.com/acorn-io/runtime/pkg/apis/api.acorn.io/v1"
 	cli "github.com/acorn-io/runtime/pkg/cli/builder"
 	"github.com/spf13/cobra"
@@ -44,7 +44,7 @@ func (a *SecretCreate) buildSecret() (*apiv1.Secret, error) {
 	}{}
 
 	if a.File != "" {
-		err := amlreadhelper.UnmarshalFile(a.File, secret)
+		err := aml.UnmarshalFile(a.File, secret)
 		if err != nil {
 			return nil, fmt.Errorf("reading %s: %w", a.File, err)
 		}

pkg/client/build.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/acorn-io/aml/cli/pkg/amlreadhelper"
+	"github.com/acorn-io/aml"
 	apiv1 "github.com/acorn-io/runtime/pkg/apis/api.acorn.io/v1"
 	v1 "github.com/acorn-io/runtime/pkg/apis/internal.acorn.io/v1"
 	"github.com/acorn-io/runtime/pkg/buildclient"
@@ -64,7 +64,7 @@ func (c *DefaultClient) AcornImageBuild(ctx context.Context, file string, opts *
 		return nil, err
 	}
 
-	fileData, err := amlreadhelper.ReadFile(file)
+	fileData, err := aml.ReadFile(file)
 	if err != nil {
 		return nil, err
 	}