Merge pull request #249 from ndeloof/secrets

include build secrets when validating/normalizing project resources

Author: glours

loader/validate.go

@@ -55,9 +55,11 @@ func checkConsistency(project *types.Project) error {
 				}
 			}
 		}
-		for _, secret := range s.Secrets {
-			if _, ok := project.Secrets[secret.Source]; !ok {
-				return errors.Wrap(errdefs.ErrInvalid, fmt.Sprintf("service %q refers to undefined secret %s", s.Name, secret.Source))
+		if s.Build != nil {
+			for _, secret := range s.Build.Secrets {
+				if _, ok := project.Secrets[secret.Source]; !ok {
+					return errors.Wrap(errdefs.ErrInvalid, fmt.Sprintf("service %q refers to undefined build secret %s", s.Name, secret.Source))
+				}
 			}
 		}
 		for _, config := range s.Configs {

types/project.go

@@ -246,6 +246,11 @@ func (p *Project) WithoutUnnecessaryResources() {
 		for _, v := range s.Secrets {
 			requiredSecrets[v.Source] = struct{}{}
 		}
+		if s.Build != nil {
+			for _, v := range s.Build.Secrets {
+				requiredSecrets[v.Source] = struct{}{}
+			}
+		}
 		for _, v := range s.Configs {
 			requiredConfigs[v.Source] = struct{}{}
 		}