8000 `keycloakCRName` and `realm` are no longer marked as required in KeycloakRealmImport CRD by vmuzikar · Pull Request #21634 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

keycloakCRName and realm are no longer marked as required in KeycloakRealmImport CRD #21634

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

Merged
vmuzikar merged 1 commit into from
Jul 17, 2023
Merged

keycloakCRName and realm are no longer marked as required in KeycloakRealmImport CRD #21634

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
7 changes: 3 additions & 4 deletions ...rc/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImportSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,15 @@
package org.keycloak.operator.crds.v2alpha1.realmimport;

import com.fasterxml.jackson.annotation.JsonPropertyDescription;
import io.fabric8.generator.annotation.Required;
import org.keycloak.representations.idm.RealmRepresentation;

import jakarta.validation.constraints.NotNull;

public class KeycloakRealmImportSpec {

@NotNull
@Required
@JsonPropertyDescription("The name of the Keycloak CR to reference, in the same namespace.")
private String keycloakCRName;
@NotNull
@Required
@JsonPropertyDescription("The RealmRepresentation to import into Keycloak.")
private RealmRepresentation realm;

Expand Down
17 changes: 17 additions & 0 deletions operator/src/test/java/org/keycloak/operator/testsuite/integration/CRDTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.fabric8.junit.jupiter.api.KubernetesTest;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.dsl.Resource;

import org.junit.jupiter.api.BeforeAll;
Expand All @@ -30,8 +31,10 @@
import java.io.FileNotFoundException;

import com.fasterxml.jackson.databind.ObjectMapper;
import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportBuilder;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;

@KubernetesTest
public class CRDTest {
Expand All @@ -50,6 +53,20 @@ public void testRealmImport() {
roundTrip("/test-serialization-realmimport-cr.yml", KeycloakRealmImport.class);
}

@Test
public void testRealmImportWithoutRequiredFields() {
KeycloakRealmImport cr = new KeycloakRealmImportBuilder()
.withNewMetadata()
.withName("invalid-realm")
.endMetadata()
.withNewSpec()
.endSpec()
.build();

var eMsg = assertThrows(KubernetesClientException.class, () -> client.resource(cr).create()).getMessage();
assertThat(eMsg).contains("spec.keycloakCRName: Required value", "spec.realm: Required value");
}

@Test
public void testKeycloak() {
roundTrip("/test-serialization-keycloak-cr.yml", Keycloak.class);
Expand Down
0