Fixed an issue in vfsevents where the S3 event names were being evaluated incorrectly (#300)

* Fixed an issue in vfsevents where the S3 event names were being evaluated incorrectly

* Added entry in changelog

* Updated the right changelog this time.

Author: jkware

contrib/vfsevents/CHANGELOG.md

@@ -5,13 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Updated logic to correctly evaluate the S3 event name to determine the event type
 
 ## [contrib/vfsevents/v1.1.0] - 2025-10-07
 ### Security
 - Updated to go 1.24.7
 - Updated dependcies
 ### Fixed
-- Fixed lint issues where t.Context() shoudl be used and pubsub v1 is deprecated, so updated.
+- Fixed lint issues where t.Context() should be used and pubsub v1 is deprecated, so updated.
 
 ## [contrib/vfsevents/v1.0.2] - 2025-09-16
 ### Fixed

contrib/vfsevents/watchers/s3events/s3events.go

@@ -333,28 +333,28 @@ func (w *S3Watcher) processMessage(
 // mapS3EventType maps an S3 event name to a vfsevents.EventType with semantic accuracy
 func (w *S3Watcher) mapS3EventType(eventName string) vfsevents.EventType {
 	switch eventName {
-	case "s3:ObjectCreated:Put", "s3:ObjectCreated:Post":
+	case "ObjectCreated:Put", "ObjectCreated:Post":
 		// Direct uploads are typically new file creations
 		return vfsevents.EventCreated
-	case "s3:ObjectCreated:Copy":
+	case "ObjectCreated:Copy":
 		// Copy operations are more likely to be overwrites or modifications
 		return vfsevents.EventModified
-	case "s3:ObjectCreated:CompleteMultipartUpload":
+	case "ObjectCreated:CompleteMultipartUpload":
 		// Large uploads could be either, but often represent significant changes
 		return vfsevents.EventModified
-	case "s3:ObjectCreated:*":
+	case "ObjectCreated:*":
 		// Wildcard - default to created for broad compatibility
 		return vfsevents.EventCreated
-	case "s3:ObjectRestore:Post":
+	case "ObjectRestore:Post":
 		// Restore initiation - modification-like operation
 		return vfsevents.EventModified
-	case "s3:ObjectRestore:Completed":
+	case "ObjectRestore:Completed":
 		// Restore completion - object is now available (modification)
 		return vfsevents.EventModified
-	case "s3:ObjectRestore:Delete":
+	case "ObjectRestore:Delete":
 		// Temporary restored copy expires - deletion
 		return vfsevents.EventDeleted
-	case "s3:ObjectRemoved:*", "s3:ObjectRemoved:Delete", "s3:ObjectRemoved:DeleteMarkerCreated":
+	case "ObjectRemoved:*", "ObjectRemoved:Delete", "ObjectRemoved:DeleteMarkerCreated":
 		return vfsevents.EventDeleted
 	default:
 		return vfsevents.EventUnknown

contrib/vfsevents/watchers/s3events/s3events_test.go

@@ -29,6 +29,7 @@ type S3WatcherTestSuite struct {
 }
 
 func (s *S3WatcherTestSuite) SetupTest() {
+	s.sqsClient = mocks.NewSqsClient(s.T())
 	s.sqsClient = mocks.NewSqsClient(s.T())
 	s.watcher, _ = NewS3Watcher("https://sqs.us-east-1.amazonaws.com/123456789012/my-queue", WithSqsClient(s.sqsClient))
 }
@@ -109,7 +110,7 @@ func (s *S3WatcherTestSuite) TestPoll() {
 					Records: []S3Record{
 						{
 							EventTime: time.Now().Format(time.RFC3339Nano),
-							EventName: "s3:ObjectCreated:Put",
+							EventName: "ObjectCreated:Put",
 							S3: S3Entity{
 								Bucket: S3Bucket{
 									Name: "bucket-name",
@@ -152,7 +153,7 @@ func (s *S3WatcherTestSuite) TestPoll() {
 					Records: []S3Record{
 						{
 							EventTime: time.Now().Format(time.RFC3339Nano),
-							EventName: "s3:ObjectRemoved:Delete",
+							EventName: "ObjectRemoved:Delete",
 							S3: S3Entity{
 								Bucket: S3Bucket{
 									Name: "bucket-name",
@@ -195,7 +196,7 @@ func (s *S3WatcherTestSuite) TestPoll() {
 					Records: []S3Record{
 						{
 							EventTime: time.Now().Format(time.RFC3339Nano),
-							EventName: "s3:ObjectAccessed:Get",
+							EventName: "ObjectAccessed:Get",
 							S3: S3Entity{
 								Bucket: S3Bucket{
 									Name: "bucket-name",
@@ -238,7 +239,7 @@ func (s *S3WatcherTestSuite) TestPoll() {
 					Records: []S3Record{
 						{
 							EventTime: time.Now().Format(time.RFC3339Nano),
-							EventName: "s3:ObjectCreated:Put",
+							EventName: "ObjectCreated:Put",
 							S3: S3Entity{
 								Bucket: S3Bucket{
 									Name: "bucket-name",
@@ -329,7 +330,7 @@ func (s *S3WatcherTestSuite) TestPollWithRetry() {
 				s3Event := S3Event{
 					Records: []S3Record{
 						{
-							EventName: "s3:ObjectCreated:Put",
+							EventName: "ObjectCreated:Put",
 							S3: S3Entity{
 								Bucket: S3Bucket{Name: "test-bucket"},
 								Object: S3Object{Key: "test-object"},
@@ -533,7 +534,7 @@ func (s *S3WatcherTestSuite) TestWithReceivedCount() {
 				Records: []S3Record{
 					{
 						EventTime: time.Now().Format(time.RFC3339Nano),
-						EventName: "s3:ObjectCreated:Put",
+						EventName: "ObjectCreated:Put",
 						S3: S3Entity{
 							Bucket: S3Bucket{Name: "test-bucket"},
 							Object: S3Object{Key: "test-object"},
@@ -605,7 +606,7 @@ func (s *S3WatcherTestSuite) TestWithReceivedCountNoAttributes() {
 		Records: []S3Record{
 			{
 				EventTime: time.Now().Format(time.RFC3339Nano),
-				EventName: "s3:ObjectCreated:Put",
+				EventName: "ObjectCreated:Put",
 				S3: S3Entity{
 					Bucket: S3Bucket{Name: "test-bucket"},
 					Object: S3Object{Key: "test-object"},
@@ -659,7 +660,7 @@ func (s *S3WatcherTestSuite) TestWithReceivedCountMissingAttribute() {
 		Records: []S3Record{
 			{
 				EventTime: time.Now().Format(time.RFC3339Nano),
-				EventName: "s3:ObjectCreated:Put",
+				EventName: "ObjectCreated:Put",
 				S3: S3Entity{
 					Bucket: S3Bucket{Name: "test-bucket"},
 					Object: S3Object{Key: "test-object"},
@@ -757,62 +758,62 @@ func (s *S3WatcherTestSuite) TestMapS3EventType() {
 	}{
 		{
 			name:      "ObjectCreated:Put - direct upload",
-			eventName: "s3:ObjectCreated:Put",
+			eventName: "ObjectCreated:Put",
 			expected:  vfsevents.EventCreated,
 		},
 		{
 			name:      "ObjectCreated:Post - form upload",
-			eventName: "s3:ObjectCreated:Post",
+			eventName: "ObjectCreated:Post",
 			expected:  vfsevents.EventCreated,
 		},
 		{
 			name:      "ObjectCreated:Copy - copy operation",
-			eventName: "s3:ObjectCreated:Copy",
+			eventName: "ObjectCreated:Copy",
 			expected:  vfsevents.EventModified,
 		},
 		{
 			name:      "ObjectCreated:CompleteMultipartUpload - large upload",
-			eventName: "s3:ObjectCreated:CompleteMultipartUpload",
+			eventName: "ObjectCreated:CompleteMultipartUpload",
 			expected:  vfsevents.EventModified,
 		},
 		{
 			name:      "ObjectCreated:* - wildcard",
-			eventName: "s3:ObjectCreated:*",
+			eventName: "ObjectCreated:*",
 			expected:  vfsevents.EventCreated,
 		},
 		{
 			name:      "ObjectRestore:Post - restore initiation",
-			eventName: "s3:ObjectRestore:Post",
+			eventName: "ObjectRestore:Post",
 			expected:  vfsevents.EventModified,
 		},
 		{
 			name:      "ObjectRestore:Completed - restore completion",
-			eventName: "s3:ObjectRestore:Completed",
+			eventName: "ObjectRestore:Completed",
 			expected:  vfsevents.EventModified,
 		},
 		{
 			name:      "ObjectRestore:Delete - restored copy expires",
-			eventName: "s3:ObjectRestore:Delete",
+			eventName: "ObjectRestore:Delete",
 			expected:  vfsevents.EventDeleted,
 		},
 		{
 			name:      "ObjectRemoved:Delete - object deletion",
-			eventName: "s3:ObjectRemoved:Delete",
+			eventName: "ObjectRemoved:Delete",
 			expected:  vfsevents.EventDeleted,
 		},
 		{
 			name:      "ObjectRemoved:DeleteMarkerCreated - versioned deletion",
-			eventName: "s3:ObjectRemoved:DeleteMarkerCreated",
+			eventName: "ObjectRemoved:DeleteMarkerCreated",
 			expected:  vfsevents.EventDeleted,
 		},
 		{
 			name:      "ObjectRemoved:* - wildcard deletion",
-			eventName: "s3:ObjectRemoved:*",
+			eventName: "ObjectRemoved:*",
 			expected:  vfsevents.EventDeleted,
 		},
 		{
 			name:      "Unknown event type",
-			eventName: "s3:ObjectTagging:Put",
+			eventName: "ObjectTagging:Put",
 			expected:  vfsevents.EventUnknown,
 		},
 	}
@@ -833,37 +834,37 @@ func (s *S3WatcherTestSuite) TestGetOperationType() {
 	}{
 		{
 			name:      "Put operation",
-			eventName: "s3:ObjectCreated:Put",
+			eventName: "ObjectCreated:Put",
 			expected:  "put",
 		},
 		{
 			name:      "Post operation",
-			eventName: "s3:ObjectCreated:Post",
+			eventName: "ObjectCreated:Post",
 			expected:  "post",
 		},
 		{
 			name:      "Copy operation",
-			eventName: "s3:ObjectCreated:Copy",
+			eventName: "ObjectCreated:Copy",
 			expected:  "copy",
 		},
 		{
 			name:      "Multipart operation",
-			eventName: "s3:ObjectCreated:CompleteMultipartUpload",
+			eventName: "ObjectCreated:CompleteMultipartUpload",
 			expected:  "multipart",
 		},
 		{
 			name:      "Restore operation",
-			eventName: "s3:ObjectRestore:Completed",
+			eventName: "ObjectRestore:Completed",
 			expected:  "restore",
 		},
 		{
 			name:      "Delete operation",
-			eventName: "s3:ObjectRemoved:Delete",
+			eventName: "ObjectRemoved:Delete",
 			expected:  "delete",
 		},
 		{
 			name:      "Unknown operation",
-			eventName: "s3:ObjectTagging:Put",
+			eventName: "ObjectTagging:Put",
 			expected:  "unknown",
 		},
 	}
@@ -889,7 +890,7 @@ func (s *S3WatcherTestSuite) TestEnhancedMetadata() {
 		Records: []S3Record{
 			{
 				EventTime: "2023-01-01T12:00:00.000Z",
-				EventName: "s3:ObjectCreated:Copy",
+				EventName: "ObjectCreated:Copy",
 				AwsRegion: "us-east-1",
 				S3: S3Entity{
 					Bucket: S3Bucket{
@@ -950,7 +951,7 @@ func (s *S3WatcherTestSuite) TestEnhancedMetadata() {
 	// Verify enhanced metadata
 	s.Equal("test-bucket", receivedEvent.Metadata["bucketName"])
 	s.Equal("test-file.txt", receivedEvent.Metadata["key"])
-	s.Equal("s3:ObjectCreated:Copy", receivedEvent.Metadata["eventName"])
+	s.Equal("ObjectCreated:Copy", receivedEvent.Metadata["eventName"])
 	s.Equal("us-east-1", receivedEvent.Metadata["region"])
 	s.Equal("2023-01-01T12:00:00.000Z", receivedEvent.Metadata["eventTime"])
 	s.Equal("copy", receivedEvent.Metadata["operation"])
@@ -973,7 +974,7 @@ func (s *S3WatcherTestSuite) TestNonVersionedBucketMetadata() {
 		Records: []S3Record{
 			{
 				EventTime: "2023-01-01T12:00:00.000Z",
-				EventName: "s3:ObjectCreated:Put",
+				EventName: "ObjectCreated:Put",
 				AwsRegion: "us-west-2",
 				S3: S3Entity{
 					Bucket: S3Bucket{