luci_deploy: Enable loading "index.yaml" directly.

deploytool/cmd/luci_deploy/layout.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package main
 
 import (
         "io/ioutil"
         "os"
         "path/filepath"
@@ skipping 213 matching lines @@
                 // Referenced handler paths.
                 for i, p := range aem.HandlerPath {
                         var msg deploy.AppEngineModule_HandlerSet
                         if err := unmarshalTextProtobuf(comp.pathTo(p), &msg); err != nil {
                                 return errors.Annotate(err).Reason("failed to load HandlerSet #%(index)d for %(component)q").
                                         D("index", i).D("component", comp).Err()
                         }
                         module.Handlers.Handler = append(module.Handlers.Handler, msg.Handler...)
                 }
 
+                // If the module specifies a direct "index.yaml" path, load index entries
+                // from there and translate them to resources.
+                if p := module.IndexYamlPath; p != "" {
+                        path := module.comp.pathTo(p)
+                        res, err := loadIndexYAMLResource(path)
+                        if err != nil {
+                                return errors.Annotate(err).Reason("failed to load 'index.yaml' from [%(path)s]").
+                                        D("path", path).Err()
+                        }
+                        dep.cloudProject.appendResources(res, &module)
+                }
+
                 // Append GAE Resources.
                 if r := module.Resources; r != nil {
                         dep.cloudProject.appendResources(r, &module)
                 }
 
                 for i, p := range module.ResourcePath {
                         if err := comp.dep.substituteParams(&p); err != nil {
                                 return errors.Annotate(err).Reason("failed to substitute parameters for resource path").
                                         D("path", p).Err()
                         }
@@ skipping 730 matching lines @@
                         return "", errors.Reason("could not find %(filename)q starting from %(dir)q").
                                 D("filename", filename).D("dir", dir).Err()
                 }
         }
 }
 
 type componentRegistrar interface {
         addGAEModule(*layoutDeploymentGAEModule)
         addGKEPod(*layoutDeploymentGKEPodBinding)
 }