Skip to content
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

Set SSLMode for provider-sqls provider-config #303

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Set SSLMode for provider-sqls provider-config #303

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
10 changes: 7 additions & 3 deletions pkg/comp-functions/functions/vshnpostgres/user_management.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func UserManagement(ctx context.Context, comp *vshnv1.VSHNPostgreSQL, svc *runti
return nil
}

addProviderConfig(comp, svc)
addProviderConfig(comp, svc, comp.Spec.Parameters.Service.TLS.Enabled)

for _, access := range comp.Spec.Parameters.Service.Access {

Expand Down Expand Up @@ -138,7 +138,7 @@ func addConnectionDetail(comp common.Composite, svc *runtime.ServiceRuntime, sec
}
}

func addProviderConfig(comp common.Composite, svc *runtime.ServiceRuntime) {
func addProviderConfig(comp common.Composite, svc *runtime.ServiceRuntime, tlsEnabled bool) {
cd := svc.GetConnectionDetails()

secret := &corev1.Secret{
Expand All @@ -163,14 +163,18 @@ func addProviderConfig(comp common.Composite, svc *runtime.ServiceRuntime) {
svc.Log.Error(err, "cannot set credential secret for provider-sql")
}

sslMode := "disable"
if tlsEnabled {
sslMode = "required"
}
config := &pgv1alpha1.ProviderConfig{
ObjectMeta: metav1.ObjectMeta{
Name: comp.GetName(),
},
Spec: pgv1alpha1.ProviderConfigSpec{
// Porvider-SQL doesn't support passing certificates to the config
// se we're stuck with require, which doesn't actually verify the certs.
SSLMode: ptr.To("require"),
SSLMode: &sslMode,
Credentials: pgv1alpha1.ProviderCredentials{
Source: "PostgreSQLConnectionSecret",
ConnectionSecretRef: &xpv1.SecretReference{
Expand Down
23 changes: 22 additions & 1 deletion pkg/comp-functions/functions/vshnpostgres/user_management_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func Test_addProviderConfig(t *testing.T) {
// when
comp := &vshnv1.VSHNPostgreSQL{}
assert.NoError(t, svc.GetObservedComposite(comp))
addProviderConfig(comp, svc)
addProviderConfig(comp, svc, comp.Spec.Parameters.Service.TLS.Enabled)

// then
secret := &corev1.Secret{}
Expand All @@ -29,6 +29,27 @@ func Test_addProviderConfig(t *testing.T) {
config := &pgv1alpha1.ProviderConfig{}
assert.NoError(t, svc.GetDesiredKubeObject(config, comp.GetName()+"-providerconfig"))
assert.Equal(t, comp.GetInstanceNamespace(), secret.GetNamespace())
assert.Equal(t, *config.Spec.SSLMode, "required")

}

func Test_tlsDisabled(t *testing.T) {
// given
svc := commontest.LoadRuntimeFromFile(t, "vshn-postgres/usermanagement/02-tls-disabled.yaml")

// when
comp := &vshnv1.VSHNPostgreSQL{}
assert.NoError(t, svc.GetObservedComposite(comp))
addProviderConfig(comp, svc, comp.Spec.Parameters.Service.TLS.Enabled)

// then
secret := &corev1.Secret{}
assert.NoError(t, svc.GetDesiredKubeObject(secret, comp.GetName()+"-provider-conf-credentials"))

config := &pgv1alpha1.ProviderConfig{}
assert.NoError(t, svc.GetDesiredKubeObject(config, comp.GetName()+"-providerconfig"))
assert.Equal(t, comp.GetInstanceNamespace(), secret.GetNamespace())
assert.Equal(t, *config.Spec.SSLMode, "disable")

}

Expand Down
10 changes: 8 additions & 2 deletions test/functions/vshn-postgres/usermanagement/01-emptyaccess.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ desired:
crossplane.io/composite: pgsql-gc9x4
name: pgsql-gc9x4
spec:
parameters: null
parameters:
service:
tls:
enabled: true
writeConnectionSecretToRef: {}
status: {}
observed:
Expand All @@ -47,6 +50,9 @@ observed:
crossplane.io/composite: pgsql-gc9x4
name: pgsql-gc9x4
spec:
parameters: null
parameters:
service:
tls:
enabled: true
writeConnectionSecretToRef: {}
status: {}
58 changes: 58 additions & 0 deletions test/functions/vshn-postgres/usermanagement/02-tls-disabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
desired:
composite:
connection_details:
POSTGRESQL_USER: cm9vdA== #root
POSTGRESQL_PASSWORD: cm9vdA== #root
POSTGRESQL_HOST: bG9jYWxob3N0IC1uCg== #localhost
POSTGRESQL_PORT: NTQzMgo=
resource:
apiVersion: vshn.appcat.vshn.io/v1
kind: XVSHNPostgreSQL
metadata:
creationTimestamp: "2023-03-21T16:52:31Z"
finalizers:
- composite.apiextensions.crossplane.io
generateName: pgsql-
generation: 13
labels:
appuio.io/organization: vshn
crossplane.io/claim-name: pgsql
crossplane.io/claim-namespace: unit-test
crossplane.io/composite: pgsql-gc9x4
name: pgsql-gc9x4
spec:
parameters:
service:
tls:
enabled: false
writeConnectionSecretToRef: {}
status: {}
observed:
composite:
connection_details:
POSTGRESQL_USER: cm9vdA== #root
POSTGRESQL_PASSWORD: cm9vdA== #root
POSTGRESQL_HOST: bG9jYWxob3N0IC1uCg== #localhost
POSTGRESQL_PORT: NTQzMgo=
resource:
apiVersion: vshn.appcat.vshn.io/v1
kind: XVSHNPostgreSQL
metadata:
creationTimestamp: "2023-03-21T16:52:31Z"
finalizers:
- composite.apiextensions.crossplane.io
generateName: pgsql-
generation: 13
labels:
appuio.io/organization: vshn
crossplane.io/claim-name: pgsql
crossplane.io/claim-namespace: unit-test
crossplane.io/composite: pgsql-gc9x4
name: pgsql-gc9x4
spec:
parameters:
service:
tls:
enabled: false
writeConnectionSecretToRef: {}
status: {}
Loading