Skip to content

Commit 2127032

Browse files
committed
fix/remove dapr example for testing
1 parent 12523d0 commit 2127032

File tree

9 files changed

+21
-14
lines changed

9 files changed

+21
-14
lines changed

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ list(object({
202202
volumeName = optional(string)
203203
})))
204204
})))
205-
revisionSuffix = optional(string)
205+
revisionSuffix = optional(string, null)
206206
scale = optional(object({
207207
maxReplicas = optional(number)
208208
minReplicas = optional(number)
@@ -328,6 +328,14 @@ Type: `map(string)`
328328

329329
Default: `{}`
330330

331+
### <a name="input_user_identity_resource_id"></a> [user\_identity\_resource\_id](#input\_user\_identity\_resource\_id)
332+
333+
Description: The managed identity definition for this resource.
334+
335+
Type: `string`
336+
337+
Default: `""`
338+
331339
### <a name="input_workload_profile_name"></a> [workload\_profile\_name](#input\_workload\_profile\_name)
332340

333341
Description: Workload profile name to pin for container app execution. If not set, workload profiles are not used.
File renamed without changes.
File renamed without changes.
File renamed without changes.

examples/default/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ module "container_app" {
6868
image = "mcr.microsoft.com/azuredocs/containerapps-helloworld:latest"
6969
name = "containerapps-helloworld"
7070
resources = {
71-
cpu = 0.25
71+
cpu = "0.25"
7272
memory = "0.5Gi"
7373
}
7474
}]

examples/default/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module "container_app" {
6262
image = "mcr.microsoft.com/azuredocs/containerapps-helloworld:latest"
6363
name = "containerapps-helloworld"
6464
resources = {
65-
cpu = 0.25
65+
cpu = "0.25"
6666
memory = "0.5Gi"
6767
}
6868
}]

main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ resource "azapi_resource" "container_app" {
1010
parent_id = data.azurerm_resource_group.rg.id
1111
location = local.location
1212
tags = var.tags
13-
# identity {
14-
# type = var.user_identity_resource_id == "" ? "SystemAssigned" : "SystemAssigned, UserAssigned"
15-
# identity_ids = var.user_identity_resource_id == "" ? [] : [var.user_identity_resource_id]
16-
# }
13+
identity {
14+
type = var.user_identity_resource_id == "" ? "SystemAssigned" : "SystemAssigned, UserAssigned"
15+
identity_ids = var.user_identity_resource_id == "" ? [] : [var.user_identity_resource_id]
16+
}
1717

1818
body = jsonencode({
1919
properties = {

variables.containerapps.tf

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ variable "tags" {
1515
default = {}
1616
}
1717

18-
# # fails - might be related to https://github.com/Azure/ResourceModules/issues/2391 ?
19-
# variable "user_identity_resource_id" {
20-
# type = string
21-
# description = "The managed identity definition for this resource."
22-
# default = ""
23-
# }
18+
variable "user_identity_resource_id" {
19+
type = string
20+
description = "The managed identity definition for this resource."
21+
default = ""
22+
}
2423

2524
variable "container_app_environment_resource_id" {
2625
type = string
@@ -188,7 +187,7 @@ variable "container_apps" {
188187
volumeName = optional(string)
189188
})))
190189
})))
191-
revisionSuffix = optional(string)
190+
revisionSuffix = optional(string, null)
192191
scale = optional(object({
193192
maxReplicas = optional(number)
194193
minReplicas = optional(number)

0 commit comments

Comments
 (0)