avoid storing encryptionroleid if TDE is disabled. (#328)

whites11 · web-flow · commit ffb143d4f884 · 2025-07-17T09:53:37.000+02:00
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -242,10 +242,10 @@ jobs:
   report:
     runs-on: ubuntu-latest
     needs: [ "e2e", "upgrade" ]
-    if: ${{ needs.e2e.outputs.status == 'failure' }}
+    if: ${{ needs.e2e.outputs.status == 'failure' || needs.upgrade.outputs.status == 'failure' }}
     steps:
       - name: Report Failure on slack
-        if: ${{ github.ref_name == 'main' && needs.e2e.outputs.status == 'failure' }}
+        if: ${{ github.ref_name == 'main' && (needs.e2e.outputs.status == 'failure' || needs.upgrade.outputs.status == 'failure') }}
         uses: ravsamhq/notify-slack-action@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/pkg/resource/service.go b/pkg/resource/service.go
@@ -2009,7 +2009,7 @@ func (r *ServiceResource) syncServiceState(ctx context.Context, state *models.Se
 		Enabled: types.BoolValue(service.HasTransparentDataEncryption),
 	}
 
-	if service.EncryptionRoleID != "" {
+	if service.HasTransparentDataEncryption && service.EncryptionRoleID != "" {
 		tde.RoleID = types.StringValue(service.EncryptionRoleID)
 	} else {
 		tde.RoleID = types.StringNull()

Original file line number	Diff line number	Diff line change
`@@ -2009,7 +2009,7 @@ func (r ServiceResource) syncServiceState(ctx context.Context, state models.Se`
`2009`	`2009`	`Enabled: types.BoolValue(service.HasTransparentDataEncryption),`
`2010`	`2010`	`}`
`2011`	`2011`
`2012`		`- if service.EncryptionRoleID != "" {`
	`2012`	`+ if service.HasTransparentDataEncryption && service.EncryptionRoleID != "" {`
`2013`	`2013`	`tde.RoleID = types.StringValue(service.EncryptionRoleID)`
`2014`	`2014`	`} else {`
`2015`	`2015`	`tde.RoleID = types.StringNull()`