Update some legacy references

frasermolyneux · Jun 19, 2024 · f333685 · f333685
1 parent 98486ad
commit f333685
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/terraform/api_management_api.tf b/terraform/api_management_api.tf
@@ -96,12 +96,12 @@ resource "azurerm_api_management_api_policy" "event_ingest_api_policy" {
       <set-backend-service backend-id="{{event-ingest-api-active-backend}}" />
       <cache-lookup vary-by-developer="false" vary-by-developer-groups="false" downstream-caching-type="none" />
       <validate-jwt header-name="Authorization" failed-validation-httpcode="401" failed-validation-error-message="JWT validation was unsuccessful" require-expiration-time="true" require-scheme="Bearer" require-signed-tokens="true">
-          <openid-config url="{{tenant-login-url}}{{tenant-id}}/v2.0/.well-known/openid-configuration" />
+          <openid-config url="https://login.microsoftonline.com/${data.azuread_client_config.current.tenant_id}/v2.0/.well-known/openid-configuration" />
           <audiences>
               <audience>{{event-ingest-api-audience}}</audience>
           </audiences>
           <issuers>
-              <issuer>https://sts.windows.net/{{tenant-id}}/</issuer>
+              <issuer>https://sts.windows.net/${data.azuread_client_config.current.tenant_id}/</issuer>
           </issuers>
           <required-claims>
               <claim name="roles" match="any">

diff --git a/terraform/api_subscriptions_key_vault_secrets.tf b/terraform/api_subscriptions_key_vault_secrets.tf
@@ -1,11 +1,11 @@
 resource "azurerm_key_vault_secret" "repository_api_subscription_secret_primary" {
-  name         = format("%s-api-key-primary", azurerm_api_management_subscription.repository_api_subscription.display_name)
+  name         = format("%s-legacy-api-key-primary", azurerm_api_management_subscription.repository_api_subscription.display_name)
   value        = azurerm_api_management_subscription.repository_api_subscription.primary_key
   key_vault_id = azurerm_key_vault.kv.id
 }
 
 resource "azurerm_key_vault_secret" "repository_api_subscription_secret_secondary" {
-  name         = format("%s-api-key-secondary", azurerm_api_management_subscription.repository_api_subscription.display_name)
+  name         = format("%s-legacy-api-key-secondary", azurerm_api_management_subscription.repository_api_subscription.display_name)
   value        = azurerm_api_management_subscription.repository_api_subscription.secondary_key
   key_vault_id = azurerm_key_vault.kv.id
 }