From ef6d8486a35fe77b90ada946c30df1f24cb7699a Mon Sep 17 00:00:00 2001 From: samirgandhi19 <17574913+samir-gandhi@users.noreply.github.com> Date: Fri, 14 Mar 2025 09:40:30 -0600 Subject: [PATCH 1/2] update pingcli-- to pingcli__ because it makes it easier to copy and paste --- internal/connector/common/common_utils.go | 2 +- internal/connector/exportable_resource.go | 4 ++-- internal/connector/exportable_resource_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/connector/common/common_utils.go b/internal/connector/common/common_utils.go index 02432464..945eecac 100644 --- a/internal/connector/common/common_utils.go +++ b/internal/connector/common/common_utils.go @@ -65,7 +65,7 @@ func WriteFiles(exportableResources []connector.ExportableResource, format, outp } for _, importBlock := range *importBlocks { - // Sanitize import block "to". Add pingcli-- prefix, hexidecimal encode special chars and spaces + // Sanitize import block "to". Add pingcli__ prefix, hexidecimal encode special chars and spaces importBlock.Sanitize() switch format { diff --git a/internal/connector/exportable_resource.go b/internal/connector/exportable_resource.go index e0bc6a91..c39cbb19 100644 --- a/internal/connector/exportable_resource.go +++ b/internal/connector/exportable_resource.go @@ -39,8 +39,8 @@ func (b *ImportBlock) Sanitize() { b.ResourceName = regexp.MustCompile(`[^0-9A-Za-z_\-]`).ReplaceAllStringFunc(b.ResourceName, func(s string) string { return fmt.Sprintf("-%04X-", s) }) - // Prefix resource names with pingcli-- - b.ResourceName = "pingcli--" + b.ResourceName + // Prefix resource names with pingcli__ + b.ResourceName = "pingcli__" + b.ResourceName } func (b *ImportBlock) Equals(a ImportBlock) bool { diff --git a/internal/connector/exportable_resource_test.go b/internal/connector/exportable_resource_test.go index a6aec148..1116aa1e 100644 --- a/internal/connector/exportable_resource_test.go +++ b/internal/connector/exportable_resource_test.go @@ -8,7 +8,7 @@ import ( // Test sanitization of resource name func TestSanitize(t *testing.T) { - sanitizedResourceName := "pingcli--Customer-0020-HTML-0020-Form-0020--0028-PF-0029-" + sanitizedResourceName := "pingcli__Customer-0020-HTML-0020-Form-0020--0028-PF-0029-" importBlock := connector.ImportBlock{ ResourceName: "Customer HTML Form (PF)", From 3d35661bdc8906c6fef0cb0c4815754def380b2b Mon Sep 17 00:00:00 2001 From: samirgandhi19 <17574913+samir-gandhi@users.noreply.github.com> Date: Fri, 28 Mar 2025 12:08:59 -0600 Subject: [PATCH 2/2] typo for lint --- internal/connector/common/common_utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/connector/common/common_utils.go b/internal/connector/common/common_utils.go index 06d285a9..feb076f8 100644 --- a/internal/connector/common/common_utils.go +++ b/internal/connector/common/common_utils.go @@ -74,7 +74,7 @@ func WriteFiles(exportableResources []connector.ExportableResource, format, outp } for _, importBlock := range *importBlocks { - // Sanitize import block "to". Add pingcli__ prefix, hexidecimal encode special chars and spaces + // Sanitize import block "to". Add pingcli__ prefix, hexadecimal encode special chars and spaces importBlock.Sanitize() switch format {