Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
oksana-grishchenko committed Nov 22, 2024
1 parent 023f1b2 commit 862425d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
19 changes: 14 additions & 5 deletions tools/veneer-update.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,36 @@ func main() {
}

func updateVeneer(veneerFile, channel, newVersionStr string) error {
b, err := updateVeneerImpl(veneerFile, channel, newVersionStr)
if err != nil {
return err
}

return os.WriteFile(veneerFile, b, 0644)
}

func updateVeneerImpl(veneerFile, channel, newVersionStr string) ([]byte, error) {
var t EverestBasicTemplate
err := t.readFromFile(veneerFile)
if err != nil {
return fmt.Errorf("failed to read template: %w", err)
return nil, fmt.Errorf("failed to read template: %w", err)
}

var r release
err = r.create(t.currentVersion(channel), newVersionStr)
if err != nil {
return fmt.Errorf("%s: invalid version format: %w", newVersionStr, err)
return nil, fmt.Errorf("%s: invalid version format: %w", newVersionStr, err)
}

err = t.update(r, channel)
if err != nil {
return fmt.Errorf("failed to update template: %w", err)
return nil, fmt.Errorf("failed to update template: %w", err)
}

b, err := t.toByteArray()
if err != nil {
return fmt.Errorf("failed to convert data: %w", err)
return nil, fmt.Errorf("failed to convert data: %w", err)
}

return os.WriteFile(veneerFile, b, 0644)
return b, nil
}
2 changes: 1 addition & 1 deletion tools/veneer-update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestPatch(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

b, err := updateVeneer("./everest-operator_test.yaml", tt.channel, tt.newVersion)
b, err := updateVeneerImpl("./everest-operator_test.yaml", tt.channel, tt.newVersion)
require.NoError(t, err)
actual := string(b)
require.Equal(t, tt.expectedOutput, actual)
Expand Down

0 comments on commit 862425d

Please sign in to comment.