fix: garden can again be run from project subdirs

Fixes a regression that resulted in Garden commands failing to find the
project-level config if run from a subdirectory of project root.

Also added a unit test to prevent this regression from being repeated.

garden-service/src/config/base.ts

@@ -178,9 +178,9 @@ export async function findProjectConfig(path: string, allowInvalid = false): Pro
     } catch (err) {
       if (!allowInvalid) {
         throw err
-      } else {
-        path = resolve(path, "..")
       }
+    } finally {
+      path = resolve(path, "..")
     }
   }
 

garden-service/test/unit/src/config/base.ts

@@ -1,5 +1,5 @@
 import { expect } from "chai"
-import { loadConfig } from "../../../../src/config/base"
+import { loadConfig, findProjectConfig } from "../../../../src/config/base"
 import { resolve } from "path"
 import { dataDir, expectError, getDataDir } from "../../../helpers"
 
@@ -313,3 +313,16 @@ describe("loadConfig", () => {
   })
 
 })
+
+describe("findProjectConfig", async () => {
+  it("should find the project config when path is projectRoot", async () => {
+    const project = await findProjectConfig(projectPathA)
+    expect(project && project.path).to.eq(projectPathA)
+  })
+
+  it("should find the project config when path is a subdir of projectRoot", async () => {
+    // modulePathA is a subdir of projectPathA
+    const project = await findProjectConfig(modulePathA)
+    expect(project && project.path).to.eq(projectPathA)
+  })
+})