Move setArtifactNames stateFunc since it is now used by 2 different b…

…uild
canonical · Oct 18, 2023 · 73ec099 · 73ec099
1 parent 9815ea4
commit 73ec099
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/internal/statemachine/common_states.go b/internal/statemachine/common_states.go
@@ -68,6 +68,16 @@ func (stateMachine *StateMachine) determineOutputDirectory() error {
 	return nil
 }
 
+// for snap/core image builds, the image name is always <volume-name>.img for
+// each volume in the gadget. This function stores that info in the struct
+func (stateMachine *StateMachine) setArtifactNames() error {
+	stateMachine.VolumeNames = make(map[string]string)
+	for volumeName := range stateMachine.GadgetInfo.Volumes {
+		stateMachine.VolumeNames[volumeName] = volumeName + ".img"
+	}
+	return nil
+}
+
 // Load gadget.yaml, do some validation, and store the relevant info in the StateMachine struct
 func (stateMachine *StateMachine) loadGadgetYaml() error {
 	gadgetYamlDst := filepath.Join(stateMachine.stateMachineFlags.WorkDir, "gadget.yaml")

diff --git a/internal/statemachine/snap_states.go b/internal/statemachine/snap_states.go
@@ -82,16 +82,6 @@ func (stateMachine *StateMachine) prepareImage() error {
 	return nil
 }
 
-// for snap/core image builds, the image name is always <volume-name>.img for
-// each volume in the gadget. This function stores that info in the struct
-func (stateMachine *StateMachine) setArtifactNames() error {
-	stateMachine.VolumeNames = make(map[string]string)
-	for volumeName := range stateMachine.GadgetInfo.Volumes {
-		stateMachine.VolumeNames[volumeName] = volumeName + ".img"
-	}
-	return nil
-}
-
 // populateSnapRootfsContents uses a NewMountedFileSystemWriter to populate the rootfs
 func (stateMachine *StateMachine) populateSnapRootfsContents() error {
 	var src, dst string