Skip to content

Merge into main #452

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

Merged
nikola-petrovic-valcon merged 42 commits into from
Oct 8, 2025
Merged

Merge into main #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
0ca69c6
Location of connection must be dynamic (#432)
ArtiomMatiom Oct 9, 2024
a1f21f7
Added -Force param to Logic App Standard to bypass confict errors on …
pipalmic Oct 10, 2024
6ac57d2
Merge pull request #433 from recognizegroup/feature/21762-force-param
tom-reinders Oct 10, 2024
280cc79
Allow Access Policy name to be speficied explicitely AB#21752
pipalmic Oct 11, 2024
5e3dad1
Merge pull request #434 from recognizegroup/feature/21752-optional-ac…
tom-reinders Oct 14, 2024
c0d5db6
Add variable to configure logging extent (#435)
ArtiomMatiom Oct 17, 2024
4119db7
Update main.tf
ArtiomMatiom Oct 31, 2024
5208ac3
format
ArtiomMatiom Oct 31, 2024
0e2d066
Merge pull request #436 from recognizegroup/bugfix/22046-standard-log…
tom-reinders Oct 31, 2024
aaaea8c
Add dimension and frequency configuration (#437)
ArtiomMatiom Dec 3, 2024
4c533f6
Added optional diagnostic settings for Standard Logic Apps
pipalmic Dec 9, 2024
9dfaa56
Merge pull request #438 from recognizegroup/feature/22222-standard-ap…
tom-reinders Dec 9, 2024
1f82ced
Adding role validation into api policy
patrik-pa4k Dec 17, 2024
632020e
Merge pull request #439 from recognizegroup/feature/22184-add-role-va…
tom-reinders Dec 17, 2024
c99e758
Api management support multiple roles validation AB#22184 (#440)
patrik-pa4k Dec 18, 2024
54d9f82
feat: Apply diagnostic settings changes once the deployment is finish…
pipalmic Jan 9, 2025
7f0035a
Upgraded default TLS on SB (since older are going to be deprecated)
pipalmic Jan 16, 2025
4d48c43
Update modules/azure/service_bus_public/variables.tf
pipalmic Jan 16, 2025
b019960
Merge pull request #442 from recognizegroup/feature/22690-default-tls…
tom-reinders Jan 16, 2025
9670b2b
Adding optional setting for diagnostic categories
patrik-pa4k Jan 24, 2025
5f63790
fix TF formating
patrik-pa4k Jan 24, 2025
e5881ee
Merge pull request #443 from recognizegroup/feature/22857-standard-lo…
tom-reinders Jan 24, 2025
83293e7
Adding property to enable/disable sftp on storage account
patrik-pa4k Feb 6, 2025
9eb0cff
Merge pull request #444 from recognizegroup/feature/22884-storage-acc…
tom-reinders Feb 7, 2025
bd34ceb
feat: Added Standard Logic App with Managed Identity and IP restricti…
pipalmic Feb 9, 2025
531c548
Merged Standard Logic App modules into a single one
pipalmic Feb 10, 2025
a11dcd9
Omit MICROSOFT_PROVIDER_AUTHENTICATION_SECRET when not applicable
pipalmic Feb 10, 2025
8b93e56
Reverse condition
pipalmic Feb 10, 2025
90ec974
Updated appsettings configuration
pipalmic Feb 11, 2025
9f54751
Merge pull request #445 from recognizegroup/feature/22793-workflow-po…
tom-reinders Feb 11, 2025
3d384a2
fix: Removed validation for optional module AB#23089 (#446)
pipalmic Feb 14, 2025
7d3735a
added app_scale_limit into windows azure function module
IsonsoftZdenek Feb 28, 2025
58c4041
update of app_scale_limit to leverage null or not being set
IsonsoftZdenek Mar 3, 2025
8877d33
update the condition and remove comment
IsonsoftZdenek Mar 3, 2025
f7d08b9
app_scale_limit set default to 0
IsonsoftZdenek Mar 4, 2025
bfe49f2
Merge pull request #447 from recognizegroup/feature/31597-concurrency…
tom-reinders Mar 4, 2025
eb1a782
feat: Enable option to configure runtime_scale_monitoring_enabled
pipalmic Mar 27, 2025
67939cd
Merge pull request #448 from recognizegroup/feature/23418-enable-runt…
tom-reinders Mar 27, 2025
11bb82e
feat: Allow APIM API bytes_to_log to be specified
pipalmic Mar 31, 2025
c0e42c4
Merge pull request #449 from recognizegroup/feature/optional-bytes-to…
tom-reinders Mar 31, 2025
053c069
Updated terraform providers to their latest minor versions (#450)
nikola-petrovic-valcon Jul 15, 2025
2bd6cf5
Updated TF providers: Merging into develop (#451)
nikola-petrovic-valcon Oct 8, 2025
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ override.tf.json
.terraform.lock.hcl

#IDE files
.idea
.idea

.vs/
4 changes: 2 additions & 2 deletions modules/azure/analysis_services/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/arm_managed_identity/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/custom_connector/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/event_hub_managed_identity/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/excel_online/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/key_vault_managed_identity/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/log_analytics/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/logic_app_custom_connector/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/office365/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/office365_set/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/service_bus_managed_identity/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/service_bus_managed_identity_set/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/sftp_ssh/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/sharepoint_online/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/storage_blob/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/storage_blob_managed_identity/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_connectors/storage_table/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
10 changes: 5 additions & 5 deletions modules/azure/api_management/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
azuread = {
source = "hashicorp/azuread"
version = "~> 2.36"
version = "~> 2.53"
}
}

Expand Down Expand Up @@ -204,13 +204,13 @@ resource "azuread_application" "application" {
}

resource "azuread_application_password" "password" {
application_object_id = azuread_application.application.object_id
application_id = azuread_application.application.id
}

resource "azurerm_api_management_identity_provider_aad" "identity_provider_aad" {
resource_group_name = var.resource_group_name
api_management_name = azurerm_api_management.api_management.name
client_id = azuread_application.application.application_id
client_id = azuread_application.application.client_id
client_secret = azuread_application_password.password.value
allowed_tenants = var.allowed_tenants
signin_tenant = var.signin_tenant
Expand Down
29 changes: 20 additions & 9 deletions modules/azure/api_management_api/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
azuread = {
source = "hashicorp/azuread"
version = "~> 2.36"
version = "~> 2.53"
}
}

Expand Down Expand Up @@ -125,11 +125,22 @@ resource "azurerm_api_management_api_policy" "api_policy" {
<openid-config url="${var.aad_settings.openid_url}"/>
<required-claims>
<claim name="aud" match="any">
<value>${azuread_application.application.application_id}</value>
<value>${azuread_application.application.client_id}</value>
</claim>
<claim name="iss" match="any">
<value>${var.aad_settings.issuer}</value>
</claim>
%{if length(var.role_assignments) > 0}
<claim name="roles" match="any">
%{
for role in var.role_assignments
}
<value>${role}</value>
%{
endfor
}
</claim>
%{endif}
</required-claims>
</validate-jwt>
%{if var.backend_type == "managed-identity"}
Expand Down Expand Up @@ -305,7 +316,7 @@ resource "azurerm_api_management_authorization_server" "oauth2" {
authorization_endpoint = var.auth_endpoint != null ? var.auth_endpoint : "https://login.microsoftonline.com/${var.authorization_tenant}/oauth2/v2.0/authorize"
token_endpoint = var.token_endpoint != null ? var.token_endpoint : "https://login.microsoftonline.com/${var.authorization_tenant}/oauth2/v2.0/token"
client_registration_endpoint = var.client_registration_endpoint
client_id = azuread_application.application.application_id
client_id = azuread_application.application.client_id
client_secret = azuread_application_password.password.value
bearer_token_sending_methods = ["authorizationHeader"]
client_authentication_method = ["Body"]
Expand All @@ -314,20 +325,20 @@ resource "azurerm_api_management_authorization_server" "oauth2" {
}

resource "azuread_service_principal" "application" {
count = local.should_assign_group ? 1 : 0
application_id = azuread_application.application.application_id
client_id = azuread_application.application.client_id
app_role_assignment_required = false
owners = [data.azuread_client_config.current.object_id]
use_existing = true
}

resource "azuread_group_member" "registered_app_member" {
count = local.should_assign_group ? 1 : 0
group_object_id = var.group_id
member_object_id = azuread_service_principal.application[0].object_id
member_object_id = azuread_service_principal.application.object_id
}

resource "azuread_application_password" "password" {
application_object_id = azuread_application.application.object_id
application_id = azuread_application.application.id
}

resource "random_uuid" "oath2_uuid" {}
Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_management_api/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ output "api_management_api_diagnostic" {
value = (var.api_diagnostic_settings != null && var.api_management_logger_id != null) ? azurerm_api_management_api_diagnostic.api_diagnostic[0].id : null
}

output "application_id" {
value = azuread_application.application.application_id
output "client_id" {
value = azuread_application.application.client_id
}

output "default_role" {
Expand Down
6 changes: 6 additions & 0 deletions modules/azure/api_management_api/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,3 +222,9 @@ variable "custom_backend_policy" {
description = "Additional backend xml policies"
default = null
}

variable "role_assignments" {
type = list(string)
description = "Roles to validate in the JWT token's 'roles' claim for access control."
default = []
}
4 changes: 2 additions & 2 deletions modules/azure/api_management_api_operation/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/azure/api_management_api_operation_policy/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = "~> 1.3"
required_version = "~> 1.12"

required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.48"
version = "~> 3.117"
}
}

Expand Down
Loading
Loading