packages/grafana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!62 [sync] PR-57: Fix gtime_test

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-04-14 06:11:05 +00:00 committed by Gitee
commit 36432458a9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
fix-gtime_test.patch Normal file
View File

@ -0,0 +1,50 @@
From 3e491ce63e1c8f63abc891765848a7484f0d6005 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Wed, 1 Mar 2023 13:08:34 +0100
Subject: [PATCH] fix gtime_test (#637)
---
pkg/components/gtime/gtime_test.go | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkg/components/gtime/gtime_test.go b/pkg/components/gtime/gtime_test.go
index 0b1b23a..a7b952d 100644
--- a/pkg/components/gtime/gtime_test.go
+++ b/pkg/components/gtime/gtime_test.go
@@ -72,13 +72,13 @@ func TestParseDuration(t *testing.T) {
func calculateDays() (int, int) {
now := time.Now().UTC()
- currentYear, currentMonth, _ := now.Date()
+ currentYear, currentMonth, currentDay := now.Date()
firstDayOfMonth := time.Date(currentYear, currentMonth, 1, 0, 0, 0, 0, time.UTC)
daysInMonth := firstDayOfMonth.AddDate(0, 1, -1).Day()
- t1 := time.Date(currentYear, 1, 1, 0, 0, 0, 0, time.UTC)
- t2 := time.Date(currentYear+1, 1, 1, 0, 0, 0, 0, time.UTC)
+ t1 := time.Date(currentYear, currentMonth, currentDay, 0, 0, 0, 0, time.UTC)
+ t2 := t1.AddDate(1, 0, 0)
daysInYear := int(t2.Sub(t1).Hours() / 24)
@@ -87,13 +87,13 @@ func calculateDays() (int, int) {
func calculateDays5y() int {
now := time.Now().UTC()
- currentYear, _, _ := now.Date()
+ currentYear, currentMonth, currentDay := now.Date()
var daysInYear int
for i := 0; i < 5; i++ {
- t1 := time.Date(currentYear+i, 1, 1, 0, 0, 0, 0, time.UTC)
- t2 := time.Date(currentYear+i+1, 1, 1, 0, 0, 0, 0, time.UTC)
+ t1 := time.Date(currentYear+i, currentMonth, currentDay, 0, 0, 0, 0, time.UTC)
+ t2 := t1.AddDate(1, 0, 0)
daysInYear = daysInYear + int(t2.Sub(t1).Hours()/24)
}
--
2.33.0

8
grafana.spec
View File

@ -7,7 +7,7 @@
Name: grafana
Version: 7.5.15
Release: 3
Release: 4
Summary: Metrics dashboard and graph editor
License: Apache 2.0
URL: https://grafana.org
@ -46,6 +46,8 @@ Patch15: 015-CVE-2022-21698.vendor.patch
#https://github.com/grafana/grafana/pull/49223
Patch16: CVE-2022-29170.patch
Patch17: CVE-2022-31107.patch
# https://github.com/grafana/grafana-plugin-sdk-go/pull/637
Patch18: fix-gtime_test.patch
BuildRequires: git, systemd, golang
@ -421,6 +423,7 @@ rm -r plugins-bundled
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
# Set up build subdirs and links
@ -585,6 +588,9 @@ rm -r pkg/macaron
%changelog
* Thu Apr 13 2023 wangkai <13474090681@163.com> - 7.5.15-4
- Fix gtime_test
* Wed Aug 17 2022 yaoxin <yaoxin30@h-partners.com> - 7.5.15-3
- Fix CVE-2022-31107