From 2606f9f33cab7f62562a52cbb51a889553d32b53 Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 13 Dec 2024 10:51:08 -0700 Subject: [PATCH] PDI-1814: Add PingFederate Resource Exports - Add Captcha Provider Settings resource export - Add Certificates Revocation OCSP Certificate resource export - Add Certificates Revocation Settings resource export - Add Cluster Settings resource export - Various typo fixes and changes --- .../pingfederate/pingfederate_connector.go | 4 + .../pingfederate_connector_test.go | 24 +++++ .../pingfederate_captcha_provider_settings.go | 53 +++++++++++ ...federate_captcha_provider_settings_test.go | 26 +++++ ...ertificates_revocation_ocsp_certificate.go | 95 +++++++++++++++++++ ...icates_revocation_ocsp_certificate_test.go | 25 +++++ ...derate_certificates_revocation_settings.go | 53 +++++++++++ ...e_certificates_revocation_settings_test.go | 26 +++++ .../pingfederate_cluster_settings.go | 53 +++++++++++ .../pingfederate_cluster_settings_test.go | 26 +++++ .../resources/pingfederate_data_store.go | 4 +- .../resources/pingfederate_server_settings.go | 2 +- .../pingfederate_server_settings_general.go | 2 +- ...ngfederate_server_settings_general_test.go | 2 +- .../pingfederate_server_settings_test.go | 2 +- ...pingfederate_session_application_policy.go | 2 +- ...ederate_session_application_policy_test.go | 2 +- ..._session_authentication_policies_global.go | 2 +- ...ion_authentication_policies_global_test.go | 2 +- server-profiles/12.1/data.json.subst | 34 ++++++- 20 files changed, 428 insertions(+), 11 deletions(-) create mode 100644 internal/connector/pingfederate/resources/pingfederate_captcha_provider_settings.go create mode 100644 internal/connector/pingfederate/resources/pingfederate_captcha_provider_settings_test.go create mode 100644 internal/connector/pingfederate/resources/pingfederate_certificates_revocation_ocsp_certificate.go create mode 100644 internal/connector/pingfederate/resources/pingfederate_certificates_revocation_ocsp_certificate_test.go create mode 100644 internal/connector/pingfederate/resources/pingfederate_certificates_revocation_settings.go create mode 100644 internal/connector/pingfederate/resources/pingfederate_certificates_revocation_settings_test.go create mode 100644 internal/connector/pingfederate/resources/pingfederate_cluster_settings.go create mode 100644 internal/connector/pingfederate/resources/pingfederate_cluster_settings_test.go diff --git a/internal/connector/pingfederate/pingfederate_connector.go b/internal/connector/pingfederate/pingfederate_connector.go index 39d8632a..c55901f4 100644 --- a/internal/connector/pingfederate/pingfederate_connector.go +++ b/internal/connector/pingfederate/pingfederate_connector.go @@ -48,7 +48,11 @@ func (c *PingFederateConnector) Export(format, outputDir string, overwriteExport resources.AuthenticationPolicyContract(&c.clientInfo), resources.AuthenticationSelector(&c.clientInfo), resources.CaptchaProvider(&c.clientInfo), + resources.CaptchaProviderSettings(&c.clientInfo), resources.CertificateCA(&c.clientInfo), + resources.CertificatesRevocationOCSPCertificate(&c.clientInfo), + resources.CertificatesRevocationSettings(&c.clientInfo), + resources.ClusterSettings(&c.clientInfo), resources.DataStore(&c.clientInfo), resources.DefaultURLs(&c.clientInfo), resources.ExtendedProperties(&c.clientInfo), diff --git a/internal/connector/pingfederate/pingfederate_connector_test.go b/internal/connector/pingfederate/pingfederate_connector_test.go index a5396b05..25f0a3da 100644 --- a/internal/connector/pingfederate/pingfederate_connector_test.go +++ b/internal/connector/pingfederate/pingfederate_connector_test.go @@ -59,6 +59,11 @@ func TestPingFederateTerraformPlan(t *testing.T) { resource: resources.CaptchaProvider(PingFederateClientInfo), ignoredErrors: nil, }, + { + name: "PingFederateCaptchaProviderSettings", + resource: resources.CaptchaProviderSettings(PingFederateClientInfo), + ignoredErrors: nil, + }, { name: "PingFederateCertificateCA", resource: resources.CertificateCA(PingFederateClientInfo), @@ -66,6 +71,25 @@ func TestPingFederateTerraformPlan(t *testing.T) { "Error: Invalid Attribute Value Length", }, }, + { + name: "PingFederateCertificatesRevocationOCSPCertificate", + resource: resources.CertificatesRevocationOCSPCertificate(PingFederateClientInfo), + ignoredErrors: []string{ + "Error: Missing Configuration for Required Attribute", + }, + }, + { + name: "PingFederateCertificatesRevocationSettings", + resource: resources.CertificatesRevocationSettings(PingFederateClientInfo), + ignoredErrors: nil, + }, + { + name: "PingFederateClusterSettings", + resource: resources.ClusterSettings(PingFederateClientInfo), + ignoredErrors: []string{ + "Error: PingFederate API error", + }, + }, { name: "PingFederateDataStore", resource: resources.DataStore(PingFederateClientInfo), diff --git a/internal/connector/pingfederate/resources/pingfederate_captcha_provider_settings.go b/internal/connector/pingfederate/resources/pingfederate_captcha_provider_settings.go new file mode 100644 index 00000000..6431973b --- /dev/null +++ b/internal/connector/pingfederate/resources/pingfederate_captcha_provider_settings.go @@ -0,0 +1,53 @@ +package resources + +import ( + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/logger" +) + +// Verify that the resource satisfies the exportable resource interface +var ( + _ connector.ExportableResource = &PingFederateCaptchaProviderSettingsResource{} +) + +type PingFederateCaptchaProviderSettingsResource struct { + clientInfo *connector.PingFederateClientInfo +} + +// Utility method for creating a PingFederateCaptchaProviderSettingsResource +func CaptchaProviderSettings(clientInfo *connector.PingFederateClientInfo) *PingFederateCaptchaProviderSettingsResource { + return &PingFederateCaptchaProviderSettingsResource{ + clientInfo: clientInfo, + } +} + +func (r *PingFederateCaptchaProviderSettingsResource) ResourceType() string { + return "pingfederate_captcha_provider_settings" +} + +func (r *PingFederateCaptchaProviderSettingsResource) ExportAll() (*[]connector.ImportBlock, error) { + l := logger.Get() + l.Debug().Msgf("Exporting all '%s' Resources...", r.ResourceType()) + + importBlocks := []connector.ImportBlock{} + + captchaProviderSettingsId := "captcha_provider_settings_singleton_id" + captchaProviderSettingsName := "Captcha Provider Settings" + + commentData := map[string]string{ + "Resource Type": r.ResourceType(), + "Singleton ID": common.SINGLETON_ID_COMMENT_DATA, + } + + importBlock := connector.ImportBlock{ + ResourceType: r.ResourceType(), + ResourceName: captchaProviderSettingsName, + ResourceID: captchaProviderSettingsId, + CommentInformation: common.GenerateCommentInformation(commentData), + } + + importBlocks = append(importBlocks, importBlock) + + return &importBlocks, nil +} diff --git a/internal/connector/pingfederate/resources/pingfederate_captcha_provider_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_captcha_provider_settings_test.go new file mode 100644 index 00000000..227d8bc9 --- /dev/null +++ b/internal/connector/pingfederate/resources/pingfederate_captcha_provider_settings_test.go @@ -0,0 +1,26 @@ +package resources_test + +import ( + "testing" + + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" +) + +func TestPingFederateCaptchaProviderSettingsExport(t *testing.T) { + // Get initialized apiClient and resource + PingFederateClientInfo := testutils.GetPingFederateClientInfo(t) + resource := resources.CaptchaProviderSettings(PingFederateClientInfo) + + // Defined the expected ImportBlocks for the resource + expectedImportBlocks := []connector.ImportBlock{ + { + ResourceType: "pingfederate_captcha_provider_settings", + ResourceName: "Captcha Provider Settings", + ResourceID: "captcha_provider_settings_singleton_id", + }, + } + + testutils.ValidateImportBlocks(t, resource, &expectedImportBlocks) +} diff --git a/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_ocsp_certificate.go b/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_ocsp_certificate.go new file mode 100644 index 00000000..832e19c1 --- /dev/null +++ b/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_ocsp_certificate.go @@ -0,0 +1,95 @@ +package resources + +import ( + "fmt" + + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/logger" +) + +// Verify that the resource satisfies the exportable resource interface +var ( + _ connector.ExportableResource = &PingFederateCertificatesRevocationOCSPCertificateResource{} +) + +type PingFederateCertificatesRevocationOCSPCertificateResource struct { + clientInfo *connector.PingFederateClientInfo +} + +// Utility method for creating a PingFederateCertificatesRevocationOCSPCertificateResource +func CertificatesRevocationOCSPCertificate(clientInfo *connector.PingFederateClientInfo) *PingFederateCertificatesRevocationOCSPCertificateResource { + return &PingFederateCertificatesRevocationOCSPCertificateResource{ + clientInfo: clientInfo, + } +} + +func (r *PingFederateCertificatesRevocationOCSPCertificateResource) ResourceType() string { + return "pingfederate_certificates_revocation_ocsp_certificate" +} + +func (r *PingFederateCertificatesRevocationOCSPCertificateResource) ExportAll() (*[]connector.ImportBlock, error) { + l := logger.Get() + l.Debug().Msgf("Exporting all '%s' Resources...", r.ResourceType()) + + importBlocks := []connector.ImportBlock{} + + ocspCertificateData, err := r.getOcspCertificateData() + if err != nil { + return nil, err + } + + for ocspCertificateId, ocspCertificateInfo := range *ocspCertificateData { + ocspCertificateIssuerDN := ocspCertificateInfo[0] + ocspCertificateSerialNumber := ocspCertificateInfo[1] + + commentData := map[string]string{ + "Certificate Revocation OCSP Certificate ID": ocspCertificateId, + "Certificate Revocation OCSP Certificate Issuer DN": ocspCertificateIssuerDN, + "Certificate Revocation OCSP Certificate Serial Number": ocspCertificateSerialNumber, + "Resource Type": r.ResourceType(), + } + + importBlock := connector.ImportBlock{ + ResourceType: r.ResourceType(), + ResourceName: fmt.Sprintf("%s_%s", ocspCertificateIssuerDN, ocspCertificateSerialNumber), + ResourceID: ocspCertificateId, + CommentInformation: common.GenerateCommentInformation(commentData), + } + + importBlocks = append(importBlocks, importBlock) + } + + return &importBlocks, nil +} + +func (r *PingFederateCertificatesRevocationOCSPCertificateResource) getOcspCertificateData() (*map[string][]string, error) { + ocspCertificateData := make(map[string][]string) + + ocspCertificates, response, err := r.clientInfo.ApiClient.CertificatesRevocationAPI.GetOcspCertificates(r.clientInfo.Context).Execute() + err = common.HandleClientResponse(response, err, "GetOcspCertificates", r.ResourceType()) + if err != nil { + return nil, err + } + + if ocspCertificates == nil { + return nil, common.DataNilError(r.ResourceType(), response) + } + + ocspCertificatesItems, ocspCertificatesItemsOk := ocspCertificates.GetItemsOk() + if !ocspCertificatesItemsOk { + return nil, common.DataNilError(r.ResourceType(), response) + } + + for _, ocspCertificate := range ocspCertificatesItems { + ocspCertificateId, ocspCertificateIdOk := ocspCertificate.GetIdOk() + ocspCertificateIssuerDN, ocspCertificateIssuerDNOk := ocspCertificate.GetIssuerDNOk() + ocspCertificateSerialNumber, ocspCertificateSerialNumberOk := ocspCertificate.GetSerialNumberOk() + + if ocspCertificateIdOk && ocspCertificateIssuerDNOk && ocspCertificateSerialNumberOk { + ocspCertificateData[*ocspCertificateId] = []string{*ocspCertificateIssuerDN, *ocspCertificateSerialNumber} + } + } + + return &ocspCertificateData, nil +} diff --git a/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_ocsp_certificate_test.go b/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_ocsp_certificate_test.go new file mode 100644 index 00000000..473aafe0 --- /dev/null +++ b/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_ocsp_certificate_test.go @@ -0,0 +1,25 @@ +package resources_test + +import ( + "testing" + + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" +) + +func TestPingFederateCertificatesRevocationOCSPCertificateExport(t *testing.T) { + // Get initialized apiClient and resource + PingFederateClientInfo := testutils.GetPingFederateClientInfo(t) + resource := resources.CertificatesRevocationOCSPCertificate(PingFederateClientInfo) + + // Defined the expected ImportBlocks for the resource + expectedImportBlocks := []connector.ImportBlock{ + { + ResourceType: "pingfederate_certificates_revocation_ocsp_certificate", + ResourceName: "CN=test, O=Ping Identity Corporation, L=Denver, ST=CO, C=US_430421198347763948001683365009287878912609754790", + ResourceID: "opcey20sf9djwvk8snv1actzq", + }, + } + testutils.ValidateImportBlocks(t, resource, &expectedImportBlocks) +} diff --git a/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_settings.go b/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_settings.go new file mode 100644 index 00000000..ec5155d2 --- /dev/null +++ b/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_settings.go @@ -0,0 +1,53 @@ +package resources + +import ( + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/logger" +) + +// Verify that the resource satisfies the exportable resource interface +var ( + _ connector.ExportableResource = &PingFederateCertificatesRevocationSettingsResource{} +) + +type PingFederateCertificatesRevocationSettingsResource struct { + clientInfo *connector.PingFederateClientInfo +} + +// Utility method for creating a PingFederateCertificatesRevocationSettingsResource +func CertificatesRevocationSettings(clientInfo *connector.PingFederateClientInfo) *PingFederateCertificatesRevocationSettingsResource { + return &PingFederateCertificatesRevocationSettingsResource{ + clientInfo: clientInfo, + } +} + +func (r *PingFederateCertificatesRevocationSettingsResource) ResourceType() string { + return "pingfederate_certificates_revocation_settings" +} + +func (r *PingFederateCertificatesRevocationSettingsResource) ExportAll() (*[]connector.ImportBlock, error) { + l := logger.Get() + l.Debug().Msgf("Exporting all '%s' Resources...", r.ResourceType()) + + importBlocks := []connector.ImportBlock{} + + certificatesRevocationSettingsId := "certificates_revocation_settings_singleton_id" + certificatesRevocationSettingsName := "Certificates Revocation Settings" + + commentData := map[string]string{ + "Resource Type": r.ResourceType(), + "Singleton ID": common.SINGLETON_ID_COMMENT_DATA, + } + + importBlock := connector.ImportBlock{ + ResourceType: r.ResourceType(), + ResourceName: certificatesRevocationSettingsName, + ResourceID: certificatesRevocationSettingsId, + CommentInformation: common.GenerateCommentInformation(commentData), + } + + importBlocks = append(importBlocks, importBlock) + + return &importBlocks, nil +} diff --git a/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_settings_test.go new file mode 100644 index 00000000..8ac444b7 --- /dev/null +++ b/internal/connector/pingfederate/resources/pingfederate_certificates_revocation_settings_test.go @@ -0,0 +1,26 @@ +package resources_test + +import ( + "testing" + + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" +) + +func TestPingFederateCertificatesRevocationSettingsExport(t *testing.T) { + // Get initialized apiClient and resource + PingFederateClientInfo := testutils.GetPingFederateClientInfo(t) + resource := resources.CertificatesRevocationSettings(PingFederateClientInfo) + + // Defined the expected ImportBlocks for the resource + expectedImportBlocks := []connector.ImportBlock{ + { + ResourceType: "pingfederate_certificates_revocation_settings", + ResourceName: "Certificates Revocation Settings", + ResourceID: "certificates_revocation_settings_singleton_id", + }, + } + + testutils.ValidateImportBlocks(t, resource, &expectedImportBlocks) +} diff --git a/internal/connector/pingfederate/resources/pingfederate_cluster_settings.go b/internal/connector/pingfederate/resources/pingfederate_cluster_settings.go new file mode 100644 index 00000000..af7f5c4c --- /dev/null +++ b/internal/connector/pingfederate/resources/pingfederate_cluster_settings.go @@ -0,0 +1,53 @@ +package resources + +import ( + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/logger" +) + +// Verify that the resource satisfies the exportable resource interface +var ( + _ connector.ExportableResource = &PingFederateClusterSettingsResource{} +) + +type PingFederateClusterSettingsResource struct { + clientInfo *connector.PingFederateClientInfo +} + +// Utility method for creating a PingFederateClusterSettingsResource +func ClusterSettings(clientInfo *connector.PingFederateClientInfo) *PingFederateClusterSettingsResource { + return &PingFederateClusterSettingsResource{ + clientInfo: clientInfo, + } +} + +func (r *PingFederateClusterSettingsResource) ResourceType() string { + return "pingfederate_cluster_settings" +} + +func (r *PingFederateClusterSettingsResource) ExportAll() (*[]connector.ImportBlock, error) { + l := logger.Get() + l.Debug().Msgf("Exporting all '%s' Resources...", r.ResourceType()) + + importBlocks := []connector.ImportBlock{} + + clusterSettingsId := "cluster_settings_singleton_id" + clusterSettingsName := "Cluster Settings" + + commentData := map[string]string{ + "Resource Type": r.ResourceType(), + "Singleton ID": common.SINGLETON_ID_COMMENT_DATA, + } + + importBlock := connector.ImportBlock{ + ResourceType: r.ResourceType(), + ResourceName: clusterSettingsName, + ResourceID: clusterSettingsId, + CommentInformation: common.GenerateCommentInformation(commentData), + } + + importBlocks = append(importBlocks, importBlock) + + return &importBlocks, nil +} diff --git a/internal/connector/pingfederate/resources/pingfederate_cluster_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_cluster_settings_test.go new file mode 100644 index 00000000..0fe835ac --- /dev/null +++ b/internal/connector/pingfederate/resources/pingfederate_cluster_settings_test.go @@ -0,0 +1,26 @@ +package resources_test + +import ( + "testing" + + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" +) + +func TestPingFederateClusterSettingsExport(t *testing.T) { + // Get initialized apiClient and resource + PingFederateClientInfo := testutils.GetPingFederateClientInfo(t) + resource := resources.ClusterSettings(PingFederateClientInfo) + + // Defined the expected ImportBlocks for the resource + expectedImportBlocks := []connector.ImportBlock{ + { + ResourceType: "pingfederate_cluster_settings", + ResourceName: "Cluster Settings", + ResourceID: "cluster_settings_singleton_id", + }, + } + + testutils.ValidateImportBlocks(t, resource, &expectedImportBlocks) +} diff --git a/internal/connector/pingfederate/resources/pingfederate_data_store.go b/internal/connector/pingfederate/resources/pingfederate_data_store.go index 3a45507c..ed3e0eec 100644 --- a/internal/connector/pingfederate/resources/pingfederate_data_store.go +++ b/internal/connector/pingfederate/resources/pingfederate_data_store.go @@ -72,8 +72,8 @@ func (r *PingFederateDataStoreResource) getDataStoreData() (*map[string]string, return nil, common.DataNilError(r.ResourceType(), response) } - dataStoresItems, ok := dataStores.GetItemsOk() - if !ok { + dataStoresItems, dataStoresItemsOk := dataStores.GetItemsOk() + if !dataStoresItemsOk { return nil, common.DataNilError(r.ResourceType(), response) } diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings.go b/internal/connector/pingfederate/resources/pingfederate_server_settings.go index e4a951ed..46b20754 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings.go @@ -32,7 +32,7 @@ func (r *PingFederateServerSettingsResource) ExportAll() (*[]connector.ImportBlo importBlocks := []connector.ImportBlock{} - serverSettingsId := "pingfederate_server_settings_singleton_id" + serverSettingsId := "server_settings_singleton_id" serverSettingsName := "Server Settings" commentData := map[string]string{ diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings_general.go b/internal/connector/pingfederate/resources/pingfederate_server_settings_general.go index 0304318e..658bf001 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings_general.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings_general.go @@ -32,7 +32,7 @@ func (r *PingFederateServerSettingsGeneralResource) ExportAll() (*[]connector.Im importBlocks := []connector.ImportBlock{} - serverSettingsGeneralId := "pingfederate_server_settings_general_singleton_id" + serverSettingsGeneralId := "server_settings_general_singleton_id" serverSettingsGeneralName := "Server Settings General" commentData := map[string]string{ diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings_general_test.go b/internal/connector/pingfederate/resources/pingfederate_server_settings_general_test.go index ba2ac6f9..82f18737 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings_general_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings_general_test.go @@ -18,7 +18,7 @@ func TestPingFederateServerSettingsGeneralExport(t *testing.T) { { ResourceType: "pingfederate_server_settings_general", ResourceName: "Server Settings General", - ResourceID: "pingfederate_server_settings_general_singleton_id", + ResourceID: "server_settings_general_singleton_id", }, } diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_server_settings_test.go index de1f2d82..dca0856d 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings_test.go @@ -18,7 +18,7 @@ func TestPingFederateServerSettingsExport(t *testing.T) { { ResourceType: "pingfederate_server_settings", ResourceName: "Server Settings", - ResourceID: "pingfederate_server_settings_singleton_id", + ResourceID: "server_settings_singleton_id", }, } diff --git a/internal/connector/pingfederate/resources/pingfederate_session_application_policy.go b/internal/connector/pingfederate/resources/pingfederate_session_application_policy.go index 3769d8f0..5b81abfd 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_application_policy.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_application_policy.go @@ -32,7 +32,7 @@ func (r *PingFederateSessionApplicationPolicyResource) ExportAll() (*[]connector importBlocks := []connector.ImportBlock{} - sessionApplicationPolicyId := "pingfederate_session_application_policy_singleton_id" + sessionApplicationPolicyId := "session_application_policy_singleton_id" sessionApplicationPolicyName := "Session Application Policy" commentData := map[string]string{ diff --git a/internal/connector/pingfederate/resources/pingfederate_session_application_policy_test.go b/internal/connector/pingfederate/resources/pingfederate_session_application_policy_test.go index f9ec120c..e832e99b 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_application_policy_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_application_policy_test.go @@ -18,7 +18,7 @@ func TestPingFederateSessionApplicationPolicyExport(t *testing.T) { { ResourceType: "pingfederate_session_application_policy", ResourceName: "Session Application Policy", - ResourceID: "pingfederate_session_application_policy_singleton_id", + ResourceID: "session_application_policy_singleton_id", }, } diff --git a/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global.go b/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global.go index 3e4d8dea..0a2b582b 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global.go @@ -32,7 +32,7 @@ func (r *PingFederateSessionAuthenticationPoliciesGlobalResource) ExportAll() (* importBlocks := []connector.ImportBlock{} - sessionAuthenticationPoliciesGlobalId := "pingfederate_session_authentication_policies_global_singleton_id" + sessionAuthenticationPoliciesGlobalId := "session_authentication_policies_global_singleton_id" sessionAuthenticationPoliciesGlobalName := "Session Authentication Policies Global" commentData := map[string]string{ diff --git a/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global_test.go b/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global_test.go index 5109915a..f9fbb990 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global_test.go @@ -18,7 +18,7 @@ func TestPingFederateSessionAuthenticationPoliciesGlobalExport(t *testing.T) { { ResourceType: "pingfederate_session_authentication_policies_global", ResourceName: "Session Authentication Policies Global", - ResourceID: "pingfederate_session_authentication_policies_global_singleton_id", + ResourceID: "session_authentication_policies_global_singleton_id", }, } diff --git a/server-profiles/12.1/data.json.subst b/server-profiles/12.1/data.json.subst index 74bba4e4..42ac9b15 100644 --- a/server-profiles/12.1/data.json.subst +++ b/server-profiles/12.1/data.json.subst @@ -3884,6 +3884,38 @@ } } ] + }, + { + "resourceType": "/certificates/revocation/ocspCertificates", + "operationType": "SAVE", + "items": [ + { + "id": "opcey20sf9djwvk8snv1actzq", + "fileData": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURuVENDQW9XZ0F3SUJBZ0lVUzJUQkNkUnpwSzRaemUrSERLakI5RVFTSHFZd0RRWUpLb1pJaHZjTkFRRUxCUUF3WGpFTE1Ba0cKQTFVRUJoTUNWVk14Q3pBSkJnTlZCQWdNQWtOUE1ROHdEUVlEVlFRSERBWkVaVzUyWlhJeElqQWdCZ05WQkFvTUdWQnBibWNnU1dSbApiblJwZEhrZ1EyOXljRzl5WVhScGIyNHhEVEFMQmdOVkJBTU1CSFJsYzNRd0hoY05NalF4TWpFeU1qTXlPREkwV2hjTk1qY3dPVEE0Ck1qTXlPREkwV2pCZU1Rc3dDUVlEVlFRR0V3SlZVekVMTUFrR0ExVUVDQXdDUTA4eER6QU5CZ05WQkFjTUJrUmxiblpsY2pFaU1DQUcKQTFVRUNnd1pVR2x1WnlCSlpHVnVkR2wwZVNCRGIzSndiM0poZEdsdmJqRU5NQXNHQTFVRUF3d0VkR1Z6ZERDQ0FTSXdEUVlKS29aSQpodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUpkb0d1cmdEdlNSQkwyY0llVWFDWTNwbzVZRFpuVjFleXVPUVR4UWM2T1QySlMwCis0MGdKYkptZk5yYmNPU3QrMURieHpQK0l4YmxrY3o1NjlWT0M1bGJST24zOHllYU1VMzJYYy80REdTcDFIQ1kvSmZTeWd6LytxcjgKOFlUcU1hSTIxQWJabkFpWTV4MFJ3NTZJRG1KZ2xYYVhlVmJDVUp5N29QVHlBb1lZVDkzREpEazQxWmU1MVVjVG1Vc1RLTjRLM2d2dgpTYVJ1eXE1K2c2RVhCcTdBa2VPbmJQMGJTSHliTjFLRVY1QlhOTnBnazloMEp3M1BFK3FrbS81bllSenhCZjRSQS9BZ2Z2OWVzRzlOCnozWGdEb3dBR0JteHIrclUvbmE3cHdFRXVkTWg2NjhERURlUlZ3aDFaYXBZcEJ0VmN4TUhtZEpQZ0ZKckJsbzZtTUVDQXdFQUFhTlQKTUZFd0hRWURWUjBPQkJZRUZHSmMzWjBqOWtYUHNUbW1iZ0FzWS9QSzJjdXBNQjhHQTFVZEl3UVlNQmFBRkdKYzNaMGo5a1hQc1RtbQpiZ0FzWS9QSzJjdXBNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSlZCdmNIaGgrMDBnelEwCnBuWkt0Ukp4dkVnK3BHaCtCOUUrNWkyUHNOR3lJQXZBWHc0bWRCY1FaS3hmaVhNMzFaRTJnZTFtUCs0ZGkxMStQS1lOSDJFOTczUEwKSit3R0hlUVoxRVRERzVmbzc5dDBNRzFSekh0R29pclpXN3Y0Qk5VSTZaTTJGakVhQ090WmcxclVoa2RJZnFEeDRDZU5qemIwcmhYSQp6WE5UUzRZNlZseFdBclFud0FncVB0YjVwb0pHM01tLzNmNnVRZy9sMExJS1RZL0dSNnlRc05Da3pUWlFocklwWGo0UnBxblgzUWdECjFJV1RvTW9uN250cDRnQVAvbEFTTTUveG01SnpiNmRtRitob04wNzNnMDJVZVYyVERMemU4MCtLK1hyMUdaZWVVTHVYTnJoT0VYRFIKeXR2dWJlOE9YUFBZNi96Q3BoVmIyMWc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K" + } + ] + }, + { + "resourceType": "/certificates/revocation/settings", + "operationType": "SAVE", + "items": [ + { + "ocspSettings": { + "requesterAddNonce": false, + "actionOnResponderUnavailable": "CONTINUE", + "actionOnStatusUnknown": "FAIL", + "actionOnUnsuccessfulResponse": "FAIL", + "currentUpdateGracePeriod": 5, + "nextUpdateGracePeriod": 5, + "responseCachePeriod": 48, + "responderTimeout": 5, + "responderCertReference": { + "id": "opcey20sf9djwvk8snv1actzq", + "location": "https://localhost:9999/pf-admin-api/v1/certificates/revocation/ocspCertificates/opcey20sf9djwvk8snv1actzq" + } + } + } + ] } ] -} \ No newline at end of file +}