S28 3951 Allow SuperUsers to perform more edit actions #1178

GeorgeBarnesUK · 2025-08-11T08:44:15Z

Change description

Allows Super Users to perform edits that are not allowed by normal admins. These actions are required as part of incident resolution processes when not having direct edit access to DB:

Allow super users to share bookings as if they were another user (required when restoring lost share bookings)
Allow super users to create bookings scheduled in the past (required when migrated cases mistakenly recorded in DEMO etc)
Allow super users to update cases in the CLOSED state.

oliver-scott

looks good, just a small suggestion. Looks like there might be some checkstyle fixes needed too

src/test/java/uk/gov/hmcts/reform/preapi/dto/validators/NotPastDateValidatorTest.java

…/allow-admins-extra-api-actions-2

src/test/java/uk/gov/hmcts/reform/preapi/controller/BookingControllerTest.java

…/allow-admins-extra-api-actions-2

src/main/java/uk/gov/hmcts/reform/preapi/services/BookingService.java

src/main/java/uk/gov/hmcts/reform/preapi/services/CaseService.java

src/test/java/uk/gov/hmcts/reform/preapi/services/BookingServiceTest.java

lydiaralphgov

See comments

hmcts-jenkins-cnp · 2025-11-07T09:35:54Z

Plan Result (stg)

⚠️ Resource Deletion will happen

This plan contains resource delete operation. Please check the plan result very carefully!

Plan: 2 to add, 6 to change, 2 to destroy.

