Merge pull request #6 from lalamove/fix-format-parsing

Fix format parsing
lalamove · Jan 19, 2021 · effe6b5 · effe6b5
2 parents 627f6b3 + dabd772
commit effe6b5
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/internal/routes/apollo/routes.go b/internal/routes/apollo/routes.go
@@ -90,7 +90,7 @@ func (a *Apollo) parseNamespace(namespace string) (string, string) {
 	ext := filepath.Ext(namespace)
 
 	switch ext {
-	case ".properties", ".yml", ".xml":
+	case ".properties", ".yml", ".yaml", ".xml", ".json":
 		s := strings.TrimSuffix(namespace, ext)
 		return s, ext
 	default:

diff --git a/internal/routes/apollo/routes_test.go b/internal/routes/apollo/routes_test.go
@@ -117,6 +117,38 @@ func TestParseNamespace(t *testing.T) {
 		)
 	})
 
+	t.Run("get ns2.yaml", func(t *testing.T) {
+		ns, ext := a.parseNamespace("ns2.yaml")
+		require.Equal(
+			t,
+			"ns2",
+			ns,
+			ns,
+		)
+		require.Equal(
+			t,
+			".yaml",
+			ext,
+			ext,
+		)
+	})
+
+	t.Run("get ns2.json", func(t *testing.T) {
+		ns, ext := a.parseNamespace("ns2.json")
+		require.Equal(
+			t,
+			"ns2",
+			ns,
+			ns,
+		)
+		require.Equal(
+			t,
+			".json",
+			ext,
+			ext,
+		)
+	})
+
 	t.Run("get ns", func(t *testing.T) {
 		ns, ext := a.parseNamespace("ns")
 		require.Equal(