fix: add timestamp parsing to MAASTime (#113)

Author: SK1Y101

entity/machine.go

@@ -3,6 +3,7 @@ package entity
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"net"
 	"strconv"
 	"time"
@@ -134,14 +135,22 @@ func (t *MAASTime) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	temp, err := time.Parse("2006-01-02T15:04:05.999", str)
-	if err != nil {
-		return err
+	formats := []string{
+		"2006-01-02T15:04:05.999+00:00",
+		"2006-01-02T15:04:05.999Z",
+		"2006-01-02T15:04:05.999",
 	}
 
-	*t = MAASTime(temp)
+	for _, format := range formats {
+		foundTime, err := time.Parse(format, str)
+		if err == nil {
+			*t = MAASTime(foundTime)
 
-	return nil
+			return nil
+		}
+	}
+
+	return fmt.Errorf("unsupported time format for %q", str)
 }
 
 // String returns MAASTime in RFC3339Nano format

entity/machine_test.go

@@ -2,6 +2,7 @@ package entity
 
 import (
 	"encoding/json"
+	"fmt"
 	"testing"
 
 	"github.com/canonical/gomaasclient/test/helper"
@@ -93,14 +94,22 @@ func TestMAASTimeUnmarshalJSON(t *testing.T) {
 		Time MAASTime
 	}{}
 
-	data := []byte(`{"Time": "2023-05-11T21:15:04.208"}`)
-	if err := json.Unmarshal(data, &temp); err != nil {
-		t.Fatal(err)
+	formats := []string{
+		"2023-05-11T21:15:04.208+00:00",
+		"2023-05-11T21:15:04.208Z",
+		"2023-05-11T21:15:04.208",
 	}
 
-	expected := "2023-05-11T21:15:04.208Z"
-	if temp.Time.String() != expected {
-		t.Fatalf("expected %v, got %v", expected, temp.Time.String())
+	for _, format := range formats {
+		data := []byte(fmt.Sprintf(`{"Time": "%s"}`, format))
+		if err := json.Unmarshal(data, &temp); err != nil {
+			t.Fatal(err)
+		}
+
+		expected := "2023-05-11T21:15:04.208Z"
+		if temp.Time.String() != expected {
+			t.Fatalf("expected %v, got %v", expected, temp.Time.String())
+		}
 	}
 }