stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: refactor sqlserver handle optional encryption #27

Merged
marcel.henselin merged 1 commit from fix/handle_empty_encryption into alpha 2026-02-02 10:52:22 +00:00
Conversation 0 Commits 1 Files changed 2 +20 -11
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 11573835dc - Show all commits

18
stackit/internal/services/sqlserverflexalpha/instance/functions.go
View file

@ -175,12 +175,18 @@ func toCreatePayload(
storagePayload.Size = conversion.Int64ValueToPointer(storage.Size)
}
encryptionPayload := &sqlserverflex.CreateInstanceRequestPayloadGetEncryptionArgType{}
if encryption != nil {
encryptionPayload.KekKeyId = conversion.StringValueToPointer(encryption.KeyId)
encryptionPayload.KekKeyVersion = conversion.StringValueToPointer(encryption.KeyVersion)
encryptionPayload.KekKeyRingId = conversion.StringValueToPointer(encryption.KeyRingId)
encryptionPayload.ServiceAccount = conversion.StringValueToPointer(encryption.ServiceAccount)
var encryptionPayload *sqlserverflex.CreateInstanceRequestPayloadGetEncryptionArgType
if encryption != nil &&
!encryption.KeyId.IsNull() && !encryption.KeyId.IsUnknown() &&
!encryption.KeyRingId.IsNull() && !encryption.KeyRingId.IsUnknown() &&
!encryption.KeyVersion.IsNull() && !encryption.KeyVersion.IsUnknown() &&
!encryption.ServiceAccount.IsNull() && !encryption.ServiceAccount.IsUnknown() {
encryptionPayload = &sqlserverflex.CreateInstanceRequestPayloadGetEncryptionArgType{
KekKeyId: conversion.StringValueToPointer(encryption.KeyId),
KekKeyRingId: conversion.StringValueToPointer(encryption.KeyVersion),
KekKeyVersion: conversion.StringValueToPointer(encryption.KeyRingId),
ServiceAccount: conversion.StringValueToPointer(encryption.ServiceAccount),
}
}
var aclElements []string

13
stackit/internal/wait/sqlserverflexalpha/wait.go
View file

@ -16,12 +16,15 @@ import (
sqlserverflex "tf-provider.git.onstackit.cloud/stackit-dev-tools/terraform-provider-stackitprivatepreview/pkg_gen/sqlserverflexalpha"
)
// READY, PENDING, PROGRESSING, FAILURE, UNKNOWN,
const (
InstanceStateEmpty = ""
InstanceStateProcessing = "Progressing"
InstanceStateUnknown = "Unknown"
InstanceStateSuccess = "Ready"
InstanceStateFailed = "Failed"
InstanceStateEmpty = ""
InstanceStateSuccess = "READY"
InstanceStatePending = "PENDING"
InstanceStateProcessing = "PROGRESSING"
InstanceStateFailed = "FAILURE"
InstanceStateUnknown = "UNKNOWN"
InstanceStateTerminating = "TERMINATING"
)
// APIClientInstanceInterface Interface needed for tests