Merge branch 'main' into CLDC-4400-buyer-still-serving-answer-remapping

aws-devcontainer/.devcontainer/Dockerfile

@@ -1,7 +1,13 @@
 FROM homebrew/brew
 
 RUN brew install aws-vault && brew install awscli
-RUN curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" -o "session-manager-plugin.deb" && sudo dpkg -i session-manager-plugin.deb
+RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
+      ARCH="ubuntu_arm64"; \
+    else \
+      ARCH="ubuntu_64bit"; \
+    fi && \
+    curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/${ARCH}/session-manager-plugin.deb" -o "session-manager-plugin.deb" && \
+    sudo dpkg -i session-manager-plugin.deb
 
 ENV AWS_VAULT_BACKEND=file
 ENV AWS_VAULT_FILE_DIR=./vault

lib/tasks/delete_logs_in_collection_year_and_earlier.rake

@@ -1,5 +1,5 @@
 desc "Deletes all logs in a given collection year and earlier. Note that this operation is PERMANENT and this will bypass callbacks/paper trail. Use only as instructed in a yearly cleanup task."
-task :delete_logs_before_year, %i[year] => :environment do |_task, args|
+task :delete_logs_in_collection_year_and_earlier, %i[year] => :environment do |_task, args|
   year = args[:year].to_i
 
   if year < 2020