From d47825ba6c2e477b2b264af9f0c4338ab4b0d416 Mon Sep 17 00:00:00 2001
From: Ace Nassri <anassri@google.com>
Date: Thu, 21 May 2020 10:40:31 -0700
Subject: [PATCH] Revert "Move spanner out of functions dir + update owners
 (#1826)"

This reverts commit 07b20f5441e204eee7ddbbda2b6e605d7b60ca30.
---
 .kokoro/{spanner-functions.cfg => functions/spanner.cfg}    | 4 ++--
 CODEOWNERS                                                  | 3 ++-
 {spanner/functions => functions/spanner}/index.js           | 0
 {spanner/functions => functions/spanner}/package.json       | 0
 {spanner/functions => functions/spanner}/test/index.test.js | 0
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename .kokoro/{spanner-functions.cfg => functions/spanner.cfg} (86%)
 rename {spanner/functions => functions/spanner}/index.js (100%)
 rename {spanner/functions => functions/spanner}/package.json (100%)
 rename {spanner/functions => functions/spanner}/test/index.test.js (100%)

diff --git a/.kokoro/spanner-functions.cfg b/.kokoro/functions/spanner.cfg
similarity index 86%
rename from .kokoro/spanner-functions.cfg
rename to .kokoro/functions/spanner.cfg
index 631967ae86..7e10b33a0e 100644
--- a/.kokoro/spanner-functions.cfg
+++ b/.kokoro/functions/spanner.cfg
@@ -3,11 +3,11 @@
 # Set the folder in which the tests are run
 env_vars: {
     key: "PROJECT"
-    value: "spanner/functions"
+    value: "functions/spanner"
 }
 
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
     value: "github/nodejs-docs-samples/.kokoro/build.sh"
-}
+}
diff --git a/CODEOWNERS b/CODEOWNERS
index 38f5669f53..a7b461f303 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -19,11 +19,11 @@ functions/composer-storage-trigger @leahecole
 functions/scheduleinstance @djmailhot
 functions/speech-to-speech @ricalo
 functions/memorystore @ericschmidtatwork
+functions/spanner @jsimonweb
 functions/tokenservice @nnegrey
 
 # GCF samples outside of functions/
 datastore/functions @benwhitehead
-spanner/functions @skuruppu
 
 # One-offs
 cloud-sql @kurtisvg
@@ -31,3 +31,4 @@ composer @leahecole @sofisl
 healthcare @noerog
 iot @gguuss
 jobs @happyhuman
+
diff --git a/spanner/functions/index.js b/functions/spanner/index.js
similarity index 100%
rename from spanner/functions/index.js
rename to functions/spanner/index.js
diff --git a/spanner/functions/package.json b/functions/spanner/package.json
similarity index 100%
rename from spanner/functions/package.json
rename to functions/spanner/package.json
diff --git a/spanner/functions/test/index.test.js b/functions/spanner/test/index.test.js
similarity index 100%
rename from spanner/functions/test/index.test.js
rename to functions/spanner/test/index.test.js