Incorrect usage checks for birdhouse backup create (#632)

## Overview

Running `birdhouse backup create` was failing without either the
`--no-restic` or `--snapshot` options specified.
However, `--snapshot` is only required for the `restore` subargument
(not `create`) and so `create` would often fail with a confusing error
message.

This fixes the issue by moving the check so that it is only triggered
when restoring a backup.

## Changes

**Non-breaking changes**
- Bug fix

**Breaking changes**

## Related Issue / Discussion

## Additional Information

Links to other issues or sources.

- [ ] Things to do...

## CI Operations

<!--
The test suite can be run using a different DACCS config with
``birdhouse_daccs_configs_branch: branch_name`` in the PR description.
To globally skip the test suite regardless of the commit message use
``birdhouse_skip_ci`` set to ``true`` in the PR description.

Using ``[<cmd>]`` (with the brackets) where ``<cmd> = skip ci`` in the
commit message will override ``birdhouse_skip_ci`` from the PR
description.
Such commit command can be used to override the PR description behavior
for a specific commit update.
However, a commit message cannot 'force run' a PR which the description
turns off the CI.
To run the CI, the PR should instead be updated with a ``true`` value,
and a running message can be posted in following PR comments to trigger
tests once again.
-->

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false

Author: mishaschwartz

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.20.2"
+current_version = "2.20.3"
 commit = true
 tag = false
 tag_name = "{new_version}"

CHANGES.md

@@ -15,6 +15,11 @@
 [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
 ------------------------------------------------------------------------------------------------------------------
 
+[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+
+[2.20.3](https://github.com/bird-house/birdhouse-deploy/tree/2.20.3) (2026-01-13)
+------------------------------------------------------------------------------------------------------------------
+
 ## Fixes
 
 - Fix bugs in `get-components-json.include.sh` and simplify `get-services-json.include.sh`
@@ -27,6 +32,14 @@
   - removed unnecessary variable declarations
   - simplify component discovery `get-components-json.include.sh`
 
+- Incorrect usage checks for `birdhouse backup create`
+
+  Running `birdhouse backup create` was failing without either the `--no-restic` or `--snapshot` options specified.
+  However, `--snapshot` is only required for the `restore` subargument (not `create`) and so `create` would often
+  fail with a confusing error message.
+
+  This fixes the issue by moving the check so that it is only triggered when restoring a backup.
+
 [2.20.2](https://github.com/bird-house/birdhouse-deploy/tree/2.20.2) (2026-01-05)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

@@ -8,7 +8,7 @@ override BIRDHOUSE_MAKE_DIR := $(shell realpath -P $$(dirname $(BIRDHOUSE_MAKE_C
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 2.20.2
+override APP_VERSION := 2.20.3
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

README.rst

@@ -18,13 +18,13 @@ for a full-fledged production platform.
     * - citation
       - | |citation|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.20.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.20.3.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.20.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.20.3...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-2.20.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-2.20.3-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.20.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.20.3
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-2.20.2 2026-01-05T18:34:59Z
+2.20.3 2026-01-13T15:45:06Z

bin/birdhouse

@@ -377,13 +377,7 @@ check_backup_create_args() {
       "BIRDHOUSE_BACKUP_VOLUME must be specified." \
       "${BACKUP_CREATE_USAGE}"
   fi
-  [ -n "${BIRDHOUSE_BACKUP_RESTORE_SNAPSHOT}" ] || \
-  [ "${BIRDHOUSE_BACKUP_NO_RESTIC}" = 'true' ] || \
-    log_error_help \
-      'Use the -s|--snapshot option to specify a snapshot to restore with restic or --no-restic to employ BIRDHOUSE_BACKUP_VOLUME directly.' \
-      "${BACKUP_CREATE_USAGE}"
   if
-    [ -z "${BIRDHOUSE_BACKUP_RESTORE_SNAPSHOT}" ] && \
     [ "${BIRDHOUSE_BACKUP_NO_RESTIC}" = 'true' ] && \
     [ $(echo "${BIRDHOUSE_BACKUP_VOLUME}" | grep -c '/' || true) -eq 0 ]; then
       log WARN \
@@ -399,6 +393,11 @@ check_backup_restore_args() {
       "BIRDHOUSE_BACKUP_VOLUME must be specified." \
       "${BACKUP_RESTORE_USAGE}"
   fi
+  [ -n "${BIRDHOUSE_BACKUP_RESTORE_SNAPSHOT}" ] || \
+  [ "${BIRDHOUSE_BACKUP_NO_RESTIC}" = 'true' ] || \
+    log_error_help \
+      'Use the -s|--snapshot option to specify a snapshot to restore with restic or --no-restic to restore from BIRDHOUSE_BACKUP_VOLUME directly.' \
+      "${BACKUP_CREATE_USAGE}"
   if [ "${BIRDHOUSE_BACKUP_NO_RESTIC}" = 'true' ]; then
     if [ $(echo "${BIRDHOUSE_BACKUP_VOLUME}" | grep -c '/' || true) -eq 0 ]; then
       log WARN \

birdhouse/components/canarie-api/docker_configuration.py.template

@@ -108,8 +108,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.20.2',
-            'releaseTime': '2026-01-05T18:34:59Z',
+            'version': '2.20.3',
+            'releaseTime': '2026-01-13T15:45:06Z',
             'institution': '${BIRDHOUSE_INSTITUTION}',
             'researchSubject': '${BIRDHOUSE_SUBJECT}',
             'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.20.2',
-            'releaseTime': '2026-01-05T18:34:59Z',
+            'version': '2.20.3',
+            'releaseTime': '2026-01-13T15:45:06Z',
             'institution': '${BIRDHOUSE_INSTITUTION}',
             'researchSubject': '${BIRDHOUSE_SUBJECT}',
             'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

docs/source/conf.py

@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.20.2'
+version = '2.20.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.20.2'
+release = '2.20.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.