Add additional config path error wrapping and index to embeds

cli/cmd/lib_config_reader.go

@@ -92,7 +92,7 @@ func allConfigPaths(root string) []string {
 
 func appNameFromConfig() (string, error) {
 	appRoot := mustAppRoot()
-	return userconfig.ReadAppName(filepath.Join(appRoot, "app.yaml"))
+	return userconfig.ReadAppName(filepath.Join(appRoot, "app.yaml"), "app.yaml")
 }
 
 func AppNameFromFlagOrConfig() (string, error) {

pkg/api/context/models.go

@@ -37,11 +37,13 @@ type Model struct {
 
 type TrainingDataset struct {
 	*ComputedResourceFields
-	Name        string `json:"name"`
-	ModelName   string `json:"model_name"`
-	TrainKey    string `json:"train_key"`
-	EvalKey     string `json:"eval_key"`
-	MetadataKey string `json:"metadata_key"`
+	Name        string            `json:"name"`
+	ModelName   string            `json:"model_name"`
+	TrainKey    string            `json:"train_key"`
+	EvalKey     string            `json:"eval_key"`
+	MetadataKey string            `json:"metadata_key"`
+	FilePath    string            `json:"file_path"`
+	Embed       *userconfig.Embed `json:"embed"`
 }
 
 func (trainingDataset *TrainingDataset) GetName() string {
@@ -53,7 +55,11 @@ func (trainingDataset *TrainingDataset) GetResourceType() resource.Type {
 }
 
 func (trainingDataset *TrainingDataset) GetFilePath() string {
-	return ""
+	return trainingDataset.FilePath
+}
+
+func (trainingDataset *TrainingDataset) GetEmbed() *userconfig.Embed {
+	return trainingDataset.Embed
 }
 
 func (models Models) OneByID(id string) *Model {

pkg/api/context/python_packages.go

@@ -18,6 +18,7 @@ package context
 
 import (
 	"github.com/cortexlabs/cortex/pkg/api/resource"
+	"github.com/cortexlabs/cortex/pkg/api/userconfig"
 )
 
 type PythonPackages map[string]*PythonPackage
@@ -40,3 +41,7 @@ func (pythonPackage *PythonPackage) GetResourceType() resource.Type {
 func (pythonPackage *PythonPackage) GetFilePath() string {
 	return ""
 }
+
+func (pythonPackage *PythonPackage) GetEmbed() *userconfig.Embed {
+	return nil
+}

pkg/api/resource/errors.go

@@ -31,6 +31,8 @@ const (
 	ErrNameNotFound
 	ErrNameOrTypeNotFound
 	ErrInvalidType
+	ErrTemplateInTemplate
+	ErrEmbedInTemplate
 )
 
 var (
@@ -41,6 +43,8 @@ var (
 		"err_name_not_found",
 		"err_name_or_type_not_found",
 		"err_invalid_type",
+		"err_template_in_template",
+		"err_embed_in_template",
 	}
 )
 
@@ -121,3 +125,17 @@ func ErrorUnknownKind(name string) error {
 		message: fmt.Sprintf("unknown kind %s", s.UserStr(name)),
 	}
 }
+
+func ErrorTemplateInTemplate() error {
+	return ResourceError{
+		Kind:    ErrTemplateInTemplate,
+		message: "templates cannot be defined inside of templates",
+	}
+}
+
+func ErrorEmbedInTemplate() error {
+	return ResourceError{
+		Kind:    ErrEmbedInTemplate,
+		message: "embeds cannot be defined inside of templates",
+	}
+}

pkg/api/userconfig/aggregates.go

@@ -31,6 +31,7 @@ type Aggregate struct {
 	Compute    *SparkCompute `json:"compute" yaml:"compute"`
 	Tags       Tags          `json:"tags" yaml:"tags"`
 	FilePath   string        `json:"file_path"  yaml:"-"`
+	Embed      *Embed        `json:"embed"  yaml:"-"`
 }
 
 var aggregateValidation = &cr.StructValidation{
@@ -81,6 +82,10 @@ func (aggregate *Aggregate) GetFilePath() string {
 	return aggregate.FilePath
 }
 
+func (aggregate *Aggregate) GetEmbed() *Embed {
+	return aggregate.Embed
+}
+
 func (aggregates Aggregates) Names() []string {
 	names := make([]string, len(aggregates))
 	for i, aggregate := range aggregates {

pkg/api/userconfig/aggregators.go

@@ -29,6 +29,7 @@ type Aggregator struct {
 	OutputType interface{} `json:"output_type"  yaml:"output_type"`
 	Path       string      `json:"path"  yaml:"path"`
 	FilePath   string      `json:"file_path" yaml:"-"`
+	Embed      *Embed      `json:"embed"  yaml:"-"`
 }
 
 var aggregatorValidation = &cr.StructValidation{
@@ -96,6 +97,10 @@ func (aggregator *Aggregator) GetFilePath() string {
 	return aggregator.FilePath
 }
 
+func (aggregator *Aggregator) GetEmbed() *Embed {
+	return aggregator.Embed
+}
+
 func (aggregators Aggregators) Names() []string {
 	names := make([]string, len(aggregators))
 	for i, aggregator := range aggregators {

pkg/api/userconfig/apis.go

@@ -29,6 +29,7 @@ type API struct {
 	Compute   *APICompute `json:"compute" yaml:"compute"`
 	Tags      Tags        `json:"tags" yaml:"tags"`
 	FilePath  string      `json:"file_path"  yaml:"-"`
+	Embed     *Embed      `json:"embed"  yaml:"-"`
 }
 
 var apiValidation = &cr.StructValidation{
@@ -79,6 +80,10 @@ func (api *API) GetFilePath() string {
 	return api.FilePath
 }
 
+func (api *API) GetEmbed() *Embed {
+	return api.Embed
+}
+
 func (apis APIs) Names() []string {
 	names := make([]string, len(apis))
 	for i, api := range apis {

pkg/api/userconfig/app.go

@@ -17,7 +17,6 @@ limitations under the License.
 package userconfig
 
 import (
-	"github.com/cortexlabs/cortex/pkg/api/resource"
 	cr "github.com/cortexlabs/cortex/pkg/utils/configreader"
 )
 
@@ -40,14 +39,6 @@ var appValidation = &cr.StructValidation{
 	},
 }
 
-func (app *App) GetName() string {
-	return app.Name
-}
-
-func (app *App) GetResourceType() resource.Type {
-	return resource.AppType
-}
-
 func (app *App) Validate() error {
 	return nil
 }