Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.23.x"
go-version: "1.25.x"
- name: Build
run: go build -v ./...
- name: Test
Expand All @@ -25,9 +25,8 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.23.x"
go-version: "1.25.x"
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v8
with:
version: latest

4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/samshadwell/split-ynab

go 1.23.1

toolchain go1.24.1
go 1.25.1

require (
github.com/aws/aws-cdk-go/awscdk/v2 v2.218.0
Expand Down
32 changes: 23 additions & 9 deletions internal/storage/file_storage_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (l *localStorageAdapter) GetLastServerKnowledge(ctx context.Context, budget
return 0, fmt.Errorf("no budget found with id %v", budgetId)
}

func (l *localStorageAdapter) SetLastServerKnowledge(ctx context.Context, budgetId uuid.UUID, serverKnowledge int64) error {
func (l *localStorageAdapter) SetLastServerKnowledge(ctx context.Context, budgetId uuid.UUID, serverKnowledge int64) (err error) {
var data []budgetData

if _, err := os.Stat(storageFile); err == nil {
Expand Down Expand Up @@ -68,25 +68,39 @@ func (l *localStorageAdapter) SetLastServerKnowledge(ctx context.Context, budget
if err != nil {
return err
}
defer f.Close()
defer func() {
if closeErr := f.Close(); err == nil && closeErr != nil {
err = fmt.Errorf("failed to close storage file: %w", closeErr)
}
}()

encoder := yaml.NewEncoder(f)
defer encoder.Close()
defer func() {
if closeErr := encoder.Close(); err == nil && closeErr != nil {
err = fmt.Errorf("failed to close YAML encoder: %w", closeErr)
}
}()

if err = encoder.Encode(data); err != nil {
return fmt.Errorf("failed to encode storage data: %w", err)
}

return encoder.Encode(data)
return nil
}

func (l *localStorageAdapter) readData() ([]budgetData, error) {
func (l *localStorageAdapter) readData() (data []budgetData, err error) {
f, err := os.Open(storageFile)
if err != nil {
return nil, err
}
defer f.Close()
defer func() {
if closeErr := f.Close(); err == nil && closeErr != nil {
err = fmt.Errorf("failed to close storage file: %w", closeErr)
}
}()

var data []budgetData
decoder := yaml.NewDecoder(f)
err = decoder.Decode(&data)
if err != nil {
if err = decoder.Decode(&data); err != nil {
return nil, err
}

Expand Down