fix: detect workspaces when in subdirectories (#4363)

server/events/project_command_builder.go

@@ -524,9 +524,10 @@ func (p *DefaultProjectCommandBuilder) buildAllCommandsByCfg(ctx *command.Contex
 			len(modifiedProjects), modifiedProjects)
 		for _, mp := range modifiedProjects {
 			ctx.Log.Debug("determining config for project at dir: %q", mp.Path)
-			pWorkspace, err := p.ProjectFinder.DetermineWorkspaceFromHCL(ctx.Log, repoDir)
+			absProjectDir := filepath.Join(repoDir, mp.Path)
+			pWorkspace, err := p.ProjectFinder.DetermineWorkspaceFromHCL(ctx.Log, absProjectDir)
 			if err != nil {
-				return nil, errors.Wrapf(err, "looking for Terraform Cloud workspace from configuration %s", repoDir)
+				return nil, errors.Wrapf(err, "looking for Terraform Cloud workspace from configuration %s", absProjectDir)
 			}
 
 			pCfg := p.GlobalCfg.DefaultProjCfg(ctx.Log, ctx.Pull.BaseRepo.ID(), mp.Path, pWorkspace)

server/events/project_command_builder_test.go

@@ -48,6 +48,19 @@ var defaultUserConfig = struct {
 	AutoDiscoverMode:         "auto",
 }
 
+func ChangedFiles(dirStructure map[string]interface{}, parent string) []string {
+	var files []string
+	for k, v := range dirStructure {
+		switch v := v.(type) {
+		case map[string]interface{}:
+			files = append(files, ChangedFiles(v, k)...)
+		default:
+			files = append(files, filepath.Join(parent, k))
+		}
+	}
+	return files
+}
+
 func TestDefaultProjectCommandBuilder_BuildAutoplanCommands(t *testing.T) {
 	// expCtxFields define the ctx fields we're going to assert on.
 	// Since we're focused on autoplanning here, we don't validate all the
@@ -57,11 +70,16 @@ func TestDefaultProjectCommandBuilder_BuildAutoplanCommands(t *testing.T) {
 		RepoRelDir  string
 		Workspace   string
 	}
+	defaultTestDirStructure := map[string]interface{}{
+		"main.tf": nil,
+	}
+
 	cases := []struct {
-		Description    string
-		AtlantisYAML   string
-		ServerSideYAML string
-		exp            []expCtxFields
+		Description      string
+		AtlantisYAML     string
+		ServerSideYAML   string
+		TestDirStructure map[string]interface{}
+		exp              []expCtxFields
 	}{
 		{
 			Description: "simple atlantis.yaml",
@@ -70,6 +88,7 @@ version: 3
 projects:
 - dir: .
 `,
+			TestDirStructure: defaultTestDirStructure,
 			exp: []expCtxFields{
 				{
 					ProjectName: "",
@@ -94,6 +113,7 @@ projects:
   name: myname
   workspace: myworkspace2
 `,
+			TestDirStructure: defaultTestDirStructure,
 			exp: []expCtxFields{
 				{
 					ProjectName: "",
@@ -122,6 +142,7 @@ projects:
 - dir: .
   workspace: myworkspace2
 `,
+			TestDirStructure: defaultTestDirStructure,
 			exp: []expCtxFields{
 				{
 					ProjectName: "",
@@ -142,7 +163,68 @@ version: 3
 projects:
 - dir: mydir
 `,
-			exp: nil,
+			TestDirStructure: defaultTestDirStructure,
+			exp:              nil,
+		},
+		{
+			Description: "workspaces from subdirectories detected",
+			TestDirStructure: map[string]interface{}{
+				"work": map[string]interface{}{
+					"main.tf": `
+terraform {
+  cloud {
+    organization = "atlantis-test"
+    workspaces {
+      name = "test-workspace1"
+    }
+  }
+}`,
+				},
+				"test": map[string]interface{}{
+					"main.tf": `
+terraform {
+  cloud {
+    organization = "atlantis-test"
+    workspaces {
+      name = "test-workspace12"
+    }
+  }
+}`,
+				},
+			},
+			exp: []expCtxFields{
+				{
+					ProjectName: "",
+					RepoRelDir:  "work",
+					Workspace:   "test-workspace1",
+				},
+				{
+					ProjectName: "",
+					RepoRelDir:  "test",
+					Workspace:   "test-workspace12",
+				},
+			},
+		},
+		{
+			Description: "workspaces in parent directory are detected",
+			TestDirStructure: map[string]interface{}{
+				"main.tf": `
+terraform {
+  cloud {
+    organization = "atlantis-test"
+    workspaces {
+      name = "test-workspace"
+    }
+  }
+}`,
+			},
+			exp: []expCtxFields{
+				{
+					ProjectName: "",
+					RepoRelDir:  ".",
+					Workspace:   "test-workspace",
+				},
+			},
 		},
 	}
 
@@ -156,15 +238,12 @@ projects:
 	for _, c := range cases {
 		t.Run(c.Description, func(t *testing.T) {
 			RegisterMockTestingT(t)
-			tmpDir := DirStructure(t, map[string]interface{}{
-				"main.tf": nil,
-			})
-
+			tmpDir := DirStructure(t, c.TestDirStructure)
 			workingDir := mocks.NewMockWorkingDir()
 			When(workingDir.Clone(Any[models.Repo](), Any[models.PullRequest](), Any[string]())).ThenReturn(tmpDir, false, nil)
 			vcsClient := vcsmocks.NewMockClient()
 			When(vcsClient.GetModifiedFiles(
-				Any[logging.SimpleLogging](), Any[models.Repo](), Any[models.PullRequest]())).ThenReturn([]string{"main.tf"}, nil)
+				Any[logging.SimpleLogging](), Any[models.Repo](), Any[models.PullRequest]())).ThenReturn(ChangedFiles(c.TestDirStructure, ""), nil)
 			if c.AtlantisYAML != "" {
 				err := os.WriteFile(filepath.Join(tmpDir, valid.DefaultAtlantisFile), []byte(c.AtlantisYAML), 0600)
 				Ok(t, err)