Backport fix for #646

atomist · Feb 10, 2020 · 9cb2f9e · 9cb2f9e
1 parent 3d386bf
commit 9cb2f9e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 36 deletions.
diff --git a/lib/operations/common/BitBucketRepoRef.ts b/lib/operations/common/BitBucketRepoRef.ts
@@ -56,12 +56,9 @@ export class BitBucketRepoRef extends AbstractRemoteRepoRef {
                 };
             })
             .catch(error => {
-                logger.error("Error attempting to create repository %j: %s", this, error);
-                return {
-                    target: this,
-                    success: false,
-                    error,
-                };
+                error.message = `Error attempting to create repository ${JSON.stringify(this)}: ${error.message}`;
+                logger.error(error.message);
+                throw error;
             });
 
     }
@@ -84,12 +81,9 @@ export class BitBucketRepoRef extends AbstractRemoteRepoRef {
                 };
             })
             .catch(error => {
-                logger.error("Error attempting to delete repository: " + error);
-                return {
-                    target: this,
-                    success: false,
-                    error,
-                };
+                error.message = `Error attempting to delete repository: ${error.message}`;
+                logger.error(error.message);
+                throw error;
             });
     }
 
@@ -134,12 +128,9 @@ export class BitBucketRepoRef extends AbstractRemoteRepoRef {
                 };
             })
             .catch(error => {
-                logger.error(`Error attempting to raise PR. ${url} ${error}`);
-                return {
-                    target: this,
-                    success: false,
-                    error,
-                };
+                error.message = `Error attempting to raise PR ${url}: ${error}`;
+                logger.error(error.message);
+                throw error;
             });
     }
 }

diff --git a/lib/operations/common/BitBucketServerRepoRef.ts b/lib/operations/common/BitBucketServerRepoRef.ts
@@ -71,12 +71,9 @@ export class BitBucketServerRepoRef extends AbstractRemoteRepoRef {
                 response,
             }))
             .catch(error => {
-                logger.error("Error attempting to create repository %j: %s", this, error);
-                return {
-                    success: false,
-                    target: this,
-                    error,
-                };
+                error.message = `Error attempting to create repository ${JSON.stringify(this)}}: ${error.message}`;
+                logger.error(error.message);
+                throw error;
             });
     }
 
@@ -96,12 +93,9 @@ export class BitBucketServerRepoRef extends AbstractRemoteRepoRef {
                 response,
             }))
             .catch(error => {
-                logger.error(`Error attempting to delete repository: ${error}`);
-                return {
-                    success: false,
-                    target: this,
-                    error,
-                };
+                error.message = `Error attempting to delete repository: ${error.message}`;
+                logger.error(error.message);
+                throw error;
             });
     }
 
@@ -149,12 +143,9 @@ export class BitBucketServerRepoRef extends AbstractRemoteRepoRef {
                 response,
             }))
             .catch(error => {
-                logger.error(`Error attempting to raise PR`);
-                return {
-                    success: false,
-                    target: this,
-                    error,
-                };
+                error.message = `Error attempting to raise PR: ${error.message}`;
+                logger.error(error.message);
+                throw error;
             });
     }