Skip to content

Commit ea2b2be

Browse files
Georgy GorelkoGeorgy Gorelko
authored andcommitted
Refactor logging for branch policy checks to improve clarity and remove redundant identifiers
1 parent a5f87d3 commit ea2b2be

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/Octoshift/Services/AdoPipelineTriggerService.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,15 @@ public async Task<bool> IsPipelineRequiredByBranchPolicy(string adoOrg, string t
138138

139139
if (string.IsNullOrEmpty(repositoryId))
140140
{
141-
var repoIdentifier = repoName ?? repoId ?? "unknown";
142-
_log.LogWarning($"Repository ID not found for {adoOrg}/{teamProject}/{repoIdentifier}. Branch policy check cannot be performed for pipeline {pipelineId}.");
141+
_log.LogWarning($"Repository ID not found for {adoOrg}/{teamProject}/{repoName}. Branch policy check cannot be performed for pipeline {pipelineId}.");
143142
return false;
144143
}
145144
}
146145

147146
// Skip branch policy check if repository is disabled
148147
if (isRepositoryDisabled)
149148
{
150-
var repoIdentifier = repoName ?? repoId ?? "unknown";
149+
var repoIdentifier = repoName ?? repoId;
151150
_log.LogWarning($"Repository {adoOrg}/{teamProject}/{repoIdentifier} is disabled. Branch policy check skipped for pipeline {pipelineId}. Pipeline trigger configuration may not preserve branch policy requirements.");
152151
return false;
153152
}
@@ -546,7 +545,7 @@ private bool HasTriggerType(JToken originalTriggers, string triggerType)
546545
// Log as verbose since the caller will log a more specific warning about the disabled repository
547546
// Return (null, true) to indicate repository ID is unknown but repository is disabled
548547
_log.LogVerbose($"Repository {adoOrg}/{teamProject}/{identifier} returned 404 - likely disabled or not found.");
549-
var info = ((string)null, true); // Mark as disabled with null ID since identifier may be a name
548+
var info = (null, true); // Mark as disabled with null ID since identifier may be a name
550549
_repositoryCache[cacheKey] = info;
551550
return info;
552551
}

0 commit comments

Comments
 (0)