Skip to content

PDI-2133: Platform export output consistency #62

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

Merged
erikostien-pingidentity merged 2 commits into from
Jan 7, 2025
Merged

PDI-2133: Platform export output consistency #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48db64a
PDI-2133: Platform export output consistency
erikostien-pingidentity Jan 7, 2025
2e070d6
Fix nil dereference in pingone_notification_template_content.go
erikostien-pingidentity Jan 7, 2025
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
7 changes: 7 additions & 0 deletions internal/connector/common/common_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"fmt"
"os"
"path/filepath"
"slices"
"strings"
"text/template"
"time"

Expand Down Expand Up @@ -33,6 +35,11 @@ func WriteFiles(exportableResources []connector.ExportableResource, format, outp
continue
}

// Sort import blocks by ResourceName
slices.SortFunc(*importBlocks, func(i, j connector.ImportBlock) int {
return strings.Compare(i.ResourceName, j.ResourceName)
})

l.Debug().Msgf("Generating import file for %s resource...", exportableResource.ResourceType())

outputFileName := fmt.Sprintf("%s.tf", exportableResource.ResourceType())
Expand Down
10 changes: 8 additions & 2 deletions internal/connector/common/resources_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package common

import (
"fmt"
"maps"
"net/http"
"slices"

"github.com/pingidentity/pingcli/internal/logger"
)
Expand Down Expand Up @@ -38,9 +40,13 @@ func DataNilError(resourceType string, response *http.Response) error {
}

func GenerateCommentInformation(data map[string]string) string {
// Get a sorted slice of the keys
keys := slices.Sorted(maps.Keys(data))

commentInformation := "\n"
for key, value := range data {
commentInformation += fmt.Sprintf("# %s: %s\n", key, value)
for _, key := range keys {
commentInformation += fmt.Sprintf("# %s: %s\n", key, data[key])
}

return commentInformation
}
6 changes: 1 addition & 5 deletions internal/connector/pingone/platform/resources/pingone_notification_template_content.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@ func (r *PingOneNotificationTemplateContentResource) getTemplateContentData(temp
return nil, common.DataNilError(r.ResourceType(), cursor.HTTPResponse)
}

if templateName == management.ENUMTEMPLATENAME_STRONG_AUTHENTICATION {
fmt.Printf("Page data length %d\n", len(embedded.GetContents()))
}

for _, templateContent := range embedded.GetContents() {
var (
templateContentId *string
Expand Down Expand Up @@ -222,7 +218,7 @@ func (r *PingOneNotificationTemplateContentResource) getTemplateContentData(temp
templateContentLocale, templateContentLocaleOk = templateContent.TemplateContentVoice.GetLocaleOk()
templateContentVariant = templateContent.TemplateContentVoice.GetVariant()
default:
l.Warn().Msgf("Template content '%s' for template '%s' is not one of: Push, SMS, Email, or Voice. Skipping export.", *templateContentId, templateName)
l.Warn().Msgf("Template content '%v' for template '%s' is not one of: Push, SMS, Email, or Voice. Skipping export.", templateContent, templateName)
continue
}

Expand Down
Loading