From 33b6a0bdfda1851be6c53d3c45b6ee04213bc1f9 Mon Sep 17 00:00:00 2001
From: Daniel Brondani <daniel.brondani@arm.com>
Date: Fri, 19 Jul 2024 11:12:06 +0200
Subject: [PATCH] [cbuild] Fix `setup` list layers arguments

---
 pkg/builder/csolution/builder.go      | 20 ++------------------
 pkg/builder/csolution/builder_test.go |  7 +++++++
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/pkg/builder/csolution/builder.go b/pkg/builder/csolution/builder.go
index ab0b91a..2be59aa 100644
--- a/pkg/builder/csolution/builder.go
+++ b/pkg/builder/csolution/builder.go
@@ -125,20 +125,6 @@ func (b CSolutionBuilder) installMissingPacks() (err error) {
 func (b CSolutionBuilder) generateBuildFiles() (err error) {
 	args := b.formulateArgs([]string{"convert"})
 
-	cbuildSetFile := b.getCbuildSetFilePath()
-
-	var selectedContexts []string
-	if len(b.Options.Contexts) != 0 {
-		selectedContexts = append(selectedContexts, b.Options.Contexts...)
-	}
-
-	_, err = os.Stat(cbuildSetFile)
-
-	// Read contexts to be processed from cbuild-set file
-	if b.Options.UseContextSet && err == nil {
-		selectedContexts, _ = b.getSelectedContexts(cbuildSetFile)
-	}
-
 	// when using "cbuild setup *.csolution.yml -S" with no existing cbuild-set file
 	// Select first target-type and the first build-type for first listed project
 	if b.Setup && b.Options.UseContextSet && (len(b.Options.Contexts) == 0) && errors.Is(err, os.ErrNotExist) {
@@ -189,11 +175,9 @@ func (b CSolutionBuilder) generateBuildFiles() (err error) {
 			log.Debug("error code received: " + errCodeStr)
 
 			if exitError.ExitCode() == 2 {
-				args = []string{"list", "layers", b.InputFile, "--load=all", "--update-idx", "--quiet"}
-				for _, context := range selectedContexts {
-					args = append(args, "--context="+context)
-				}
+				args = []string{"list", "layers", b.InputFile, "--context-set", "--load=all", "--update-idx", "--quiet"}
 				_, listCmdErr := b.runCSolution(args, false)
+				log.Debug("csolution command: csolution " + strings.Join(args, " "))
 				if listCmdErr != nil {
 					err = listCmdErr
 				} else {
diff --git a/pkg/builder/csolution/builder_test.go b/pkg/builder/csolution/builder_test.go
index 0e77620..7ba5915 100644
--- a/pkg/builder/csolution/builder_test.go
+++ b/pkg/builder/csolution/builder_test.go
@@ -250,6 +250,13 @@ func TestBuild(t *testing.T) {
 		},
 	}
 
+	t.Run("test setup", func(t *testing.T) {
+		b.Setup = true
+		err := b.Build()
+		assert.Error(err)
+		b.Setup = false
+	})
+
 	t.Run("test build csolution without context", func(t *testing.T) {
 		err := b.Build()
 		assert.Error(err)