Skip to content

Commit e47d1c5

Browse files
nikola-petrovic-valconArtiomMatiompipalmictom-reinderspatrik-pa4k
authored
Merge into main (#452)
* Location of connection must be dynamic (#432) * make location dynamic * Update main.tf * Update variables.tf * Update main.tf * Added -Force param to Logic App Standard to bypass confict errors on local AB#21762 * Allow Access Policy name to be speficied explicitely AB#21752 * Add variable to configure logging extent (#435) * Add variable to configure logging extent * Update variables.tf * Update main.tf * format * Add dimension and frequency configuration (#437) * Add dimention and frequncy config * format * fix null dimension access * allow list of dimensions * Added optional diagnostic settings for Standard Logic Apps * Adding role validation into api policy * Api management support multiple roles validation AB#22184 (#440) * Api management support multiple roles validation * fix fmt * adding service principal role assignments * resolving PR comments * fix formating * feat: Apply diagnostic settings changes once the deployment is finished (#441) * feat: Apply diagnostic settings changes once the deployment is finished * Added comment * Upgraded default TLS on SB (since older are going to be deprecated) * Update modules/azure/service_bus_public/variables.tf Co-authored-by: tom-reinders <[email protected]> * Adding optional setting for diagnostic categories * fix TF formating * Adding property to enable/disable sftp on storage account * feat: Added Standard Logic App with Managed Identity and IP restriction (for HTTP trigger) * Merged Standard Logic App modules into a single one * Omit MICROSOFT_PROVIDER_AUTHENTICATION_SECRET when not applicable * Reverse condition * Updated appsettings configuration * fix: Removed validation for optional module AB#23089 (#446) * added app_scale_limit into windows azure function module * update of app_scale_limit to leverage null or not being set * update the condition and remove comment * app_scale_limit set default to 0 * feat: Enable option to configure runtime_scale_monitoring_enabled * feat: Allow APIM API bytes_to_log to be specified * Updated terraform providers to their latest minor versions (#450) * Updated terraform providers to their latest minor versions * Fixed azurerm version for service_plan * reverted elastic/ec version * Updated TF providers: Merging into develop (#451) * Updated terraform providers to their latest minor versions * Fixed azurerm version for service_plan * reverted elastic/ec version * Update main.tf deprecated application_id -> client_id * Update main.tf * Added separate frontdoor firewall policy, extracted classic. * Fixed managed_rule action and details link * Added support for Front Door Standard * Fixed origins parameter reference * Added https_redirect_enabled=false * Removed link_to_default_domain initialization * FD: Updated optional variables * Updated FD templates according to migrated FD example * Fixed variable property name. Aligned spaces * FD: Fixed variable interpolation. Initialized necessary property * FD: Set link_to_default_domain to false * Temporarily set cloudfare records as data source * CF: added type filter * CF: Temporarily commented outputs * Update README.md * Update README.md * FD: introduced FD security policy * Reverted main and outputs of cloudflare dns records * Replaced some deprecated properties * CF: fixed outputs * Fixed setting application_id for app password * Added temporary output of API policy XML content * Reverted auth v2 logic for function app * Creating an API will now always create an SP * Fixed syntax error * Fixed tenant auth settings URL * Set use_existing to true for API SP --------- Co-authored-by: ArtiomMatiom <[email protected]> Co-authored-by: Michal Pipal <[email protected]> Co-authored-by: tom-reinders <[email protected]> Co-authored-by: ArtiomMatiom <[email protected]> Co-authored-by: Patrik Kovacs <[email protected]> Co-authored-by: Michal Pipal <[email protected]> Co-authored-by: zjanura <[email protected]>
1 parent 68fd30c commit e47d1c5

File tree

148 files changed

+1285
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+1285
-332
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,6 @@ override.tf.json
3131
.terraform.lock.hcl
3232

3333
#IDE files
34-
.idea
34+
.idea
35+
36+
.vs/

modules/azure/analysis_services/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

modules/azure/api_connectors/arm_managed_identity/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

modules/azure/api_connectors/custom_connector/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

modules/azure/api_connectors/event_hub_managed_identity/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

modules/azure/api_connectors/excel_online/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

modules/azure/api_connectors/key_vault_managed_identity/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

modules/azure/api_connectors/log_analytics/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

modules/azure/api_connectors/logic_app_custom_connector/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

modules/azure/api_connectors/office365/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = "~> 1.3"
2+
required_version = "~> 1.12"
33

44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "~> 3.48"
7+
version = "~> 3.117"
88
}
99
}
1010

0 commit comments

Comments
 (0)