Skip to content

Merge main branch and resolve conflicts with V1Alpha1 restructure#97

Open
Copilot wants to merge 4 commits intomainfrom
copilot/remove-redundant-deletion-logic
Open

Merge main branch and resolve conflicts with V1Alpha1 restructure#97
Copilot wants to merge 4 commits intomainfrom
copilot/remove-redundant-deletion-logic

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Feb 26, 2026

The feature branch removed redundant logging from controller DeletedAsync methods. Meanwhile, main restructured the project for API versioning by moving controllers, entities, and finalizers into V1Alpha1 subdirectories. This PR merges main and applies the logging removal to the versioned structure.

Changes

Namespace Updates

  • Updated all imports from SqlServerOperator.EntitiesSqlServerOperator.Entities.V1Alpha1
  • Updated all imports from SqlServerOperator.ControllersSqlServerOperator.Controllers.V1Alpha1
  • Updated test files to reference versioned namespaces

File Cleanup

  • Removed duplicate non-versioned controllers, entities, and finalizers
  • Git recognized moves as renames with modifications

Logging Removal Applied to V1Alpha1

Applied the redundant deletion logging removal to all V1Alpha1 controllers:

Before:

public Task<ReconciliationResult<V1Alpha1SQLServerLogin>> DeletedAsync(V1Alpha1SQLServerLogin entity, CancellationToken cancellationToken)
{
    logger.LogInformation("Deleted SQLServerLogin: {Name}", entity.Metadata.Name);
    return Task.FromResult(ReconciliationResult<V1Alpha1SQLServerLogin>.Success(entity));
}

After:

public Task<ReconciliationResult<V1Alpha1SQLServerLogin>> DeletedAsync(V1Alpha1SQLServerLogin entity, CancellationToken cancellationToken)
{
    return Task.FromResult(ReconciliationResult<V1Alpha1SQLServerLogin>.Success(entity));
}

Dependencies

  • Updated Aspire.Hosting.AppHost from 13.1.1 → 13.1.2 (from main)
Original prompt

This section details on the original issue you should resolve

<issue_title>Remove redundant deletion logic from Controllers</issue_title>
<issue_description>Remove redundant deletion logic from the controllers in src/OperatorTemplate.Operator/Controllers.

The logic currently in the controllers is redundant because resource deletion is already correctly handled by the finalizers in src/OperatorTemplate.Operator/Finalizers. Ensure that everything still works as expected after removing the redundant code from the controllers.</issue_description>

Comments on the Issue (you are @copilot in this section)


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Copilot AI and others added 2 commits February 26, 2026 02:17
Co-authored-by: josephaw1022 <47674962+josephaw1022@users.noreply.github.com>
Co-authored-by: josephaw1022 <47674962+josephaw1022@users.noreply.github.com>
Copilot AI changed the title [WIP] Remove redundant deletion logic from controllers Remove redundant logging from controller DeletedAsync methods Feb 26, 2026
- Resolved merge conflicts by updating namespaces to V1Alpha1
- Removed old non-versioned controllers, entities, and finalizers
- Applied redundant logging removal to V1Alpha1 controllers
- Updated package version to Aspire.Hosting.AppHost 13.1.2
- All tests passing (23/23)
Copilot AI changed the title Remove redundant logging from controller DeletedAsync methods Merge main branch and resolve conflicts with V1Alpha1 restructure Feb 26, 2026
@josephaw1022 josephaw1022 marked this pull request as ready for review March 15, 2026 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove redundant deletion logic from Controllers

2 participants