Skip to content

Restructure project for API versioning #96

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
josephaw1022 merged 5 commits into from
Feb 26, 2026
Merged

Restructure project for API versioning #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84ea2e0
Initial plan
Copilot Feb 26, 2026
6727949
Restructure project for API versioning - move files and update namesp…
Copilot Feb 26, 2026
5b92ad6
Fix imports in SqlServerEndpointService for API versioning
Copilot Feb 26, 2026
125ae6c
Fix SQL injection vulnerabilities in Finalizers
Copilot Feb 26, 2026
7e2c29e
Revert QuoteName security changes - not part of original requirements
Copilot Feb 26, 2026
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
2 changes: 1 addition & 1 deletion src/OperatorTemplate.Operator/Controllers/Services/SqlServerEndpointService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using k8s.Models;
using KubeOps.KubernetesClient;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;

namespace SqlServerOperator.Controllers.Services;

Expand Down
4 changes: 2 additions & 2 deletions ...perator/Controllers/DatabaseController.cs → ...ontrollers/V1Alpha1/DatabaseController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
using Microsoft.Data.SqlClient;
using SqlServerOperator.Configuration;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using System.Text;

namespace SqlServerOperator.Controllers;
namespace SqlServerOperator.Controllers.V1Alpha1;

[EntityRbac(typeof(V1Alpha1SQLServerDatabase), Verbs = RbacVerb.All)]
public class SQLServerDatabaseController(
ILogger<SQLServerDatabaseController> logger,
IKubernetesClient kubernetesClient,
DefaultMssqlConfig config,

Check warning on line 18 in src/OperatorTemplate.Operator/Controllers/V1Alpha1/DatabaseController.cs

View workflow job for this annotation

GitHub Actions / build 

Parameter 'config' is unread.

Check warning on line 18 in src/OperatorTemplate.Operator/Controllers/V1Alpha1/DatabaseController.cs

View workflow job for this annotation

GitHub Actions / build 

Parameter 'config' is unread.

Check warning on line 18 in src/OperatorTemplate.Operator/Controllers/V1Alpha1/DatabaseController.cs

View workflow job for this annotation

GitHub Actions / test 

Parameter 'config' is unread.

Check warning on line 18 in src/OperatorTemplate.Operator/Controllers/V1Alpha1/DatabaseController.cs

View workflow job for this annotation

GitHub Actions / test 

Parameter 'config' is unread.
ISqlServerEndpointService sqlServerEndpointService,
ISqlExecutor sqlExecutor)
: IEntityController<V1Alpha1SQLServerDatabase>
Expand Down
4 changes: 2 additions & 2 deletions ...tor/Controllers/DatabaseUserController.cs → ...ollers/V1Alpha1/DatabaseUserController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using KubeOps.KubernetesClient;
using Microsoft.Data.SqlClient;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using System.Text;

namespace SqlServerOperator.Controllers;
namespace SqlServerOperator.Controllers.V1Alpha1;

