App ID (#641)

* App ID * Clean-up * Use ID or name to reference apps * Can use app by name or ID * Get rid of AppName for routes API and model routes API is completely backwards-compatible routes API accepts both app ID and name * Get rid of AppName from calls API and model * Fixing tests * Get rid of AppName from logs API and model * Restrict API to work with app names only * Addressing review comments * Fix for hybrid mode * Fix rebase problems * Addressing review comments * Addressing review comments pt.2 * Fixing test issue * Addressing review comments pt.3 * Updated docstring * Adjust UpdateApp SQL implementation to work with app IDs instead of names * Fixing tests * fmt after rebase * Make tests green again! * Use GetAppByID wherever it is necessary - adding new v2 endpoints to keep hybrid api/runner mode working - extract CallBase from Call object to expose that to a user (it doesn't include any app reference, as we do for all other API objects) * Get rid of GetAppByName * Adjusting server router setup * Make hybrid work again * Fix datastore tests * Fixing tests * Do not ignore app_id * Resolve issues after rebase * Updating test to make it work as it was * Tabula rasa for migrations * Adding calls API test - we need to ensure we give "App not found" for the missing app and missing call in first place - making previous test work (request missing call for the existing app) * Make datastore tests work fine with correctly applied migrations * Make CallFunction middleware work again had to adjust its implementation to set app ID before proceeding * The biggest rebase ever made * Fix 8's migration * Fix tests * Fix hybrid client * Fix tests problem * Increment app ID migration version * Fixing TestAppUpdate * Fix rebase issues * Addressing review comments * Renew vendor * Updated swagger doc per recommendations
2022-10-28 21:29:17 +03:00 · 2018-03-26 21:19:36 +03:00
parent 4e90844a67
commit 3c15ca6ea6
59 changed files with 1101 additions and 657 deletions
--- a/api/datastore/internal/datastoretest/test.go
+++ b/api/datastore/internal/datastoretest/test.go
@@ -32,6 +32,9 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		}
 	}()

+	testApp.SetDefaults()
+	testRoute.AppID = testApp.ID
+
 	ctx := context.Background()

 	call := new(models.Call)
@@ -40,7 +43,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 	call.Error = "ya dun goofed"
 	call.StartedAt = strfmt.DateTime(time.Now())
 	call.CompletedAt = strfmt.DateTime(time.Now())
