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_spring_cloud_build_deployment - support for the application_performance_monitoring_ids property #23969

Merged
merged 1 commit into from
Dec 7, 2023
Merged

azurerm_spring_cloud_build_deployment - support for the application_performance_monitoring_ids property #23969

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
17 changes: 17 additions & 0 deletions internal/services/springcloud/spring_cloud_build_deployment_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"log"
"time"

appplatform2 "github.com/hashicorp/go-azure-sdk/resource-manager/appplatform/2023-09-01-preview/appplatform"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/springcloud/migration"
Expand Down Expand Up @@ -65,6 +66,16 @@ func resourceSpringCloudBuildDeployment() *pluginsdk.Resource {
ValidateFunc: validation.StringIsNotEmpty,
},

"application_performance_monitoring_ids": {
Type: pluginsdk.TypeList,
Optional: true,
MinItems: 1,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: appplatform2.ValidateApmID,
},
},

"addon_json": {
Type: pluginsdk.TypeString,
Optional: true,
Expand Down Expand Up @@ -169,6 +180,7 @@ func resourceSpringCloudBuildDeploymentCreateUpdate(d *pluginsdk.ResourceData, m
},
DeploymentSettings: &appplatform.DeploymentSettings{
AddonConfigs: addonConfig,
Apms: expandSpringCloudDeploymentApms(d.Get("application_performance_monitoring_ids").([]interface{})),
EnvironmentVariables: expandSpringCloudDeploymentEnvironmentVariables(d.Get("environment_variables").(map[string]interface{})),
ResourceRequests: expandSpringCloudBuildDeploymentResourceRequests(d.Get("quota").([]interface{})),
},
Expand Down Expand Up @@ -223,6 +235,11 @@ func resourceSpringCloudBuildDeploymentRead(d *pluginsdk.ResourceData, meta inte
if err := d.Set("addon_json", flattenSpringCloudAppAddon(settings.AddonConfigs)); err != nil {
return fmt.Errorf("setting `addon_json`: %s", err)
}
apmIds, err := flattenSpringCloudDeploymentApms(settings.Apms)
if err != nil {
return fmt.Errorf("setting `application_performance_monitoring_ids`: %+v", err)
}
d.Set("application_performance_monitoring_ids", apmIds)
}
if source, ok := resp.Properties.Source.AsBuildResultUserSourceInfo(); ok && source != nil {
d.Set("build_result_id", source.BuildResultID)
Expand Down
39 changes: 29 additions & 10 deletions internal/services/springcloud/spring_cloud_build_deployment_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,11 @@ func (r SpringCloudBuildDeploymentResource) complete(data acceptance.TestData) s
%s

resource "azurerm_spring_cloud_build_deployment" "test" {
name = "acctest-scjd%s"
spring_cloud_app_id = azurerm_spring_cloud_app.test.id
build_result_id = "<default>"
instance_count = 2
name = "acctest-scjd%s"
spring_cloud_app_id = azurerm_spring_cloud_app.test.id
build_result_id = "<default>"
instance_count = 2
application_performance_monitoring_ids = [azurerm_spring_cloud_application_insights_application_performance_monitoring.test.id]

environment_variables = {
"Foo" : "Bar"
Expand Down Expand Up @@ -204,25 +205,43 @@ resource "azurerm_spring_cloud_build_deployment" "test" {
func (SpringCloudBuildDeploymentResource) template(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
features {
application_insights {
disable_generated_rule = true
}
}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-spring-%d"
location = "%s"
name = "acctestRG-spring-%[2]d"
location = "%[1]s"
}

resource "azurerm_spring_cloud_service" "test" {
name = "acctest-sc-%d"
name = "acctest-sc-%[2]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku_name = "E0"
}

resource "azurerm_spring_cloud_app" "test" {
name = "acctest-sca-%d"
name = "acctest-sca-%[2]d"
resource_group_name = azurerm_spring_cloud_service.test.resource_group_name
service_name = azurerm_spring_cloud_service.test.name
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)


resource "azurerm_application_insights" "test" {
name = "acctest-ai-%[2]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
application_type = "web"
}

resource "azurerm_spring_cloud_application_insights_application_performance_monitoring" "test" {
name = "acctest-apm-%[2]d"
spring_cloud_service_id = azurerm_spring_cloud_service.test.id
connection_string = azurerm_application_insights.test.instrumentation_key
}
`, data.Locations.Primary, data.RandomInteger)
}
2 changes: 2 additions & 0 deletions website/docs/r/spring_cloud_build_deployment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ The following arguments are supported:

* `addon_json` - (Optional) A JSON object that contains the addon configurations of the Spring Cloud Build Deployment.

* `application_performance_monitoring_ids` - (Optional) Specifies a list of Spring Cloud Application Performance Monitoring IDs.

* `environment_variables` - (Optional) Specifies the environment variables of the Spring Cloud Deployment as a map of key-value pairs.

* `instance_count` - (Optional) Specifies the required instance count of the Spring Cloud Deployment. Possible Values are between `1` and `500`. Defaults to `1` if not specified.
Expand Down
Loading