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

azurerm_container_app_custom_domain - fix when azurerm_container_app has secret specified (#25196) #25251

Merged
merged 2 commits into from
Mar 21, 2024
Merged

azurerm_container_app_custom_domain - fix when azurerm_container_app has secret specified (#25196) #25251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d406858
Fixes issue with secrets not being populated when updating custom domain
AButler Mar 14, 2024
63d364c
Fixes missing imports
AButler Mar 20, 2024
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
12 changes: 12 additions & 0 deletions internal/services/containerapps/container_app_custom_domain_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@ package containerapps
import (
"context"
"fmt"
"net/http"
"strings"
"time"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/containerapps/2023-05-01/containerapps"
"github.com/hashicorp/go-azure-sdk/resource-manager/containerapps/2023-05-01/managedenvironments"
"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/containerapps/helpers"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/containerapps/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/containerapps/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down Expand Up @@ -124,6 +127,15 @@ func (a ContainerAppCustomDomainResource) Create() sdk.ResourceFunc {
return fmt.Errorf("specified Container App (%s) has no Ingress configuration for Custom Domains", containerAppId)
}

// Delta-updates need the secrets back from the list API, or we'll end up removing them or erroring out.
secretsResp, err := client.ListSecrets(ctx, *containerAppId)
if err != nil || secretsResp.Model == nil {
if !response.WasStatusCode(secretsResp.HttpResponse, http.StatusNoContent) {
return fmt.Errorf("retrieving secrets for update for %s: %+v", *containerAppId, err)
}
}
config.Secrets = helpers.UnpackContainerSecretsCollection(secretsResp.Model)

ingress := *config.Ingress

customDomains := make([]containerapps.CustomDomain, 0)
Expand Down
Loading