From f10804272bf96c89e6de70969258f11056930750 Mon Sep 17 00:00:00 2001
From: Fred Zhang <fredzqm@google.com>
Date: Mon, 7 Jun 2021 18:48:01 +0000
Subject: [PATCH 1/7] Add asian-southeast1 to RTDB

---
 src/init/features/database.ts | 1 +
 src/management/database.ts    | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/init/features/database.ts b/src/init/features/database.ts
index 0471c0228c7..812a15b21e8 100644
--- a/src/init/features/database.ts
+++ b/src/init/features/database.ts
@@ -71,6 +71,7 @@ async function createDefaultDatabaseInstance(project: string): Promise<DatabaseI
     choices: [
       { name: "us-central1", value: DatabaseLocation.US_CENTRAL1 },
       { name: "europe-west1", value: DatabaseLocation.EUROPE_WEST1 },
+      { name: "asian-southeast1", value: DatabaseLocation.ASIAN_SOUTHEAST1 },
     ],
   });
   let instanceName = `${project}-default-rtdb`;
diff --git a/src/management/database.ts b/src/management/database.ts
index 509be437d45..28db6d4da5a 100644
--- a/src/management/database.ts
+++ b/src/management/database.ts
@@ -29,6 +29,7 @@ export enum DatabaseInstanceState {
 export enum DatabaseLocation {
   US_CENTRAL1 = "us-central1",
   EUROPE_WEST1 = "europe-west1",
+  ASIAN_SOUTHEAST1 = "asia-southeast1",
   ANY = "-",
 }
 
@@ -206,10 +207,12 @@ export function parseDatabaseLocation(
     return defaultLocation;
   }
   switch (location.toLowerCase()) {
-    case "europe-west1":
-      return DatabaseLocation.EUROPE_WEST1;
     case "us-central1":
       return DatabaseLocation.US_CENTRAL1;
+    case "europe-west1":
+      return DatabaseLocation.EUROPE_WEST1;
+    case "asia-southeast1":
+      return DatabaseLocation.ASIAN_SOUTHEAST1;
     case "":
       return defaultLocation;
     default:

From 572ed9a051ab87bc05f742a67b653d4092943a6c Mon Sep 17 00:00:00 2001
From: Fred Zhang <fredzqm@google.com>
Date: Mon, 7 Jun 2021 19:00:41 +0000
Subject: [PATCH 2/7] doc

---
 src/management/database.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/management/database.ts b/src/management/database.ts
index 28db6d4da5a..745e17d276e 100644
--- a/src/management/database.ts
+++ b/src/management/database.ts
@@ -217,7 +217,7 @@ export function parseDatabaseLocation(
       return defaultLocation;
     default:
       throw new FirebaseError(
-        `Unexpected location value: ${location}. Only us-central1, and europe-west1 locations are supported`
+        `Unexpected location value: ${location}. Only us-central1, europe-west1 and asia-southeast1 locations are supported`
       );
   }
 }

From dc692cd0c6584d80d93a28b225af8bb818474ff0 Mon Sep 17 00:00:00 2001
From: Fred Zhang <fredzqm@google.com>
Date: Mon, 7 Jun 2021 19:17:15 +0000
Subject: [PATCH 3/7] change log

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d3dba4a76e..71f3456ef8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1,2 @@
 - Add Warsaw (europe-central2) Cloud Function Location to Firebase Extension template.
+- Add Singapore (aisa-southeast1) to Firebase Database location.

From 0758dc69014c7fee1f02537f9985bcaee0e4a261 Mon Sep 17 00:00:00 2001
From: Fred Zhang <fredzqm@google.com>
Date: Mon, 7 Jun 2021 19:18:22 +0000
Subject: [PATCH 4/7] typo

---
 CHANGELOG.md                  | 2 +-
 src/init/features/database.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71f3456ef8c..0ac7425ae18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,2 @@
 - Add Warsaw (europe-central2) Cloud Function Location to Firebase Extension template.
-- Add Singapore (aisa-southeast1) to Firebase Database location.
+- Add Singapore (asia-southeast1) to Firebase Database location.
diff --git a/src/init/features/database.ts b/src/init/features/database.ts
index 812a15b21e8..8e9208a6b80 100644
--- a/src/init/features/database.ts
+++ b/src/init/features/database.ts
@@ -71,7 +71,7 @@ async function createDefaultDatabaseInstance(project: string): Promise<DatabaseI
     choices: [
       { name: "us-central1", value: DatabaseLocation.US_CENTRAL1 },
       { name: "europe-west1", value: DatabaseLocation.EUROPE_WEST1 },
-      { name: "asian-southeast1", value: DatabaseLocation.ASIAN_SOUTHEAST1 },
+      { name: "asia-southeast1", value: DatabaseLocation.ASIAN_SOUTHEAST1 },
     ],
   });
   let instanceName = `${project}-default-rtdb`;

