Fixes

CMSgov · Jun 24, 2024 · ab3e425 · ab3e425
1 parent 5eb5b42
commit ab3e425
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bcda/lambda/cclf/main.go b/bcda/lambda/cclf/main.go
@@ -56,12 +56,12 @@ func cclfImportHandler(ctx context.Context, sqsEvent events.SQSEvent) (string, e
 				return "", err
 			}
 
-			parts := strings.SplitN(e.S3.Object.Key, "/", 2)
+			lastSeparatorIdx := strings.LastIndex(e.S3.Object.Key, "/")
 
-			if len(parts) == 1 {
+			if lastSeparatorIdx == -1 {
 				return handleCclfImport(s3AssumeRoleArn, e.S3.Bucket.Name)
 			} else {
-				directory := fmt.Sprintf("%s/%s", e.S3.Bucket.Name, parts[0])
+				directory := fmt.Sprintf("%s/%s", e.S3.Bucket.Name, e.S3.Object.Key[:lastSeparatorIdx-1])
 				return handleCclfImport(s3AssumeRoleArn, directory)
 			}
 		}

diff --git a/bcda/lambda/optout/main.go b/bcda/lambda/optout/main.go
@@ -58,12 +58,12 @@ func optOutImportHandler(ctx context.Context, sqsEvent events.SQSEvent) (string,
 				return "", err
 			}
 
-			parts := strings.SplitN(e.S3.Object.Key, "/", 2)
+			lastSeparatorIdx := strings.LastIndex(e.S3.Object.Key, "/")
 
-			if len(parts) == 1 {
+			if lastSeparatorIdx == -1 {
 				return handleOptOutImport(s3AssumeRoleArn, e.S3.Bucket.Name)
 			} else {
-				directory := fmt.Sprintf("%s/%s", e.S3.Bucket.Name, parts[0])
+				directory := fmt.Sprintf("%s/%s", e.S3.Bucket.Name, e.S3.Object.Key[:lastSeparatorIdx-1])
 				return handleOptOutImport(s3AssumeRoleArn, directory)
 			}
 		}