fix lint

Author: duhminick

plugins/outputs/cloudwatchlogs/internal/pusher/retention_policy_ttl.go

@@ -27,7 +27,7 @@ type payload struct {
 	timestamp time.Time
 }
 
-type retentionPolicyTTL struct {
+type RetentionPolicyTTL struct {
 	logger        telegraf.Logger
 	stateFilePath string
 	// oldTimestamps come from the TTL file on agent start. Key is escaped group name
@@ -39,8 +39,8 @@ type retentionPolicyTTL struct {
 	done          chan struct{}
 }
 
-func NewRetentionPolicyTTL(logger telegraf.Logger, fileStatePath string) *retentionPolicyTTL {
-	r := &retentionPolicyTTL{
+func NewRetentionPolicyTTL(logger telegraf.Logger, fileStatePath string) *RetentionPolicyTTL {
+	r := &RetentionPolicyTTL{
 		logger:        logger,
 		stateFilePath: filepath.Join(fileStatePath, logscommon.RetentionPolicyTTLFileName),
 		oldTimestamps: make(map[string]time.Time),
@@ -55,19 +55,19 @@ func NewRetentionPolicyTTL(logger telegraf.Logger, fileStatePath string) *retent
 }
 
 // Update will update the newTimestamps to the current time that will later be persisted to disk.
-func (r *retentionPolicyTTL) Update(group string) {
+func (r *RetentionPolicyTTL) Update(group string) {
 	r.ch <- payload{
 		group:     group,
 		timestamp: time.Now(),
 	}
 }
 
-func (r *retentionPolicyTTL) Done() {
+func (r *RetentionPolicyTTL) Done() {
 	close(r.done)
 }
 
 // IsExpired checks from the timestamps in the read state file at the agent start.
-func (r *retentionPolicyTTL) IsExpired(group string) bool {
+func (r *RetentionPolicyTTL) IsExpired(group string) bool {
 	if ts, ok := r.oldTimestamps[escapeLogGroup(group)]; ok {
 		return ts.Add(ttlTime).Before(time.Now())
 	}
@@ -76,7 +76,7 @@ func (r *retentionPolicyTTL) IsExpired(group string) bool {
 }
 
 // UpdateFromFile updates the newTimestamps cache using the timestamp from the loaded state file.
-func (r *retentionPolicyTTL) UpdateFromFile(group string) {
+func (r *RetentionPolicyTTL) UpdateFromFile(group string) {
 	if oldTs, ok := r.oldTimestamps[escapeLogGroup(group)]; ok {
 		r.ch <- payload{
 			group:     group,
@@ -85,7 +85,7 @@ func (r *retentionPolicyTTL) UpdateFromFile(group string) {
 	}
 }
 
-func (r *retentionPolicyTTL) loadTTLState() {
+func (r *RetentionPolicyTTL) loadTTLState() {
 	if _, err := os.Stat(r.stateFilePath); err != nil {
 		r.logger.Debug("retention policy ttl state file does not exist")
 		return
@@ -125,7 +125,7 @@ func (r *retentionPolicyTTL) loadTTLState() {
 	}
 }
 
-func (r *retentionPolicyTTL) process() {
+func (r *RetentionPolicyTTL) process() {
 	t := time.NewTicker(time.Minute)
 	defer t.Stop()
 
@@ -142,13 +142,13 @@ func (r *retentionPolicyTTL) process() {
 	}
 }
 
-func (r *retentionPolicyTTL) updateTimestamp(group string, timestamp time.Time) {
+func (r *RetentionPolicyTTL) updateTimestamp(group string, timestamp time.Time) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	r.newTimestamps[escapeLogGroup(group)] = timestamp
 }
 
-func (r *retentionPolicyTTL) saveTTLState() {
+func (r *RetentionPolicyTTL) saveTTLState() {
 	r.mu.RLock()
 	defer r.mu.RUnlock()
 
@@ -157,16 +157,16 @@ func (r *retentionPolicyTTL) saveTTLState() {
 		buf.Write([]byte(group + ":" + strconv.FormatInt(timestamp.UnixMilli(), 10) + "\n"))
 	}
 
-	err := os.WriteFile(r.stateFilePath, buf.Bytes(), 0644)
+	err := os.WriteFile(r.stateFilePath, buf.Bytes(), 0644) // nolint:gosec
 	if err != nil {
 		r.logger.Errorf("unable to write retention policy ttl state file: %v", err)
 	}
 }
 
-func escapeLogGroup(group string) (escapedLogGroup string) {
-	escapedLogGroup = filepath.ToSlash(group)
+func escapeLogGroup(group string) string {
+	escapedLogGroup := filepath.ToSlash(group)
 	escapedLogGroup = strings.Replace(escapedLogGroup, "/", "_", -1)
 	escapedLogGroup = strings.Replace(escapedLogGroup, " ", "_", -1)
 	escapedLogGroup = strings.Replace(escapedLogGroup, ":", "_", -1)
-	return
+	return escapedLogGroup
 }

plugins/outputs/cloudwatchlogs/internal/pusher/retention_policy_ttl_test.go

@@ -144,7 +144,7 @@ func TestRetentionPolicyTTL(t *testing.T) {
 		content := "group1:" + strconv.FormatInt(nowMillis, 10) + "\n" +
 			"group2:" + strconv.FormatInt(nowMillis+60000, 10) + "\n"
 
-		err := os.WriteFile(stateFilePath, []byte(content), 0644)
+		err := os.WriteFile(stateFilePath, []byte(content), 0644) // nolint:gosec
 		assert.NoError(t, err)
 
 		// Create a new TTL instance that will load the file
@@ -172,7 +172,7 @@ func TestRetentionPolicyTTL(t *testing.T) {
 			"\n" + // Empty line should be skipped
 			"invalid_line_no_separator\n"
 
-		err := os.WriteFile(stateFilePath, []byte(content), 0644)
+		err := os.WriteFile(stateFilePath, []byte(content), 0644) // nolint:gosec
 		assert.NoError(t, err)
 
 		ttl := NewRetentionPolicyTTL(logger, tempDir)

plugins/outputs/cloudwatchlogs/internal/pusher/target.go

@@ -46,7 +46,7 @@ type targetManager struct {
 	dlg      chan Target
 	prp      chan Target
 	// cache of most recent retention policy changes
-	retentionPolicyTTL *retentionPolicyTTL
+	retentionPolicyTTL *RetentionPolicyTTL
 }
 
 func NewTargetManager(logger telegraf.Logger, service cloudWatchLogsService, fileStateFolder string) TargetManager {

plugins/outputs/cloudwatchlogs/internal/pusher/target_test.go

@@ -407,7 +407,7 @@ func TestTargetManagerWithTTL(t *testing.T) {
 		ttlFilePath := filepath.Join(tempDir, logscommon.RetentionPolicyTTLFileName)
 		now := time.Now()
 		content := escapeLogGroup(target.Group) + ":" + strconv.FormatInt(now.UnixMilli(), 10) + "\n"
-		err := os.WriteFile(ttlFilePath, []byte(content), 0644)
+		err := os.WriteFile(ttlFilePath, []byte(content), 0644) // nolint:gosec
 		assert.NoError(t, err)
 
 		mockService := new(mockLogsService)

translator/translate/logs/ruleFileStateFolder.go

@@ -11,12 +11,10 @@ type FileStateFolder struct {
 }
 
 // FileStateFolder is internal value, not exposing to customer
-func (f *FileStateFolder) ApplyRule(input interface{}) (returnKey string, returnVal interface{}) {
+func (f *FileStateFolder) ApplyRule(_ interface{}) (string, interface{}) {
 	res := map[string]interface{}{}
 	res["file_state_folder"] = util.GetFileStateFolder()
-	returnKey = Output_Cloudwatch_Logs
-	returnVal = res
-	return
+	return Output_Cloudwatch_Logs, res
 }
 func init() {
 	f := new(FileStateFolder)