[EntityRbac(typeof(V1Alpha1DatabaseUser), Verbs = RbacVerb.All)]
public class SQLServerUserController(
Expand Down
4 changes: 2 additions & 2 deletions ...ontrollers/ExternalSqlServerController.cs → ...s/V1Alpha1/ExternalSqlServerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using KubeOps.KubernetesClient;
using Microsoft.Data.SqlClient;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using System.Text;

namespace SqlServerOperator.Controllers;
namespace SqlServerOperator.Controllers.V1Alpha1;

[EntityRbac(typeof(V1Alpha1ExternalSQLServer), Verbs = RbacVerb.All)]
public class ExternalSQLServerController(
Expand Down
4 changes: 2 additions & 2 deletions ....Operator/Controllers/SchemaController.cs → .../Controllers/V1Alpha1/SchemaController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using KubeOps.KubernetesClient;
using Microsoft.Data.SqlClient;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using System.Text;

namespace SqlServerOperator.Controllers;
namespace SqlServerOperator.Controllers.V1Alpha1;

[EntityRbac(typeof(V1Alpha1SQLServerSchema), Verbs = RbacVerb.All)]
public class SQLServerSchemaController(
Expand Down
6 changes: 3 additions & 3 deletions ...erator/Controllers/SqlServerController.cs → ...ntrollers/V1Alpha1/SqlServerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
using KubeOps.KubernetesClient;
using SqlServerOperator.Builders;
using SqlServerOperator.Configuration;
using SqlServerOperator.Entities;
using SqlServerOperator.Finalizers;
using SqlServerOperator.Entities.V1Alpha1;
using SqlServerOperator.Finalizers.V1Alpha1;
using System.Security.Cryptography;

namespace SqlServerOperator.Controllers;
namespace SqlServerOperator.Controllers.V1Alpha1;

[EntityRbac(typeof(V1Alpha1SQLServer), Verbs = RbacVerb.All)]
public class SQLServerController(ILogger<SQLServerController> logger, IKubernetesClient kubernetesClient, DefaultMssqlConfig config) : IEntityController<V1Alpha1SQLServer>
Expand Down
4 changes: 2 additions & 2 deletions ...r/Controllers/SqlServerLoginController.cs → ...lers/V1Alpha1/SqlServerLoginController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using KubeOps.KubernetesClient;
using Microsoft.Data.SqlClient;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using System.Text;

namespace SqlServerOperator.Controllers;
namespace SqlServerOperator.Controllers.V1Alpha1;

[EntityRbac(typeof(V1Alpha1SQLServerLogin), Verbs = RbacVerb.All)]
public class SQLServerLoginController(
Expand Down
2 changes: 1 addition & 1 deletion ...torTemplate.Operator/Entities/Database.cs → ...te.Operator/Entities/V1Alpha1/Database.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using KubeOps.Abstractions.Entities;
using KubeOps.Abstractions.Entities.Attributes;

namespace SqlServerOperator.Entities;
namespace SqlServerOperator.Entities.V1Alpha1;

[KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "Database")]
public class V1Alpha1SQLServerDatabase : CustomKubernetesEntity<V1Alpha1SQLServerDatabase.V1Alpha1SQLServerDatabaseSpec, V1Alpha1SQLServerDatabase.V1Alpha1SQLServerDatabaseStatus>
Expand Down
2 changes: 1 addition & 1 deletion ...emplate.Operator/Entities/DatabaseUser.cs → ...perator/Entities/V1Alpha1/DatabaseUser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using KubeOps.Abstractions.Entities;
using KubeOps.Abstractions.Entities.Attributes;

namespace SqlServerOperator.Entities;
namespace SqlServerOperator.Entities.V1Alpha1;

[KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "SQLServerUser")]
public class V1Alpha1DatabaseUser : CustomKubernetesEntity<V1Alpha1DatabaseUser.V1Alpha1DatabaseUserSpec, V1Alpha1DatabaseUser.V1Alpha1DatabaseUserStatus>
Expand Down
2 changes: 1 addition & 1 deletion ...te.Operator/Entities/ExternalSqlServer.cs → ...or/Entities/V1Alpha1/ExternalSqlServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using KubeOps.Abstractions.Entities;
using KubeOps.Abstractions.Entities.Attributes;

namespace SqlServerOperator.Entities;
namespace SqlServerOperator.Entities.V1Alpha1;

[KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "ExternalSQLServer")]
public class V1Alpha1ExternalSQLServer : CustomKubernetesEntity<V1Alpha1ExternalSQLServer.V1Alpha1ExternalSQLServerSpec, V1Alpha1ExternalSQLServer.V1Alpha1ExternalSQLServerStatus>
Expand Down
2 changes: 1 addition & 1 deletion ...ratorTemplate.Operator/Entities/Schema.cs → ...late.Operator/Entities/V1Alpha1/Schema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using KubeOps.Abstractions.Entities;
using KubeOps.Abstractions.Entities.Attributes;

namespace SqlServerOperator.Entities;
namespace SqlServerOperator.Entities.V1Alpha1;

[KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "SQLServerSchema")]
public class V1Alpha1SQLServerSchema : CustomKubernetesEntity<V1Alpha1SQLServerSchema.V1Alpha1SQLServerSchemaSpec, V1Alpha1SQLServerSchema.V1Alpha1SQLServerSchemaStatus>
Expand Down
2 changes: 1 addition & 1 deletion ...orTemplate.Operator/Entities/SqlServer.cs → ...e.Operator/Entities/V1Alpha1/SqlServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using KubeOps.Abstractions.Entities;
using KubeOps.Abstractions.Entities.Attributes;

namespace SqlServerOperator.Entities;
namespace SqlServerOperator.Entities.V1Alpha1;

[KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "SQLServer")]
public class V1Alpha1SQLServer : CustomKubernetesEntity<V1Alpha1SQLServer.V1Alpha1SQLServerSpec, V1Alpha1SQLServer.V1Alpha1SQLServerStatus>
Expand Down
2 changes: 1 addition & 1 deletion ...plate.Operator/Entities/SqlServerLogin.cs → ...rator/Entities/V1Alpha1/SqlServerLogin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using KubeOps.Abstractions.Entities;
using KubeOps.Abstractions.Entities.Attributes;

namespace SqlServerOperator.Entities;
namespace SqlServerOperator.Entities.V1Alpha1;

