acc: read postgres top-level ID fields directly in direct engine

bundle/direct/dresources/postgres_branch.go

@@ -78,13 +78,9 @@ func makePostgresBranchRemote(branch *postgres.Branch) *PostgresBranchRemote {
 	if branch.Spec != nil {
 		spec = *branch.Spec
 	}
-	var branchID string
-	if branch.Status != nil {
-		branchID = branch.Status.BranchId
-	}
 	return &PostgresBranchRemote{
 		BranchSpec: spec,
-		BranchId:   branchID,
+		BranchId:   branch.BranchId,
 		Parent:     branch.Parent,
 		Name:       branch.Name,
 		Status:     branch.Status,

bundle/direct/dresources/postgres_database.go

@@ -72,13 +72,9 @@ func makePostgresDatabaseRemote(database *postgres.Database) *PostgresDatabaseRe
 	if database.Spec != nil {
 		spec = *database.Spec
 	}
-	var databaseID string
-	if database.Status != nil {
-		databaseID = database.Status.DatabaseId
-	}
 	return &PostgresDatabaseRemote{
 		DatabaseDatabaseSpec: spec,
-		DatabaseId:           databaseID,
+		DatabaseId:           database.DatabaseId,
 		Parent:               database.Parent,
 		Name:                 database.Name,
 		Status:               database.Status,

bundle/direct/dresources/postgres_endpoint.go

@@ -87,13 +87,9 @@ func makePostgresEndpointRemote(endpoint *postgres.Endpoint) *PostgresEndpointRe
 	if endpoint.Spec != nil {
 		spec = *endpoint.Spec
 	}
-	var endpointID string
-	if endpoint.Status != nil {
-		endpointID = endpoint.Status.EndpointId
-	}
 	return &PostgresEndpointRemote{
 		EndpointSpec: spec,
-		EndpointId:   endpointID,
+		EndpointId:   endpoint.EndpointId,
 		Parent:       endpoint.Parent,
 		Name:         endpoint.Name,
 		Status:       endpoint.Status,

bundle/direct/dresources/postgres_project.go

@@ -80,13 +80,9 @@ func makePostgresProjectRemote(project *postgres.Project) *PostgresProjectRemote
 	if project.Spec != nil {
 		spec = *project.Spec
 	}
-	var projectID string
-	if project.Status != nil {
-		projectID = project.Status.ProjectId
-	}
 	return &PostgresProjectRemote{
 		ProjectSpec:         spec,
-		ProjectId:           projectID,
+		ProjectId:           project.ProjectId,
 		InitialEndpointSpec: project.InitialEndpointSpec,
 		Name:                project.Name,
 		Status:              project.Status,

bundle/direct/dresources/postgres_role.go

@@ -85,13 +85,9 @@ func makePostgresRoleRemote(role *postgres.Role) *PostgresRoleRemote {
 	if role.Spec != nil {
 		spec = *role.Spec
 	}
-	var roleID string
-	if role.Status != nil {
-		roleID = role.Status.RoleId
-	}
 	return &PostgresRoleRemote{
 		RoleRoleSpec: spec,
-		RoleId:       roleID,
+		RoleId:       role.RoleId,
 		Parent:       role.Parent,
 		Name:         role.Name,
 		Status:       role.Status,