Skip to content

Commit 6da725b

Browse files
committed
Fix template imports
1 parent b112dfd commit 6da725b

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"$schema": "http://json.schemastore.org/launchsettings.json",
3+
"profiles": {
4+
"SeqCli": {
5+
"commandName": "Project",
6+
"commandLineArgs": "signal update --json-stdin"
7+
}
8+
}
9+
}

src/SeqCli/Templates/Import/TemplateSetImporter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static class TemplateSetImporter
7777
var resourceGroup = await connection.Client.GetAsync<ResourceGroup>(apiRoot, link.Key);
7878

7979
// ExpressionIndexes with mapped ids or identical expressions are assumed to be equivalent.
80-
var immutableTarget = template.ResourceGroup != "ExpressionIndexes";
80+
var immutableTarget = template.ResourceGroup == "ExpressionIndexes";
8181

8282
if (state.TryGetCreatedEntityId(template.Name, out var existingId) &&
8383
await CheckEntityExistenceAsync(connection, resourceGroup, existingId))

test/SeqCli.EndToEnd/Support/TestConfiguration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public CaptiveProcess SpawnServerProcess(string storagePath)
4040
if (args.UseDockerSeq(out var imageTag))
4141
{
4242
var containerName = Guid.NewGuid().ToString("n");
43-
return new CaptiveProcess("podman", $"run --name {containerName} -it --rm -e ACCEPT_EULA=Y -p {_serverListenPort}:80 datalust/seq:{imageTag}", stopCommandFullExePath: "podman", stopCommandArgs: $"stop {containerName}");
43+
const string containerRuntime = "docker";
44+
return new CaptiveProcess(containerRuntime, $"run --name {containerName} -it --rm -e ACCEPT_EULA=Y -p {_serverListenPort}:80 datalust/seq:{imageTag}", stopCommandFullExePath: containerRuntime, stopCommandArgs: $"stop {containerName}");
4445
}
4546

4647
return new CaptiveProcess("seq", commandWithArgs);

0 commit comments

Comments
 (0)