Skip to content

Commit cdcbb1b

Browse files
committed
finalizing changes
1 parent 70eed22 commit cdcbb1b

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

terraform/data.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
data "azurerm_resource_group" "rg" {
2-
name = var.resource_group_name
3-
}
4-
51
data "azuread_client_config" "current" {}

terraform/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ resource "azuredevops_serviceendpoint_azurecr" "acr_registry_endpoint" {
9696
resource_group = var.resource_group_name
9797
service_endpoint_name = "AzureCR Endpoint"
9898
service_endpoint_authentication_scheme = "WorkloadIdentityFederation"
99-
azurecr_spn_tenantid = "233318cd-0fbb-44eb-9437-4e2681adf87e"
99+
azurecr_spn_tenantid = var.TFC_AZ_TENANT_ID
100100
azurecr_name = var.acr_name
101-
azurecr_subscription_id = "9e3af6ab-6e22-4d23-a3ef-a6e883abe616"
102-
azurecr_subscription_name = "DSB"
101+
azurecr_subscription_id = var.TFC_AZ_SUBSCRIPTION_ID
102+
azurecr_subscription_name = var.TFC_AZ_SUBSCRIPTION_NAME
103103

104104
credentials {
105105
serviceprincipalid = azurerm_user_assigned_identity.this_uaid.client_id

terraform/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ variable "TFC_AZ_CLIENT_ID" {}
33
variable "TFC_AZ_CLIENT_PASSWORD" {}
44
variable "TFC_AZ_TENANT_ID" {}
55
variable "TFC_AZ_SUBSCRIPTION_ID" {}
6+
variable "TFC_AZ_SUBSCRIPTION_NAME" {}
67
variable "TFC_AZ_DEVOPS_ORG_SERVICE_URL" {}
78
variable "TFC_AZ_DEVOPS_PAT" {}
89
variable "TFC_AZ_DEVOPS_GITHUB_PAT" {}

0 commit comments

Comments
 (0)