Remove prefix pe- in module (#1462)

Co-authored-by: Automatic Update <[email protected]>
equinor · Oct 2, 2024 · eaf1514 · eaf1514
1 parent 8f8fc33
commit eaf1514
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/terraform/subscriptions/modules/private-endpoints/main.tf b/terraform/subscriptions/modules/private-endpoints/main.tf
@@ -15,7 +15,7 @@ data "azurerm_private_dns_zone" "this" {
 }
 
 resource "azurerm_private_endpoint" "this" {
-  name                = "pe-${var.server_name}"
+  name                = var.server_name
   location            = var.location
   resource_group_name = var.vnet_resource_group
   subnet_id           = data.azurerm_subnet.this.id
@@ -32,7 +32,7 @@ resource "azurerm_private_endpoint" "this" {
   dynamic "private_service_connection" {
     for_each = var.subresourcename != "privatelinkservice" ? [1] : []
     content {
-      name                           = "pe-${var.server_name}"
+      name                           = var.server_name
       private_connection_resource_id = var.resource_id
       subresource_names              = [var.subresourcename]
       is_manual_connection           = var.manual_connection
@@ -43,7 +43,7 @@ resource "azurerm_private_endpoint" "this" {
   dynamic "private_service_connection" {
     for_each = var.subresourcename == "privatelinkservice" ? [1] : []
     content {
-      name                           = "pe-${var.server_name}"
+      name                           = var.server_name
       private_connection_resource_id = var.resource_id
       is_manual_connection           = true
       request_message                = "Radix Private Link"

diff --git a/terraform/subscriptions/s940/prod/common/github.tf b/terraform/subscriptions/s940/prod/common/github.tf
@@ -44,11 +44,11 @@ resource "azuread_application_federated_identity_credential" "github-operator-fe
 
 resource "azuread_application_federated_identity_credential" "github-operator-federated-credentials-operations" {
   application_id = data.azuread_application.github_operator.id
-  display_name          = "radix-platform-operations-operations"
-  description           = "Allow Github to authenticate"
-  audiences             = ["api://AzureADTokenExchange"]
-  issuer                = "https://token.actions.githubusercontent.com"
-  subject               = "repo:equinor/radix-platform:environment:operations"
+  display_name   = "radix-platform-operations-operations"
+  description    = "Allow Github to authenticate"
+  audiences      = ["api://AzureADTokenExchange"]
+  issuer         = "https://token.actions.githubusercontent.com"
+  subject        = "repo:equinor/radix-platform:environment:operations"
 
   timeouts {}
 }
diff --git a/terraform/subscriptions/s941/dev/common/github.tf b/terraform/subscriptions/s941/dev/common/github.tf
@@ -44,11 +44,11 @@ resource "azuread_application_federated_identity_credential" "github-operator-fe
 
 resource "azuread_application_federated_identity_credential" "github-operator-federated-credentials-operations" {
   application_id = data.azuread_application.github_operator.id
-  display_name          = "radix-platform-operations-operations"
-  description           = "Allow Github to authenticate"
-  audiences             = ["api://AzureADTokenExchange"]
-  issuer                = "https://token.actions.githubusercontent.com"
-  subject               = "repo:equinor/radix-platform:environment:operations"
+  display_name   = "radix-platform-operations-operations"
+  description    = "Allow Github to authenticate"
+  audiences      = ["api://AzureADTokenExchange"]
+  issuer         = "https://token.actions.githubusercontent.com"
+  subject        = "repo:equinor/radix-platform:environment:operations"
 
   timeouts {}
 }