Merge pull request #1357 from danger/RepoMetaData-extract

Refactor: Extract RepoMetaData to own file

Author: orta

source/ci_source/ci_source_helpers.ts

@@ -6,7 +6,7 @@ import {
   BitBucketServerAPI,
   bitbucketServerRepoCredentialsFromEnv,
 } from "../platforms/bitbucket_server/BitBucketServerAPI"
-import { RepoMetaData } from "../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../dsl/RepoMetaData"
 import { BitBucketCloudAPI, bitbucketCloudCredentialsFromEnv } from "../platforms/bitbucket_cloud/BitBucketCloudAPI"
 
 /**

source/dsl/BitBucketCloudDSL.ts

@@ -1,7 +1,6 @@
 // Please don't have includes in here that aren't inside the DSL folder, or the d.ts/flow defs break
 
-// TODO: extract out from BitBucket specifically, or create our own type
-import { RepoMetaData } from "../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "./RepoMetaData"
 
 export interface BitBucketCloudJSONDSL {
   /** The pull request and repository metadata */

source/dsl/BitBucketServerDSL.ts

@@ -1,12 +1,6 @@
 // Please don't have includes in here that aren't inside the DSL folder, or the d.ts/flow defs break
 
-/** Key details about a repo */
-export interface RepoMetaData {
-  /** A path like "artsy/eigen" */
-  repoSlug: string
-  /** The ID for the pull/merge request "11" */
-  pullRequestID: string
-}
+import { RepoMetaData } from "./RepoMetaData"
 
 // This is `danger.bitbucket_server` inside the JSON
 

source/dsl/GitLabDSL.ts

@@ -1,7 +1,6 @@
 // Please don't have includes in here that aren't inside the DSL folder, or the d.ts/flow defs break
-// TODO: extract out from BitBucket specifically, or create our own type
 import { Gitlab } from "@gitbeaker/node"
-import { RepoMetaData } from "./BitBucketServerDSL"
+import { RepoMetaData } from "./RepoMetaData"
 
 // getPlatformReviewDSLRepresentation
 export interface GitLabJSONDSL {

source/dsl/RepoMetaData.ts

@@ -0,0 +1,7 @@
+/** Key details about a repo */
+export interface RepoMetaData {
+  /** A path like "artsy/eigen" */
+  repoSlug: string
+  /** The ID for the pull/merge request "11" */
+  pullRequestID: string
+}

source/platforms/_tests/_bitbucket_cloud.test.ts

@@ -34,7 +34,7 @@ jest.mock("../bitbucket_cloud/BitBucketCloudAPI", () => {
 
 import { BitBucketCloud } from "../BitBucketCloud"
 import { BitBucketCloudAPI } from "../bitbucket_cloud/BitBucketCloudAPI"
-import { RepoMetaData } from "../../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../../dsl/RepoMetaData"
 
 describe("getPlatformReviewDSLRepresentation", () => {
   let bbs: BitBucketCloud

source/platforms/_tests/_bitbucket_server.test.ts

@@ -45,7 +45,7 @@ jest.mock("../bitbucket_server/BitBucketServerAPI", () => {
 import { BitBucketServer } from "../BitBucketServer"
 import { BitBucketServerAPI } from "../bitbucket_server/BitBucketServerAPI"
 
-import { RepoMetaData } from "../../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../../dsl/RepoMetaData"
 
 describe("getPlatformReviewDSLRepresentation", () => {
   let bbs: BitBucketServer

source/platforms/_tests/_github.test.ts

@@ -57,7 +57,7 @@ jest.mock("../github/GitHubAPI", () => {
 import { GitHub, GitHubType } from "../GitHub"
 import { GitHubAPI } from "../github/GitHubAPI"
 
-import { RepoMetaData } from "../../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../../dsl/RepoMetaData"
 
 describe("getPlatformReviewDSLRepresentation", () => {
   let github: GitHubType

source/platforms/bitbucket_cloud/BitBucketCloudAPI.ts

@@ -16,7 +16,7 @@ import {
   BitBucketCloudAPIDSL,
 } from "../../dsl/BitBucketCloudDSL"
 import { Comment } from "../platform"
-import { RepoMetaData } from "../../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../../dsl/RepoMetaData"
 
 export type BitBucketCloudCredentials = {
   /** Unique ID for this user, must be wrapped with brackets */

source/platforms/bitbucket_server/BitBucketServerAPI.ts

@@ -10,11 +10,11 @@ import {
   JIRAIssue,
   BitBucketServerPRActivity,
   BitBucketServerDiff,
-  RepoMetaData,
   BitBucketServerChangesValue,
   BitBucketServerPagedResponse,
   BitBucketServerAPIDSL,
 } from "../../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../../dsl/RepoMetaData"
 import { Comment } from "../platform"
 
 import { Env } from "../../ci_source/ci_source"

source/platforms/bitbucket_server/BitBucketServerGit.ts

@@ -3,9 +3,9 @@ import {
   BitBucketServerCommit,
   BitBucketServerDiff,
   BitBucketServerJSONDSL,
-  RepoMetaData,
   BitBucketServerChangesValue,
 } from "../../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../../dsl/RepoMetaData"
 import { GitCommit } from "../../dsl/Commit"
 
 import { BitBucketServerAPI } from "./BitBucketServerAPI"

source/platforms/github/GitHubAPI.ts

@@ -8,7 +8,7 @@ import { GitHubPRDSL, GitHubIssueComment, GitHubUser } from "../../dsl/GitHubDSL
 
 import { dangerIDToString } from "../../runner/templates/githubIssueTemplate"
 import { api as fetch } from "../../api/fetch"
-import { RepoMetaData } from "../../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../../dsl/RepoMetaData"
 import { CheckOptions } from "./comms/checks/resultsToCheck"
 
 // The Handle the API specific parts of the github

source/platforms/gitlab/GitLabAPI.ts

@@ -1,4 +1,4 @@
-import { RepoMetaData } from "../../dsl/BitBucketServerDSL"
+import { RepoMetaData } from "../../dsl/RepoMetaData"
 import {
   GitLabApproval,
   GitLabDiscussion,