From 1923adf89c2cfb4cfcc901a5d2f5f9f4917e8d8b Mon Sep 17 00:00:00 2001
From: Christiane Heiligers <christiane.heiligers@elastic.co>
Date: Thu, 28 Jan 2021 16:44:49 -0700
Subject: [PATCH 1/3] Fixes REPOSITORY_EDIT missing type, adds tsconfig

---
 .../test/fixtures/repository.ts               |  2 +-
 x-pack/plugins/snapshot_restore/tsconfig.json | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 x-pack/plugins/snapshot_restore/tsconfig.json

diff --git a/x-pack/plugins/snapshot_restore/test/fixtures/repository.ts b/x-pack/plugins/snapshot_restore/test/fixtures/repository.ts
index 6045976180987..f1672219756d1 100644
--- a/x-pack/plugins/snapshot_restore/test/fixtures/repository.ts
+++ b/x-pack/plugins/snapshot_restore/test/fixtures/repository.ts
@@ -8,7 +8,7 @@ import { getRandomString } from '@kbn/test/jest';
 import { RepositoryType } from '../../common/types';
 const defaultSettings: any = { chunkSize: '10mb', location: '/tmp/es-backups' };
 
-interface Repository {
+export interface Repository {
   name: string;
   type: RepositoryType;
   settings: any;
diff --git a/x-pack/plugins/snapshot_restore/tsconfig.json b/x-pack/plugins/snapshot_restore/tsconfig.json
new file mode 100644
index 0000000000000..5d962c7c17aff
--- /dev/null
+++ b/x-pack/plugins/snapshot_restore/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "__jest__/**/*",
+    "common/**/*",
+    "public/**/*",
+    "server/**/*",
+    "test/**/*",
+    "../../typings/**/*",
+  ],
+  "references": [
+    { "path": "../../../src/core/tsconfig.json" },
+    { "path": "../licensing/tsconfig.json" },
+    { "path": "../features/tsconfig.json" },
+    { "path": "../cloud/tsconfig.json" },
+    { "path": "../security/tsconfig.json" },
+    { "path": "../../../src/plugins/management/tsconfig.json"},
+    { "path": "../../../src/plugins/usage_collection/tsconfig.json"},
+    { "path": "../../../src/plugins/home/tsconfig.json"},
+    { "path": "../../../src/plugins/kibana_react/tsconfig.json" },
+    { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" }
+  ]
+}

From 6c3a86e2ec2e9868ad43f17c3ddd6af0841c4788 Mon Sep 17 00:00:00 2001
From: Christiane Heiligers <christiane.heiligers@elastic.co>
Date: Thu, 28 Jan 2021 16:47:49 -0700
Subject: [PATCH 2/3] Adds snapshot_restore references

---
 x-pack/test/tsconfig.json | 3 ++-
 x-pack/tsconfig.json      | 2 ++
 x-pack/tsconfig.refs.json | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index 6a75f0c7e02d3..d1287524ca16c 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -59,6 +59,7 @@
     { "path": "../plugins/cloud/tsconfig.json" },
     { "path": "../plugins/saved_objects_tagging/tsconfig.json" },
     { "path": "../plugins/global_search_bar/tsconfig.json" },
-    { "path": "../plugins/license_management/tsconfig.json" }
+    { "path": "../plugins/license_management/tsconfig.json" },
+    { "path": "../plugins/snapshot_restore/tsconfig.json" }
   ]
 }
diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json
index 7ed53ca0abb6b..4022f57d8ad9c 100644
--- a/x-pack/tsconfig.json
+++ b/x-pack/tsconfig.json
@@ -38,6 +38,7 @@
     "plugins/saved_objects_tagging/**/*",
     "plugins/global_search_bar/**/*",
     "plugins/license_management/**/*",
+    "plugins/snapshot_restore/**/*",
     "test/**/*"
   ],
   "compilerOptions": {
@@ -109,5 +110,6 @@
     { "path": "./plugins/triggers_actions_ui/tsconfig.json"},
     { "path": "./plugins/stack_alerts/tsconfig.json"},
     { "path": "./plugins/license_management/tsconfig.json" },
+    { "path": "./plugins/snapshot_restore/tsconfig.json" },
   ]
 }
diff --git a/x-pack/tsconfig.refs.json b/x-pack/tsconfig.refs.json
index eeba8dd770da6..f7ab6d4cb9933 100644
--- a/x-pack/tsconfig.refs.json
+++ b/x-pack/tsconfig.refs.json
@@ -32,6 +32,7 @@
     { "path": "./plugins/cloud/tsconfig.json" },
     { "path": "./plugins/saved_objects_tagging/tsconfig.json" },
     { "path": "./plugins/global_search_bar/tsconfig.json" },
-    { "path": "./plugins/license_management/tsconfig.json" }
+    { "path": "./plugins/license_management/tsconfig.json" },
+    { "path": "./plugins/snapshot_restore/tsconfig.json" }
   ]
 }

From d10a353050dd72e137fd80b94b6ff2cbeed7a2e4 Mon Sep 17 00:00:00 2001
From: Christiane Heiligers <christiane.heiligers@elastic.co>
Date: Sun, 31 Jan 2021 10:25:33 -0700
Subject: [PATCH 3/3] remove merge conflict markers

---
 x-pack/tsconfig.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json
index ceb3b469b7575..6f00071d526e1 100644
--- a/x-pack/tsconfig.json
+++ b/x-pack/tsconfig.json
@@ -41,11 +41,8 @@
     "plugins/saved_objects_tagging/**/*",
     "plugins/global_search_bar/**/*",
     "plugins/license_management/**/*",
-<<<<<<< HEAD
     "plugins/snapshot_restore/**/*",
-=======
     "plugins/painless_lab/**/*",
->>>>>>> master
     "plugins/watcher/**/*",
     "test/**/*"
   ],