Skip to content
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

Post-refactoring cleanup #404

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Post-refactoring cleanup #404

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f420b
Remove stale argument in `ApplyInstance`
errordeveloper Jun 24, 2024
e4cc2c6
Remove redundant call to `UpdateStoredInstance`
errordeveloper Jun 26, 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
8 changes: 1 addition & 7 deletions internal/reconciler/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (r *Reconciler) Init(ctx context.Context, builder *engine.ModuleBuilder, bu
return nil
}

func (r *Reconciler) ApplyInstance(ctx context.Context, log logr.Logger, builder *engine.ModuleBuilder, buildResult cue.Value, opts InteractiveOptions) error {
func (r *Reconciler) ApplyInstance(ctx context.Context, log logr.Logger, builder *engine.ModuleBuilder, buildResult cue.Value) error {
if !r.instanceExists {
if err := r.UpdateStoredInstance(ctx); err != nil {
return fmt.Errorf("instance init failed: %w", err)
Expand Down Expand Up @@ -174,12 +174,6 @@ func (r *Reconciler) doWaitForTermination(_ context.Context, _ logr.Logger, cs *
}

func (r *Reconciler) ApplyAllSets(ctx context.Context, log logr.Logger, withChangeSet withChangeSetFunc) error {
if !r.instanceExists {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is exactly the same invocation in ApplyInstance, which is actually visible in this diff right above.

if err := r.UpdateStoredInstance(ctx); err != nil {
return fmt.Errorf("instance init failed: %w", err)
}
}

multiSet := len(r.sets) > 1
for s := range r.sets {
set := r.sets[s]
Expand Down