Change MakeTarget to GadgetTarget

canonical · Mar 17, 2023 · 0835665 · 0835665
1 parent 027fa8d
commit 0835665
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/internal/imagedefinition/image_definition.go b/internal/imagedefinition/image_definition.go
@@ -31,7 +31,7 @@ type ImageDefinition struct {
 // Gadget defines the gadget section of the image definition file
 type Gadget struct {
 	Ref          string `yaml:"ref"    json:"Ref,omitempty"`
-	MakeTarget   string `yaml:"target" json:"MakeTarget,omitempty"`
+	GadgetTarget string `yaml:"target" json:"GadgetTarget,omitempty"`
 	GadgetBranch string `yaml:"branch" json:"GadgetBranch,omitempty"`
 	GadgetType   string `yaml:"type"   json:"GadgetType"             jsonschema:"enum=git,enum=directory,enum=prebuilt"`
 	GadgetURL    string `yaml:"url"    json:"GadgetURL,omitempty"    jsonschema:"type=string,format=uri"`

diff --git a/internal/statemachine/classic_states.go b/internal/statemachine/classic_states.go
@@ -413,8 +413,8 @@ func (stateMachine *StateMachine) buildGadgetTree() error {
 	makeCmd := execCommand("make")
 
 	// if a make target was specified then add it to the command
-	if classicStateMachine.ImageDef.Gadget.MakeTarget != "" {
-		makeCmd.Args = append(makeCmd.Args, classicStateMachine.ImageDef.Gadget.MakeTarget)
+	if classicStateMachine.ImageDef.Gadget.GadgetTarget != "" {
+		makeCmd.Args = append(makeCmd.Args, classicStateMachine.ImageDef.Gadget.GadgetTarget)
 	}
 
 	// add ARCH and SERIES environment variables for making the gadget tree

diff --git a/internal/statemachine/classic_test.go b/internal/statemachine/classic_test.go
@@ -2265,8 +2265,8 @@ func TestBuildGadgetTree(t *testing.T) {
 	})
 }
 
-// TestGadgetMakeTargets tests using alternate make targets with gadget builds
-func TestGadgetMakeTargets(t *testing.T) {
+// TestGadgetGadgetTargets tests using alternate make targets with gadget builds
+func TestGadgetGadgetTargets(t *testing.T) {
 	testCases := []struct {
 		name           string
 		target         string
@@ -2304,9 +2304,9 @@ func TestGadgetMakeTargets(t *testing.T) {
 				Architecture: getHostArch(),
 				Series:       getHostSuite(),
 				Gadget: &imagedefinition.Gadget{
-					GadgetURL:  fmt.Sprintf("file://%s", gadgetSrc),
-					GadgetType: "directory",
-					MakeTarget: tc.target,
+					GadgetURL:    fmt.Sprintf("file://%s", gadgetSrc),
+					GadgetType:   "directory",
+					GadgetTarget: tc.target,
 				},
 			}
 			stateMachine.ImageDef = imageDef