From 02814c71a5b1155cea8bcf36760eecb03c0eee09 Mon Sep 17 00:00:00 2001 From: yusheng-guo Date: Wed, 14 Aug 2024 11:08:48 +0800 Subject: [PATCH 1/2] fixed: time format --- sinks/utils/aliyun_util.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sinks/utils/aliyun_util.go b/sinks/utils/aliyun_util.go index a35f5a60..a7e6fcac 100644 --- a/sinks/utils/aliyun_util.go +++ b/sinks/utils/aliyun_util.go @@ -17,6 +17,7 @@ import ( const ( ConfigPath = "/var/addon/token-config" StsTokenTimeLayout = "2006-01-02T15:04:05Z" + TimeLogLayout = "2006-01-02 15:04:05 -07 UTC" ) type AKInfo struct { @@ -33,8 +34,6 @@ func (akInfo *AKInfo) IsExpired() bool { return true } - klog.V(7).Infof("akinfo Expiration: %v, Now: %v", akInfo.Expiration, time.Now().Format(StsTokenTimeLayout)) - if len(akInfo.AccessKeyId) > 0 && len(akInfo.AccessKeySecret) > 0 && len(akInfo.SecurityToken) == 0 { return false } @@ -44,6 +43,9 @@ func (akInfo *AKInfo) IsExpired() bool { klog.Errorf("failed to parse time layout, akInfo Expiration: %v, err: %v", akInfo.Expiration, err) return true } + + klog.V(7).Infof("akinfo Expiration: %v, Now: %v", t.Local().Format(TimeLogLayout), time.Now().Local().Format(TimeLogLayout)) + if t.Before(time.Now()) { klog.Errorf("invalid token which is expired, akInfo Expiration: %v, now: %v", akInfo.Expiration, time.Now()) return true @@ -149,7 +151,7 @@ func ParseAKInfoFromMeta() (*AKInfo, error) { akInfo.AccessKeyId = auth.AccessKeyId akInfo.AccessKeySecret = auth.AccessKeySecret akInfo.SecurityToken = auth.SecurityToken - akInfo.Expiration = auth.Expiration.Format(StsTokenTimeLayout) + akInfo.Expiration = auth.Expiration.UTC().Format(StsTokenTimeLayout) return &akInfo, nil } From e798a3939b55ef8cbc2a5f4c1c385987e8afcde8 Mon Sep 17 00:00:00 2001 From: yusheng-guo Date: Wed, 14 Aug 2024 11:19:17 +0800 Subject: [PATCH 2/2] fixed: error log format --- sinks/utils/aliyun_util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sinks/utils/aliyun_util.go b/sinks/utils/aliyun_util.go index a7e6fcac..73745226 100644 --- a/sinks/utils/aliyun_util.go +++ b/sinks/utils/aliyun_util.go @@ -47,7 +47,7 @@ func (akInfo *AKInfo) IsExpired() bool { klog.V(7).Infof("akinfo Expiration: %v, Now: %v", t.Local().Format(TimeLogLayout), time.Now().Local().Format(TimeLogLayout)) if t.Before(time.Now()) { - klog.Errorf("invalid token which is expired, akInfo Expiration: %v, now: %v", akInfo.Expiration, time.Now()) + klog.Errorf("invalid token which is expired, akInfo Expiration: %v, now: %v", t.Local().Format(TimeLogLayout), time.Now().Local().Format(TimeLogLayout)) return true } return false