api: add test to cover multiple certificates with same issuer

tsuru · Sep 5, 2024 · e525cbd · e525cbd
1 parent 1f26996
commit e525cbd
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 2 deletions.
diff --git a/internal/pkg/rpaas/certificates.go b/internal/pkg/rpaas/certificates.go
@@ -106,9 +106,9 @@ func (m *k8sRpaasManager) UpdateCertManagerRequest(ctx context.Context, instance
 		instance.Spec.DynamicCertificates.CertManager = nil
 	}
 
-	if index, found := findCertManagerRequestByName(instance, in.Name); found {
+	if index, found := findCertManagerRequestByName(instance, in.Name); found && in.Name != "" {
 		instance.Spec.DynamicCertificates.CertManagerRequests[index] = newRequest
-	} else if index, found := findCertManagerRequestByIssuer(instance, in.Issuer); found {
+	} else if index, found := findCertManagerRequestByIssuer(instance, in.Issuer); found && in.Name == "" {
 		instance.Spec.DynamicCertificates.CertManagerRequests[index] = newRequest
 	} else {
 		instance.Spec.DynamicCertificates.CertManagerRequests = append(instance.Spec.DynamicCertificates.CertManagerRequests, newRequest)

diff --git a/internal/pkg/rpaas/certificates_test.go b/internal/pkg/rpaas/certificates_test.go
@@ -322,6 +322,67 @@ func Test_k8sRpaasManager_UpdateCertManagerRequest(t *testing.T) {
 	}
 }
 
+func Test_k8sRpaasManager_UpdateCertManagerRequestWithManyCertificates(t *testing.T) {
+	cfg := config.RpaasConfig{
+		EnableCertManager: true,
+	}
+
+	oldCfg := config.Get()
+	config.Set(cfg)
+	defer func() { config.Set(oldCfg) }()
+
+	instance := &v1alpha1.RpaasInstance{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-instance-1",
+			Namespace: "rpaasv2",
+		},
+	}
+
+	issuer := &cmv1.ClusterIssuer{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "default-issuer",
+			Annotations: map[string]string{
+				allowedDNSZonesAnnotation: "example.com,example.org",
+			},
+		},
+	}
+
+	client := fake.NewClientBuilder().
+		WithScheme(rpaasruntime.NewScheme()).
+		WithRuntimeObjects(instance, issuer).
+		Build()
+
+	manager := &k8sRpaasManager{cli: client}
+
+	err := manager.UpdateCertManagerRequest(context.TODO(), instance.Name, clientTypes.CertManager{
+		Issuer:   "default-issuer",
+		Name:     "my-instance-1.example.com",
+		DNSNames: []string{"my-instance-1.example.com"},
+	})
+
+	require.NoError(t, err)
+
+	err = manager.UpdateCertManagerRequest(context.TODO(), instance.Name, clientTypes.CertManager{
+		Issuer:   "default-issuer",
+		Name:     "my-instance-2.example.com",
+		DNSNames: []string{"my-instance-2.example.com"},
+	})
+	require.NoError(t, err)
+
+	updatedInstance := &v1alpha1.RpaasInstance{}
+	err = client.Get(context.TODO(), types.NamespacedName{
+		Name:      "my-instance-1",
+		Namespace: "rpaasv2",
+	}, updatedInstance)
+	require.NoError(t, err)
+
+	assert.Len(t, updatedInstance.Spec.DynamicCertificates.CertManagerRequests, 2)
+	assert.Equal(t, []v1alpha1.CertManager{
+		{Name: "my-instance-1.example.com", Issuer: "default-issuer", DNSNames: []string{"my-instance-1.example.com"}},
+		{Name: "my-instance-2.example.com", Issuer: "default-issuer", DNSNames: []string{"my-instance-2.example.com"}},
+	}, updatedInstance.Spec.DynamicCertificates.CertManagerRequests)
+}
+
 func Test_k8sRpaasManager_DeleteCertManagerRequestByIssuer(t *testing.T) {
 	resources := []runtime.Object{
 		&v1alpha1.RpaasInstance{