Migrate to Go AWS SDK V2

examples/cmd/markdownRenderer/handlers/httphandler.go

@@ -1,6 +1,6 @@
 package handlers
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"context"

examples/cmd/markdownRenderer/handlers/httphandler_test.go

@@ -1,6 +1,6 @@
 package handlers
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"testing"

examples/cmd/markdownRenderer/main.go

@@ -1,6 +1,6 @@
 package main
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"context"

examples/cmd/markdownRenderer/main_test.go

@@ -1,6 +1,6 @@
 package main
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"testing"

examples/cmd/markdownRenderer/notifytypes/types.go

@@ -1,6 +1,6 @@
 package notifytypes
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"github.com/google/uuid"

examples/cmd/markdownRenderer/notifytypes/types_test.go

@@ -1,6 +1,6 @@
 package notifytypes
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"testing"

examples/cmd/markdownRenderer/queuetypes/types.go

@@ -1,6 +1,6 @@
 package queuetypes
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 // WorkTypeMarkdown is queued work that renders markdown to HTML
 const (

examples/cmd/markdownRenderer/queuetypes/types_test.go

@@ -1,6 +1,6 @@
 package queuetypes
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"testing"

examples/cmd/markdownRenderer/runners/renderer_runner.go

@@ -1,8 +1,9 @@
 package runners
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
+	"context"
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
@@ -20,7 +21,7 @@ import (
 )
 
 // RendererRunner is a runner is registered with the queue agent that knows how
-// to render markdown text to HTML.
+// to render Markdown text to HTML.
 type RendererRunner struct {
 	queue.BaseRunner
 
@@ -74,7 +75,7 @@ func (w RendererWork) Dir() string {
 	return ""
 }
 
-func (r *RendererRunner) Run(work queue.RecursableWork) error {
+func (r *RendererRunner) Run(ctx context.Context, work queue.RecursableWork) error {
 
 	job := &RendererWork{}
 	err := json.Unmarshal(work.Work, &job)
@@ -84,7 +85,7 @@ func (r *RendererRunner) Run(work queue.RecursableWork) error {
 
 	for {
 		// Render the markdown to HTML and "Put" it into storage.
-		_, _, err = r.server.Put(r.getResolverText(job), job.Dir(), job.Address())
+		_, _, err = r.server.Put(ctx, r.getResolverText(job), job.Dir(), job.Address())
 		if err != nil {
 			return errors.Wrap(err, "renderer_runner error")
 		} else {
@@ -104,7 +105,7 @@ func (r *RendererRunner) getResolverText(job *RendererWork) storagetypes.Resolve
 			parser.Strikethrough |
 			parser.SpaceHeadings |
 			parser.AutoHeadingIDs
-		parser := parser.NewWithExtensions(extensions)
+		p := parser.NewWithExtensions(extensions)
 
 		// Specify some helpful flags and create a renderer.
 		htmlFlags := html.CommonFlags | html.HrefTargetBlank
@@ -113,8 +114,8 @@ func (r *RendererRunner) getResolverText(job *RendererWork) storagetypes.Resolve
 
 		// Render the markdown and write it to storage.
 		normalized := markdown.NormalizeNewlines([]byte(job.Markdown))
-		html := markdown.ToHTML(normalized, parser, renderer)
-		_, err := writer.Write(html)
+		renderedHtml := markdown.ToHTML(normalized, p, renderer)
+		_, err := writer.Write(renderedHtml)
 		return "", "", err
 	}
 }

examples/cmd/markdownRenderer/runners/renderer_runner_test.go

@@ -1,9 +1,10 @@
 package runners
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"testing"
@@ -66,9 +67,7 @@ func (s *RendererRunnerSuite) TestRunUnmarshalError(c *check.C) {
 	server := &rsstorage.DummyStorageServer{}
 	r := NewRendererRunner(server)
 	bWork := []byte("bad")
-	err := r.Run(queue.RecursableWork{
-		Work: bWork,
-	})
+	err := r.Run(context.Background(), queue.RecursableWork{Work: bWork})
 	c.Check(err, check.ErrorMatches, "invalid character 'b' looking for beginning of value")
 }
 
@@ -81,9 +80,7 @@ func (s *RendererRunnerSuite) TestRunCacheError(c *check.C) {
 	c.Assert(err, check.IsNil)
 	bWork, err := json.Marshal(w)
 	c.Assert(err, check.IsNil)
-	err = r.Run(queue.RecursableWork{
-		Work: bWork,
-	})
+	err = r.Run(context.Background(), queue.RecursableWork{Work: bWork})
 	c.Check(err, check.ErrorMatches, `renderer_runner error: cache error`)
 }
 
@@ -94,9 +91,7 @@ func (s *RendererRunnerSuite) TestRunOk(c *check.C) {
 	c.Assert(err, check.IsNil)
 	bWork, err := json.Marshal(w)
 	c.Assert(err, check.IsNil)
-	err = r.Run(queue.RecursableWork{
-		Work: bWork,
-	})
+	err = r.Run(context.Background(), queue.RecursableWork{Work: bWork})
 	c.Check(err, check.IsNil)
 	c.Check(server.PutCalled, check.Equals, 1)
 }

examples/cmd/markdownRenderer/storage/chunks.go

@@ -1,6 +1,6 @@
 package storage
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"time"

examples/cmd/markdownRenderer/storage/chunks_test.go

@@ -1,6 +1,6 @@
 package storage
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"errors"

examples/cmd/markdownRenderer/store/queue.go

@@ -1,6 +1,6 @@
 package store
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"database/sql"
@@ -198,7 +198,7 @@ func QueueUpdateGroup(conn *gorm.DB, group *QueueGroup) (dbqueuetypes.QueueGroup
 
 func (conn *store) QueueGroupComplete(id int64) (done bool, cancelled bool, err error) {
 	var count int64
-	conn.db.Transaction(func(tx *gorm.DB) error {
+	err = conn.db.Transaction(func(tx *gorm.DB) error {
 		err = tx.Model(&Queue{}).Where("group_id = ?", id).Count(&count).Error
 		if err != nil {
 			return err
@@ -218,6 +218,9 @@ func (conn *store) QueueGroupComplete(id int64) (done bool, cancelled bool, err
 		}
 		return err
 	})
+	if err != nil {
+		return false, false, err
+	}
 
 	return count == 0, cancelled, err
 }
@@ -232,7 +235,7 @@ func (conn *store) IsQueueAddressComplete(address string) (done bool, err error)
 	// testing with a special locking connection.
 	var count int64
 	var workErr error
-	conn.db.Transaction(func(tx *gorm.DB) error {
+	err = conn.db.Transaction(func(tx *gorm.DB) error {
 		err = tx.Model(&Queue{}).Where("address = ?", address).Count(&count).Error
 		if err != nil {
 			return err
@@ -244,6 +247,9 @@ func (conn *store) IsQueueAddressComplete(address string) (done bool, err error)
 		workErr = c2.QueueAddressedCheck(address)
 		return nil
 	})
+	if err != nil {
+		return false, err
+	}
 
 	if workErr != nil {
 		err = workErr
@@ -507,7 +513,7 @@ func (conn *store) QueuePop(name string, maxPriority uint64, types []uint64) (*q
 		types = append(types, queuetypes.TYPE_NONE)
 	}
 
-	// Important: we do this SELECT outside of the transaction to help avoid "database is locked" errors.
+	// Important: we do this SELECT outside the transaction to help avoid "database is locked" errors.
 	// Since SQLite WAL allows us to read during writes, we can do quick read-only check to see if any
 	// work is available in the queue before even starting a transaction or requesting a queue permit.
 	//
@@ -539,7 +545,7 @@ func (conn *store) QueuePop(name string, maxPriority uint64, types []uint64) (*q
 		// Get work item
 		result.Work, result.Address, result.WorkType, result.Carrier, err = getWork(tx, pt.ID)
 		result.Permit = pt.PermitId()
-		if err == gorm.ErrRecordNotFound {
+		if errors.Is(gorm.ErrRecordNotFound, err) {
 			return err
 		} else if err != nil {
 			return fmt.Errorf("Error getting claimed queue work: %s", err)

examples/cmd/markdownRenderer/store/queue_test.go

@@ -1,6 +1,6 @@
 package store
 
-// Copyright (C) 2022 by RStudio, PBC
+// Copyright (C) 2025 by Posit Software, PBC
 
 import (
 	"database/sql"

examples/cmd/testlog/cmd/debug.go

@@ -1,6 +1,6 @@
 package cmd
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"fmt"

examples/cmd/testlog/cmd/log.go

@@ -1,6 +1,6 @@
 package cmd
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"log"

examples/cmd/testlog/cmd/log_test.go

@@ -1,6 +1,6 @@
 package cmd
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"testing"

examples/cmd/testlog/cmd/root.go

@@ -1,6 +1,6 @@
 package cmd
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"errors"

examples/cmd/testlog/main.go

@@ -1,6 +1,6 @@
 package main
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"log"

examples/cmd/testlog/main_test.go

@@ -1,6 +1,6 @@
 package main
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"testing"

examples/cmd/testnotify/cmd/notify.go

@@ -1,6 +1,6 @@
 package cmd
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"context"

examples/cmd/testnotify/cmd/notify_test.go

@@ -1,6 +1,6 @@
 package cmd
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"testing"

examples/cmd/testnotify/cmd/root.go

@@ -1,6 +1,6 @@
 package cmd
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"errors"

examples/cmd/testnotify/main.go

@@ -1,6 +1,6 @@
 package main
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"log"

examples/cmd/testnotify/main_test.go

@@ -1,6 +1,6 @@
 package main
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"testing"

examples/cmd/testservice/main.go

@@ -1,6 +1,6 @@
 package main
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"context"

examples/cmd/testservice/main_test.go

@@ -1,6 +1,6 @@
 package main
 
-// Copyright (C) 2022 by RStudio, PBC.
+// Copyright (C) 2025 by Posit Software, PBC.
 
 import (
 	"testing"