Add --dir and add .tar.gz to uploaded object

The `--dir` option allows files to be uploaded to a "subdirectory" on
S3. While testing it, I noticed that the uploaded files were missing the
`.tar.gz` suffix, so fix that, too.

Set the release date for v0.1.1.

Author: theory

CHANGELOG.md

@@ -7,31 +7,16 @@ All notable changes to this project will be documented in this file. It uses the
   [Semantic Versioning]: https://semver.org/spec/v2.0.0.html
     "Semantic Versioning 2.0.0"
 
-## [v0.1.1] — To Be Released
+## [v0.1.1] — 2025-04-24
 
 ### ⚡ Improvements
 
-New features and other improvements.
+*   Added the `--dir` option to specify the S3 subdirectory in which to upload
+    backups.
 
 ### 🪲 Bug Fixes
 
-Issues addressed.
-
-### 📔 Notes
-
-Security issues fixed, incompatible changes.
-
-### ⬆️ Dependency Updates
-
-Updates to third party dependencies.
-
-### 🏗️ Build Setup
-
-Changes to how Harpo is built and released.
-
-### 📚 Documentation
-
-Documentation improvements.
+*   Fixed the name of the file uploaded to S3 to end in `.tar.gz`.
 
   [v0.1.1]: https://github.com/tembo-io/temback/compare/v0.1.1...v0.1.1
 

README.md

@@ -64,6 +64,7 @@ Options
 
 *   `--name`: The name of the backup; required
 *   `--bucket`: Upload to the named S3 bucket
+*   `--dir`: Upload to the named S3 subdirectory
 *   `--compress`: Compress into a tarball (ignored with `--bucket`)
 *   `--host`: The Postgres host name; defaults to `PGHOST` if set
 *   `--user`: The Postgres username; defaults to `PGUSER` if set

main.go

@@ -54,6 +54,7 @@ type backupConfig struct {
 	user     string
 	pass     string
 	bucket   string
+	dir      string
 	compress bool
 	plain    bool
 	clean    bool
@@ -69,13 +70,21 @@ func (c *backupConfig) Tarball() string {
 	return c.name + ".tar.gz"
 }
 
+func (c *backupConfig) UploadKey() string {
+	if c.dir == "" {
+		return c.Tarball()
+	}
+	return c.dir + "/" + c.Tarball()
+}
+
 func newConfig() *backupConfig {
 	cfg := &backupConfig{time: time.Now().UTC()}
 	flag.StringVar(&cfg.name, "name", "", "Backup name")
 	flag.StringVar(&cfg.host, "host", os.Getenv("PGHOST"), "Database host name")
 	flag.StringVar(&cfg.user, "user", os.Getenv("PGUSER"), "Database username")
 	flag.StringVar(&cfg.pass, "pass", os.Getenv("PGPASSWORD"), "Database password")
 	flag.StringVar(&cfg.bucket, "bucket", "", "S3 bucket name")
+	flag.StringVar(&cfg.dir, "dir", "", "S3 bucket directory")
 	flag.BoolVar(&cfg.compress, "compress", false, "Compress the backup (ignored with --bucket)")
 	flag.BoolVar(&cfg.plain, "text", false, "Plain text format")
 	flag.BoolVar(&cfg.clean, "clean", false, "Delete files after upload")
@@ -315,7 +324,7 @@ func upload(cfg *backupConfig) error {
 
 	if _, err := client.PutObject(context.Background(), &s3.PutObjectInput{
 		Bucket:            aws.String(cfg.bucket),
-		Key:               aws.String(cfg.name),
+		Key:               aws.String(cfg.UploadKey()),
 		Body:              fh,
 		ChecksumAlgorithm: types.ChecksumAlgorithmSha256,
 		ContentType:       aws.String("application/gzip"),