Update
- module.apim_subscription_editvm[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_portal[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_powerplatform[0].azurerm_api_management_subscription.subscription
- module.apim_subscription_smoketest[0].azurerm_api_management_subscription.subscription
- module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
- module.pre_b2c_product[0].azurerm_api_management_product.product
Replace
- module.pre_api[0].azurerm_api_management_api.api
- module.pre_api_b2c[0].azurerm_api_management_api.api

Change Result (Click me)

  # module.apim_subscription_editvm[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/8265f455-2bf2-4c4b-8ba3-bfd0a2f5a6b7"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_portal[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/500e642d-76ef-4d82-8741-bf9e9d979705"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_powerplatform[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/37f73c17-345b-4c67-81d5-50d582e97227"
        # (10 unchanged attributes hidden)
    }

  # module.apim_subscription_smoketest[0].azurerm_api_management_subscription.subscription will be updated in-place
  ~ resource "azurerm_api_management_subscription" "subscription" {
      ~ allow_tracing       = false -> true
        id                  = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/subscriptions/da1d82f9-7187-4cb6-a6dd-b0020311f3bb"
        # (10 unchanged attributes hidden)
    }

  # module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/pre-stg/providers/Microsoft.Resources/deployments/PRE_API_exception"
        name                     = "PRE_API_exception"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

  # module.pre_api[0].azurerm_api_management_api.api must be replaced
-/+ resource "azurerm_api_management_api" "api" {
      ~ id                    = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/apis/pre-api;rev=125" -> (known after apply)
      ~ is_current            = true -> (known after apply)
      ~ is_online             = false -> (known after apply)
        name                  = "pre-api"
      ~ revision              = "125" -> "126" # forces replacement
      + version               = (known after apply)
      + version_set_id        = (known after apply)
        # (12 unchanged attributes hidden)

      ~ subscription_key_parameter_names (known after apply)
      - subscription_key_parameter_names {
          - header = "Ocp-Apim-Subscription-Key" -> null
          - query  = "subscription-key" -> null
        }

        # (1 unchanged block hidden)
    }

  # module.pre_api_b2c[0].azurerm_api_management_api.api must be replaced
-/+ resource "azurerm_api_management_api" "api" {
      ~ id                    = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/apis/pre-api-b2c;rev=125" -> (known after apply)
      ~ is_current            = true -> (known after apply)
      ~ is_online             = false -> (known after apply)
        name                  = "pre-api-b2c"
      ~ revision              = "125" -> "126" # forces replacement
      + version               = (known after apply)
      + version_set_id        = (known after apply)
        # (12 unchanged attributes hidden)

      ~ subscription_key_parameter_names (known after apply)
      - subscription_key_parameter_names {
          - header = "Ocp-Apim-Subscription-Key" -> null
          - query  = "subscription-key" -> null
        }

        # (1 unchanged block hidden)
    }

  # module.pre_b2c_product[0].azurerm_api_management_product.product will be updated in-place
  ~ resource "azurerm_api_management_product" "product" {
        id                    = "/subscriptions/74dacd4f-a248-45bb-a2f0-af700dc4cf68/resourceGroups/ss-stg-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-stg/products/pre-api-b2c"
      ~ subscriptions_limit   = 0 -> 20
        # (9 unchanged attributes hidden)
    }

Plan: 2 to add, 6 to change, 2 to destroy.

hmcts-jenkins-cnp · 2025-11-07T09:36:29Z

Plan Result (prod)

⚠️ Resource Deletion will happen

This plan contains resource delete operation. Please check the plan result very carefully!

Plan: 1 to add, 2 to change, 1 to destroy.

Update
- module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
- module.pre-api-liveness-alert[0].azurerm_resource_group_template_deployment.custom_alert[0]
Replace
- module.pre_api[0].azurerm_api_management_api.api

Change Result (Click me)

  # module.pre-api-exception-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/pre-prod/providers/Microsoft.Resources/deployments/PRE_API_exception"
        name                     = "PRE_API_exception"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

  # module.pre-api-liveness-alert[0].azurerm_resource_group_template_deployment.custom_alert[0] will be updated in-place
  ~ resource "azurerm_resource_group_template_deployment" "custom_alert" {
        id                       = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/pre-prod/providers/Microsoft.Resources/deployments/PRE_API_liveness"
        name                     = "PRE_API_liveness"
        tags                     = {}
      ~ template_content         = jsonencode(
          ~ {
              ~ parameters     = {
                  ~ actionGroupName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ actionGroupRg            = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertDesc                = {
                      ~ type = "String" -> "string"
                    }
                  ~ alertName                = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsName          = {
                      ~ type = "String" -> "string"
                    }
                  ~ appInsightsQuery         = {
                      ~ type = "String" -> "string"
                    }
                  ~ commonTags               = {
                      ~ type = "String" -> "string"
                    }
                  ~ customEmailSubject       = {
                      ~ type = "String" -> "string"
                    }
                  ~ frequencyInMinutes       = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ location                 = {
                      ~ type = "String" -> "string"
                    }
                  ~ severityLevel            = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ timeWindowInMinutes      = {
                      ~ type         = "String" -> "string"
                        # (1 unchanged attribute hidden)
                    }
                  ~ triggerThreshold         = {
                      ~ type = "String" -> "string"
                    }
                  ~ triggerThresholdOperator = {
                      ~ type          = "String" -> "string"
                        # (2 unchanged attributes hidden)
                    }
                }
                # (4 unchanged attributes hidden)
            }
        )
        # (6 unchanged attributes hidden)
    }

  # module.pre_api[0].azurerm_api_management_api.api must be replaced
-/+ resource "azurerm_api_management_api" "api" {
      ~ id                    = "/subscriptions/5ca62022-6aa2-4cee-aaa7-e7536c8d566c/resourceGroups/ss-prod-network-rg/providers/Microsoft.ApiManagement/service/sds-api-mgmt-prod/apis/pre-api;rev=125" -> (known after apply)
      ~ is_current            = true -> (known after apply)
      ~ is_online             = false -> (known after apply)
        name                  = "pre-api"
      ~ revision              = "125" -> "126" # forces replacement
      + version               = (known after apply)
      + version_set_id        = (known after apply)
        # (12 unchanged attributes hidden)

      ~ subscription_key_parameter_names (known after apply)
      - subscription_key_parameter_names {
          - header = "Ocp-Apim-Subscription-Key" -> null
          - query  = "subscription-key" -> null
        }

        # (1 unchanged block hidden)
    }

Plan: 1 to add, 2 to change, 1 to destroy.

Fix share id tests

2c6016a

GeorgeBarnesUK changed the title ~~Fix share id tests~~ Allow SuperUsers to perform more edit actions Aug 11, 2025

GeorgeBarnesUK changed the title ~~Allow SuperUsers to perform more edit actions~~ S28 3951 Allow SuperUsers to perform more edit actions Aug 11, 2025

GeorgeBarnesUK marked this pull request as ready for review August 11, 2025 09:14

GeorgeBarnesUK requested a review from a team as a code owner August 11, 2025 09:14

GeorgeBarnesUK and others added 4 commits August 11, 2025 10:14

Merge branch 'master' into S28-3951/allow-admins-extra-api-actions-2

aaaed35

Fix after master pull

4904845

Fix typo

dd06f87

Add missing from stash

93ffaec

oliver-scott reviewed Aug 18, 2025

View reviewed changes

src/test/java/uk/gov/hmcts/reform/preapi/dto/validators/NotPastDateValidatorTest.java Outdated Show resolved Hide resolved

GeorgeBarnesUK added 4 commits September 22, 2025 09:07

Merge branch 'master' of https://github.com/hmcts/pre-api into S28-3951…

5132d4e

…/allow-admins-extra-api-actions-2

Style&Test fixes

0adf055

Remove redundant tests in BookingController

b8bfc4f

Merge branch 'master' of https://github.com/hmcts/pre-api into S28-3951…

ab69cb8

…/allow-admins-extra-api-actions-2

GeorgeBarnesUK commented Sep 24, 2025

View reviewed changes

src/test/java/uk/gov/hmcts/reform/preapi/controller/BookingControllerTest.java Show resolved Hide resolved

checkstyle cleanup

85a7280

hmcts-jenkins-cnp bot deployed to preview September 24, 2025 08:57 View deployment

hmcts-jenkins-cnp bot added ns:pre prd:pre rel:pre-api-pr-1178 labels Sep 24, 2025

hmcts-jenkins-cnp bot deployed to preview September 24, 2025 09:25 View deployment

hmcts-jenkins-cnp bot deployed to preview September 24, 2025 09:31 View deployment

GeorgeBarnesUK added 2 commits September 24, 2025 10:46

Functional Test perms fix

ecbd49e

Checkstyle

2934384

hmcts-jenkins-cnp bot deployed to preview September 24, 2025 10:23 View deployment

Merge branch 'master' of https://github.com/hmcts/pre-api into S28-3951…

3a9781a

…/allow-admins-extra-api-actions-2

hmcts-jenkins-cnp bot deployed to preview September 26, 2025 09:35 View deployment

oliver-scott previously approved these changes Sep 26, 2025

View reviewed changes

Merge branch 'master' into S28-3951/allow-admins-extra-api-actions-2

8c0e491

hmcts-jenkins-cnp bot deployed to preview September 29, 2025 08:31 View deployment