Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update version and remove unused var #272

Merged
merged 4 commits into from
Nov 11, 2021
Merged

update version and remove unused var #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c33ea8e
update version and remove unused var
rickychew77 Nov 10, 2021
8ccd189
Update solution.tf
rickychew77 Nov 11, 2021
8f043d1
Create local.azuread.tf
rickychew77 Nov 11, 2021
25d7477
Update variables.tf
rickychew77 Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions caf_solution/add-ons/azure_devops_agent/local.azuread.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
locals {
azuread = merge(
var.azuread,
{
azuread_apps = var.azuread_apps
azuread_groups = var.azuread_groups
}
)
}
5 changes: 2 additions & 3 deletions caf_solution/add-ons/azure_devops_agent/solution.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module "caf" {
source = "aztfmod/caf/azurerm"
version = "~>5.3.0"
version = "~>5.4.2"

azuread = local.azuread
current_landingzone_key = var.landingzone.key
tenant_id = var.tenant_id
tfstates = local.tfstates
Expand All @@ -13,13 +14,11 @@ module "caf" {
logged_aad_app_objectId = var.logged_aad_app_objectId
resource_groups = var.resource_groups
storage_accounts = var.storage_accounts
azuread_groups = var.azuread_groups
keyvaults = var.keyvaults
keyvault_access_policies = var.keyvault_access_policies
managed_identities = var.managed_identities
role_mapping = var.role_mapping
custom_role_definitions = var.custom_role_definitions
azuread_apps = var.azuread_apps
compute = {
virtual_machines = var.virtual_machines
}
Expand Down
5 changes: 4 additions & 1 deletion caf_solution/add-ons/azure_devops_agent/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ variable "storage_accounts" {
variable "storage_account_blobs" {
default = {}
}
variable "azuread" {
default = {}
}
variable "azuread_groups" {
default = {}
}
Expand Down Expand Up @@ -99,4 +102,4 @@ variable "dynamic_keyvault_secrets" {
}
variable "managed_identities" {
default = {}
}
}