weldr: move common.ComposeState to weldr

ComposeState is only used by the weldr API.

Drop the JSON marshaller and unmarshaller, because ComposeState is not
used in an JSON-exported field anymore.

internal/common/states.go

@@ -69,31 +69,3 @@ func (ibs *ImageBuildState) UnmarshalJSON(data []byte) error {
 func (ibs ImageBuildState) MarshalJSON() ([]byte, error) {
 	return json.Marshal(getStateMapping()[ibs])
 }
-
-type ComposeState int
-
-const (
-	CWaiting ComposeState = iota
-	CRunning
-	CFinished
-	CFailed
-)
-
-// ToString converts ImageBuildState into a human readable string
-func (cs ComposeState) ToString() string {
-	return getStateMapping()[int(cs)]
-}
-
-// UnmarshalJSON converts a JSON string into an ImageBuildState
-func (ibs *ComposeState) UnmarshalJSON(data []byte) error {
-	val, err := unmarshalStateHelper(data, getStateMapping())
-	if err != nil {
-		return err
-	}
-	*ibs = ComposeState(val)
-	return nil
-}
-
-func (ibs ComposeState) MarshalJSON() ([]byte, error) {
-	return json.Marshal(getStateMapping()[ibs])
-}

internal/common/states_test.go

@@ -2,28 +2,26 @@ package common
 
 import (
 	"encoding/json"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestJSONConversions(t *testing.T) {
 	type TestJson struct {
 		Ibs ImageBuildState `json:"ibs"`
-		Cs  ComposeState    `json:"cs"`
 	}
 	typedCases := []TestJson{
 		{
 			Ibs: IBWaiting,
-			Cs:  CWaiting,
 		},
 		{
 			Ibs: IBRunning,
-			Cs:  CFailed,
 		},
 	}
 	strCases := []string{
-		`{"ibs": "WAITING", "cs": "WAITING"}`,
-		`{"ibs": "RUNNING", "cs": "FAILED"}`,
+		`{"ibs": "WAITING"}`,
+		`{"ibs": "RUNNING"}`,
 	}
 
 	for n, c := range strCases {