Skip to content

Commit b758b9e

Browse files
PaamickyPaamicky
committed
fix: resolve workflow lint issues
1 parent 144fac4 commit b758b9e

File tree

4 files changed

+39
-39
lines changed

4 files changed

+39
-39
lines changed

‎.github/workflows/test-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ jobs:
487487
- name: Terraform apply
488488
uses: nick-fields/retry@v2
489489
with:
490-
max_attempts: 1
490+
max_attempts: 3
491491
timeout_minutes: 60
492492
retry_wait_seconds: 5
493493
command: |

‎translator/tocwconfig/totomlconfig/tomlConfigTemplate/tomlConfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ type (
105105
eventConfig struct {
106106
BatchReadSize int `toml:"batch_read_size"`
107107
EventLevels []string `toml:"event_levels"`
108-
EventIds []int `toml:"event_ids"`
108+
EventIDs []int `toml:"event_ids"`
109109
EventName string `toml:"event_name"`
110110
LogGroupName string `toml:"log_group_name"`
111111
LogStreamName string `toml:"log_stream_name"`

‎translator/translate/logs/logs_collected/windows_events/collect_list/collectlist.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const (
2121
EventConfigTomlKey = "event_config"
2222
BatchReadSizeKey = "batch_read_size"
2323
EventLevelsKey = "event_levels"
24-
EventIdKey = "event_ids"
24+
EventIDKey = "event_ids"
2525
//TODO: Performance test to confirm the proper value here - https://github.com/aws/amazon-cloudwatch-agent/issues/231
2626
BatchReadSizeValue = 170
2727
)
@@ -35,7 +35,7 @@ func RegisterRule(fieldname string, r Rule) {
3535
type CollectList struct {
3636
}
3737

38-
var customizedJsonConfigKeys = []string{"event_name", EventLevelsKey, EventIdKey}
38+
var customizedJSONConfigKeys = []string{"event_name", EventLevelsKey, EventIDKey}
3939
var eventLevelMapping = map[string]string{
4040
"VERBOSE": "5",
4141
"INFORMATION": "4",
@@ -78,7 +78,7 @@ func init() {
7878
func getTransformedConfig(input interface{}) interface{} {
7979
result := map[string]interface{}{}
8080
// Extract customer specified config
81-
util.SetWithSameKeyIfFound(input, customizedJsonConfigKeys, result)
81+
util.SetWithSameKeyIfFound(input, customizedJSONConfigKeys, result)
8282
// Set Fixed config
8383
addFixedJsonConfig(result)
8484

@@ -120,40 +120,40 @@ func addFixedJsonConfig(result map[string]interface{}) {
120120
}
121121
result[EventLevelsKey] = resultEventLevels
122122

123-
if eventIds, ok := result[EventIdKey]; ok {
124-
validatedIds, errorMessages := validateEventIds(eventIds.([]interface{}))
123+
if eventIDs, ok := result[EventIDKey]; ok {
124+
validatedIDs, errorMessages := validateEventIDs(eventIDs.([]interface{}))
125125
for _, err := range errorMessages {
126126
translator.AddErrorMessages(GetCurPath(), err)
127127
}
128-
result[EventIdKey] = validatedIds
128+
result[EventIDKey] = validatedIDs
129129
}
130130
}
131131

132132
// Validate event_id inputs
133-
func validateEventIds(inputEventIds []interface{}) ([]int, []string) {
134-
validatedIds := []int{}
133+
func validateEventIDs(inputEventIDs []interface{}) ([]int, []string) {
134+
validatedIDs := []int{}
135135
errorMessages := []string{}
136136

137137
const (
138-
minEventId = 0
139-
maxEventId = 65535
138+
minEventID = 0
139+
maxEventID = 65535
140140
)
141141

142-
for _, id := range inputEventIds {
143-
eventIdFloat, ok := id.(float64)
142+
for _, id := range inputEventIDs {
143+
eventIDFloat, ok := id.(float64)
144144
if !ok {
145145
errorMessages = append(errorMessages, fmt.Sprintf("Event ID %v is not a number", id))
146146
continue
147147
}
148-
eventIdInt := int(eventIdFloat)
149-
if eventIdInt < minEventId || eventIdInt > maxEventId {
150-
errorMessages = append(errorMessages, fmt.Sprintf("Event ID %v is not a valid windows event_id.", eventIdInt))
148+
eventIDInt := int(eventIDFloat)
149+
if eventIDInt < minEventID || eventIDInt > maxEventID {
150+
errorMessages = append(errorMessages, fmt.Sprintf("Event ID %v is not a valid windows event_id.", eventIDInt))
151151
continue
152152
}
153153

154-
validatedIds = append(validatedIds, eventIdInt)
154+
validatedIDs = append(validatedIDs, eventIDInt)
155155
}
156156

157-
return validatedIds, errorMessages
157+
return validatedIDs, errorMessages
158158

159159
}

‎translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
func TestApplyRule(t *testing.T) {
1717
c := new(CollectList)
18-
var rawJsonString = `
18+
var rawJSONString = `
1919
{
2020
"collect_list": [
2121
{
@@ -76,7 +76,7 @@ func TestApplyRule(t *testing.T) {
7676

7777
var actual interface{}
7878

79-
err := json.Unmarshal([]byte(rawJsonString), &input)
79+
err := json.Unmarshal([]byte(rawJSONString), &input)
8080
if err == nil {
8181
_, actual = c.ApplyRule(input)
8282
assert.Equal(t, expected, actual)
@@ -87,7 +87,7 @@ func TestApplyRule(t *testing.T) {
8787

8888
func TestDuplicateRetention(t *testing.T) {
8989
c := new(CollectList)
90-
var rawJsonString = `
90+
var rawJSONString = `
9191
{
9292
"collect_list": [
9393
{
@@ -175,19 +175,19 @@ func TestDuplicateRetention(t *testing.T) {
175175

176176
var actual interface{}
177177

178-
error := json.Unmarshal([]byte(rawJsonString), &input)
179-
if error == nil {
178+
err := json.Unmarshal([]byte(rawJSONString), &input)
179+
if err == nil {
180180
_, actual = c.ApplyRule(input)
181181
assert.Equal(t, 0, len(translator.ErrorMessages))
182182
assert.Equal(t, expected, actual)
183183
} else {
184-
assert.Fail(t, error.Error())
184+
assert.Fail(t, err.Error())
185185
}
186186
}
187187

188188
func TestConflictingRetention(t *testing.T) {
189189
c := new(CollectList)
190-
var rawJsonString = `
190+
var rawJSONString = `
191191
{
192192
"collect_list": [
193193
{
@@ -247,7 +247,7 @@ func TestConflictingRetention(t *testing.T) {
247247

248248
var actual interface{}
249249

250-
error := json.Unmarshal([]byte(rawJsonString), &input)
250+
error := json.Unmarshal([]byte(rawJSONString), &input)
251251
if error == nil {
252252
_, actual = c.ApplyRule(input)
253253
assert.GreaterOrEqual(t, 1, len(translator.ErrorMessages))
@@ -260,7 +260,7 @@ func TestConflictingRetention(t *testing.T) {
260260

261261
func TestEventID(t *testing.T) {
262262
//Inputs
263-
rawJsonString := `{
263+
rawJSONString := `{
264264
"collect_list": [{
265265
"event_name": "System",
266266
"event_ids": [100, 101, 102],
@@ -269,7 +269,7 @@ func TestEventID(t *testing.T) {
269269
}`
270270

271271
var config interface{}
272-
err := json.Unmarshal([]byte(rawJsonString), &config)
272+
err := json.Unmarshal([]byte(rawJSONString), &config)
273273
assert.NoError(t, err)
274274

275275
//process new configutation
@@ -279,54 +279,54 @@ func TestEventID(t *testing.T) {
279279
// Verify event_ids in final configuration
280280
result := val.([]interface{})[0].(map[string]interface{})
281281

282-
eventIds, exists := result["event_ids"]
282+
eventIDs, exists := result["event_ids"]
283283
assert.True(t, exists, "event_ids should exist in final configuration")
284-
assert.Equal(t, []int{100, 101, 102}, eventIds)
284+
assert.Equal(t, []int{100, 101, 102}, eventIDs)
285285

286286
}
287287

288-
func TestValidateEventIds(t *testing.T) {
288+
func TestValidateEventIDs(t *testing.T) {
289289
test := []struct {
290290
name string
291291
input []interface{}
292-
expectedIds []int
292+
expectedIDs []int
293293
expectError bool
294294
}{
295295
{
296296
name: "Valid event IDs",
297297
input: []interface{}{float64(100), float64(200), float64(300)},
298-
expectedIds: []int{100, 200, 300},
298+
expectedIDs: []int{100, 200, 300},
299299
expectError: false,
300300
},
301301
{
302302
name: "Invalid event ID - UpperBound",
303303
input: []interface{}{float64(65536)},
304-
expectedIds: []int{},
304+
expectedIDs: []int{},
305305
expectError: true,
306306
},
307307
{
308308
name: "Invalid event ID - LowerBound",
309309
input: []interface{}{float64(-1)},
310-
expectedIds: []int{},
310+
expectedIDs: []int{},
311311
expectError: true,
312312
},
313313
{
314314
name: "Empty input",
315315
input: []interface{}{},
316-
expectedIds: []int{},
316+
expectedIDs: []int{},
317317
expectError: false,
318318
},
319319
}
320320

321321
for _, tt := range test {
322322
t.Run(tt.name, func(t *testing.T) {
323-
validatedIds, errorMessages := validateEventIds(tt.input)
323+
validatedIDs, errorMessages := validateEventIDs(tt.input)
324324

325325
if !tt.expectError && len(errorMessages) > 0 {
326326
t.Errorf("Unexpected error messages: %v", errorMessages)
327327
}
328328
// Check if validated IDs match expected
329-
assert.Equal(t, tt.expectedIds, validatedIds)
329+
assert.Equal(t, tt.expectedIDs, validatedIDs)
330330

331331
})
332332

0 commit comments

Comments
 (0)