Skip to content

fix: escape '/' in azuread_application_identifier_uri to prevent parsing errors #1692

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: escape '/' in azuread_application_identifier_uri to prevent parsing errors #1692

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
4 changes: 2 additions & 2 deletions docs/resources/application_identifier_uri.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/l

## Import

Application Identifier URIs can be imported using the object ID of the application and the base64-encoded identifier URI, in the following format.
Application Identifier URIs can be imported using the object ID of the application and the URL escaped base64-encoded identifier URI, in the following format.

```shell
terraform import azuread_application_identifier_uri.example /applications/00000000-0000-0000-0000-000000000000/identifierUris/aHR0cHM6Ly9leGFtcGxlLm5ldC8=
terraform import azuread_application_identifier_uri.example /applications/00000000-0000-0000-0000-000000000000/identifierUris/aHR0cHM6Ly9leGFtcGxlLm5ldC8%3D
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

URL / shell incompatible encoding can be supported by quoting the import line on the cli, such as:

Suggested change
terraform import azuread_application_identifier_uri.example /applications/00000000-0000-0000-0000-000000000000/identifierUris/aHR0cHM6Ly9leGFtcGxlLm5ldC8%3D
terraform import azuread_application_identifier_uri.example "/applications/00000000-0000-0000-0000-000000000000/identifierUris/aHR0cHM6Ly9leGFtcGxlLm5ldC8="

```
23 changes: 19 additions & 4 deletions internal/services/applications/parse/identifier_uri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package parse

import (
"fmt"
"net/url"

"github.com/hashicorp/go-azure-helpers/resourcemanager/resourceids"
)
Expand Down Expand Up @@ -36,10 +37,17 @@ func ParseIdentifierUriID(input string) (*IdentifierUriId, error) {
return nil, resourceids.NewSegmentNotSpecifiedError(id, "applicationId", *parsed)
}

if id.IdentifierUri, ok = parsed.Parsed["identifierUri"]; !ok {
var parsedIdentifierUri string
if parsedIdentifierUri, ok = parsed.Parsed["identifierUri"]; !ok {
return nil, resourceids.NewSegmentNotSpecifiedError(id, "identifierUri", *parsed)
}

identifierUri, err := url.PathUnescape(parsedIdentifierUri)
if err != nil {
return nil, fmt.Errorf("unescaping %q: %+v", parsedIdentifierUri, err)
}
id.IdentifierUri = identifierUri

return id, nil
}

Expand All @@ -61,7 +69,7 @@ func ValidateIdentifierUriID(input interface{}, key string) (warnings []string,

func (id *IdentifierUriId) ID() string {
fmtString := "/applications/%s/identifierUris/%s"
return fmt.Sprintf(fmtString, id.ApplicationId, id.IdentifierUri)
return fmt.Sprintf(fmtString, id.ApplicationId, url.PathEscape(id.IdentifierUri))
}

// Segments returns a slice of Resource ID Segments which comprise this ID
Expand All @@ -70,7 +78,7 @@ func (id *IdentifierUriId) Segments() []resourceids.Segment {
resourceids.StaticSegment("applications", "applications", "applications"),
resourceids.UserSpecifiedSegment("applicationId", "00000000-0000-0000-0000-000000000000"),
resourceids.StaticSegment("identifierUris", "identifierUris", "identifierUris"),
resourceids.UserSpecifiedSegment("identifierUri", "aHR0cHM6Ly9leGFtcGxlLm5ldC8="),
resourceids.UserSpecifiedSegment("identifierUri", "aHR0cHM6Ly9leGFtcGxlLm5ldC8%3D"),
}
}

Expand All @@ -85,9 +93,16 @@ func (id *IdentifierUriId) FromParseResult(input resourceids.ParseResult) error
return resourceids.NewSegmentNotSpecifiedError(id, "applicationId", input)
}

if id.IdentifierUri, ok = input.Parsed["identifierUri"]; !ok {
var parsedIdentifierUri string
if parsedIdentifierUri, ok = input.Parsed["identifierUri"]; !ok {
return resourceids.NewSegmentNotSpecifiedError(id, "identifierUri", input)
}

identifierUri, err := url.PathUnescape(parsedIdentifierUri)
if err != nil {
return fmt.Errorf("unescaping %q: %+v", parsedIdentifierUri, err)
}
id.IdentifierUri = identifierUri

return nil
}
Loading