@backstage/plugin-scaffolder-backend 0.17.2 → 0.17.3

package/CHANGELOG.md

@@ -1,16 +1,38 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.17.3
+
+### Patch Changes
+
+- 5c7f2343ea: Applied fix from version 0.17.2 of this package, which is part of the v0.69.2 release of Backstage.
+- 899f196af5: Use `getEntityByRef` instead of `getEntityByName` in the catalog client
+- 34af86517c: ensure `apiBaseUrl` being set for Bitbucket integrations, replace hardcoded defaults
+- d6deb5e440: Set timeout for scaffolder octokit client
+- 83a83381b0: Use the new `processingResult` export from the catalog backend
+- 7372f29473: Cleanup API report
+- c7f6424a26: Applied fix from `v0.17.1` of this package which is part of the `v0.69.1` release of Backstage.
+- 36aa63022b: Use `CompoundEntityRef` instead of `EntityName`, and `getCompoundEntityRef` instead of `getEntityName`, from `@backstage/catalog-model`.
+- 8119a9e011: Fix the support for custom defaultBranch values for Bitbucket Cloud at the `publish:bitbucket` scaffolder action.
+- Updated dependencies
+  - @backstage/catalog-model@0.12.0
+  - @backstage/catalog-client@0.8.0
+  - @backstage/plugin-catalog-backend@0.23.0
+  - @backstage/backend-common@0.12.0
+  - @backstage/integration@0.8.0
+  - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.3
+  - @backstage/plugin-scaffolder-common@0.2.3
+
 ## 0.17.2
 
 ### Patch Changes
 
-- `repoUrl` does not have a protocol in `publish:github:pull-request`
+- bug: `repoUrl` does not have a protocol in `publish:github:pull-request`
 
 ## 0.17.1
 
 ### Patch Changes
 
-- bug: fixing `repoUrl` resolution for `github:pr:` action
+- bug: fixing `repoUrl` resolution for `publish:github:pull-request` action
 
 ## 0.17.0
 

package/dist/index.cjs.js

@@ -938,7 +938,9 @@ const createBitbucketCloudRepository = async (opts) => {
     repo,
     description,
     repoVisibility,
-    authorization
+    mainBranch,
+    authorization,
+    apiBaseUrl
   } = opts;
   const options = {
     method: "POST",
@@ -955,7 +957,7 @@ const createBitbucketCloudRepository = async (opts) => {
   };
   let response;
   try {
-    response = await fetch__default["default"](`https://api.bitbucket.org/2.0/repositories/${workspace}/${repo}`, options);
+    response = await fetch__default["default"](`${apiBaseUrl}/repositories/${workspace}/${repo}`, options);
   } catch (e) {
     throw new Error(`Unable to create repository, ${e}`);
   }
@@ -969,12 +971,11 @@ const createBitbucketCloudRepository = async (opts) => {
       remoteUrl = link.href;
     }
   }
-  const repoContentsUrl = `${r.links.html.href}/src/master`;
+  const repoContentsUrl = `${r.links.html.href}/src/${mainBranch}`;
   return { remoteUrl, repoContentsUrl };
 };
 const createBitbucketServerRepository = async (opts) => {
   const {
-    host,
     project,
     repo,
     description,
@@ -996,8 +997,7 @@ const createBitbucketServerRepository = async (opts) => {
     }
   };
   try {
-    const baseUrl = apiBaseUrl ? apiBaseUrl : `https://${host}/rest/api/1.0`;
-    response = await fetch__default["default"](`${baseUrl}/projects/${project}/repos`, options);
+    response = await fetch__default["default"](`${apiBaseUrl}/projects/${project}/repos`, options);
   } catch (e) {
     throw new Error(`Unable to create repository, ${e}`);
   }
@@ -1117,16 +1117,20 @@ function createPublishBitbucketAction(options) {
       if (!integrationConfig) {
         throw new errors.InputError(`No matching integration configuration for host ${host}, please check your integrations config`);
       }
-      const authorization = getAuthorizationHeader(ctx.input.token ? { host: integrationConfig.config.host, token: ctx.input.token } : integrationConfig.config);
+      const authorization = getAuthorizationHeader(ctx.input.token ? {
+        host: integrationConfig.config.host,
+        apiBaseUrl: integrationConfig.config.apiBaseUrl,
+        token: ctx.input.token
+      } : integrationConfig.config);
       const apiBaseUrl = integrationConfig.config.apiBaseUrl;
       const createMethod = host === "bitbucket.org" ? createBitbucketCloudRepository : createBitbucketServerRepository;
       const { remoteUrl, repoContentsUrl } = await createMethod({
         authorization,
-        host,
         workspace: workspace || "",
         project,
         repo,
         repoVisibility,
+        mainBranch: defaultBranch,
         description,
         apiBaseUrl
       });
@@ -1192,10 +1196,14 @@ function createPublishFileAction() {
   });
 }
 
+const DEFAULT_TIMEOUT_MS = 6e4;
 async function getOctokitOptions(options) {
   var _a;
   const { integrations, credentialsProvider, repoUrl, token } = options;
   const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
+  const requestOptions = {
+    timeout: DEFAULT_TIMEOUT_MS
+  };
   if (!owner) {
     throw new errors.InputError(`No owner provided for repo ${repoUrl}`);
   }
@@ -1207,7 +1215,8 @@ async function getOctokitOptions(options) {
     return {
       auth: token,
       baseUrl: integrationConfig.apiBaseUrl,
-      previews: ["nebula-preview"]
+      previews: ["nebula-preview"],
+      request: requestOptions
     };
   }
   const githubCredentialsProvider = credentialsProvider != null ? credentialsProvider : integration.DefaultGithubCredentialsProvider.fromIntegrations(integrations);
@@ -2865,9 +2874,9 @@ async function findTemplate(options) {
   if (entityRef.kind.toLocaleLowerCase("en-US") !== "template") {
     throw new errors.InputError(`Invalid kind, only 'Template' kind is supported`);
   }
-  const template = await catalogApi.getEntityByName(entityRef, { token });
+  const template = await catalogApi.getEntityByRef(entityRef, { token });
   if (!template) {
-    throw new errors.NotFoundError(`Template ${entityRef} not found`);
+    throw new errors.NotFoundError(`Template ${catalogModel.stringifyEntityRef(entityRef)} not found`);
   }
   return template;
 }
@@ -3112,7 +3121,7 @@ class ScaffolderEntitiesProcessor {
     return false;
   }
   async postProcessEntity(entity, _location, emit) {
-    const selfRef = catalogModel.getEntityName(entity);
+    const selfRef = catalogModel.getCompoundEntityRef(entity);
     if (entity.apiVersion === "scaffolder.backstage.io/v1beta3" && entity.kind === "Template") {
       const template = entity;
       const target = template.spec.owner;
@@ -3121,7 +3130,7 @@ class ScaffolderEntitiesProcessor {
           defaultKind: "Group",
           defaultNamespace: selfRef.namespace
         });
-        emit(pluginCatalogBackend.results.relation({
+        emit(pluginCatalogBackend.processingResult.relation({
           source: selfRef,
           type: catalogModel.RELATION_OWNED_BY,
           target: {
@@ -3130,7 +3139,7 @@ class ScaffolderEntitiesProcessor {
             name: targetRef.name
           }
         }));
-        emit(pluginCatalogBackend.results.relation({
+        emit(pluginCatalogBackend.processingResult.relation({
           source: {
             kind: targetRef.kind,
             namespace: targetRef.namespace,