@backstage/plugin-catalog-backend 0.19.1 → 0.19.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @backstage/plugin-catalog-backend
 
+## 0.19.2
+
+### Patch Changes
+
+- 3368f27aef: Fixed the handling of optional locations so that the catalog no longer logs `NotFoundError`s for missing optional locations.
+- Updated dependencies
+  - @backstage/backend-common@0.9.14
+  - @backstage/catalog-model@0.9.8
+
 ## 0.19.1
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -472,7 +472,8 @@ async function* paginated20(request, options) {
 const defaultRepositoryParser = async function* defaultRepositoryParser2({ target }) {
   yield location({
     type: "url",
-    target
+    target,
+    presence: "optional"
   }, true);
 };
 
@@ -1135,7 +1136,8 @@ class GithubDiscoveryProcessor {
       const path = `/blob/${branchName}${catalogPath}`;
       emit(location({
         type: "url",
-        target: `${repository.url}${path}`
+        target: `${repository.url}${path}`,
+        presence: "optional"
       }, true));
     }
     return true;
@@ -1224,7 +1226,8 @@ class AzureDevOpsDiscoveryProcessor {
     for (const file of files) {
       emit(location({
         type: "url",
-        target: `${baseUrl}/${org}/${project}/_git/${file.repository.name}?path=${file.path}`
+        target: `${baseUrl}/${org}/${project}/_git/${file.repository.name}?path=${file.path}`,
+        presence: "optional"
       }, true));
     }
     return true;
@@ -1521,7 +1524,8 @@ class GitLabDiscoveryProcessor {
       const project_branch = branch === "*" ? project.default_branch : branch;
       emit(location({
         type: "url",
-        target: `${project.web_url}/-/blob/${project_branch}/${catalogPath}`
+        target: `${project.web_url}/-/blob/${project_branch}/${catalogPath}`,
+        presence: "optional"
       }, true));
     }
     const duration = ((Date.now() - startTimestamp) / 1e3).toFixed(1);
@@ -3270,7 +3274,8 @@ function locationSpecToLocationEntity(location, parentEntity) {
     },
     spec: {
       type: location.type,
-      target: location.target
+      target: location.target,
+      presence: location.presence
     }
   };
   return result;
@@ -4366,7 +4371,8 @@ class ProcessorOutputCollector {
       }
       this.deferredEntities.push({ entity, locationKey: location });
     } else if (i.type === "location") {
-      const entity = locationSpecToLocationEntity(i.location, this.parentEntity);
+      const presence = i.optional ? "optional" : "required";
+      const entity = locationSpecToLocationEntity({ presence, ...i.location }, this.parentEntity);
       const locationKey = getEntityLocationRef(entity);
       this.deferredEntities.push({ entity, locationKey });
     } else if (i.type === "relation") {
@@ -4563,7 +4569,7 @@ class DefaultCatalogProcessingOrchestrator {
     }
   }
   async runSpecialLocationStep(entity, context) {
-    const { type = context.location.type } = entity.spec;
+    const { type = context.location.type, presence = "required" } = entity.spec;
     const targets = new Array();
     if (entity.spec.target) {
       targets.push(entity.spec.target);
@@ -4584,8 +4590,8 @@ class DefaultCatalogProcessingOrchestrator {
             const read = await processor.readLocation({
               type,
               target,
-              presence: "required"
-            }, false, context.collector.onEmit, this.options.parser, context.cache.forProcessor(processor, target));
+              presence
+            }, presence === "optional", context.collector.onEmit, this.options.parser, context.cache.forProcessor(processor, target));
             if (read) {
               didRead = true;
               break;