Skip to content

Add registered domain ingest processor #5616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Nest/Ingest/ProcessorFormatter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ internal class ProcessorFormatter : IJsonFormatter<IProcessor>
{ "uri_parts", 33 },
{ "fingerprint", 34 },
{ "community_id", 35 },
{ "network_direction", 36 }
{ "network_direction", 36 },
{ "registered_domain", 37 }
};

public IProcessor Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
Expand Down Expand Up @@ -181,6 +182,9 @@ public IProcessor Deserialize(ref JsonReader reader, IJsonFormatterResolver form
case 36:
processor = Deserialize<NetworkDirectionProcessor>(ref reader, formatterResolver);
break;
case 37:
processor = Deserialize<RegisteredDomainProcessor>(ref reader, formatterResolver);
break;
}
}
else
Expand Down Expand Up @@ -313,6 +317,9 @@ public void Serialize(ref JsonWriter writer, IProcessor value, IJsonFormatterRes
case "network_direction":
Serialize<INetworkDirectionProcessor>(ref writer, value, formatterResolver);
break;
case "registered_domain":
Serialize<IRegisteredDomainProcessor>(ref writer, value, formatterResolver);
break;
default:
var formatter = DynamicObjectResolver.ExcludeNullCamelCase.GetFormatter<IProcessor>();
formatter.Serialize(ref writer, value, formatterResolver);
Expand Down
6 changes: 5 additions & 1 deletion src/Nest/Ingest/Processors/NetworkDirectionProcessor.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
using System;
// Licensed to Elasticsearch B.V under one or more agreements.
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information

using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Runtime.Serialization;
Expand Down
65 changes: 65 additions & 0 deletions src/Nest/Ingest/Processors/RegisteredDomainProcoessor.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// Licensed to Elasticsearch B.V under one or more agreements.
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information

using System;
using System.Linq.Expressions;
using System.Runtime.Serialization;
using Elasticsearch.Net.Utf8Json;

namespace Nest
{
[InterfaceDataContract]
public interface IRegisteredDomainProcessor : IProcessor
{
[DataMember(Name = "field")]
Field Field { get; set; }

[DataMember(Name = "ignore_missing")]
bool? IgnoreMissing { get; set; }

[DataMember(Name = "target_field")]
Field TargetField { get; set; }
}

public class RegisteredDomainProcessor : ProcessorBase, IRegisteredDomainProcessor
{
protected override string Name => "registered_domain";

/// <inheritdoc />
public Field Field { get; set; }
/// <inheritdoc />
public bool? IgnoreMissing { get; set; }
/// <inheritdoc />
public Field TargetField { get; set; }
}

/// <inheritdoc cref="IFingerprintProcessor" />
public class RegisteredDomainProcessorDescriptor<T>
: ProcessorDescriptorBase<RegisteredDomainProcessorDescriptor<T>, IRegisteredDomainProcessor>, IRegisteredDomainProcessor
where T : class
{
protected override string Name => "registered_domain";

Field IRegisteredDomainProcessor.Field { get; set; }
bool? IRegisteredDomainProcessor.IgnoreMissing { get; set; }
Field IRegisteredDomainProcessor.TargetField { get; set; }

/// <inheritdoc cref="IRegisteredDomainProcessor.Field" />
public RegisteredDomainProcessorDescriptor<T> Field(Field field) => Assign(field, (a, v) => a.Field = v);

/// <inheritdoc cref="IRegisteredDomainProcessor.Field" />
public RegisteredDomainProcessorDescriptor<T> Field<TValue>(Expression<Func<T, TValue>> objectPath) =>
Assign(objectPath, (a, v) => a.Field = v);

/// <inheritdoc cref="IRegisteredDomainProcessor.IgnoreMissing" />
public RegisteredDomainProcessorDescriptor<T> IgnoreMissing(bool? ignoreMissing = true) => Assign(ignoreMissing, (a, v) => a.IgnoreMissing = v);

/// <inheritdoc cref="IRegisteredDomainProcessor.TargetField" />
public RegisteredDomainProcessorDescriptor<T> TargetField(Field field) => Assign(field, (a, v) => a.TargetField = v);

/// <inheritdoc cref="IRegisteredDomainProcessor.TargetField" />
public RegisteredDomainProcessorDescriptor<T> TargetField<TValue>(Expression<Func<T, TValue>> objectPath) =>
Assign(objectPath, (a, v) => a.TargetField = v);
}
}
4 changes: 4 additions & 0 deletions src/Nest/Ingest/ProcessorsDescriptor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -193,5 +193,9 @@ public ProcessorsDescriptor NetworkCommunityId<T>(Func<NetworkCommunityIdProcess
/// <inheritdoc cref="INetworkDirectionProcessor"/>
public ProcessorsDescriptor NetworkDirection<T>(Func<NetworkDirectionProcessorDescriptor<T>, INetworkDirectionProcessor> selector) where T : class =>
Assign(selector, (a, v) => a.AddIfNotNull(v?.Invoke(new NetworkDirectionProcessorDescriptor<T>())));

/// <inheritdoc cref="IRegisteredDomainProcessor"/>
public ProcessorsDescriptor RegisteredDomain<T>(Func<RegisteredDomainProcessorDescriptor<T>, IRegisteredDomainProcessor> selector) where T : class =>
Assign(selector, (a, v) => a.AddIfNotNull(v?.Invoke(new RegisteredDomainProcessorDescriptor<T>())));
}
}
26 changes: 26 additions & 0 deletions tests/Tests/Ingest/ProcessorAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -850,5 +850,31 @@ public class NetworkDirectionWithField : ProcessorAssertion

public override string Key => "network_direction";
}

[SkipVersion("<7.13.0", "Register_domain processor added in 7.13.0")]
public class RegisteredDomain : ProcessorAssertion
{
public override ProcFunc Fluent => d => d
.RegisteredDomain<Project>(ud => ud
.Field(f => f.Name)
.TargetField("domain")
.IgnoreMissing());

public override IProcessor Initializer => new RegisteredDomainProcessor
{
Field = Field<Project>(f => f.Name),
TargetField = "domain",
IgnoreMissing = true
};

public override object Json => new
{
field = "name",
target_field = "domain",
ignore_missing = true
};

public override string Key => "registered_domain";
}
}
}