Fixing Zammad 6.5 API-Changes

Author: Lorenz Kästle

cmd/root.go

@@ -131,12 +131,16 @@ func sendNotification(_ *cobra.Command, _ []string) {
 
 	var notificationErr error
 
+	foundTicket := false
+
 	if len(tickets) > 0 {
 		// Using the first ticket found for the notification,
 		// the SearchTickets methods returns the tickets by created_at.
 		// If no ticket is found the zammad.Ticket type will be empty,
 		// which can be used to detect if a new ticket needs to be created.
 		ticket = tickets[0]
+
+		foundTicket = true
 	}
 
 	switch notificationType {
@@ -149,7 +153,7 @@ func sendNotification(_ *cobra.Command, _ []string) {
 	case icingadsl.Problem:
 		// Opens a new ticket if none exists
 		// If one exists, adds article to existing ticket
-		notificationErr = handleProblemNotification(ctx, c, ticket)
+		notificationErr = handleProblemNotification(ctx, c, ticket.ID, foundTicket)
 	case icingadsl.Recovery:
 		// Closes a ticket if one exists
 		// If ticket is open, adds article to existing ticket
@@ -206,11 +210,10 @@ func createArticleBody(header string) string {
 
 // handleProblemNotification opens a new ticket if none exists,
 // If one exists, adds message to existing ticket.
-func handleProblemNotification(ctx context.Context, c *client.Client, ticket zammad.Ticket) error {
+func handleProblemNotification(ctx context.Context, c *client.Client, ticketID int, ticketExists bool) error {
 	var err error
 
 	a := zammad.Article{
-		TicketID:    ticket.ID,
 		Subject:     "Problem",
 		Body:        createArticleBody("Problem"),
 		ContentType: "text/html",
@@ -220,8 +223,10 @@ func handleProblemNotification(ctx context.Context, c *client.Client, ticket zam
 	}
 
 	// If a Zammad Ticket exists, add the article to this ticket.
-	if ticket.ID != 0 {
+	if ticketExists {
+		a.TicketID = ticketID
 		err = c.AddArticleToTicket(ctx, a)
+
 		return err
 	}
 
@@ -237,6 +242,8 @@ func handleProblemNotification(ctx context.Context, c *client.Client, ticket zam
 		title.WriteString(" Service: " + cliConfig.IcingaServiceName)
 	}
 
+	ticket := zammad.NewTicket{}
+
 	ticket.Title = title.String()
 	ticket.Group = cliConfig.ZammadGroup
 	ticket.Customer = cliConfig.ZammadCustomer

internal/api/api.go

@@ -12,18 +12,13 @@ const (
 // We currently only care about the assets in which the tickets
 // are contained
 type TicketSearchResult struct {
-	Assets Assets `json:"assets"`
-}
-
-// Assets represents the assets in the search result
-type Assets struct {
-	Tickets map[string]Ticket `json:"Ticket"`
+	Tickets []Ticket `json:"Ticket"`
 }
 
 // Ticket represents a Zammad Ticket
 // We use two custom field attributes for the tickets
 // icinga_host and icinga_service to track existing tickets
-type Ticket struct {
+type NewTicket struct {
 	ID            int     `json:"id,omitempty"`
 	Title         string  `json:"title"`
 	Group         string  `json:"group"`
@@ -33,6 +28,16 @@ type Ticket struct {
 	Article       Article `json:"article,omitempty"`
 }
 
+type Ticket struct {
+	ID            int    `json:"id,omitempty"`
+	Title         string `json:"title"`
+	GroupID       int    `json:"group_id"`
+	CustomerID    int    `json:"customer_id"`
+	IcingaHost    string `json:"icinga_host"`
+	IcingaService string `json:"icinga_service"`
+	ArticleIDs    []int  `json:"article_ids,omitempty"`
+}
+
 // Article represents a Zammad Ticket Article
 type Article struct {
 	TicketID    int    `json:"ticket_id,omitempty"`

internal/client/client.go

@@ -12,6 +12,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 
 	zammad "github.com/NETWAYS/notify_zammad/internal/api"
 )
@@ -52,6 +53,8 @@ func (c *Client) SearchTickets(ctx context.Context, hostname, service string) ([
 	search.Set("order_by", "desc")
 	u.RawQuery = search.Encode()
 
+	// fmt.Printf("Raw Search query: %s\n", u.RawQuery)
+
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
 
 	if err != nil {
@@ -70,18 +73,32 @@ func (c *Client) SearchTickets(ctx context.Context, hostname, service string) ([
 		return nil, fmt.Errorf("authentication failed for %s", c.URL.String())
 	}
 
-	var result zammad.TicketSearchResult
+	var result []zammad.Ticket
+
+	buf := new(strings.Builder)
+	_, err = io.Copy(buf, resp.Body)
+	// check errors
+	if err != nil {
+		return nil, fmt.Errorf("unable to read search results: %w", err)
+	}
+	// fmt.Println("received answer: " + buf.String() + "\n")
+
+	if buf.String() == "[]" {
+		tickets := make([]zammad.Ticket, 0)
+		return tickets, nil
+	}
 
-	err = json.NewDecoder(resp.Body).Decode(&result)
+	err = json.NewDecoder(strings.NewReader(buf.String())).Decode(&result)
 
 	if err != nil {
+		// Maybe an empty result
 		return nil, fmt.Errorf("unable to parse search results: %w", err)
 	}
 
 	// We only care about the tickets, thus we create a slice to easier work with them
-	tickets := make([]zammad.Ticket, 0, len(result.Assets.Tickets))
+	tickets := make([]zammad.Ticket, 0, len(result))
 
-	for _, ticket := range result.Assets.Tickets {
+	for _, ticket := range result {
 		// If no service is provided we add the ticket and are done
 		if service == "" {
 			tickets = append(tickets, ticket)
@@ -133,7 +150,7 @@ func (c *Client) AddArticleToTicket(ctx context.Context, article zammad.Article)
 }
 
 // CreateTicket create a new ticket in Zammad
-func (c *Client) CreateTicket(ctx context.Context, ticket zammad.Ticket) error {
+func (c *Client) CreateTicket(ctx context.Context, ticket zammad.NewTicket) error {
 	url := c.URL.JoinPath("/api/v1/tickets")
 
 	data, err := json.Marshal(ticket)