Skip to content

MsSql provisioner fixes #122

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

Open
fraliv13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MsSql provisioner fixes #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions helm/crds/provisioning.totalsoft.ro_mssqldatabases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ spec:
logicalDataFileName:
description: The logical name of the data file in the backup.
type: string
logicalFileStreamFileName:
description: The logical name of the file stream file in the backup.
type: string
logicalLogFileName:
description: The logical name of the log file in the backup.
type: string
Expand Down
17 changes: 8 additions & 9 deletions internal/controllers/provisioning/provisioners/pulumi/mssql_db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ func deployMsSqlDb(target provisioning.ProvisioningTarget,
valueExporter := handleValueExport(target)
gvk := provisioningv1.SchemeGroupVersion.WithKind("MsSqlDatabase")

provider, err := mssql.NewProvider(ctx, "provider-mssql", &mssql.ProviderArgs{
providerName := fmt.Sprintf("provider-mssql-%s", mssqlDb.Name)
provider, err := mssql.NewProvider(ctx, providerName, &mssql.ProviderArgs{
Hostname: pulumi.String(mssqlDb.Spec.SqlServer.HostName),
Port: pulumi.Int(mssqlDb.Spec.SqlServer.Port),
SqlAuth: &mssql.ProviderSqlAuthArgs{
Expand Down Expand Up @@ -66,6 +67,10 @@ func deployMsSqlDb(target provisioning.ProvisioningTarget,
DatabaseId: db.ID(),
ReadScript: pulumi.String("SELECT CASE WHEN EXISTS (SELECT 1 FROM sys.tables) THEN 'Initialized' ELSE 'Empty' END AS [DatabaseStatus]"),
UpdateScript: db.Name.ApplyT(func(n string) pulumi.StringOutput {
xtpMove := ""
if mssqlDb.Spec.RestoreFrom.LogicalFileStreamFileName != "" {
xtpMove = fmt.Sprintf(", MOVE N'%s' TO @XtpFilePath", mssqlDb.Spec.RestoreFrom.LogicalFileStreamFileName)
}
return pulumi.Sprintf(`
DECLARE @DataFilePath NVARCHAR(512) = CAST(SERVERPROPERTY('InstanceDefaultDataPath') AS NVARCHAR(512)) + '%v.mdf';
DECLARE @LogFilePath NVARCHAR(512) = CAST(SERVERPROPERTY('InstanceDefaultLogPath') AS NVARCHAR(512)) + '%v.ldf';
Expand All @@ -75,17 +80,11 @@ IF (SELECT COUNT(1) FROM sys.tables) = 0
BEGIN
USE master;
ALTER DATABASE [%v] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
RESTORE DATABASE [%v] FROM DISK = '%v' WITH FILE = 1, MOVE N'%v' TO @DataFilePath, MOVE N'%v' TO @LogFilePath, MOVE N'XTP' TO @XtpFilePath, NOUNLOAD, REPLACE;
RESTORE DATABASE [%v] FROM DISK = '%v' WITH FILE = 1, MOVE N'%v' TO @DataFilePath, MOVE N'%v' TO @LogFilePath%s, NOUNLOAD, REPLACE;
ALTER DATABASE [%v] SET MULTI_USER;
END
`, n, n, n, n, n, mssqlDb.Spec.RestoreFrom.BackupFilePath, mssqlDb.Spec.RestoreFrom.LogicalDataFileName, mssqlDb.Spec.RestoreFrom.LogicalLogFileName, n)
`, n, n, n, n, n, mssqlDb.Spec.RestoreFrom.BackupFilePath, mssqlDb.Spec.RestoreFrom.LogicalDataFileName, mssqlDb.Spec.RestoreFrom.LogicalLogFileName, xtpMove, n)
}).(pulumi.StringOutput),
DeleteScript: db.Name.ApplyT(
func(n string) pulumi.StringOutput {
return pulumi.Sprintf(`
ALTER DATABASE [%v] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
`, n)
}).(pulumi.StringOutput),
State: pulumi.StringMap{
"DatabaseStatus": pulumi.String("Initialized"),
},
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/provisioning/v1alpha1/mssqlDatabaseTypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ type MsSqlDatabaseRestoreSpec struct {
LogicalDataFileName string `json:"logicalDataFileName,omitempty"`
// The logical name of the log file in the backup.
LogicalLogFileName string `json:"logicalLogFileName,omitempty"`
// The logical name of the file stream file in the backup.
// +optional
LogicalFileStreamFileName string `json:"logicalFileStreamFileName,omitempty"`
}

type MsSqlDatabaseExportsSpec struct {
Expand Down
15 changes: 12 additions & 3 deletions pkg/generated/applyconfiguration/provisioning/v1alpha1/mssqldatabaserestorespec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.