Skip to content

enforce conditional updates on AutoUpdate* + rename typos #48240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugoShaka merged 2 commits into from
Nov 4, 2024
Merged

enforce conditional updates on AutoUpdate* + rename typos #48240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c79c465
enforce conditaional updates on AutoUpdate* + rename typos
hugoShaka Oct 31, 2024
b4e12e5
fix tests
hugoShaka Nov 4, 2024
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
6 changes: 3 additions & 3 deletions api/types/autoupdate/rollout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ import (

// NewAutoUpdateAgentRollout creates a new auto update version resource.
func NewAutoUpdateAgentRollout(spec *autoupdate.AutoUpdateAgentRolloutSpec) (*autoupdate.AutoUpdateAgentRollout, error) {
version := &autoupdate.AutoUpdateAgentRollout{
rollout := &autoupdate.AutoUpdateAgentRollout{
Kind: types.KindAutoUpdateAgentRollout,
Version: types.V1,
Metadata: &headerv1.Metadata{
Name: types.MetaNameAutoUpdateAgentRollout,
},
Spec: spec,
}
if err := ValidateAutoUpdateAgentRollout(version); err != nil {
if err := ValidateAutoUpdateAgentRollout(rollout); err != nil {
return nil, trace.Wrap(err)
}

return version, nil
return rollout, nil
}

// ValidateAutoUpdateAgentRollout checks that required parameters are set
Expand Down
6 changes: 3 additions & 3 deletions lib/services/autoupdates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ type AutoUpdateService interface {
DeleteAutoUpdateVersion(ctx context.Context) error

// CreateAutoUpdateAgentRollout creates the AutoUpdateAgentRollout singleton resource.
CreateAutoUpdateAgentRollout(ctx context.Context, plan *autoupdate.AutoUpdateAgentRollout) (*autoupdate.AutoUpdateAgentRollout, error)
CreateAutoUpdateAgentRollout(ctx context.Context, rollout *autoupdate.AutoUpdateAgentRollout) (*autoupdate.AutoUpdateAgentRollout, error)

// UpdateAutoUpdateAgentRollout updates the AutoUpdateAgentRollout singleton resource.
UpdateAutoUpdateAgentRollout(ctx context.Context, plan *autoupdate.AutoUpdateAgentRollout) (*autoupdate.AutoUpdateAgentRollout, error)
UpdateAutoUpdateAgentRollout(ctx context.Context, rollout *autoupdate.AutoUpdateAgentRollout) (*autoupdate.AutoUpdateAgentRollout, error)

// UpsertAutoUpdateAgentRollout sets the AutoUpdateAgentRollout singleton resource.
UpsertAutoUpdateAgentRollout(ctx context.Context, plan *autoupdate.AutoUpdateAgentRollout) (*autoupdate.AutoUpdateAgentRollout, error)
UpsertAutoUpdateAgentRollout(ctx context.Context, rollout *autoupdate.AutoUpdateAgentRollout) (*autoupdate.AutoUpdateAgentRollout, error)

// DeleteAutoUpdateAgentRollout deletes the AutoUpdateAgentRollout singleton resource.
DeleteAutoUpdateAgentRollout(ctx context.Context) error
Expand Down
6 changes: 3 additions & 3 deletions lib/services/local/autoupdate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (s *AutoUpdateService) UpdateAutoUpdateConfig(
ctx context.Context,
c *autoupdate.AutoUpdateConfig,
) (*autoupdate.AutoUpdateConfig, error) {
config, err := s.config.UpdateResource(ctx, c)
config, err := s.config.ConditionalUpdateResource(ctx, c)
return config, trace.Wrap(err)
}

Expand Down Expand Up @@ -151,7 +151,7 @@ func (s *AutoUpdateService) UpdateAutoUpdateVersion(
ctx context.Context,
v *autoupdate.AutoUpdateVersion,
) (*autoupdate.AutoUpdateVersion, error) {
version, err := s.version.UpdateResource(ctx, v)
version, err := s.version.ConditionalUpdateResource(ctx, v)
return version, trace.Wrap(err)
}

Expand Down Expand Up @@ -189,7 +189,7 @@ func (s *AutoUpdateService) UpdateAutoUpdateAgentRollout(
ctx context.Context,
v *autoupdate.AutoUpdateAgentRollout,
) (*autoupdate.AutoUpdateAgentRollout, error) {
rollout, err := s.rollout.UpdateResource(ctx, v)
rollout, err := s.rollout.ConditionalUpdateResource(ctx, v)
return rollout, trace.Wrap(err)
}

Expand Down
10 changes: 8 additions & 2 deletions lib/services/local/autoupdate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,11 @@ func TestAutoUpdateServiceConfigCRUD(t *testing.T) {
var notFoundError *trace.NotFoundError
require.ErrorAs(t, err, &notFoundError)

// If we try to conditionally update a missing resource, we receive
// a CompareFailed instead of a NotFound.
var revisionMismatchError *trace.CompareFailedError
_, err = service.UpdateAutoUpdateConfig(ctx, config)
require.ErrorAs(t, err, &notFoundError)
require.ErrorAs(t, err, &revisionMismatchError)
}

// TestAutoUpdateServiceVersionCRUD verifies get/create/update/upsert/delete methods of the backend service
Expand Down Expand Up @@ -155,8 +158,11 @@ func TestAutoUpdateServiceVersionCRUD(t *testing.T) {
var notFoundError *trace.NotFoundError
require.ErrorAs(t, err, &notFoundError)

// If we try to conditionally update a missing resource, we receive
// a CompareFailed instead of a NotFound.
var revisionMismatchError *trace.CompareFailedError
_, err = service.UpdateAutoUpdateVersion(ctx, version)
require.ErrorAs(t, err, &notFoundError)
require.ErrorAs(t, err, &revisionMismatchError)
}

// TestAutoUpdateServiceInvalidNameCreate verifies that configuration and version
Expand Down
4 changes: 2 additions & 2 deletions tool/tctl/common/edit_command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ func testEditAutoUpdateConfig(t *testing.T, clt *authclient.Client) {
require.NoError(t, err)

serviceClient := autoupdatev1pb.NewAutoUpdateServiceClient(clt.GetConnection())
_, err = serviceClient.CreateAutoUpdateConfig(ctx, &autoupdatev1pb.CreateAutoUpdateConfigRequest{Config: initial})
initial, err = serviceClient.CreateAutoUpdateConfig(ctx, &autoupdatev1pb.CreateAutoUpdateConfigRequest{Config: initial})
require.NoError(t, err, "creating initial autoupdate config")

editor := func(name string) error {
Expand Down Expand Up @@ -616,7 +616,7 @@ func testEditAutoUpdateVersion(t *testing.T, clt *authclient.Client) {
require.NoError(t, err)

serviceClient := autoupdatev1pb.NewAutoUpdateServiceClient(clt.GetConnection())
_, err = serviceClient.CreateAutoUpdateVersion(ctx, &autoupdatev1pb.CreateAutoUpdateVersionRequest{Version: initial})
initial, err = serviceClient.CreateAutoUpdateVersion(ctx, &autoupdatev1pb.CreateAutoUpdateVersionRequest{Version: initial})
require.NoError(t, err, "creating initial autoupdate version")

editor := func(name string) error {
Expand Down