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

azurerm_container_app - add support for scale rules #23294

Merged
merged 5 commits into from
Sep 18, 2023
Merged

azurerm_container_app - add support for scale rules #23294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
878d021
add schemas and structs for scale rules types
jackofallops Sep 7, 2023
f4fd1d8
add scale rules with auth
jackofallops Sep 14, 2023
ebd476d
rework to cater for multiple auth blocks
jackofallops Sep 15, 2023
9185e1b
add docs update for scale rules
jackofallops Sep 15, 2023
c6c8bea
add validation for concurrent_requests
jackofallops Sep 18, 2023
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
217 changes: 217 additions & 0 deletions internal/services/containerapps/container_app_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,57 @@ func TestAccContainerAppResource_secretRemoveWithAddShouldFail(t *testing.T) {
})
}

func TestAccContainerAppResource_scaleRules(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_container_app", "test")
r := ContainerAppResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.scaleRules(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccContainerAppResource_scaleRulesUpdate(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_container_app", "test")
r := ContainerAppResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basic(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.scaleRules(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.scaleRulesUpdate(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.basicWithRetainedSecret(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func (r ContainerAppResource) Exists(ctx context.Context, client *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := containerapps.ParseContainerAppID(state.ID)
if err != nil {
Expand Down Expand Up @@ -342,6 +393,33 @@ resource "azurerm_container_app" "test" {
`, r.template(data), data.RandomInteger)
}

func (r ContainerAppResource) basicWithRetainedSecret(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

resource "azurerm_container_app" "test" {
name = "acctest-capp-%[2]d"
resource_group_name = azurerm_resource_group.test.name
container_app_environment_id = azurerm_container_app_environment.test.id
revision_mode = "Single"

secret {
name = "queue-auth-secret"
value = "VGhpcyBJcyBOb3QgQSBHb29kIFBhc3N3b3JkCg=="
}

template {
container {
name = "acctest-cont-%[2]d"
image = "jackofallops/azure-containerapps-python-acctest:v0.0.1"
cpu = 0.25
memory = "0.5Gi"
}
}
}
`, r.template(data), data.RandomInteger)
}

func (r ContainerAppResource) withSystemIdentity(data acceptance.TestData) string {
return fmt.Sprintf(`
%s
Expand Down Expand Up @@ -1325,6 +1403,145 @@ resource "azurerm_container_app" "test" {
`, r.templatePlusExtras(data), data.RandomInteger, revisionSuffix)
}

func (r ContainerAppResource) scaleRules(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

resource "azurerm_container_app" "test" {
name = "acctest-capp-%[2]d"
resource_group_name = azurerm_resource_group.test.name
container_app_environment_id = azurerm_container_app_environment.test.id
revision_mode = "Single"

secret {
name = "queue-auth-secret"
value = "VGhpcyBJcyBOb3QgQSBHb29kIFBhc3N3b3JkCg=="
}

template {
container {
name = "acctest-cont-%[2]d"
image = "jackofallops/azure-containerapps-python-acctest:v0.0.1"
cpu = 0.25
memory = "0.5Gi"
}

azure_queue_scale_rule {
name = "azq-1"
queue_name = "foo"
queue_length = 10

authentication {
secret_name = "queue-auth-secret"
trigger_parameter = "password"
}
}

custom_scale_rule {
name = "csr-1"
custom_rule_type = "azure-monitor"
metadata = {
foo = "bar"
}
}

http_scale_rule {
name = "http-1"
concurrent_requests = "100"
}

tcp_scale_rule {
name = "tcp-1"
concurrent_requests = "1000"
}
}
}
`, r.template(data), data.RandomInteger)
}

func (r ContainerAppResource) scaleRulesUpdate(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

resource "azurerm_container_app" "test" {
name = "acctest-capp-%[2]d"
resource_group_name = azurerm_resource_group.test.name
container_app_environment_id = azurerm_container_app_environment.test.id
revision_mode = "Single"

secret {
name = "queue-auth-secret"
value = "VGhpcyBJcyBOb3QgQSBHb29kIFBhc3N3b3JkCg=="
}

template {
container {
name = "acctest-cont-%[2]d"
image = "jackofallops/azure-containerapps-python-acctest:v0.0.1"
cpu = 0.25
memory = "0.5Gi"
}

azure_queue_scale_rule {
name = "azq-1"
queue_name = "foo"
queue_length = 10

authentication {
secret_name = "queue-auth-secret"
trigger_parameter = "password"
}
}

azure_queue_scale_rule {
name = "azq-2"
queue_name = "bar"
queue_length = 20

authentication {
secret_name = "queue-auth-secret"
trigger_parameter = "another_password"
}
}

custom_scale_rule {
name = "csr-1"
custom_rule_type = "rabbitmq"

metadata = {
foo = "bar"
}

authentication {
secret_name = "queue-auth-secret"
trigger_parameter = "password"
}
}

http_scale_rule {
name = "http-1"
concurrent_requests = "200"

authentication {
secret_name = "queue-auth-secret"
trigger_parameter = "password"
}
}

tcp_scale_rule {
name = "tcp-1"
concurrent_requests = "1000"

authentication {
secret_name = "queue-auth-secret"
trigger_parameter = "password"
}
}
}
}
`, r.template(data), data.RandomInteger)
}

func (ContainerAppResource) template(data acceptance.TestData) string {
return ContainerAppEnvironmentResource{}.basic(data)
}
Expand Down
Loading
Loading