Skip to content

Changes after terraform fmt #1

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

Open
ghost wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changes after terraform fmt #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions solution/landingzone.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ module "solution" {
azurerm.vhub = azurerm.vhub
}

github = local.github
azuread = local.azuread
cloud = local.cloud
compute = local.compute
apim = local.apim
cognitive_services = local.cognitive_services
current_landingzone_key = try(var.landingzone.key, var.landingzone[var.backend_type].key)
custom_role_definitions = var.custom_role_definitions
data_factory = local.data_factory
database = local.database
data_protection = local.data_protection
github = local.github
azuread = local.azuread
cloud = local.cloud
compute = local.compute
apim = local.apim
cognitive_services = local.cognitive_services
current_landingzone_key = try(var.landingzone.key, var.landingzone[var.backend_type].key)
custom_role_definitions = var.custom_role_definitions
data_factory = local.data_factory
database = local.database
data_protection = local.data_protection
# devcenter = local.devcenter
diagnostic_storage_accounts = var.diagnostic_storage_accounts
diagnostics_definition = var.diagnostics_definition
Expand Down
2 changes: 1 addition & 1 deletion solution/local.devcenter.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
devcenter = merge(
var.devcenter,
{
network_connections = var.network_connections
network_connections = var.network_connections
}
)
}
6 changes: 3 additions & 3 deletions solution/local.github.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ locals {
github = merge(
var.github,
{
github_membership = var.github_membership
github_teams = var.github_teams
github_repositories = var.github_repositories
github_membership = var.github_membership
github_teams = var.github_teams
github_repositories = var.github_repositories
}
)
}
2 changes: 1 addition & 1 deletion solution/local.logic_app.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ locals {
{
# logic_app_integration_account_certificate = var.logic_app_integration_account_certificate
# logic_app_integration_account_session = var.logic_app_integration_account_session
logic_app_standard = var.logic_app_standard
logic_app_standard = var.logic_app_standard
integration_service_environment = var.integration_service_environment
logic_app_action_custom = var.logic_app_action_custom
logic_app_action_http = var.logic_app_action_http
Expand Down
8 changes: 4 additions & 4 deletions solution/local.messaging.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ locals {
messaging = merge(
var.messaging,
{
signalr_services = var.signalr_services
servicebus_namespaces = var.servicebus_namespaces
servicebus_topics = var.servicebus_topics
servicebus_queues = var.servicebus_queues
signalr_services = var.signalr_services
servicebus_namespaces = var.servicebus_namespaces
servicebus_topics = var.servicebus_topics
servicebus_queues = var.servicebus_queues
eventgrid_domain = var.eventgrid_domain
eventgrid_topic = var.eventgrid_topic
eventgrid_event_subscription = var.eventgrid_event_subscription
Expand Down
2 changes: 1 addition & 1 deletion solution/local.networking.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ locals {
azurerm_routes = var.azurerm_routes
cdn_endpoints = var.cdn_endpoints # Check for cdn_endpoint
cdn_profiles = var.cdn_profiles # Check for cdn_profile
ddos_services = var.ddos_services
ddos_services = var.ddos_services
dns_zone_records = var.dns_zone_records
dns_zones = var.dns_zones
domain_name_registrations = var.domain_name_registrations
Expand Down
4 changes: 2 additions & 2 deletions solution/local.shared_services.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ locals {
log_analytics_storage_insights = var.log_analytics_storage_insights
monitor_action_groups = var.monitor_action_groups
monitor_autoscale_settings = var.monitor_autoscale_settings
monitor_metric_alert = var.monitor_metric_alert
monitor_activity_log_alert = var.monitor_activity_log_alert
monitor_metric_alert = var.monitor_metric_alert
monitor_activity_log_alert = var.monitor_activity_log_alert
monitoring = var.monitoring
packer_build = var.packer_build
packer_managed_identity = var.packer_managed_identity
Expand Down
14 changes: 7 additions & 7 deletions solution/local.webapp.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ locals {
azurerm_application_insights = var.azurerm_application_insights
azurerm_application_insights_web_test = var.azurerm_application_insights_web_test
azurerm_application_insights_standard_web_test = var.azurerm_application_insights_standard_web_test
app_service_environments = var.app_service_environments
app_service_environments_v3 = var.app_service_environments_v3
app_service_plans = var.app_service_plans
app_services = var.app_services
azurerm_application_insights = var.azurerm_application_insights
function_apps = var.function_apps
static_sites = var.static_sites
app_service_environments = var.app_service_environments
app_service_environments_v3 = var.app_service_environments_v3
app_service_plans = var.app_service_plans
app_services = var.app_services
azurerm_application_insights = var.azurerm_application_insights
function_apps = var.function_apps
static_sites = var.static_sites
}
)
}
4 changes: 2 additions & 2 deletions solution/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ provider "github" {
}

provider "azuread" {
partner_id = "d40f4895-5a21-5612-aa15-69cd25571694"
partner_id = "d40f4895-5a21-5612-aa15-69cd25571694"
}

provider "azurerm" {
partner_id = "d40f4895-5a21-5612-aa15-69cd25571694"
partner_id = "d40f4895-5a21-5612-aa15-69cd25571694"
# partner identifier for CAF Terraform landing zones.
features {
api_management {
Expand Down
2 changes: 1 addition & 1 deletion solution/variables.devcenter.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ variable "devcenter" {
}

variable "network_connections" {
default = {}
default = {}
}
24 changes: 12 additions & 12 deletions solution/variables.github.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ variable "github_membership" {

variable "github_teams" {
type = map(object({
name = string
description = optional(string)
privacy = optional(string)
parent_team_key = optional(string)
ldap_dn = optional(string)
name = string
description = optional(string)
privacy = optional(string)
parent_team_key = optional(string)
ldap_dn = optional(string)
create_default_maintainer = optional(bool)
}))
description = "A map of GitHub team names to their details."
Expand Down Expand Up @@ -59,12 +59,12 @@ variable "github_repositories" {

variable "github" {
type = object({
github_teams = optional(map(object({
name = string
description = optional(string)
privacy = optional(string)
parent_team_key = optional(string)
ldap_dn = optional(string)
github_teams = optional(map(object({
name = string
description = optional(string)
privacy = optional(string)
parent_team_key = optional(string)
ldap_dn = optional(string)
create_default_maintainer = optional(bool)
})))
github_repositories = optional(map(object({
Expand All @@ -85,7 +85,7 @@ variable "github" {
archived = optional(bool)
topics = optional(list(string))
})))
github_membership = optional(map(object({
github_membership = optional(map(object({
username = string
role = string
})))
Expand Down
2 changes: 1 addition & 1 deletion solution/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ variable "user_type" {

variable "management_groups" {
description = "Management Group configuration object"
default = {}
default = {}
# type = map(object({
# name = string
# displayName = string
Expand Down