@backstage/plugin-catalog-backend 0.19.3 → 0.19.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @backstage/plugin-catalog-backend
 
+## 0.19.4
+
+### Patch Changes
+
+- 7d4b4e937c: Uptake changes to the GitHub Credentials Provider interface.
+- 3a63491c5f: Filter out projects with missing `default_branch` from GitLab Discovery.
+- Updated dependencies
+  - @backstage/backend-common@0.10.1
+  - @backstage/integration@0.7.0
+
 ## 0.19.3
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -1116,7 +1116,7 @@ class GithubDiscoveryProcessor {
     }
     const { org, repoSearchPath, catalogPath, branch, host } = parseUrl$2(location$1.target);
     const orgUrl = `https://${host}/${org}`;
-    const { headers } = await integration.GithubCredentialsProvider.create(gitHubConfig).getCredentials({ url: orgUrl });
+    const { headers } = await integration.SingleInstanceGithubCredentialsProvider.create(gitHubConfig).getCredentials({ url: orgUrl });
     const client = graphql.graphql.defaults({
       baseUrl: gitHubConfig.apiBaseUrl,
       headers
@@ -1331,7 +1331,7 @@ class GithubOrgReaderProcessor {
     if (!gitHubConfig) {
       throw new Error(`There is no GitHub Org provider that matches ${orgUrl}. Please add a configuration for an integration.`);
     }
-    const credentialsProvider = integration.GithubCredentialsProvider.create(gitHubConfig);
+    const credentialsProvider = integration.SingleInstanceGithubCredentialsProvider.create(gitHubConfig);
     const { headers, type: tokenType } = await credentialsProvider.getCredentials({
       url: orgUrl
     });
@@ -1369,7 +1369,7 @@ class GithubMultiOrgReaderProcessor {
     }
     const allUsersMap = /* @__PURE__ */ new Map();
     const baseUrl = new URL(location.target).origin;
-    const credentialsProvider = integration.GithubCredentialsProvider.create(gitHubConfig);
+    const credentialsProvider = integration.SingleInstanceGithubCredentialsProvider.create(gitHubConfig);
     const orgsToProcess = this.orgs.length ? this.orgs : await this.getAllOrgs(gitHubConfig);
     for (const orgConfig of orgsToProcess) {
       try {
@@ -1516,9 +1516,13 @@ class GitLabDiscoveryProcessor {
     };
     for await (const project of projects) {
       result.scanned++;
-      if (!project.archived) {
-        result.matches.push(project);
+      if (project.archived) {
+        continue;
+      }
+      if (branch === "*" && project.default_branch === void 0) {
+        continue;
       }
+      result.matches.push(project);
     }
     for (const project of result.matches) {
       const project_branch = branch === "*" ? project.default_branch : branch;
@@ -1835,7 +1839,7 @@ const defaultEntityDataParser = async function* defaultEntityDataParser2({ data,
 class GitHubOrgEntityProvider {
   constructor(options) {
     this.options = options;
-    this.credentialsProvider = integration.GithubCredentialsProvider.create(options.gitHubConfig);
+    this.credentialsProvider = integration.SingleInstanceGithubCredentialsProvider.create(options.gitHubConfig);
   }
   static fromConfig(config, options) {
     var _a;