Browse Source

Merge daf2c49a53 into 75465614e6

pull/1613/merge
Phillip Morton 3 years ago
committed by GitHub
parent
commit
0578807e9f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Microsoft.Tye.Core/ConfigModel/ConfigService.cs
  2. 16
      src/Microsoft.Tye.Core/Serialization/ConfigServiceParser.cs
  3. 2
      test/E2ETest/testassets/projects/multirepo/vote/tye.yaml

2
src/Microsoft.Tye.Core/ConfigModel/ConfigService.cs

@ -46,5 +46,7 @@ namespace Microsoft.Tye.ConfigModel
public string? Version { get; set; }
public string? Architecture { get; set; }
public string? CloneDirectory { get; internal set; }
public List<string> DependsOn { get; set; } = new List<string>();
}
}

16
src/Microsoft.Tye.Core/Serialization/ConfigServiceParser.cs

@ -164,6 +164,13 @@ namespace Tye.Serialization
case "cloneDirectory":
service.CloneDirectory = YamlParser.GetScalarValue(key, child.Value);
break;
case "dependsOn":
if (child.Value.NodeType != YamlNodeType.Sequence)
{
throw new TyeYamlException(child.Value.Start, CoreStrings.FormatExpectedYamlSequence(key));
}
HandleDependencies((child.Value as YamlSequenceNode)!, service.DependsOn);
break;
default:
throw new TyeYamlException(child.Key.Start, CoreStrings.FormatUnrecognizedKey(key));
}
@ -578,6 +585,15 @@ namespace Tye.Serialization
tags.Add(tag);
}
}
private static void HandleDependencies(YamlSequenceNode yamlSequenceNode, List<string> dependencies)
{
foreach (var child in yamlSequenceNode!.Children)
{
var dependsOn = YamlParser.GetScalarValue(child);
dependencies.Add(dependsOn);
}
}
private static void HandleServiceBindingRoutes(YamlSequenceNode yamlSequenceNode, List<string> routes)
{

2
test/E2ETest/testassets/projects/multirepo/vote/tye.yaml

@ -2,6 +2,8 @@ name: VotingSample
services:
- name: vote
project: vote.csproj
dependsOn:
- redis
- name: worker
include: ../worker/tye.yaml
- name: redis

Loading…
Cancel
Save