Removing the Tag if it's for ArtifactContentType.

Author: janstaelensskyline

CICD.Tools.GitHubToCatalogYamlTests/CatalogManagerTests.cs

@@ -168,7 +168,7 @@ public async Task ProcessCatalogYamlAsync_ShouldAddTagsFromRepository_WhenTagsAr
             var yamlContent = "id: testId\nshort_description: test description";
             mockFileSystem.Setup(fs => fs.File.Exists(catalogFilePath)).Returns(true); // catalog.yml exists
             mockFileSystem.Setup(fs => fs.File.ReadAllText(catalogFilePath)).Returns(yamlContent);
-            mockGitHubService.Setup(s => s.GetRepositoryTopicsAsync()).ReturnsAsync(new List<string> { "newTag" });
+            mockGitHubService.Setup(s => s.GetRepositoryTopicsAsync()).ReturnsAsync(new List<string> { "automationscript", "newTag" });
 
             // Act
             await catalogManager.ProcessCatalogYamlAsync(repoName);

Skyline.DataMiner.CICD.Tools.GitHubToCatalogYaml/CatalogManager.cs

@@ -70,7 +70,7 @@ public async Task ProcessCatalogYamlAsync(string repoName, string catalogIdentif
 
             CleanTitle parsedRepoName = CheckTitle(repoName, catalogYaml);
 
-            // Perform this after CheckTags
+            // Perform this after CheckTags.
             CheckType(catalogYaml, parsedRepoName);
 
             string outputPath = filePath ?? fs.Path.Combine(workspace, "catalog.yml");
@@ -185,6 +185,8 @@ private async Task CheckTags(CatalogYaml catalogYaml)
             if (topics is { Count: > 0 })
             {
                 catalogYaml.Tags.AddRange(topics);
+
+                // Remove duplicates
                 catalogYaml.Tags = catalogYaml.Tags.Distinct().ToList();
                 logger.LogDebug("Distinct GitHub Topics found and applied.");
             }
@@ -231,15 +233,16 @@ private void CheckType(CatalogYaml catalogYaml, CleanTitle parsedRepoName)
                 logger.LogDebug($"Item Type could be inferred from repository name {catalogYaml.Type}.");
             }
 
-            // If we still don't have a type, check topics for matching ArtifactContentType
-            if (String.IsNullOrWhiteSpace(catalogYaml.Type) && catalogYaml.Tags != null)
+            // Always check the tags
+            if (catalogYaml.Tags != null)
             {
                 foreach (var topic in catalogYaml.Tags)
                 {
                     var inferredType = InferArtifactContentType(topic);
                     if (!String.IsNullOrWhiteSpace(inferredType))
                     {
                         catalogYaml.Type = inferredType;
+                        catalogYaml.Tags.Remove(topic);
                         logger.LogDebug($"Item Type could be inferred from repository topics {catalogYaml.Type}.");
                         break;
                     }