Skip to content
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

Rename EnrollmentService to EnterpriseCA #67

Merged
merged 1 commit into from
Oct 4, 2023
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
10 changes: 5 additions & 5 deletions src/Runtime/ObjectProcessors.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ public ObjectProcessors(IContext context, ILogger log)
return await ProcessRootCA(entry, resolvedSearchResult);
case Label.AIACA:
return await ProcessAIACA(entry, resolvedSearchResult);
case Label.EnrollmentService:
return await ProcessEnrollmentService(entry, resolvedSearchResult);
case Label.EnterpriseCA:
return await ProcessEnterpriseCA(entry, resolvedSearchResult);
case Label.NTAuthStore:
return await ProcessNTAuthStore(entry, resolvedSearchResult);
case Label.CertTemplate:
Expand Down Expand Up @@ -578,9 +578,9 @@ private async Task<AIACA> ProcessAIACA(ISearchResultEntry entry, ResolvedSearchR
return ret;
}

private async Task<EnrollmentService> ProcessEnrollmentService(ISearchResultEntry entry, ResolvedSearchResult resolvedSearchResult)
private async Task<EnterpriseCA> ProcessEnterpriseCA(ISearchResultEntry entry, ResolvedSearchResult resolvedSearchResult)
{
var ret = new EnrollmentService
var ret = new EnterpriseCA
{
ObjectIdentifier = resolvedSearchResult.ObjectId
};
Expand All @@ -603,7 +603,7 @@ private async Task<EnrollmentService> ProcessEnrollmentService(ISearchResultEntr

if ((_methods & ResolvedCollectionMethod.ObjectProps) != 0)
{
var props = LDAPPropertyProcessor.ReadEnrollmentServiceProperties(entry);
var props = LDAPPropertyProcessor.ReadEnterpriseCAProperties(entry);
ret.Properties.Merge(props);

// Certificate
Expand Down
12 changes: 6 additions & 6 deletions src/Runtime/OutputWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class OutputWriter
private readonly JsonDataWriter<User> _userOutput;
private readonly JsonDataWriter<RootCA> _rootCAOutput;
private readonly JsonDataWriter<AIACA> _aIACAOutput;
private readonly JsonDataWriter<EnrollmentService> _enrollmentServiceOutput;
private readonly JsonDataWriter<EnterpriseCA> _enterpriseCAOutput;
private readonly JsonDataWriter<NTAuthStore> _nTAuthStoreOutput;
private readonly JsonDataWriter<CertTemplate> _certTemplateOutput;

Expand All @@ -52,7 +52,7 @@ public OutputWriter(IContext context, Channel<OutputBase> outputChannel)
_containerOutput = new JsonDataWriter<Container>(_context, DataType.Containers);
_rootCAOutput = new JsonDataWriter<RootCA>(_context, DataType.RootCAs);
_aIACAOutput = new JsonDataWriter<AIACA>(_context, DataType.AIACAs);
_enrollmentServiceOutput = new JsonDataWriter<EnrollmentService>(_context, DataType.EnrollmentServices);
_enterpriseCAOutput = new JsonDataWriter<EnterpriseCA>(_context, DataType.EnterpriseCAs);
_nTAuthStoreOutput = new JsonDataWriter<NTAuthStore>(_context, DataType.NTAuthStores);
_certTemplateOutput = new JsonDataWriter<CertTemplate>(_context, DataType.CertTemplates);

Expand Down Expand Up @@ -131,8 +131,8 @@ internal async Task<string> StartWriter()
case AIACA aIACA:
await _aIACAOutput.AcceptObject(aIACA);
break;
case EnrollmentService enrollmentService:
await _enrollmentServiceOutput.AcceptObject(enrollmentService);
case EnterpriseCA enterpriseCA:
await _enterpriseCAOutput.AcceptObject(enterpriseCA);
break;
case NTAuthStore nTAuthStore:
await _nTAuthStoreOutput.AcceptObject(nTAuthStore);
Expand Down Expand Up @@ -160,7 +160,7 @@ private async Task<string> FlushWriters()
await _containerOutput.FlushWriter();
await _rootCAOutput.FlushWriter();
await _aIACAOutput.FlushWriter();
await _enrollmentServiceOutput.FlushWriter();
await _enterpriseCAOutput.FlushWriter();
await _nTAuthStoreOutput.FlushWriter();
await _certTemplateOutput.FlushWriter();
CloseOutput();
Expand Down Expand Up @@ -191,7 +191,7 @@ private string ZipFiles()
_computerOutput.GetFilename(), _userOutput.GetFilename(), _groupOutput.GetFilename(),
_containerOutput.GetFilename(), _domainOutput.GetFilename(), _gpoOutput.GetFilename(),
_ouOutput.GetFilename(), _rootCAOutput.GetFilename(), _aIACAOutput.GetFilename(),
_enrollmentServiceOutput.GetFilename(), _nTAuthStoreOutput.GetFilename(),
_enterpriseCAOutput.GetFilename(), _nTAuthStoreOutput.GetFilename(),
_certTemplateOutput.GetFilename()
});

Expand Down
Loading