diff --git a/pkg/grafana/dashboard_version.go b/pkg/grafana/dashboard_version.go index c2764dd..d3c6a96 100644 --- a/pkg/grafana/dashboard_version.go +++ b/pkg/grafana/dashboard_version.go @@ -5,7 +5,6 @@ import ( "fmt" "net/url" "strconv" - "strings" "time" "git.ar21.de/yolokube/grafana-backuper/pkg/grafana/schema" @@ -168,25 +167,15 @@ func (c *DashboardVersionClient) list( return nil, nil, err } - var versions schema.DashboardVersionListResponseV10 - body := schema.DashboardVersionListResponse{} + var body schema.DashboardVersionListResponse + resp, err := c.client.do(req, &body) if err != nil { - if !strings.Contains(err.Error(), "cannot unmarshal object") { - return nil, resp, err - } - bodyV10 := schema.DashboardVersionListResponseV10{} - resp, err = c.client.do(req, &bodyV10) - if err != nil { - return nil, resp, err - } - versions = bodyV10 - } else { - versions = body.Versions + return nil, resp, err } - dashboardVersions := make([]*DashboardVersion, 0, len(versions)) - for _, dashboardVersion := range versions { + dashboardVersions := make([]*DashboardVersion, 0, len(body)) + for _, dashboardVersion := range body { dashboardVersions = append(dashboardVersions, DashboardVersionFromSchema(dashboardVersion)) } diff --git a/pkg/grafana/schema/dashboard_version.go b/pkg/grafana/schema/dashboard_version.go index 829dafb..45f2643 100644 --- a/pkg/grafana/schema/dashboard_version.go +++ b/pkg/grafana/schema/dashboard_version.go @@ -1,8 +1,6 @@ package schema -import ( - "time" -) +import "time" type DashboardVersion struct { ID uint `json:"id"` @@ -17,9 +15,4 @@ type DashboardVersion struct { Data any `json:"data"` } -type DashboardVersionListResponseV10 []DashboardVersion - -type DashboardVersionListResponse struct { - ContinueToken string `json:"continueToken"` - Versions DashboardVersionListResponseV10 `json:"versions"` -} +type DashboardVersionListResponse []DashboardVersion