[KubernetesEntity(Group = "sql-server.dotkube.io", ApiVersion = "v1alpha1", Kind = "SQLServerLogin")]
public class V1Alpha1SQLServerLogin : CustomKubernetesEntity<V1Alpha1SQLServerLogin.V1Alpha1SQLServerLoginSpec, V1Alpha1SQLServerLogin.V1Alpha1SQLServerLoginStatus>
Expand Down
4 changes: 2 additions & 2 deletions ...ator/Finalizers/SQLServerUserFinalizer.cs → ...lizers/V1Alpha1/SQLServerUserFinalizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
using KubeOps.KubernetesClient;
using Microsoft.Data.SqlClient;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using System.Text;

namespace SqlServerOperator.Finalizers;
namespace SqlServerOperator.Finalizers.V1Alpha1;

public class SQLServerUserFinalizer(
ILogger<SQLServerUserFinalizer> logger,
Expand Down
4 changes: 2 additions & 2 deletions ...Operator/Finalizers/SqlServerFinalizer.cs → ...Finalizers/V1Alpha1/SqlServerFinalizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using KubeOps.Abstractions.Reconciliation;
using KubeOps.Abstractions.Reconciliation.Finalizer;
using KubeOps.KubernetesClient;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;

namespace SqlServerOperator.Finalizers;
namespace SqlServerOperator.Finalizers.V1Alpha1;

public class SQLServerFinalizer(ILogger<SQLServerFinalizer> logger, IKubernetesClient kubernetesClient) : IEntityFinalizer<V1Alpha1SQLServer>
{
Expand Down
4 changes: 2 additions & 2 deletions ...tor/Finalizers/SqlServerLoginFinalizer.cs → ...izers/V1Alpha1/SqlServerLoginFinalizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
using KubeOps.KubernetesClient;
using Microsoft.Data.SqlClient;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using System.Text;

namespace SqlServerOperator.Finalizers;
namespace SqlServerOperator.Finalizers.V1Alpha1;

public class SQLServerLoginFinalizer(
ILogger<SQLServerLoginFinalizer> logger,
Expand Down
4 changes: 2 additions & 2 deletions src/tests/OperatorTemplate.Operator.UnitTests/Controllers/DatabaseControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
using Moq;
using OperatorTemplate.Operator.UnitTests.Helpers;
using SqlServerOperator.Configuration;
using SqlServerOperator.Controllers;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Controllers.V1Alpha1;
using SqlServerOperator.Entities.V1Alpha1;
using Xunit;

namespace OperatorTemplate.Operator.UnitTests.Controllers;
Expand Down
4 changes: 2 additions & 2 deletions src/tests/OperatorTemplate.Operator.UnitTests/Controllers/DatabaseUserControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using Microsoft.Extensions.Logging;
using Moq;
using OperatorTemplate.Operator.UnitTests.Helpers;
using SqlServerOperator.Controllers;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Controllers.V1Alpha1;
using SqlServerOperator.Entities.V1Alpha1;
using Xunit;

namespace OperatorTemplate.Operator.UnitTests.Controllers;
Expand Down
4 changes: 2 additions & 2 deletions ...tests/OperatorTemplate.Operator.UnitTests/Controllers/ExternalSqlServerControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using Microsoft.Extensions.Logging;
using Moq;
using OperatorTemplate.Operator.UnitTests.Helpers;
using SqlServerOperator.Controllers;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Controllers.V1Alpha1;
using SqlServerOperator.Entities.V1Alpha1;
using Xunit;

namespace OperatorTemplate.Operator.UnitTests.Controllers;
Expand Down
4 changes: 2 additions & 2 deletions src/tests/OperatorTemplate.Operator.UnitTests/Controllers/SchemaControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using Microsoft.Extensions.Logging;
using Moq;
using OperatorTemplate.Operator.UnitTests.Helpers;
using SqlServerOperator.Controllers;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Controllers.V1Alpha1;
using SqlServerOperator.Entities.V1Alpha1;
using Xunit;

namespace OperatorTemplate.Operator.UnitTests.Controllers;
Expand Down
4 changes: 2 additions & 2 deletions src/tests/OperatorTemplate.Operator.UnitTests/Controllers/SqlServerLoginControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using Microsoft.Extensions.Logging;
using Moq;
using OperatorTemplate.Operator.UnitTests.Helpers;
using SqlServerOperator.Controllers;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Controllers.V1Alpha1;
using SqlServerOperator.Entities.V1Alpha1;
using Xunit;

namespace OperatorTemplate.Operator.UnitTests.Controllers;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/OperatorTemplate.Operator.UnitTests/Helpers/TestDataBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using k8s.Models;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using System.Text;

namespace OperatorTemplate.Operator.UnitTests.Helpers;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/OperatorTemplate.Operator.UnitTests/Services/SqlServerEndpointServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Moq;
using OperatorTemplate.Operator.UnitTests.Helpers;
using SqlServerOperator.Controllers.Services;
using SqlServerOperator.Entities;
using SqlServerOperator.Entities.V1Alpha1;
using Xunit;

namespace OperatorTemplate.Operator.UnitTests.Services;
Expand Down
Loading