Add latest changes from gitlab-org/gitlab@master

1 files changed, 48 insertions, 0 deletions

diff --git a/app/validators/json_schemas/google_service_account_key.json b/app/validators/json_schemas/google_service_account_key.json
new file mode 100644
index 00000000000..d040ef19f66
--- /dev/null
+++ b/app/validators/json_schemas/google_service_account_key.json
@@ -0,0 +1,48 @@
+{
+  "description": "Google service account key",
+  "type": "object",
+  "required": [
+    "type",
+    "project_id",
+    "private_key_id",
+    "private_key",
+    "client_email",
+    "client_id",
+    "auth_uri",
+    "token_uri",
+    "auth_provider_x509_cert_url",
+    "client_x509_cert_url"
+  ],
+  "properties": {
+    "type": {
+      "const": "service_account"
+    },
+    "project_id": {
+      "type": "string"
+    },
+    "private_key_id": {
+      "type": "string"
+    },
+    "private_key": {
+      "type": "string"
+    },
+    "client_email": {
+      "type": "string"
+    },
+    "client_id": {
+      "type": "string"
+    },
+    "auth_uri": {
+      "type": "string"
+    },
+    "token_uri": {
+      "type": "string"
+    },
+    "auth_provider_x509_cert_url": {
+      "type": "string"
+    },
+    "client_x509_cert_url": {
+      "type": "string"
+    }
+  }
+}