From c476a04a0099757a0f429cee4ebe510b93bc5b3e Mon Sep 17 00:00:00 2001
From: Fred Zhang <fredzqm@google.com>
Date: Mon, 7 Jun 2021 13:02:06 -0700
Subject: [PATCH 5/7] Update src/management/database.ts

Co-authored-by: Bryan Kendall <bkend@google.com>
---
 src/management/database.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/management/database.ts b/src/management/database.ts
index 745e17d276e..390e73a31b9 100644
--- a/src/management/database.ts
+++ b/src/management/database.ts
@@ -217,7 +217,7 @@ export function parseDatabaseLocation(
       return defaultLocation;
     default:
       throw new FirebaseError(
-        `Unexpected location value: ${location}. Only us-central1, europe-west1 and asia-southeast1 locations are supported`
+        `Unexpected location value: ${location}. Only us-central1, europe-west1, and asia-southeast1 locations are supported`
       );
   }
 }

From 85154d1125e5ae1f603de76a22a43d32d445ed18 Mon Sep 17 00:00:00 2001
From: Fred Zhang <fredzqm@google.com>
Date: Mon, 7 Jun 2021 13:02:11 -0700
Subject: [PATCH 6/7] Update CHANGELOG.md

Co-authored-by: Bryan Kendall <bkend@google.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ac7425ae18..f12b0bea4ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,2 @@
 - Add Warsaw (europe-central2) Cloud Function Location to Firebase Extension template.
-- Add Singapore (asia-southeast1) to Firebase Database location.
+- Add Singapore (asia-southeast1) as a valid Firebase Realtime Database location.

From 286a92c891532e352739bd319535422ada61de9d Mon Sep 17 00:00:00 2001
From: Fred Zhang <fredzqm@google.com>
Date: Mon, 7 Jun 2021 20:03:15 +0000
Subject: [PATCH 7/7] rename

---
 src/init/features/database.ts | 2 +-
 src/management/database.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/init/features/database.ts b/src/init/features/database.ts
index 8e9208a6b80..99661152574 100644
--- a/src/init/features/database.ts
+++ b/src/init/features/database.ts
@@ -71,7 +71,7 @@ async function createDefaultDatabaseInstance(project: string): Promise<DatabaseI
     choices: [
       { name: "us-central1", value: DatabaseLocation.US_CENTRAL1 },
       { name: "europe-west1", value: DatabaseLocation.EUROPE_WEST1 },
-      { name: "asia-southeast1", value: DatabaseLocation.ASIAN_SOUTHEAST1 },
+      { name: "asia-southeast1", value: DatabaseLocation.ASIA_SOUTHEAST1 },
     ],
   });
   let instanceName = `${project}-default-rtdb`;
diff --git a/src/management/database.ts b/src/management/database.ts
index 390e73a31b9..c96b3007457 100644
--- a/src/management/database.ts
+++ b/src/management/database.ts
@@ -29,7 +29,7 @@ export enum DatabaseInstanceState {
 export enum DatabaseLocation {
   US_CENTRAL1 = "us-central1",
   EUROPE_WEST1 = "europe-west1",
-  ASIAN_SOUTHEAST1 = "asia-southeast1",
+  ASIA_SOUTHEAST1 = "asia-southeast1",
   ANY = "-",
 }
 
@@ -212,7 +212,7 @@ export function parseDatabaseLocation(
     case "europe-west1":
       return DatabaseLocation.EUROPE_WEST1;
     case "asia-southeast1":
-      return DatabaseLocation.ASIAN_SOUTHEAST1;
+      return DatabaseLocation.ASIA_SOUTHEAST1;
     case "":
       return defaultLocation;
     default: