Make it possible to specify backup directory

db-dumper/Makefile

@@ -9,13 +9,13 @@ scaleway_db_to_bucket: venv
 	$(VENV)/ansible-playbook playbooks/scaleway_db_to_bucket.yml -e @./config/variables.yml
 
 build:
-	docker build -t $(NAME):1.0.5 --rm .
-	docker tag $(NAME):1.0.5 $(NAME):1.0
-	docker tag $(NAME):1.0 $(NAME):latest
+	docker build -t $(NAME):1.1.0 --rm .
+	docker tag $(NAME):1.1.0 $(NAME):1.1
+	docker tag $(NAME):1.1 $(NAME):latest
 
 push:
-	docker push $(NAME):1.0
-	docker push $(NAME):1.0.5
+	docker push $(NAME):1.1
+	docker push $(NAME):1.1.0
 	docker push $(NAME):latest
 
 include Makefile.venv

db-dumper/config/variables.example.yml

@@ -13,3 +13,4 @@ object_storage_endpoint_url: "https://s3.fr-par.scw.cloud"
 object_storage_access_key: "AWS_ACCESS_KEY"
 object_storage_secret_key: "AWS_SECRET_KEY"
 object_storage_region: "fr-par"
+object_storage_root_folder: "project-name/db"

db-dumper/playbooks/scaleway_db_to_bucket.yml

@@ -20,6 +20,7 @@
         object_storage_access_key: "{{ lookup('env', 'OBJECT_STORAGE_ACCESS_KEY') }}"
         object_storage_secret_key: "{{ lookup('env', 'OBJECT_STORAGE_SECRET_KEY') }}"
         object_storage_region: "{{ lookup('env', 'OBJECT_STORAGE_STORAGE_REGION') }}"
+        object_storage_root_folder: "{{ lookup('env', 'OBJECT_STORAGE_STORAGE_ROOT_FOLDER') }}"
 
     - name: Set backup extension
       set_fact:
@@ -40,7 +41,7 @@
   ansible.builtin.import_playbook: sub-plays/copy_to_s3.yml
   vars:
     source: "../../tmp/{{ backup_name }}.{{ backup_extension_or_default }}"
-    destination: "s3://{{ object_storage_bucket_name}}/db-exports/{{ backup_name }}/{{ backup_name }}-{{ date_string }}.{{ backup_extension_or_default }}"
+    destination: "s3://{{ object_storage_bucket_name}}/{{ object_storage_root_folder }}/{{ backup_name }}/{{ backup_name }}-{{ date_string }}.{{ backup_extension_or_default }}"
 
     endpoint_url: "{{ object_storage_endpoint_url }}"
     aws_access_key: "{{ object_storage_access_key }}"