Closes #23 to ensure we consistently name Host Groups Host Enclaves

Author: phrocker

api/src/main/java/io/sentrius/sso/startup/ConfigurationApplicationTask.java

@@ -276,7 +276,7 @@ protected List<HostGroup> createHostGroups(List<SideEffect> sideEffects, Map<Str
                     if (action) {
 
                         hostGroup = hostGroupRepository.save(hostGroup);
-                        log.info("Creating Host Group {} with {}", hostGroup.getId(), hostGroupDto.getDisplayName());
+                        log.info("Creating Host Enclave {} with {}", hostGroup.getId(), hostGroupDto.getDisplayName());
                         profiles.add(hostGroup);
                         for(var hs : hostGroup.getHostSystems()) {
                             if (null == hs.getHostGroups()){
@@ -287,27 +287,27 @@ protected List<HostGroup> createHostGroups(List<SideEffect> sideEffects, Map<Str
                             systemRepository.save(hs);
                         }
                     }
-                    sideEffects.add(SideEffect.builder().sideEffectDescription("Creating Host Group " + hostGroupDto.getDisplayName()).type(
+                    sideEffects.add(SideEffect.builder().sideEffectDescription("Creating Host Enclave " + hostGroupDto.getDisplayName()).type(
                         SideEffectType.UPDATE_DATABASE).asset("HostGroups").build());
                 }else {
 
                         boolean existsInHostGroup = false;
 
 
                             for(HostGroup hg : hostGroups) {
-                                log.info("Updating Host Group {} with {}", hg.getId(), hg.getId());
+                                log.info("Updating Host Enclave {} with {}", hg.getId(), hg.getId());
                                 profiles.add(hg);
 
                                 for(var hs : hostGroup.getHostSystems()) {
                                     if (!systemRepository.isAssignedToHostGroups(hs.getId(), List.of( hg.getId()))) {
                                         if (action) {
                                         hs.getHostGroups().add(hg);
                                         systemRepository.save(hs);
-                                        log.info("Updating Host Group {} with {}", hg.getId(), hs.getId());
+                                        log.info("Updating Host Enclave {} with {}", hg.getId(), hs.getId());
                                     }
 
                                         sideEffects.add(SideEffect.builder()
-                                            .sideEffectDescription("Updating Host Group " + hostGroupDto.getDisplayName()).type(
+                                            .sideEffectDescription("Updating Host Enclave " + hostGroupDto.getDisplayName()).type(
                                                 SideEffectType.UPDATE_DATABASE).asset("HostGroups").build());
                                 }
                             }
@@ -453,10 +453,10 @@ protected List<User> createUsers(
 
 
                                     sideEffects.add(SideEffect.builder().sideEffectDescription(
-                                        "Assigning user " + userDTO.getUsername() + " to Host Group " +
+                                        "Assigning user " + userDTO.getUsername() + " to Host Enclave " +
                                             hostGroup.getName()).type(
                                         SideEffectType.UPDATE_DATABASE).asset("Users").build());
-                                        log.info("Assigning user {} to Host Group {}", userDTO.getUsername(),
+                                        log.info("Assigning user {} to Host Enclave {}", userDTO.getUsername(),
                                         hostGroup.getId());
                                         user.getHostGroups().add(hostGroup);
                                     }
@@ -473,15 +473,15 @@ protected List<User> createUsers(
                         for (var profile : userDTO.getHostGroups()) {
                             for (HostGroup hostGroup : profiles) {
                                 if (hostGroup.getName().equals(profile.getDisplayName())) {
-                                    log.info("Assigning user {} to Host Group {}", userDTO.getUsername(),
+                                    log.info("Assigning user {} to Host Enclave {}", userDTO.getUsername(),
                                         hostGroup.getId());
                                     if (null == hostGroup.getId() || !userRepository.isAssignedToHostGroups(user.getId(),
                                         List.of(hostGroup.getId()))) {
                                         sideEffects.add(SideEffect.builder().sideEffectDescription(
-                                            "Assigning user " + userDTO.getUsername() + " to Host Group " +
+                                            "Assigning user " + userDTO.getUsername() + " to Host Enclave " +
                                                 hostGroup.getName()).type(
                                             SideEffectType.UPDATE_DATABASE).asset("Users").build());
-                                        log.info("Assigning user {} to Host Group {}", userDTO.getUsername(),
+                                        log.info("Assigning user {} to Host Enclave {}", userDTO.getUsername(),
                                             hostGroup.getId()
                                         );
                                     }

api/src/main/resources/static/js/rules.js

@@ -110,7 +110,7 @@ $(document).ready(function () {
 
                     if (row.canEdit) {
                         buttons +=
-                            `<button class="btn btn-secondary spacer spacer-middle" data-bs-toggle="modal" data-bs-target="#edit_dialog_${data}" onclick="editRule(${data})">Edit</button><button id="role_btn_${data}" onclick="assignRule(${data})" class="btn btn-secondary assign_btn spacer spacer-right">Assign Host Groups</button>
+                            `<button class="btn btn-secondary spacer spacer-middle" data-bs-toggle="modal" data-bs-target="#edit_dialog_${data}" onclick="editRule(${data})">Edit</button><button id="role_btn_${data}" onclick="assignRule(${data})" class="btn btn-secondary assign_btn spacer spacer-right">Assign Host Enclaves</button>
          `;
                     }
 
@@ -165,7 +165,7 @@ $(document).ready(function () {
                 if (response.ok) {
                     $('#rule-table').DataTable().ajax.reload(null, false);
                 } else {
-                    alert("Failed to assign host groups.");
+                    alert("Failed to assign host enclaves.");
                 }
                 const modal = bootstrap.Modal.getInstance(document.getElementById("assignHostGroupsModal"));
                 modal.hide();

api/src/main/resources/templates/fragments/assign_rule.html

@@ -1,10 +1,10 @@
-<!-- Assign Host Groups Modal -->
+<!-- Assign Host Enclaves Modal -->
 <div class="modal fade" id="assignHostGroupsModal" tabindex="-1" aria-labelledby="assignHostGroupsModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <form id="assignHostGroupsForm" method="POST">
                 <div class="modal-header">
-                    <h5 class="modal-title" id="assignHostGroupsModalLabel">Assign Host Groups</h5>
+                    <h5 class="modal-title" id="assignHostGroupsModalLabel">Assign Host Enclaves</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
@@ -15,17 +15,17 @@ <h5 class="modal-title" id="assignHostGroupsModalLabel">Assign Host Groups</h5>
                         <label for="assignRuleName" class="form-label">Rule Name</label>
                         <input type="text" class="form-control" id="assignRuleName" name="assignRuleName" readonly>
                     </div>
-                    <!-- Host Groups Multi-select -->
+                    <!-- Host Enclaves Multi-select -->
                     <div class="mb-3">
-                        <label for="hostGroups" class="form-label">Host Groups</label>
+                        <label for="hostGroups" class="form-label">Host Enclaves</label>
                         <select name="hostGroups" id="hostGroups" class="form-select" multiple>
                             <!-- Options will be dynamically populated -->
                         </select>
                     </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-primary">Assign Host Groups</button>
+                    <button type="submit" class="btn btn-primary">Assign Host Enclaves</button>
                 </div>
                 <!-- CSRF Token -->
 

api/src/main/resources/templates/fragments/dashboard/dashboard_cards.html

@@ -50,7 +50,7 @@ <h5 class="card-title">Number of assigned hosts</h5>
         <i class="fas fa-users card-icon"></i> <!-- Icon for the card -->
     </div>
     <div class="card-body">
-        <h5 class="card-title">Number of Host Groups</h5>
+        <h5 class="card-title">Number of Host Enclaves</h5>
         <p class="card-text"><span id="assigned-sgs"></span></p>
     </div>
 </div>

api/src/main/resources/templates/fragments/ssh_server_card.html

@@ -5,7 +5,7 @@
                 <img src="/images/hosts_medium.png" alt="Terminal Icon" class="card-image">
             </div>
             <div class="card-content">
-                <h3 class="card-title">Host Groups</h3>
+                <h3 class="card-title">Host Enclaves</h3>
                 <div class="card-stats">
                     <div class="card-stat">
                         <span>Assigned Systems:</span>

api/src/main/resources/templates/fragments/topbar.html

@@ -23,7 +23,7 @@
                 <li class="nav-item" th:if="${enclaveList != null && !enclaveList.empty}">
                     <select th:name="enclaveList" th:onchange="'javascript:changeProfile(this.value)'"
                             class="form-select view_frm_select" title="Enclave">
-                        <option value="">- Select Host Group -</option>
+                        <option value="">- Select Host Enclave -</option>
                         <option th:each="p : ${enclaveList}" th:value="${p.id}" th:text="${p.nm}" th:if="${p.selected == true}" selected></option>
                         <option th:each="p : ${enclaveList}" th:value="${p.id}" th:text="${p.nm}" th:if="${p.selected != true}"></option>
                     </select>

api/src/main/resources/templates/sso/ssh/list_servers.html

@@ -89,7 +89,7 @@ <h3>Assigned SSH Servers</h3>
             <tr>
                 <th>System Name</th>
                 <th>Hostname</th>
-                <th>Host Group</th>
+                <th>Host Enclave</th>
                 <th>SSH User</th>
                 <th>Port</th>
                 <th>Operations</th>

core/src/main/java/io/sentrius/sso/core/data/specification/HostGroupSpecification.java

@@ -18,7 +18,7 @@ public static Specification<HostGroup> findByUserIdAndOptionalFilters(@NonNull L
         return (root, query, criteriaBuilder) -> {
             List<Predicate> predicates = new ArrayList<>();
 
-            // Join the users to filter host groups by user ID
+            // Join the users to filter host enclaves by user ID
             Join<HostGroup, User> userJoin = root.join("users", JoinType.INNER);
             predicates.add(criteriaBuilder.equal(userJoin.get("id"), userId));
 

core/src/main/java/io/sentrius/sso/core/services/HostGroupService.java

@@ -43,7 +43,7 @@ public HostGroup getHostGroup(Long hostGroupId) {
     @Transactional
     public Optional<HostGroup> getHostGroupWithHostSystems(User user, Long hostGroupId) {
         HostGroup hostGroup = hostGroupRepository.findByIdWithUsers(hostGroupId)
-            .orElseThrow(() -> new EntityNotFoundException("Host Group not found"));
+            .orElseThrow(() -> new EntityNotFoundException("Host Enclave not found"));
 
 
         boolean userIsMember = hostGroup.getUsers().stream()
@@ -69,7 +69,7 @@ public List<HostSystem> getAssignedHostsForUser(User user) {
 
         userRepository.findHostGroupsByUserId(user.getId()).forEach(hostGroup -> {
             HostGroup sys = hostGroupRepository.findById(hostGroup.getId())
-                .orElseThrow(() -> new EntityNotFoundException("Host Group not found"));
+                .orElseThrow(() -> new EntityNotFoundException("Host Enclave not found"));
             log.info("HostGroup: {}", sys.getId());
             if (null != sys && null != sys.getHostSystemList()) {
                 Hibernate.initialize(sys.getHostSystemList());
@@ -93,7 +93,7 @@ public List<HostSystem> getAssignedHostsForUserAndId(User user, Long groupId) {
             return hostGroup.getId().equals(groupId);
     }).forEach(hostGroup -> {
             HostGroup sys = hostGroupRepository.findById(hostGroup.getId())
-                .orElseThrow(() -> new EntityNotFoundException("Host Group not found"));
+                .orElseThrow(() -> new EntityNotFoundException("Host Enclave not found"));
             log.info("HostGroup: {}", sys.getId());
             if (null != sys && null != sys.getHostSystemList()) {
                 Hibernate.initialize(sys.getHostSystemList());

core/src/main/java/io/sentrius/sso/core/services/UserService.java

@@ -95,8 +95,8 @@ public User getOperatingUser(HttpServletRequest request,
                     log.info("Creating new user: {}", operatingUser);
                     save(operatingUser);
                     HostGroup newHg =
-                        HostGroup.builder().name("Host Group for " + operatingUser.getUsername()).description(
-                            operatingUser.getUsername() + "'s Host Group").build();
+                        HostGroup.builder().name("Host Enclave for " + operatingUser.getUsername()).description(
+                            operatingUser.getUsername() + "'s Host Enclave").build();
                     ProfileDB.save(newHg);
 
                     operatingUser.getHostGroups().add(newHg);