Rename Jira connector module to Atlassian

Author: Colin

README.md

@@ -92,7 +92,7 @@ Sift records the matching rule, exact matched value and surrounding line, not a
 - `Stratus.Sift.Contracts` defines versioned scan requests, targets, progress, observations and summaries.
 - `Stratus.Sift.Core` contains the scanner domain, validators, content extraction, matching engine, and bundled rule catalogue.
 - `Stratus.Sift.FileSystem` enumerates files, folders, access controls, and exposure.
-- `Stratus.Sift.Connectors` contains the Microsoft 365, Slack, Slack export, Jira, and Confluence source modules.
+- `Stratus.Sift.Connectors` contains the Microsoft 365, Slack, Slack export, and Atlassian Cloud source modules. The Atlassian module scans both Jira and Confluence.
 - `Stratus.Sift.Cli` provides local, domain, network, Microsoft 365, Slack, Slack export, Atlassian, and saved-result analysis commands.
 - `tests` covers command parsing, SMB discovery, connectors, rule matching, evidence output, and resumable output.
 - `eng` contains release and public-boundary verification scripts.

src/Stratus.Sift.Cli/Program.cs

@@ -90,7 +90,7 @@ internal static IHost CreateHost()
         builder.Services.AddTransient<IConnector, Stratus.Sift.Connectors.SharePoint.SharePointConnector>();
         builder.Services.AddTransient<IConnector, Stratus.Sift.Connectors.Slack.SlackConnector>();
         builder.Services.AddTransient<IConnector, Stratus.Sift.Connectors.Slack.SlackExportConnector>();
-        builder.Services.AddTransient<IConnector, Stratus.Sift.Connectors.Jira.JiraConnector>();
+        builder.Services.AddTransient<IConnector, Stratus.Sift.Connectors.Atlassian.AtlassianConnector>();
 
         return builder.Build();
     }

…us.Sift.Connectors/Jira/JiraApiClient.cs …nnectors/Atlassian/AtlassianApiClient.cssrc/Stratus.Sift.Connectors/Jira/JiraApiClient.cs renamed to src/Stratus.Sift.Connectors/Atlassian/AtlassianApiClient.cs src/Stratus.Sift.Connectors/Jira/JiraApiClient.cs renamed to src/Stratus.Sift.Connectors/Atlassian/AtlassianApiClient.cs

@@ -3,15 +3,15 @@
 using System.Text.Json.Nodes;
 using Microsoft.Extensions.Logging;
 
-namespace Stratus.Sift.Connectors.Jira;
+namespace Stratus.Sift.Connectors.Atlassian;
 
