From e34ec7d110b59e17bd4bdc13e4cc30f48b56face Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 14:09:14 +0100
Subject: [PATCH] OZG-4624 rename jenkinsfile, cleanup, rename kubernetes CR
names
---
Jenkinsfile | 4 ++--
doc/examples/client-alfa.yaml | 2 +-
doc/examples/realm-berlin.yaml | 10 +++-------
doc/examples/user-helge.yaml | 3 +--
.../client/OzgCloudKeycloakClient.java | 6 +++---
.../user/UserUpdateControlBuilder.java | 4 ++--
.../client/KeycloakClientReconcilerTest.java | 20 -------------------
.../keycloak/client/KeycloakLivelTest.java | 6 ------
.../group/KeycloakGroupReconcilerTest.java | 20 -------------------
.../user/KeycloakUserServiceTest.java | 6 +++---
10 files changed, 15 insertions(+), 66 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ecc96e5..99b530a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -287,7 +287,7 @@ Void pushNewGitopsVersion(String environment) {
sh "git add ${environment}/application/values/ozg-operator-values.yaml"
sh "git commit -m 'jenkins rollout ${environment} ozg-operator version ${IMAGE_TAG}'"
- sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git'
+ sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-gitops/gitops.git'
}
}
}
@@ -308,7 +308,7 @@ Void configureGit() {
Void cloneGitopsRepo() {
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
- sh 'git clone https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git'
+ sh 'git clone https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-gitops/gitops.git'
}
configureGit()
diff --git a/doc/examples/client-alfa.yaml b/doc/examples/client-alfa.yaml
index 8b77970..2e4df43 100644
--- a/doc/examples/client-alfa.yaml
+++ b/doc/examples/client-alfa.yaml
@@ -1,5 +1,5 @@
apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakClient
+kind: OzgCloudKeycloakClient
metadata:
name: alfa-keycloak-client1
namespace: by-torsten-ozg-operator-dev
diff --git a/doc/examples/realm-berlin.yaml b/doc/examples/realm-berlin.yaml
index e26cb62..c99c2ae 100644
--- a/doc/examples/realm-berlin.yaml
+++ b/doc/examples/realm-berlin.yaml
@@ -1,14 +1,10 @@
apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakRealm
+kind: OzgCloudKeycloakRealm
metadata:
name: by-berlintest-dev
namespace: by-torsten-ozg-operator-dev
spec:
keep_after_delete: false
kommune: by-kiel-dev
- kop_bezeichner: kiel
- kop_displayname: Realm für Kiel (dev)
- kop_einheitlicher_ansprechpartner: false
- kop_env_base_url: dev.by.ozg-cloud.de
- kop_enviroment: dev
- kop_sso_url: https://sso.dev.by.ozg-cloud.de
+ displayName: Realm für Kiel (dev)
+
diff --git a/doc/examples/user-helge.yaml b/doc/examples/user-helge.yaml
index e2a9460..a7f55e1 100644
--- a/doc/examples/user-helge.yaml
+++ b/doc/examples/user-helge.yaml
@@ -1,5 +1,5 @@
apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakUser
+kind: OzgCloudKeycloakUser
metadata:
name: helge
namespace: by-torsten-ozg-operator-dev
@@ -17,5 +17,4 @@ spec:
last_name: helge
password: Y9nk43yrQ_zzIPpfFU-I
username: helge
- kop_sso_url: https://sso.dev.by.ozg-cloud.de
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
index d50404d..82f2cc4 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
@@ -31,11 +31,11 @@ import io.fabric8.kubernetes.model.annotation.Plural;
import io.fabric8.kubernetes.model.annotation.Singular;
import io.fabric8.kubernetes.model.annotation.Version;
-@Kind("OzgKeycloakClient")
+@Kind("OzgCloudKeycloakClient")
@Group("operator.ozgcloud.de")
@Version("v1")
-@Singular("ozgkeycloakclient")
-@Plural("ozgkeycloakclients")
+@Singular("ozgcloudkeycloakclient")
+@Plural("ozgcloudkeycloakclients")
@SuppressWarnings("serial")
class OzgCloudKeycloakClient extends CustomResource<OzgCloudKeycloakClientSpec, OzgCloudKeycloakClientStatus> implements Namespaced {
}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java b/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
index 8e2d518..8915d2e 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
@@ -41,12 +41,12 @@ class UserUpdateControlBuilder {
}
public UpdateControl<OzgCloudKeycloakUser> build() {
- resource.setStatus(buildOzgKeycloakUserStatus());
+ resource.setStatus(buildOzgCloudKeycloakUserStatus());
return buildUpdateControl();
}
- private OzgCloudKeycloakUserStatus buildOzgKeycloakUserStatus() {
+ private OzgCloudKeycloakUserStatus buildOzgCloudKeycloakUserStatus() {
var userStatus = OzgCloudKeycloakUserStatus.builder().status(status);
message.ifPresent(userStatus::message);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
index de5fdb9..cfb2db6 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
@@ -86,24 +86,4 @@ class KeycloakClientReconcilerTest {
assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.IN_PROGRESS);
}
}
-//
-// @Nested
-// class TestUpdateErrorStatus {
-//
-// @Test
-// void shouldSetErrorStatus() {
-// var response = reconciler.updateErrorStatus(OzgKeycloakClientTestFactory.create(), null, new RuntimeException(ERROR_MESSAGE));
-//
-// assertThat(response.getResource()).isPresent().map(OzgKeycloakClient::getStatus).map(OzgKeycloakClientStatus::getStatus)
-// .contains(OzgCustomResourceStatus.ERROR);
-// }
-//
-// @Test
-// void shouldSetMessage() {
-// var response = reconciler.updateErrorStatus(OzgKeycloakClientTestFactory.create(), null, new RuntimeException(ERROR_MESSAGE));
-//
-// assertThat(response.getResource()).isPresent().map(OzgKeycloakClient::getStatus).map(OzgKeycloakClientStatus::getMessage)
-// .contains(ERROR_MESSAGE);
-// }
-// }
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
index 620798e..ce957b8 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
@@ -59,12 +59,6 @@ class KeycloakLivelTest {
String realm = "by-torsten-ozg-operator-dev";
remoteService.createClient(createClient(), realm);
-// remoteService.updateClient(createClient(), realm);
-
-// remoteService.addClientRole(createRoles(), createClient().getClientId(), realm);
-// Optional<RoleRepresentation> remoteRole = remoteService.getClientRole(OzgKeycloakClientSpecTestFactory.ROLE1.getName(),
-// createClient().getClientId(), realm);
-// remoteService.updateClientRole(remoteRole.get(), createClient().getClientId(), realm);
}
@SuppressWarnings("unused")
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
index e7c4ef0..c1d2fe7 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
@@ -86,24 +86,4 @@ class KeycloakGroupReconcilerTest {
assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.IN_PROGRESS);
}
}
-
-// @Nested
-// class TestUpdateErrorStatus {
-//
-// @Test
-// void shouldSetErrorStatus() {
-// var response = reconciler.updateErrorStatus(OzgKeycloakGroupTestFactory.create(), null, new RuntimeException(ERROR_MESSAGE));
-//
-// assertThat(response.getResource()).isPresent().map(OzgKeycloakGroup::getStatus).map(OzgKeycloakGroupStatus::getStatus)
-// .contains(OzgCustomResourceStatus.ERROR);
-// }
-//
-// @Test
-// void shouldSetMessage() {
-// var response = reconciler.updateErrorStatus(OzgKeycloakGroupTestFactory.create(), null, new RuntimeException(ERROR_MESSAGE));
-//
-// assertThat(response.getResource()).isPresent().map(OzgKeycloakGroup::getStatus).map(OzgKeycloakGroupStatus::getMessage)
-// .contains(ERROR_MESSAGE);
-// }
-// }
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
index eaf20bc..827bbb9 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
@@ -70,7 +70,7 @@ class KeycloakUserServiceTest {
@Mock
private Resource<Secret> resource;
@Captor
- private ArgumentCaptor<OzgCloudKeycloakUserSpec> ozgKeycloakUserSpecCaptor;
+ private ArgumentCaptor<OzgCloudKeycloakUserSpec> ozgCloudKeycloakUserSpecCaptor;
private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.create();
@@ -98,8 +98,8 @@ class KeycloakUserServiceTest {
service.createOrUpdateUser(userWithoutPassword, TEST_NAMESPACE);
- verify(userMapper).map(ozgKeycloakUserSpecCaptor.capture());
- assertThat(ozgKeycloakUserSpecCaptor.getValue().getKeycloakUser().getPassword()).isEqualTo(KeycloakUserSpecUserTestFactory.PASSWORD);
+ verify(userMapper).map(ozgCloudKeycloakUserSpecCaptor.capture());
+ assertThat(ozgCloudKeycloakUserSpecCaptor.getValue().getKeycloakUser().getPassword()).isEqualTo(KeycloakUserSpecUserTestFactory.PASSWORD);
}
}
--
GitLab