@backstage/plugin-scaffolder-backend 0.0.0-nightly-20220302023312 → 0.0.0-nightly-20220303023541

package/CHANGELOG.md

@@ -1,17 +1,24 @@
 # @backstage/plugin-scaffolder-backend
 
-## 0.0.0-nightly-20220302023312
+## 0.0.0-nightly-20220303023541
 
 ### Patch Changes
 
 - 5c7f2343ea: Applied fix from version 0.17.2 of this package, which is part of the v0.69.2 release of Backstage.
+- 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.
 - 8119a9e011: Fix the support for custom defaultBranch values for Bitbucket Cloud at the `publish:bitbucket` scaffolder action.
 - Updated dependencies
-  - @backstage/plugin-catalog-backend@0.0.0-nightly-20220302023312
-  - @backstage/integration@0.0.0-nightly-20220302023312
+  - @backstage/plugin-catalog-backend@0.0.0-nightly-20220303023541
+  - @backstage/backend-common@0.0.0-nightly-20220303023541
+  - @backstage/integration@0.0.0-nightly-20220303023541
+  - @backstage/catalog-model@0.0.0-nightly-20220303023541
+  - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.0.0-nightly-20220303023541
+  - @backstage/catalog-client@0.0.0-nightly-20220303023541
+  - @backstage/plugin-scaffolder-common@0.0.0-nightly-20220303023541
 
 ## 0.17.2
 

package/dist/index.cjs.js

@@ -939,7 +939,8 @@ const createBitbucketCloudRepository = async (opts) => {
     description,
     repoVisibility,
     mainBranch,
-    authorization
+    authorization,
+    apiBaseUrl
   } = opts;
   const options = {
     method: "POST",
@@ -956,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}`);
   }
@@ -975,7 +976,6 @@ const createBitbucketCloudRepository = async (opts) => {
 };
 const createBitbucketServerRepository = async (opts) => {
   const {
-    host,
     project,
     repo,
     description,
@@ -997,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}`);
   }
@@ -1118,12 +1117,15 @@ 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,
@@ -3128,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: {
@@ -3137,7 +3139,7 @@ class ScaffolderEntitiesProcessor {
             name: targetRef.name
           }
         }));
-        emit(pluginCatalogBackend.results.relation({
+        emit(pluginCatalogBackend.processingResult.relation({
           source: {
             kind: targetRef.kind,
             namespace: targetRef.namespace,