-internal sealed class JiraApiClient
+internal sealed class AtlassianApiClient
 {
     internal const int MaximumJsonDepth = 256;
 
     private readonly ILogger? _logger;
 
-    internal JiraApiClient(HttpClient httpClient, Uri baseUri, ILogger? logger = null)
+    internal AtlassianApiClient(HttpClient httpClient, Uri baseUri, ILogger? logger = null)
     {
         HttpClient = httpClient;
         BaseUri = baseUri;

…us.Sift.Connectors/Jira/JiraConnector.cs …nnectors/Atlassian/AtlassianConnector.cssrc/Stratus.Sift.Connectors/Jira/JiraConnector.cs renamed to src/Stratus.Sift.Connectors/Atlassian/AtlassianConnector.cs src/Stratus.Sift.Connectors/Jira/JiraConnector.cs renamed to src/Stratus.Sift.Connectors/Atlassian/AtlassianConnector.cs

@@ -5,21 +5,26 @@
 using Stratus.Sift.Connectors.Interfaces;
 using Stratus.Sift.Core;
 
-namespace Stratus.Sift.Connectors.Jira;
+namespace Stratus.Sift.Connectors.Atlassian;
 
-public sealed class JiraConnector : IConnector
+public sealed class AtlassianConnector : IConnector
 {
     private readonly HttpClient _httpClient;
-    private readonly ILogger<JiraConnector>? _logger;
-    private JiraApiClient? _jiraApi;
-    private JiraApiClient? _confluenceApi;
+    private readonly ILogger? _logger;
+    private AtlassianApiClient? _jiraApi;
+    private AtlassianApiClient? _confluenceApi;
     private Uri? _siteUri;
     private HashSet<string>? _projectFilter;
     private HashSet<string>? _spaceFilter;
     private string? _additionalJql;
     private IReadOnlyDictionary<string, string> _customFields = new Dictionary<string, string>();
 
-    public JiraConnector(HttpClient httpClient, ILogger<JiraConnector>? logger = null)
+    public AtlassianConnector(HttpClient httpClient, ILogger<AtlassianConnector>? logger = null)
+        : this(httpClient, (ILogger?)logger)
+    {
+    }
+
+    internal AtlassianConnector(HttpClient httpClient, ILogger? logger)
     {
         _httpClient = httpClient;
         _logger = logger;
@@ -78,8 +83,8 @@ public async Task InitializeAsync(Dictionary<string, string> configuration, Canc
             confluenceApiBaseUri = new Uri($"https://api.atlassian.com/ex/confluence/{Uri.EscapeDataString(cloudId)}/");
         }
 
-        _jiraApi = new JiraApiClient(_httpClient, jiraApiBaseUri, _logger);
-        _confluenceApi = new JiraApiClient(_httpClient, confluenceApiBaseUri, _logger);
+        _jiraApi = new AtlassianApiClient(_httpClient, jiraApiBaseUri, _logger);
+        _confluenceApi = new AtlassianApiClient(_httpClient, confluenceApiBaseUri, _logger);
         try
         {
             using var _ = await _jiraApi.GetJsonAsync("rest/api/3/myself", cancellationToken);
@@ -202,7 +207,7 @@ private async Task AddConfluenceDrivesAsync(List<IRemoteDrive> drives, Cancellat
 
     private async Task<string> DiscoverCloudIdAsync(Uri siteUri, CancellationToken cancellationToken)
     {
-        var discoveryApi = new JiraApiClient(_httpClient, new Uri("https://api.atlassian.com/"), _logger);
+        var discoveryApi = new AtlassianApiClient(_httpClient, new Uri("https://api.atlassian.com/"), _logger);
         using var document = await discoveryApi.GetJsonAsync("oauth/token/accessible-resources", cancellationToken);
         foreach (var resource in document.RootElement.EnumerateArray())
         {

….Sift.Connectors/Jira/ConfluenceDrive.cs ….Connectors/Atlassian/ConfluenceDrive.cssrc/Stratus.Sift.Connectors/Jira/ConfluenceDrive.cs renamed to src/Stratus.Sift.Connectors/Atlassian/ConfluenceDrive.cs src/Stratus.Sift.Connectors/Jira/ConfluenceDrive.cs renamed to src/Stratus.Sift.Connectors/Atlassian/ConfluenceDrive.cs

@@ -4,17 +4,17 @@
 using Stratus.Sift.Connectors.Services;
 using Stratus.Sift.Core.Enums;
 
-namespace Stratus.Sift.Connectors.Jira;
+namespace Stratus.Sift.Connectors.Atlassian;
 
 internal sealed class ConfluenceDrive : IRemoteDrive
 {
     private const string NewestFirstSort = "-modified-date";
 
-    private readonly JiraApiClient _api;
+    private readonly AtlassianApiClient _api;
     private readonly Uri _siteUri;
     private readonly string _spaceKey;
 
-    internal ConfluenceDrive(JiraApiClient api, Uri siteUri, string spaceId, string spaceKey, string spaceName)
+    internal ConfluenceDrive(AtlassianApiClient api, Uri siteUri, string spaceId, string spaceKey, string spaceName)
     {
         _api = api;
         _siteUri = siteUri;
@@ -69,7 +69,7 @@ public async Task<string> ProcessChangesAsync(
             using var document = await _api.GetJsonAsync(path, cancellationToken);
             foreach (var content in document.RootElement.GetProperty("results").EnumerateArray())
             {
-                var contentId = JiraConnector.GetScalarString(content, "id") ?? string.Empty;
+                var contentId = AtlassianConnector.GetScalarString(content, "id") ?? string.Empty;
                 if (string.IsNullOrWhiteSpace(contentId)) continue;
                 var updated = GetNestedString(content, "version", "createdAt");
                 newest = MaxTimestamp(newest, updated);
@@ -96,15 +96,15 @@ private async Task EmitContentAsync(
         string contentType,
         Func<IRemoteFile, Task> onChange)
     {
-        var id = JiraConnector.GetScalarString(content, "id")!;
-        var title = JiraConnector.GetScalarString(content, "title") ?? id;
+        var id = AtlassianConnector.GetScalarString(content, "id")!;
+        var title = AtlassianConnector.GetScalarString(content, "title") ?? id;
         var builder = new StringBuilder();
         Append(builder, "Space", _spaceKey);
         Append(builder, "Content type", contentType);
         Append(builder, "Title", title);
         Append(builder, "Content ID", id);
-        Append(builder, "Author", JiraConnector.GetScalarString(content, "authorId"));
-        Append(builder, "Created", JiraConnector.GetScalarString(content, "createdAt"));
+        Append(builder, "Author", AtlassianConnector.GetScalarString(content, "authorId"));
+        Append(builder, "Created", AtlassianConnector.GetScalarString(content, "createdAt"));
         Append(builder, "Updated", GetNestedString(content, "version", "createdAt"));
         var body = GetBodyText(content);
         if (!string.IsNullOrWhiteSpace(body)) builder.AppendLine().AppendLine(body);
@@ -152,7 +152,7 @@ await onChange(new SimpleRemoteFile(
             using var document = await _api.GetJsonAsync(path, cancellationToken);
             foreach (var comment in document.RootElement.GetProperty("results").EnumerateArray())
             {
-                var id = JiraConnector.GetScalarString(comment, "id") ?? string.Empty;
+                var id = AtlassianConnector.GetScalarString(comment, "id") ?? string.Empty;
                 if (string.IsNullOrWhiteSpace(id) || !visited.Add(id)) continue;
                 var updated = GetNestedString(comment, "version", "createdAt");
                 newest = MaxTimestamp(newest, updated);
@@ -201,12 +201,12 @@ await onChange(new SimpleRemoteFile(
             using var document = await _api.GetJsonAsync(path, cancellationToken);
             foreach (var attachment in document.RootElement.GetProperty("results").EnumerateArray())
             {
-                var id = JiraConnector.GetScalarString(attachment, "id") ?? string.Empty;
+                var id = AtlassianConnector.GetScalarString(attachment, "id") ?? string.Empty;
                 if (string.IsNullOrWhiteSpace(id)) continue;
                 var updated = GetNestedString(attachment, "version", "createdAt")
-                    ?? JiraConnector.GetScalarString(attachment, "createdAt");
+                    ?? AtlassianConnector.GetScalarString(attachment, "createdAt");
                 newest = MaxTimestamp(newest, updated);
-                var name = JiraConnector.GetScalarString(attachment, "title") ?? id;
+                var name = AtlassianConnector.GetScalarString(attachment, "title") ?? id;
                 if (string.IsNullOrWhiteSpace(boundary) || IsAfter(updated, boundary))
                 {
                     var size = attachment.TryGetProperty("fileSize", out var sizeElement) && sizeElement.TryGetInt64(out var parsedSize)
@@ -221,7 +221,7 @@ await onChange(new SimpleRemoteFile(
                         $"atlassian://{_siteUri.Host}/confluence/{_spaceKey}/{collection}/{contentId}/attachments/{name}",
                         GetWebUrl(attachment, $"wiki/spaces/{Uri.EscapeDataString(_spaceKey)}"),
                         size,
-                        JiraConnector.GetScalarString(attachment, "mediaType"),
+                        AtlassianConnector.GetScalarString(attachment, "mediaType"),
                         _api.HttpClient,
                         downloadUri));
                 }
@@ -282,7 +282,7 @@ internal static string GetBodyText(JsonElement element)
             {
                 using var document = JsonDocument.Parse(
                     raw,
-                    new JsonDocumentOptions { MaxDepth = JiraApiClient.MaximumJsonDepth });
+                    new JsonDocumentOptions { MaxDepth = AtlassianApiClient.MaximumJsonDepth });
                 return JiraDrive.GetFlexibleValueText(document.RootElement);
             }
             catch (JsonException)
@@ -297,7 +297,7 @@ internal static string GetBodyText(JsonElement element)
     private string GetWebUrl(JsonElement element, string fallback)
     {
         var link = element.TryGetProperty("_links", out var links)
-            ? JiraConnector.GetScalarString(links, "webui")
+            ? AtlassianConnector.GetScalarString(links, "webui")
             : null;
         if (Uri.TryCreate(link, UriKind.Absolute, out var absolute)) return absolute.AbsoluteUri;
         var path = string.IsNullOrWhiteSpace(link) ? fallback : link.TrimStart('/');
@@ -307,7 +307,7 @@ private string GetWebUrl(JsonElement element, string fallback)
 
     private static string? GetNestedString(JsonElement element, string property, string nestedProperty)
         => element.TryGetProperty(property, out var nested) && nested.ValueKind == JsonValueKind.Object
-            ? JiraConnector.GetScalarString(nested, nestedProperty)
+            ? AtlassianConnector.GetScalarString(nested, nestedProperty)
             : null;
 
     private static string? ParseDelta(string? token)

…tratus.Sift.Connectors/Jira/JiraDrive.cs …s.Sift.Connectors/Atlassian/JiraDrive.cssrc/Stratus.Sift.Connectors/Jira/JiraDrive.cs renamed to src/Stratus.Sift.Connectors/Atlassian/JiraDrive.cs src/Stratus.Sift.Connectors/Jira/JiraDrive.cs renamed to src/Stratus.Sift.Connectors/Atlassian/JiraDrive.cs

@@ -5,7 +5,7 @@
 using Stratus.Sift.Connectors.Services;
 using Stratus.Sift.Core.Enums;
 
-namespace Stratus.Sift.Connectors.Jira;
+namespace Stratus.Sift.Connectors.Atlassian;
 
 internal sealed class JiraDrive : IRemoteDrive
 {
@@ -19,7 +19,7 @@ internal sealed class JiraDrive : IRemoteDrive
         "self", "id", "key", "accountId", "iconUrl", "avatarUrls", "type"
     };
 
-    private readonly JiraApiClient _api;
+    private readonly AtlassianApiClient _api;
     private readonly Uri _siteUri;
     private readonly string _projectKey;
     private readonly string? _additionalJql;
@@ -28,7 +28,7 @@ internal sealed class JiraDrive : IRemoteDrive
     private readonly string[] _searchFields;
 
     internal JiraDrive(
-        JiraApiClient api,
+        AtlassianApiClient api,
         Uri siteUri,
         string projectId,
         string projectKey,
@@ -116,8 +116,8 @@ private async Task EmitIssueAsync(
         Func<IRemoteFile, Task> onChange,
         CancellationToken cancellationToken)
     {
-        var issueId = JiraConnector.GetScalarString(issue, "id") ?? Guid.NewGuid().ToString("N");
-        var key = JiraConnector.GetScalarString(issue, "key") ?? issueId;
+        var issueId = AtlassianConnector.GetScalarString(issue, "id") ?? Guid.NewGuid().ToString("N");
+        var key = AtlassianConnector.GetScalarString(issue, "key") ?? issueId;
         var fields = issue.GetProperty("fields");
         var issueUrl = new Uri(_siteUri, $"browse/{Uri.EscapeDataString(key)}").AbsoluteUri;
         var builder = new StringBuilder();
@@ -156,13 +156,13 @@ await onChange(new SimpleRemoteFile(
 
         foreach (var attachment in attachments.EnumerateArray())
         {
-            var id = JiraConnector.GetScalarString(attachment, "id");
+            var id = AtlassianConnector.GetScalarString(attachment, "id");
             if (string.IsNullOrWhiteSpace(id))
             {
                 continue;
             }
 
-            var name = JiraConnector.GetScalarString(attachment, "filename") ?? id;
+            var name = AtlassianConnector.GetScalarString(attachment, "filename") ?? id;
             var downloadUri = new Uri(_api.BaseUri, $"rest/api/3/attachment/content/{Uri.EscapeDataString(id)}");
             var size = attachment.TryGetProperty("size", out var sizeElement) && sizeElement.TryGetInt64(out var parsedSize)
                 ? (long?)parsedSize
@@ -173,7 +173,7 @@ await onChange(new SimpleRemoteFile(
                 $"atlassian://{_siteUri.Host}/jira/{_projectKey}/{key}/attachments/{name}",
                 issueUrl,
                 size,
-                JiraConnector.GetScalarString(attachment, "mimeType"),
+                AtlassianConnector.GetScalarString(attachment, "mimeType"),
                 _api.HttpClient,
                 downloadUri));
         }
@@ -240,8 +240,8 @@ private string BuildJql(string? updatedTimestamp)
         {
             using var document = JsonDocument.Parse(deltaToken);
             var root = document.RootElement;
-            var filter = JiraConnector.GetScalarString(root, "filter");
-            var updated = JiraConnector.GetScalarString(root, "updated");
+            var filter = AtlassianConnector.GetScalarString(root, "filter");
+            var updated = AtlassianConnector.GetScalarString(root, "updated");
             return string.Equals(filter, _filterHash, StringComparison.Ordinal) && DateTimeOffset.TryParse(updated, out _)
                 ? updated
                 : null;

src/Stratus.Sift.Connectors/Compatibility/JiraConnector.cs

@@ -0,0 +1,28 @@
+using Microsoft.Extensions.Logging;
+using Stratus.Sift.Connectors.Interfaces;
+
+namespace Stratus.Sift.Connectors.Jira;
+
+/// <summary>
+/// Compatibility name for the connector that scans both Jira and Confluence.
+/// </summary>
+[Obsolete("Use Stratus.Sift.Connectors.Atlassian.AtlassianConnector instead.")]
+public sealed class JiraConnector : IConnector
+{
+    private readonly Atlassian.AtlassianConnector _inner;
+
+    public JiraConnector(HttpClient httpClient, ILogger<JiraConnector>? logger = null)
+    {
+        _inner = new Atlassian.AtlassianConnector(httpClient, logger);
+    }
+
+    public string ProviderName => _inner.ProviderName;
+
+    public Task InitializeAsync(
+        Dictionary<string, string> configuration,
+        CancellationToken cancellationToken = default)
+        => _inner.InitializeAsync(configuration, cancellationToken);
+
+    public Task<IEnumerable<IRemoteDrive>> GetDrivesAsync(CancellationToken cancellationToken = default)
+        => _inner.GetDrivesAsync(cancellationToken);
+}