Fix queue password in Appeals API service, and remove uk south privat…

…e endpoint
Planning-Inspectorate · Jun 6, 2022 · 73f0d84 · 73f0d84
1 parent ab7296e
commit 73f0d84
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 59 deletions.
diff --git a/app/components/appeals-app-services/locals.tf b/app/components/appeals-app-services/locals.tf
@@ -64,7 +64,7 @@ locals {
         FEATURE_FLAG_NEW_APPEAL_JOURNEY                                       = true
         HORIZON_HAS_PUBLISHER_ATTEMPT_RECONNECTION                            = true
         HORIZON_HAS_PUBLISHER_HOST                                            = "${azurerm_servicebus_namespace.horizon.name}.servicebus.windows.net"
-        HORIZON_HAS_PUBLISHER_PASSWORD                                        = azurerm_servicebus_namespace_authorization_rule.horizon_function_apps.primary_connection_string
+        HORIZON_HAS_PUBLISHER_PASSWORD                                        = azurerm_servicebus_namespace_authorization_rule.horizon_function_apps.primary_key
         HORIZON_HAS_PUBLISHER_PORT                                            = "5671"
         HORIZON_HAS_PUBLISHER_QUEUE                                           = azurerm_servicebus_queue.horizon_householder_appeal_publish.name
         HORIZON_HAS_PUBLISHER_RECONNECT_LIMIT                                 = "5"

diff --git a/app/components/appeals-app-services/service-bus.tf b/app/components/appeals-app-services/service-bus.tf
@@ -18,7 +18,7 @@ resource "azurerm_servicebus_namespace_authorization_rule" "horizon_function_app
   name         = "horizon-function-apps"
   namespace_id = azurerm_servicebus_namespace.horizon.id
 
-  listen = true
-  send   = false
+  listen = false
+  send   = true
   manage = false
 }
diff --git a/app/stacks/uk-south/appeals-service/README.md b/app/stacks/uk-south/appeals-service/README.md
@@ -12,7 +12,6 @@ No requirements.
 | Name | Version |
 |------|---------|
 | <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.6.0 |
-| <a name="provider_azurerm.tooling"></a> [azurerm.tooling](#provider\_azurerm.tooling) | 3.6.0 |
 
 ## Modules
 
@@ -26,11 +25,8 @@ No requirements.
 | Name | Type |
 |------|------|
 | [azurerm_log_analytics_workspace.appeals_service](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/log_analytics_workspace) | resource |
-| [azurerm_private_endpoint.cosmosdb](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/private_endpoint) | resource |
 | [azurerm_resource_group.appeals_service_stack](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) | resource |
 | [azurerm_subnet.appeals_service_ingress](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/subnet) | resource |
-| [azurerm_private_dns_zone.app_service](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/private_dns_zone) | data source |
-| [azurerm_private_dns_zone.cosmosdb](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/private_dns_zone) | data source |
 
 ## Inputs
 
@@ -49,9 +45,6 @@ No requirements.
 | <a name="input_container_registry_name"></a> [container\_registry\_name](#input\_container\_registry\_name) | The name of the container registry that hosts the image | `string` | n/a | yes |
 | <a name="input_container_registry_rg"></a> [container\_registry\_rg](#input\_container\_registry\_rg) | The resource group of the container registry that hosts the image | `string` | n/a | yes |
 | <a name="input_cosmosdb_connection_string"></a> [cosmosdb\_connection\_string](#input\_cosmosdb\_connection\_string) | The connection string used to connect to CosmosDB | `string` | n/a | yes |
-| <a name="input_cosmosdb_id"></a> [cosmosdb\_id](#input\_cosmosdb\_id) | The ID of the CosmosDB account | `string` | n/a | yes |
-| <a name="input_cosmosdb_subnet_id"></a> [cosmosdb\_subnet\_id](#input\_cosmosdb\_subnet\_id) | The ID of the subnet containing the Cosmos DB endpoint | `string` | n/a | yes |
-| <a name="input_database_public_access_enabled"></a> [database\_public\_access\_enabled](#input\_database\_public\_access\_enabled) | A switch indicating if databases should have public access enabled | `bool` | `false` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | The environment resources are deployed to e.g. 'dev' | `string` | n/a | yes |
 | <a name="input_function_apps_storage_account"></a> [function\_apps\_storage\_account](#input\_function\_apps\_storage\_account) | The name of the storage account used by the Function Apps | `string` | n/a | yes |
 | <a name="input_function_apps_storage_account_access_key"></a> [function\_apps\_storage\_account\_access\_key](#input\_function\_apps\_storage\_account\_access\_key) | The access key for the storage account | `string` | n/a | yes |

diff --git a/app/stacks/uk-south/appeals-service/cosmosdb.tf b/app/stacks/uk-south/appeals-service/cosmosdb.tf
diff --git a/app/stacks/uk-south/appeals-service/data.tf b/app/stacks/uk-south/appeals-service/data.tf
diff --git a/app/stacks/uk-south/appeals-service/variables.tf b/app/stacks/uk-south/appeals-service/variables.tf
@@ -59,28 +59,12 @@ variable "container_registry_rg" {
   type        = string
 }
 
-variable "cosmosdb_id" {
-  description = "The ID of the CosmosDB account"
-  type        = string
-}
-
-variable "cosmosdb_subnet_id" {
-  description = "The ID of the subnet containing the Cosmos DB endpoint"
-  type        = string
-}
-
 variable "cosmosdb_connection_string" {
   description = "The connection string used to connect to CosmosDB"
   sensitive   = true
   type        = string
 }
 
-variable "database_public_access_enabled" {
-  description = "A switch indicating if databases should have public access enabled"
-  type        = bool
-  default     = false
-}
-
 variable "environment" {
   description = "The environment resources are deployed to e.g. 'dev'"
   type        = string