From 8af0ee9a6711ab0efd47d5845af3c6631e5e647d Mon Sep 17 00:00:00 2001 From: AndrewCharlesHay <39sumer3939@gmail.com> Date: Wed, 4 Oct 2023 13:19:44 -0500 Subject: [PATCH 1/8] comment out assertion --- lambda/internal/s3writer/s3writer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda/internal/s3writer/s3writer_test.go b/lambda/internal/s3writer/s3writer_test.go index a3d68e1..8be32d8 100644 --- a/lambda/internal/s3writer/s3writer_test.go +++ b/lambda/internal/s3writer/s3writer_test.go @@ -42,5 +42,5 @@ func TestWriteLogEntry(t *testing.T) { }) assert.NoError(t, err) - s3Uploader.AssertExpectations(t) + // s3Uploader.AssertExpectations(t) } \ No newline at end of file From 1c963dc5362c970d119d47152da120262756a697 Mon Sep 17 00:00:00 2001 From: AndrewCharlesHay <39sumer3939@gmail.com> Date: Wed, 4 Oct 2023 13:20:42 -0500 Subject: [PATCH 2/8] uncomment test --- lambda/internal/s3writer/s3writer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda/internal/s3writer/s3writer_test.go b/lambda/internal/s3writer/s3writer_test.go index 8be32d8..a3d68e1 100644 --- a/lambda/internal/s3writer/s3writer_test.go +++ b/lambda/internal/s3writer/s3writer_test.go @@ -42,5 +42,5 @@ func TestWriteLogEntry(t *testing.T) { }) assert.NoError(t, err) - // s3Uploader.AssertExpectations(t) + s3Uploader.AssertExpectations(t) } \ No newline at end of file From a1a3afe5a78fdc143e81087a0009f83fb5ffddf1 Mon Sep 17 00:00:00 2001 From: AndrewCharlesHay <39sumer3939@gmail.com> Date: Wed, 4 Oct 2023 19:02:24 -0500 Subject: [PATCH 3/8] update commits --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1bfcfe3..4a7b9ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -aws-sam-cli==1.9.0 -cfn-lint==0.40.0 \ No newline at end of file +aws-sam-cli==1.98.0 +cfn-lint==0.80.3 \ No newline at end of file From 89a8d5d2f248be74108692f21b1de395b640bf77 Mon Sep 17 00:00:00 2001 From: AndrewCharlesHay <39sumer3939@gmail.com> Date: Wed, 4 Oct 2023 19:05:24 -0500 Subject: [PATCH 4/8] remove-parse-test --- lambda/internal/parser/auditlogparser_test.go | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 lambda/internal/parser/auditlogparser_test.go diff --git a/lambda/internal/parser/auditlogparser_test.go b/lambda/internal/parser/auditlogparser_test.go deleted file mode 100644 index 73abf59..0000000 --- a/lambda/internal/parser/auditlogparser_test.go +++ /dev/null @@ -1,61 +0,0 @@ -package parser - -import ( - "github.com/stretchr/testify/assert" - "rdsauditlogss3/internal/entity" - "strings" - "testing" -) - -func TestWriteLogEntrySingleLine(t *testing.T) { - parser := NewAuditLogParser() - - logFileTimestamp := int64(1595332052) - logLine := "20200714 07:05:25,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT NAME, VALUE FROM mysql.rds_configuration',0" - entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) - assert.NoError(t, err) - - assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 7), entries[0].Timestamp) - assert.Equal(t, logLine + "\n", entries[0].LogLine.String()) - assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) -} - -func TestWriteLogEntryMultiLine(t *testing.T) { - parser := NewAuditLogParser() - - logFileTimestamp := int64(1595332052) - logLine := `20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,0,CONNECT,rdslogstest,,0 -20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,161152,QUERY,rdslogstest,'select @@version_comment limit 1',0 -20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,161153,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:02 UTC 2020 (32932)"',0 -20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,0,DISCONNECT,rdslogstest,,0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161155,QUERY,mysql,'SELECT 1',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161156,QUERY,mysql,'SELECT 1',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161157,QUERY,mysql,'SELECT 1',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161159,QUERY,mysql,'SELECT count(*) from information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161161,QUERY,mysql,'SELECT 1',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT value FROM mysql.rds_heartbeat2',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161163,QUERY,mysql,'SELECT 1',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161165,QUERY,mysql,'SELECT count(*) from information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161167,QUERY,mysql,'SELECT 1',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161169,QUERY,mysql,'INSERT INTO mysql.rds_heartbeat2(id, value) values (1,1594722603906) ON DUPLICATE KEY UPDATE value = 1594722603906',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0 -20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161172,QUERY,mysql,'COMMIT',0 -20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,0,CONNECT,rdslogstest,,0 -20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,161173,QUERY,rdslogstest,'select @@version_comment limit 1',0 -20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,161174,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:04 UTC 2020 (32933)"',0 -20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,0,DISCONNECT,rdslogstest,,0 -20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,0,CONNECT,rdslogstest,,0 -20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,161176,QUERY,rdslogstest,'select @@version_comment limit 1',0 -20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,161177,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:06 UTC 2020 (32934)"',0 -20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,0,DISCONNECT,rdslogstest,,0 -20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0 -` - - entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) - assert.NoError(t, err) - assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 10), entries[0].Timestamp) - assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) - assert.Len(t, entries, 3) - - assert.Equal(t, "20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0" + "\n", entries[2].LogLine.String()) -} \ No newline at end of file From 5c3884363b21f9248104ee6a02cc96ce756b7e05 Mon Sep 17 00:00:00 2001 From: AndrewCharlesHay <39sumer3939@gmail.com> Date: Wed, 4 Oct 2023 19:20:19 -0500 Subject: [PATCH 5/8] add back first test --- lambda/internal/parser/auditlogparser_test.go | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 lambda/internal/parser/auditlogparser_test.go diff --git a/lambda/internal/parser/auditlogparser_test.go b/lambda/internal/parser/auditlogparser_test.go new file mode 100644 index 0000000..bf6137d --- /dev/null +++ b/lambda/internal/parser/auditlogparser_test.go @@ -0,0 +1,61 @@ +package parser + +import ( + "github.com/stretchr/testify/assert" + "rdsauditlogss3/internal/entity" + "strings" + "testing" +) + +func TestWriteLogEntrySingleLine(t *testing.T) { + parser := NewAuditLogParser() + + logFileTimestamp := int64(1595332052) + logLine := "20200714 07:05:25,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT NAME, VALUE FROM mysql.rds_configuration',0" + entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) + assert.NoError(t, err) + + assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 7), entries[0].Timestamp) + assert.Equal(t, logLine + "\n", entries[0].LogLine.String()) + assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) +} + +// func TestWriteLogEntryMultiLine(t *testing.T) { +// parser := NewAuditLogParser() + +// logFileTimestamp := int64(1595332052) +// logLine := `20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,0,CONNECT,rdslogstest,,0 +// 20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,161152,QUERY,rdslogstest,'select @@version_comment limit 1',0 +// 20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,161153,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:02 UTC 2020 (32932)"',0 +// 20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,0,DISCONNECT,rdslogstest,,0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161155,QUERY,mysql,'SELECT 1',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161156,QUERY,mysql,'SELECT 1',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161157,QUERY,mysql,'SELECT 1',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161159,QUERY,mysql,'SELECT count(*) from information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161161,QUERY,mysql,'SELECT 1',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT value FROM mysql.rds_heartbeat2',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161163,QUERY,mysql,'SELECT 1',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161165,QUERY,mysql,'SELECT count(*) from information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161167,QUERY,mysql,'SELECT 1',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161169,QUERY,mysql,'INSERT INTO mysql.rds_heartbeat2(id, value) values (1,1594722603906) ON DUPLICATE KEY UPDATE value = 1594722603906',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0 +// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161172,QUERY,mysql,'COMMIT',0 +// 20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,0,CONNECT,rdslogstest,,0 +// 20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,161173,QUERY,rdslogstest,'select @@version_comment limit 1',0 +// 20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,161174,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:04 UTC 2020 (32933)"',0 +// 20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,0,DISCONNECT,rdslogstest,,0 +// 20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,0,CONNECT,rdslogstest,,0 +// 20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,161176,QUERY,rdslogstest,'select @@version_comment limit 1',0 +// 20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,161177,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:06 UTC 2020 (32934)"',0 +// 20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,0,DISCONNECT,rdslogstest,,0 +// 20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0 +// ` + +// entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) +// assert.NoError(t, err) +// assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 10), entries[0].Timestamp) +// assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) +// assert.Len(t, entries, 3) + +// assert.Equal(t, "20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0" + "\n", entries[2].LogLine.String()) +// } \ No newline at end of file From 572182855f6757f306aa4e578414cb1861d9e812 Mon Sep 17 00:00:00 2001 From: AndrewCharlesHay <39sumer3939@gmail.com> Date: Wed, 4 Oct 2023 19:23:05 -0500 Subject: [PATCH 6/8] Is it the other test --- lambda/internal/parser/auditlogparser_test.go | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/lambda/internal/parser/auditlogparser_test.go b/lambda/internal/parser/auditlogparser_test.go index bf6137d..df1f9b6 100644 --- a/lambda/internal/parser/auditlogparser_test.go +++ b/lambda/internal/parser/auditlogparser_test.go @@ -7,55 +7,55 @@ import ( "testing" ) -func TestWriteLogEntrySingleLine(t *testing.T) { - parser := NewAuditLogParser() - - logFileTimestamp := int64(1595332052) - logLine := "20200714 07:05:25,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT NAME, VALUE FROM mysql.rds_configuration',0" - entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) - assert.NoError(t, err) - - assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 7), entries[0].Timestamp) - assert.Equal(t, logLine + "\n", entries[0].LogLine.String()) - assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) -} - -// func TestWriteLogEntryMultiLine(t *testing.T) { +// func TestWriteLogEntrySingleLine(t *testing.T) { // parser := NewAuditLogParser() // logFileTimestamp := int64(1595332052) -// logLine := `20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,0,CONNECT,rdslogstest,,0 -// 20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,161152,QUERY,rdslogstest,'select @@version_comment limit 1',0 -// 20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,161153,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:02 UTC 2020 (32932)"',0 -// 20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,0,DISCONNECT,rdslogstest,,0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161155,QUERY,mysql,'SELECT 1',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161156,QUERY,mysql,'SELECT 1',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161157,QUERY,mysql,'SELECT 1',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161159,QUERY,mysql,'SELECT count(*) from information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161161,QUERY,mysql,'SELECT 1',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT value FROM mysql.rds_heartbeat2',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161163,QUERY,mysql,'SELECT 1',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161165,QUERY,mysql,'SELECT count(*) from information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161167,QUERY,mysql,'SELECT 1',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161169,QUERY,mysql,'INSERT INTO mysql.rds_heartbeat2(id, value) values (1,1594722603906) ON DUPLICATE KEY UPDATE value = 1594722603906',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0 -// 20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161172,QUERY,mysql,'COMMIT',0 -// 20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,0,CONNECT,rdslogstest,,0 -// 20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,161173,QUERY,rdslogstest,'select @@version_comment limit 1',0 -// 20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,161174,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:04 UTC 2020 (32933)"',0 -// 20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,0,DISCONNECT,rdslogstest,,0 -// 20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,0,CONNECT,rdslogstest,,0 -// 20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,161176,QUERY,rdslogstest,'select @@version_comment limit 1',0 -// 20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,161177,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:06 UTC 2020 (32934)"',0 -// 20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,0,DISCONNECT,rdslogstest,,0 -// 20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0 -// ` - +// logLine := "20200714 07:05:25,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT NAME, VALUE FROM mysql.rds_configuration',0" // entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) // assert.NoError(t, err) -// assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 10), entries[0].Timestamp) + +// assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 7), entries[0].Timestamp) +// assert.Equal(t, logLine + "\n", entries[0].LogLine.String()) // assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) -// assert.Len(t, entries, 3) +// } + +func TestWriteLogEntryMultiLine(t *testing.T) { + parser := NewAuditLogParser() + + logFileTimestamp := int64(1595332052) + logLine := `20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,0,CONNECT,rdslogstest,,0 +20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,161152,QUERY,rdslogstest,'select @@version_comment limit 1',0 +20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,161153,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:02 UTC 2020 (32932)"',0 +20200714 10:30:02,ip-172-27-1-97,admin,10.120.182.212,33303,0,DISCONNECT,rdslogstest,,0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161155,QUERY,mysql,'SELECT 1',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161156,QUERY,mysql,'SELECT 1',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161157,QUERY,mysql,'SELECT 1',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161159,QUERY,mysql,'SELECT count(*) from information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161161,QUERY,mysql,'SELECT 1',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT value FROM mysql.rds_heartbeat2',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161163,QUERY,mysql,'SELECT 1',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161165,QUERY,mysql,'SELECT count(*) from information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161167,QUERY,mysql,'SELECT 1',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161169,QUERY,mysql,'INSERT INTO mysql.rds_heartbeat2(id, value) values (1,1594722603906) ON DUPLICATE KEY UPDATE value = 1594722603906',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0 +20200714 10:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161172,QUERY,mysql,'COMMIT',0 +20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,0,CONNECT,rdslogstest,,0 +20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,161173,QUERY,rdslogstest,'select @@version_comment limit 1',0 +20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,161174,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:04 UTC 2020 (32933)"',0 +20200714 11:30:04,ip-172-27-1-97,admin,10.120.182.212,33304,0,DISCONNECT,rdslogstest,,0 +20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,0,CONNECT,rdslogstest,,0 +20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,161176,QUERY,rdslogstest,'select @@version_comment limit 1',0 +20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,161177,QUERY,rdslogstest,'SELECT "Service fstehle-rdslog-test running: Tue Jul 14 10:30:06 UTC 2020 (32934)"',0 +20200714 11:30:06,ip-172-27-1-97,admin,10.120.182.212,33305,0,DISCONNECT,rdslogstest,,0 +20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0 +` + + entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) + assert.NoError(t, err) + assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 10), entries[0].Timestamp) + assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) + assert.Len(t, entries, 3) -// assert.Equal(t, "20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0" + "\n", entries[2].LogLine.String()) -// } \ No newline at end of file + assert.Equal(t, "20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0" + "\n", entries[2].LogLine.String()) +} \ No newline at end of file From 7ce294a68a364340e03f3bd18a25c0bbd310c732 Mon Sep 17 00:00:00 2001 From: AndrewCharlesHay <39sumer3939@gmail.com> Date: Wed, 4 Oct 2023 19:54:20 -0500 Subject: [PATCH 7/8] Is it the other test --- lambda/internal/parser/parser.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lambda/internal/parser/parser.go b/lambda/internal/parser/parser.go index a5d77e2..adb4f5f 100644 --- a/lambda/internal/parser/parser.go +++ b/lambda/internal/parser/parser.go @@ -1,10 +1,8 @@ package parser - import ( "rdsauditlogss3/internal/entity" "io" ) - type Parser interface { ParseEntries(data io.Reader, logFileTimestamp int64) ([]*entity.LogEntry, error) -} \ No newline at end of file +} From f8230a8ddb0c081508800428034df4aa24e35b62 Mon Sep 17 00:00:00 2001 From: AndrewCharlesHay <39sumer3939@gmail.com> Date: Wed, 4 Oct 2023 19:56:11 -0500 Subject: [PATCH 8/8] readd tests --- lambda/internal/parser/auditlogparser_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lambda/internal/parser/auditlogparser_test.go b/lambda/internal/parser/auditlogparser_test.go index df1f9b6..f7218ff 100644 --- a/lambda/internal/parser/auditlogparser_test.go +++ b/lambda/internal/parser/auditlogparser_test.go @@ -7,18 +7,18 @@ import ( "testing" ) -// func TestWriteLogEntrySingleLine(t *testing.T) { -// parser := NewAuditLogParser() +func TestWriteLogEntrySingleLine(t *testing.T) { + parser := NewAuditLogParser() -// logFileTimestamp := int64(1595332052) -// logLine := "20200714 07:05:25,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT NAME, VALUE FROM mysql.rds_configuration',0" -// entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) -// assert.NoError(t, err) + logFileTimestamp := int64(1595332052) + logLine := "20200714 07:05:25,ip-172-27-1-97,rdsadmin,localhost,26,47141561040897,QUERY,mysql,'SELECT NAME, VALUE FROM mysql.rds_configuration',0" + entries, err := parser.ParseEntries(strings.NewReader(logLine), logFileTimestamp) + assert.NoError(t, err) -// assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 7), entries[0].Timestamp) -// assert.Equal(t, logLine + "\n", entries[0].LogLine.String()) -// assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) -// } + assert.Equal(t, entity.NewLogEntryTimestamp(2020, 7, 14, 7), entries[0].Timestamp) + assert.Equal(t, logLine + "\n", entries[0].LogLine.String()) + assert.Equal(t, logFileTimestamp, entries[0].LogFileTimestamp) +} func TestWriteLogEntryMultiLine(t *testing.T) { parser := NewAuditLogParser() @@ -58,4 +58,4 @@ func TestWriteLogEntryMultiLine(t *testing.T) { assert.Len(t, entries, 3) assert.Equal(t, "20200714 12:30:03,ip-172-27-1-97,rdsadmin,localhost,26,161171,QUERY,mysql,'SELECT 1',0" + "\n", entries[2].LogLine.String()) -} \ No newline at end of file +}