-	call.AppName = testApp.Name
+	call.AppID = testApp.ID
 	call.Path = testRoute.Path

 	t.Run("call-insert", func(t *testing.T) {
@@ -67,7 +70,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		if err != nil {
 			t.Fatalf("Test UpdateCall: unexpected error `%v`", err)
 		}
-		dbCall, err := ds.GetCall(ctx, call.AppName, call.ID)
+		dbCall, err := ds.GetCall(ctx, call.AppID, call.ID)
 		if err != nil {
 			t.Fatalf("Test UpdateCall: unexpected error `%v`", err)
 		}
@@ -89,8 +92,8 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		if time.Time(dbCall.CompletedAt).Unix() != time.Time(newCall.CompletedAt).Unix() {
 			t.Fatalf("Test GetCall: completed_at mismatch `%v` `%v`", call.CompletedAt, newCall.CompletedAt)
 		}
-		if dbCall.AppName != newCall.AppName {
-			t.Fatalf("Test GetCall: app_name mismatch `%v` `%v`", call.AppName, newCall.AppName)
+		if dbCall.AppID != newCall.AppID {
+			t.Fatalf("Test GetCall: app_name mismatch `%v` `%v`", call.AppID, newCall.AppID)
 		}
 		if dbCall.Path != newCall.Path {
 			t.Fatalf("Test GetCall: path mismatch `%v` `%v`", call.Path, newCall.Path)
@@ -139,7 +142,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		if err != nil {
 			t.Fatalf("Test GetCall: unexpected error `%v`", err)
 		}
-		newCall, err := ds.GetCall(ctx, call.AppName, call.ID)
+		newCall, err := ds.GetCall(ctx, call.AppID, call.ID)
 		if err != nil {
 			t.Fatalf("Test GetCall: unexpected error `%v`", err)
 		}
@@ -161,8 +164,8 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		if time.Time(call.CompletedAt).Unix() != time.Time(newCall.CompletedAt).Unix() {
 			t.Fatalf("Test GetCall: completed_at mismatch `%v` `%v`", call.CompletedAt, newCall.CompletedAt)
 		}
-		if call.AppName != newCall.AppName {
-			t.Fatalf("Test GetCall: app_name mismatch `%v` `%v`", call.AppName, newCall.AppName)
+		if call.AppID != newCall.AppID {
+			t.Fatalf("Test GetCall: app_name mismatch `%v` `%v`", call.AppID, newCall.AppID)
 		}
 		if call.Path != newCall.Path {
 			t.Fatalf("Test GetCall: path mismatch `%v` `%v`", call.Path, newCall.Path)
@@ -171,7 +174,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {

 	t.Run("calls-get", func(t *testing.T) {
 		ds := dsf(t)
-		filter := &models.CallFilter{AppName: call.AppName, Path: call.Path, PerPage: 100}
+		filter := &models.CallFilter{AppID: call.AppID, Path: call.Path, PerPage: 100}
 		call.ID = id.New().String()
 		call.CreatedAt = strfmt.DateTime(time.Now())
 		err := ds.InsertCall(ctx, call)
@@ -238,7 +241,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		}

 		// test that filters actually applied
-		calls, err = ds.GetCalls(ctx, &models.CallFilter{AppName: "wrongappname", PerPage: 100})
+		calls, err = ds.GetCalls(ctx, &models.CallFilter{AppID: "wrongappname", PerPage: 100})
 		if err != nil {
 			t.Fatalf("Test GetCalls(ctx, filter): unexpected error `%v`", err)
 		}
@@ -291,53 +294,56 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		if !inserted.Equals(testApp) {
 			t.Fatalf("Test InsertApp: expected to insert:\n%v\nbut got:\n%v", testApp, inserted)
 		}
-
-		_, err = ds.InsertApp(ctx, testApp)
-		if err != models.ErrAppsAlreadyExists {
-			t.Fatalf("Test InsertApp duplicated: expected error `%v`, but it was `%v`", models.ErrAppsAlreadyExists, err)
-		}
+		testApp.ID = inserted.ID

 		{
 			// Set a config var
-			updated, err := ds.UpdateApp(ctx, &models.App{Name: testApp.Name, Config: map[string]string{"TEST": "1"}})
+			testApp, err := ds.GetAppByID(ctx, testApp.ID)
+			if err != nil {
+				t.Fatal(err.Error())
+			}
+			testApp.Config = map[string]string{"TEST": "1"}
+			updated, err := ds.UpdateApp(ctx, testApp)
 			if err != nil {
 				t.Fatalf("Test UpdateApp: error when updating app: %v", err)
 			}
-			expected := &models.App{Name: testApp.Name, Config: map[string]string{"TEST": "1"}}
+			expected := &models.App{ID: testApp.ID, Name: testApp.Name, Config: map[string]string{"TEST": "1"}}
 			if !updated.Equals(expected) {
 				t.Fatalf("Test UpdateApp: expected updated `%v` but got `%v`", expected, updated)
 			}

 			// Set a different var (without clearing the existing)
-			updated, err = ds.UpdateApp(ctx,
-				&models.App{Name: testApp.Name, Config: map[string]string{"OTHER": "TEST"}})
+			another := testApp.Clone()
+			another.Config = map[string]string{"OTHER": "TEST"}
+			updated, err = ds.UpdateApp(ctx, another)
 			if err != nil {
 				t.Fatalf("Test UpdateApp: error when updating app: %v", err)
 			}
-			expected = &models.App{Name: testApp.Name, Config: map[string]string{"TEST": "1", "OTHER": "TEST"}}
+			expected = &models.App{Name: testApp.Name, ID: testApp.ID, Config: map[string]string{"TEST": "1", "OTHER": "TEST"}}
 			if !updated.Equals(expected) {
 				t.Fatalf("Test UpdateApp: expected updated `%v` but got `%v`", expected, updated)
 			}

 			// Delete a var
-			updated, err = ds.UpdateApp(ctx,
-				&models.App{Name: testApp.Name, Config: map[string]string{"TEST": ""}})
+			dVar := testApp.Clone()
+			dVar.Config = map[string]string{"TEST": ""}
+			updated, err = ds.UpdateApp(ctx, dVar)
 			if err != nil {
 				t.Fatalf("Test UpdateApp: error when updating app: %v", err)
 			}
-			expected = &models.App{Name: testApp.Name, Config: map[string]string{"OTHER": "TEST"}}
+			expected = &models.App{Name: testApp.Name, ID: testApp.ID, Config: map[string]string{"OTHER": "TEST"}}
 			if !updated.Equals(expected) {
 				t.Fatalf("Test UpdateApp: expected updated `%v` but got `%v`", expected, updated)
 			}
 		}

 		// Testing get app
-		_, err = ds.GetApp(ctx, "")
-		if err != models.ErrAppsMissingName {
-			t.Fatalf("Test GetApp: expected error to be %v, but it was %s", models.ErrAppsMissingName, err)
+		_, err = ds.GetAppByID(ctx, "")
+		if err != models.ErrDatastoreEmptyAppID {
+			t.Fatalf("Test GetApp: expected error to be %v, but it was %s", models.ErrDatastoreEmptyAppID, err)
 		}

-		app, err := ds.GetApp(ctx, testApp.Name)
+		app, err := ds.GetAppByID(ctx, testApp.ID)
 		if err != nil {
 			t.Fatalf("Test GetApp: error: %s", err)
 		}
@@ -358,14 +364,14 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		}

 		// test pagination stuff (ordering / limits / cursoring)
-		a2 := *testApp
-		a3 := *testApp
-		a2.Name = "Testa"
-		a3.Name = "Testb"
-		if _, err = ds.InsertApp(ctx, &a2); err != nil {
+		a2 := &models.App{Name: "Testa"}
+		a2.SetDefaults()
+		a3 := &models.App{Name: "Testb"}
+		a3.SetDefaults()
+		if _, err = ds.InsertApp(ctx, a2); err != nil {
 			t.Fatal(err)
 		}
-		if _, err = ds.InsertApp(ctx, &a3); err != nil {
+		if _, err = ds.InsertApp(ctx, a3); err != nil {
 			t.Fatal(err)
 		}

@@ -391,10 +397,9 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 			t.Fatalf("Test GetApps: expected `app.Name` to be `%s` but it was `%s`", a3.Name, apps[1].Name)
 		}

-		a4 := *testApp
-		a4.Name = "Abcdefg" // < /test lexicographically, but not in length
-
-		if _, err = ds.InsertApp(ctx, &a4); err != nil {
+		a4 := &models.App{Name: "Abcdefg"}
+		a4.SetDefaults()
+		if _, err = ds.InsertApp(ctx, a4); err != nil {
 			t.Fatal(err)
 		}

@@ -419,29 +424,33 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {

 		// Testing app delete
 		err = ds.RemoveApp(ctx, "")
-		if err != models.ErrAppsMissingName {
-			t.Fatalf("Test RemoveApp: expected error `%v`, but it was `%v`", models.ErrAppsMissingName, err)
+		if err != models.ErrDatastoreEmptyAppID {
+			t.Fatalf("Test RemoveApp: expected error `%v`, but it was `%v`", models.ErrDatastoreEmptyAppID, err)
 		}

-		err = ds.RemoveApp(ctx, testApp.Name)
+		testApp, _ := ds.GetAppByID(ctx, testApp.ID)
+		err = ds.RemoveApp(ctx, testApp.ID)
 		if err != nil {
 			t.Fatalf("Test RemoveApp: error: %s", err)
 		}
-		app, err = ds.GetApp(ctx, testApp.Name)
+		app, err = ds.GetAppByID(ctx, testApp.ID)
 		if err != models.ErrAppsNotFound {
 			t.Fatalf("Test GetApp(removed): expected error `%v`, but it was `%v`", models.ErrAppsNotFound, err)
 		}
 		if app != nil {
-			t.Fatal("Test RemoveApp: failed to remove the app")
+			t.Log(err.Error())
+			t.Fatal("Test RemoveApp: failed to remove the app, app should be gone already")
 		}

 		// Test update inexistent app
-		_, err = ds.UpdateApp(ctx, &models.App{
+		missingApp := &models.App{
 			Name: testApp.Name,
 			Config: map[string]string{
 				"TEST": "1",
 			},
-		})
+		}
+		missingApp.SetDefaults()
+		_, err = ds.UpdateApp(ctx, missingApp)
 		if err != models.ErrAppsNotFound {
 			t.Fatalf("Test UpdateApp(inexistent): expected error `%v`, but it was `%v`", models.ErrAppsNotFound, err)
 		}
@@ -450,7 +459,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 	t.Run("routes", func(t *testing.T) {
 		ds := dsf(t)
 		// Insert app again to test routes
-		_, err := ds.InsertApp(ctx, testApp)
+		testApp, err := ds.InsertApp(ctx, testApp)
 		if err != nil && err != models.ErrAppsAlreadyExists {
 			t.Fatal("Test InsertRoute Prep: failed to insert app: ", err)
 		}
@@ -462,14 +471,15 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 				t.Fatalf("Test InsertRoute(nil): expected error `%v`, but it was `%v`", models.ErrDatastoreEmptyRoute, err)
 			}

-			copyRoute := *testRoute
-			copyRoute.AppName = "notreal"
-			_, err = ds.InsertRoute(ctx, &copyRoute)
+			newTestRoute := testRoute.Clone()
+			newTestRoute.AppID = "notreal"
+			_, err = ds.InsertRoute(ctx, newTestRoute)
 			if err != models.ErrAppsNotFound {
 				t.Fatalf("Test InsertRoute: expected error `%v`, but it was `%v`", models.ErrAppsNotFound, err)
 			}

-			_, err = ds.InsertRoute(ctx, testRoute)
+			testRoute.AppID = testApp.ID
+			testRoute, err = ds.InsertRoute(ctx, testRoute)
 			if err != nil {
 				t.Fatalf("Test InsertRoute: error when storing new route: %s", err)
 			}
@@ -482,17 +492,17 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {

 		// Testing get
 		{
-			_, err = ds.GetRoute(ctx, "a", "")
+			_, err = ds.GetRoute(ctx, id.New().String(), "")
 			if err != models.ErrRoutesMissingPath {
 				t.Fatalf("Test GetRoute(empty route path): expected error `%v`, but it was `%v`", models.ErrRoutesMissingPath, err)
 			}

 			_, err = ds.GetRoute(ctx, "", "a")
-			if err != models.ErrAppsMissingName {
-				t.Fatalf("Test GetRoute(empty app name): expected error `%v`, but it was `%v`", models.ErrAppsMissingName, err)
+			if err != models.ErrDatastoreEmptyAppID {
+				t.Fatalf("Test GetRoute(empty app name): expected error `%v`, but it was `%v`", models.ErrRoutesMissingPath, err)
 			}

-			route, err := ds.GetRoute(ctx, testApp.Name, testRoute.Path)
+			route, err := ds.GetRoute(ctx, testApp.ID, testRoute.Path)
 			if err != nil {
 				t.Fatalf("Test GetRoute: unexpected error %v", err)
 			}
@@ -505,7 +515,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		{
 			// Update some fields, and add 3 configs and 3 headers.
 			updated, err := ds.UpdateRoute(ctx, &models.Route{
-				AppName: testRoute.AppName,
+				AppID:   testApp.ID,
 				Path:    testRoute.Path,
 				Timeout: 2,
 				Config: map[string]string{
@@ -524,7 +534,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 			}
 			expected := &models.Route{
 				// unchanged
-				AppName:     testRoute.AppName,
+				AppID:       testApp.ID,
 				Path:        testRoute.Path,
 				Image:       "fnproject/fn-test-utils",
 				Type:        "sync",
@@ -551,8 +561,8 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {

 			// Update a config var, remove another. Add one Header, remove another.
 			updated, err = ds.UpdateRoute(ctx, &models.Route{
-				AppName: testRoute.AppName,
-				Path:    testRoute.Path,
+				AppID: testRoute.AppID,
+				Path:  testRoute.Path,
 				Config: map[string]string{
 					"FIRST":  "first",
 					"SECOND": "",
@@ -568,7 +578,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 			}
 			expected = &models.Route{
 				// unchanged
-				AppName:     testRoute.AppName,
+				AppID:       testRoute.AppID,
 				Path:        testRoute.Path,
 				Image:       "fnproject/fn-test-utils",
 				Type:        "sync",
@@ -593,7 +603,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		}

 		// Testing list routes
-		routes, err := ds.GetRoutesByApp(ctx, testApp.Name, &models.RouteFilter{PerPage: 1})
+		routes, err := ds.GetRoutesByApp(ctx, testApp.ID, &models.RouteFilter{PerPage: 1})
 		if err != nil {
 			t.Fatalf("Test GetRoutesByApp: unexpected error %v", err)
 		}
@@ -606,7 +616,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 			t.Fatalf("Test GetRoutes: expected `app.Name` to be `%s` but it was `%s`", testRoute.Path, routes[0].Path)
 		}

-		routes, err = ds.GetRoutesByApp(ctx, testApp.Name, &models.RouteFilter{Image: testRoute.Image, PerPage: 1})
+		routes, err = ds.GetRoutesByApp(ctx, testApp.ID, &models.RouteFilter{Image: testRoute.Image, PerPage: 1})
 		if err != nil {
 			t.Fatalf("Test GetRoutesByApp: unexpected error %v", err)
 		}
@@ -619,7 +629,9 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 			t.Fatalf("Test GetRoutesByApp: expected `route.Path` to be `%s` but it was `%s`", testRoute.Path, routes[0].Path)
 		}

-		routes, err = ds.GetRoutesByApp(ctx, "notreal", &models.RouteFilter{PerPage: 1})
+		nre := &models.App{Name: "notreal"}
+		nre.SetDefaults()
+		routes, err = ds.GetRoutesByApp(ctx, nre.ID, &models.RouteFilter{PerPage: 1})
 		if err != nil {
 			t.Fatalf("Test GetRoutesByApp: error: %s", err)
 		}
@@ -629,7 +641,9 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {

 		// test pagination stuff
 		r2 := *testRoute
+		r2.AppID = testApp.ID
 		r3 := *testRoute
+		r2.AppID = testApp.ID
 		r2.Path = "/testa"
 		r3.Path = "/testb"

@@ -640,7 +654,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 			t.Fatal(err)
 		}

-		routes, err = ds.GetRoutesByApp(ctx, testApp.Name, &models.RouteFilter{PerPage: 1})
+		routes, err = ds.GetRoutesByApp(ctx, testApp.ID, &models.RouteFilter{PerPage: 1})
 		if err != nil {
 			t.Fatalf("Test GetRoutesByApp: error: %s", err)
 		}
@@ -650,7 +664,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 			t.Fatalf("Test GetRoutesByApp: expected `route.Path` to be `%s` but it was `%s`", testRoute.Path, routes[0].Path)
 		}

-		routes, err = ds.GetRoutesByApp(ctx, testApp.Name, &models.RouteFilter{PerPage: 2, Cursor: routes[0].Path})
+		routes, err = ds.GetRoutesByApp(ctx, testApp.ID, &models.RouteFilter{PerPage: 2, Cursor: routes[0].Path})
 		if err != nil {
 			t.Fatalf("Test GetRoutesByApp: error: %s", err)
 		}
@@ -669,7 +683,7 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 			t.Fatal(err)
 		}

-		routes, err = ds.GetRoutesByApp(ctx, testApp.Name, &models.RouteFilter{PerPage: 100})
+		routes, err = ds.GetRoutesByApp(ctx, testApp.ID, &models.RouteFilter{PerPage: 100})
 		if err != nil {
 			t.Fatalf("Test GetRoutesByApp: error: %s", err)
 		}
@@ -684,21 +698,21 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {

 		// Testing route delete
 		err = ds.RemoveRoute(ctx, "", "")
-		if err != models.ErrAppsMissingName {
-			t.Fatalf("Test RemoveRoute(empty app name): expected error `%v`, but it was `%v`", models.ErrAppsMissingName, err)
+		if err != models.ErrDatastoreEmptyAppID {
+			t.Fatalf("Test RemoveRoute(empty app name): expected error `%v`, but it was `%v`", models.ErrDatastoreEmptyAppID, err)
 		}

-		err = ds.RemoveRoute(ctx, "a", "")
+		err = ds.RemoveRoute(ctx, testApp.ID, "")
 		if err != models.ErrRoutesMissingPath {
 			t.Fatalf("Test RemoveRoute(empty route path): expected error `%v`, but it was `%v`", models.ErrRoutesMissingPath, err)
 		}

-		err = ds.RemoveRoute(ctx, testRoute.AppName, testRoute.Path)
+		err = ds.RemoveRoute(ctx, testApp.ID, testRoute.Path)
 		if err != nil {
 			t.Fatalf("Test RemoveApp: unexpected error: %v", err)
 		}

-		route, err := ds.GetRoute(ctx, testRoute.AppName, testRoute.Path)
+		route, err := ds.GetRoute(ctx, testApp.ID, testRoute.Path)
 		if err != nil && err != models.ErrRoutesNotFound {
 			t.Fatalf("Test GetRoute: expected error `%v`, but it was `%v`", models.ErrRoutesNotFound, err)
 		}
@@ -707,9 +721,9 @@ func Test(t *testing.T, dsf func(t *testing.T) models.Datastore) {
 		}

 		_, err = ds.UpdateRoute(ctx, &models.Route{
-			AppName: testRoute.AppName,
-			Path:    testRoute.Path,
-			Image:   "test",
+			AppID: testApp.ID,
+			Path:  testRoute.Path,
+			Image: "test",
 		})
 		if err != models.ErrRoutesNotFound {
 			t.Fatalf("Test UpdateRoute inexistent: expected error to be `%v`, but it was `%v`", models.ErrRoutesNotFound, err)
@@ -722,7 +736,6 @@ var testApp = &models.App{
 }

 var testRoute = &models.Route{
-	AppName:     testApp.Name,
 	Path:        "/test",
 	Image:       "fnproject/fn-test-utils",
 	Type:        "sync",
--- a/api/datastore/internal/datastoreutil/metrics.go
+++ b/api/datastore/internal/datastoreutil/metrics.go
@@ -18,10 +18,16 @@ type metricds struct {
 	ds models.Datastore
 }

-func (m *metricds) GetApp(ctx context.Context, appName string) (*models.App, error) {
-	ctx, span := trace.StartSpan(ctx, "ds_get_app")
+func (m *metricds) GetAppID(ctx context.Context, appName string) (string, error) {
+	ctx, span := trace.StartSpan(ctx, "ds_get_app_id")
 	defer span.End()
-	return m.ds.GetApp(ctx, appName)
+	return m.ds.GetAppID(ctx, appName)
+}
+
+func (m *metricds) GetAppByID(ctx context.Context, appID string) (*models.App, error) {
+	ctx, span := trace.StartSpan(ctx, "ds_get_app_by_id")
+	defer span.End()
+	return m.ds.GetAppByID(ctx, appID)
 }

 func (m *metricds) GetApps(ctx context.Context, filter *models.AppFilter) ([]*models.App, error) {
@@ -42,22 +48,22 @@ func (m *metricds) UpdateApp(ctx context.Context, app *models.App) (*models.App,
 	return m.ds.UpdateApp(ctx, app)
 }

-func (m *metricds) RemoveApp(ctx context.Context, appName string) error {
+func (m *metricds) RemoveApp(ctx context.Context, appID string) error {
 	ctx, span := trace.StartSpan(ctx, "ds_remove_app")
 	defer span.End()
-	return m.ds.RemoveApp(ctx, appName)
+	return m.ds.RemoveApp(ctx, appID)
 }

-func (m *metricds) GetRoute(ctx context.Context, appName, routePath string) (*models.Route, error) {
+func (m *metricds) GetRoute(ctx context.Context, appID, routePath string) (*models.Route, error) {
 	ctx, span := trace.StartSpan(ctx, "ds_get_route")
 	defer span.End()
-	return m.ds.GetRoute(ctx, appName, routePath)
+	return m.ds.GetRoute(ctx, appID, routePath)
 }

-func (m *metricds) GetRoutesByApp(ctx context.Context, appName string, filter *models.RouteFilter) (routes []*models.Route, err error) {
+func (m *metricds) GetRoutesByApp(ctx context.Context, appID string, filter *models.RouteFilter) (routes []*models.Route, err error) {
 	ctx, span := trace.StartSpan(ctx, "ds_get_routes_by_app")
 	defer span.End()
-	return m.ds.GetRoutesByApp(ctx, appName, filter)
+	return m.ds.GetRoutesByApp(ctx, appID, filter)
 }

 func (m *metricds) InsertRoute(ctx context.Context, route *models.Route) (*models.Route, error) {
@@ -72,10 +78,10 @@ func (m *metricds) UpdateRoute(ctx context.Context, route *models.Route) (*model
 	return m.ds.UpdateRoute(ctx, route)
 }

-func (m *metricds) RemoveRoute(ctx context.Context, appName, routePath string) error {
+func (m *metricds) RemoveRoute(ctx context.Context, appID string, routePath string) error {
 	ctx, span := trace.StartSpan(ctx, "ds_remove_route")
 	defer span.End()
-	return m.ds.RemoveRoute(ctx, appName, routePath)
+	return m.ds.RemoveRoute(ctx, appID, routePath)
 }

 func (m *metricds) InsertCall(ctx context.Context, call *models.Call) error {
--- a/api/datastore/internal/datastoreutil/validator.go
+++ b/api/datastore/internal/datastoreutil/validator.go
@@ -17,12 +17,19 @@ type validator struct {
 	models.Datastore
 }

-// name will never be empty.
-func (v *validator) GetApp(ctx context.Context, name string) (app *models.App, err error) {
-	if name == "" {
-		return nil, models.ErrAppsMissingName
+func (v *validator) GetAppID(ctx context.Context, appName string) (string, error) {
+	if appName == "" {
+		return "", models.ErrAppsMissingName
 	}
-	return v.Datastore.GetApp(ctx, name)
+	return v.Datastore.GetAppID(ctx, appName)
+}
+
+func (v *validator) GetAppByID(ctx context.Context, appID string) (*models.App, error) {
+	if appID == "" {
+		return nil, models.ErrDatastoreEmptyAppID
+	}
+
+	return v.Datastore.GetAppByID(ctx, appID)
 }

 func (v *validator) GetApps(ctx context.Context, appFilter *models.AppFilter) ([]*models.App, error) {
@@ -48,40 +55,41 @@ func (v *validator) UpdateApp(ctx context.Context, app *models.App) (*models.App
 	if app == nil {
 		return nil, models.ErrDatastoreEmptyApp
 	}
-	if app.Name == "" {
-		return nil, models.ErrAppsMissingName
+	if app.ID == "" {
+		return nil, models.ErrDatastoreEmptyAppID
 	}

 	return v.Datastore.UpdateApp(ctx, app)
 }

 // name will never be empty.
-func (v *validator) RemoveApp(ctx context.Context, name string) error {
-	if name == "" {
-		return models.ErrAppsMissingName
+func (v *validator) RemoveApp(ctx context.Context, appID string) error {
+	if appID == "" {
+		return models.ErrDatastoreEmptyAppID
 	}

-	return v.Datastore.RemoveApp(ctx, name)
+	return v.Datastore.RemoveApp(ctx, appID)
 }

 // appName and routePath will never be empty.
-func (v *validator) GetRoute(ctx context.Context, appName, routePath string) (*models.Route, error) {
-	if appName == "" {
-		return nil, models.ErrAppsMissingName
+func (v *validator) GetRoute(ctx context.Context, appID, routePath string) (*models.Route, error) {
+	if appID == "" {
+		return nil, models.ErrDatastoreEmptyAppID
 	}
 	if routePath == "" {
 		return nil, models.ErrRoutesMissingPath
 	}

-	return v.Datastore.GetRoute(ctx, appName, routePath)
+	return v.Datastore.GetRoute(ctx, appID, routePath)
 }

 // appName will never be empty
-func (v *validator) GetRoutesByApp(ctx context.Context, appName string, routeFilter *models.RouteFilter) (routes []*models.Route, err error) {
-	if appName == "" {
-		return nil, models.ErrAppsMissingName
+func (v *validator) GetRoutesByApp(ctx context.Context, appID string, routeFilter *models.RouteFilter) (routes []*models.Route, err error) {
+	if appID == "" {
+		return nil, models.ErrDatastoreEmptyAppID
 	}
-	return v.Datastore.GetRoutesByApp(ctx, appName, routeFilter)
+
+	return v.Datastore.GetRoutesByApp(ctx, appID, routeFilter)
 }

 // route will never be nil and route's AppName and Path will never be empty.
@@ -103,8 +111,8 @@ func (v *validator) UpdateRoute(ctx context.Context, newroute *models.Route) (*m
 	if newroute == nil {
 		return nil, models.ErrDatastoreEmptyRoute
 	}
-	if newroute.AppName == "" {
-		return nil, models.ErrAppsMissingName
+	if newroute.AppID == "" {
+		return nil, models.ErrRoutesMissingAppID
 	}
 	if newroute.Path == "" {
 		return nil, models.ErrRoutesMissingPath
@@ -113,15 +121,15 @@ func (v *validator) UpdateRoute(ctx context.Context, newroute *models.Route) (*m
 }

 // appName and routePath will never be empty.
-func (v *validator) RemoveRoute(ctx context.Context, appName, routePath string) error {
-	if appName == "" {
-		return models.ErrAppsMissingName
+func (v *validator) RemoveRoute(ctx context.Context, appID string, routePath string) error {
+	if appID == "" {
+		return models.ErrDatastoreEmptyAppID
 	}
 	if routePath == "" {
 		return models.ErrRoutesMissingPath
 	}

-	return v.Datastore.RemoveRoute(ctx, appName, routePath)
+	return v.Datastore.RemoveRoute(ctx, appID, routePath)
 }

 // callID will never be empty.