From 632c33e533394fd1adc82d7d16d8f993d6621910 Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 11:46:04 +0200 Subject: [PATCH 01/16] Change tool name from 'pingctl' to 'pingcli' in all instances --- .gitattributes | 4 -- .../workflows/code-analysis-lint-test.yaml | 34 +++++----- .goreleaser.yaml | 4 +- cmd/auth/login.go | 2 +- cmd/auth/logout.go | 2 +- cmd/common/cobra_utils_test.go | 4 +- cmd/config/add_profile.go | 18 ++--- cmd/config/add_profile_test.go | 20 +++--- cmd/config/config.go | 14 ++-- cmd/config/config_test.go | 18 ++--- cmd/config/delete_profile.go | 16 ++--- cmd/config/delete_profile_test.go | 18 ++--- cmd/config/get.go | 18 ++--- cmd/config/get_test.go | 26 ++++---- cmd/config/list_profiles.go | 12 ++-- cmd/config/list_profiles_test.go | 16 ++--- cmd/config/set.go | 16 ++--- cmd/config/set_active_profile.go | 16 ++--- cmd/config/set_active_profile_test.go | 22 +++---- cmd/config/set_test.go | 36 +++++----- cmd/config/unset.go | 16 ++--- cmd/config/unset_test.go | 28 ++++---- cmd/config/view_profile.go | 16 ++--- cmd/config/view_profile_test.go | 14 ++-- cmd/feedback/feedback.go | 8 +-- cmd/feedback/feedback_test.go | 16 ++--- cmd/platform/export.go | 26 ++++---- cmd/platform/export_test.go | 66 +++++++++---------- cmd/platform/platform_test.go | 12 ++-- cmd/request/request.go | 18 ++--- cmd/request/request_test.go | 20 +++--- cmd/root.go | 32 ++++----- cmd/root_test.go | 46 ++++++------- go.mod | 2 +- .../commands/config/add_profile_internal.go | 10 +-- .../config/add_profile_internal_test.go | 8 +-- internal/commands/config/config_internal.go | 10 +-- .../commands/config/config_internal_test.go | 8 +-- .../config/delete_profile_internal.go | 8 +-- .../config/delete_profile_internal_test.go | 8 +-- internal/commands/config/get_internal.go | 8 +-- internal/commands/config/get_internal_test.go | 8 +-- .../commands/config/list_profiles_internal.go | 4 +- .../config/list_profiles_internal_test.go | 2 +- .../config/set_active_profile_internal.go | 8 +-- .../set_active_profile_internal_test.go | 8 +-- internal/commands/config/set_internal.go | 12 ++-- internal/commands/config/set_internal_test.go | 10 +-- internal/commands/config/unset_internal.go | 8 +-- .../commands/config/unset_internal_test.go | 8 +-- .../commands/config/view_profile_internal.go | 6 +- .../config/view_profile_internal_test.go | 8 +-- .../commands/feedback/feedback_internal.go | 4 +- internal/commands/platform/export_internal.go | 44 ++++++------- .../commands/platform/export_internal_test.go | 12 ++-- internal/commands/request/request_internal.go | 8 +-- .../commands/request/request_internal_test.go | 8 +-- internal/configuration/config/add_profile.go | 6 +- internal/configuration/config/config.go | 4 +- .../configuration/config/delete_profile.go | 4 +- internal/configuration/config/get.go | 4 +- internal/configuration/config/set.go | 4 +- .../config/set_active_profile.go | 4 +- internal/configuration/config/unset.go | 4 +- internal/configuration/config/view_profile.go | 4 +- internal/configuration/configuration.go | 14 ++-- internal/configuration/configuration_test.go | 6 +- internal/configuration/options/options.go | 6 +- internal/configuration/platform/export.go | 16 ++--- internal/configuration/profiles/profiles.go | 4 +- internal/configuration/request/request.go | 10 +-- internal/configuration/root/root.go | 20 +++--- .../configuration/services/pingfederate.go | 30 ++++----- internal/configuration/services/pingone.go | 14 ++-- internal/connector/common/common_utils.go | 6 +- internal/connector/common/resources_common.go | 2 +- .../pingfederate/pingfederate_connector.go | 8 +-- .../pingfederate_connector_test.go | 8 +-- ...federate_authentication_api_application.go | 6 +- ...ate_authentication_api_application_test.go | 6 +- ...ingfederate_authentication_api_settings.go | 6 +- ...derate_authentication_api_settings_test.go | 6 +- .../pingfederate_authentication_policies.go | 6 +- ...derate_authentication_policies_fragment.go | 6 +- ...e_authentication_policies_fragment_test.go | 6 +- ...derate_authentication_policies_settings.go | 6 +- ...e_authentication_policies_settings_test.go | 6 +- ...ngfederate_authentication_policies_test.go | 6 +- ...federate_authentication_policy_contract.go | 6 +- ...ate_authentication_policy_contract_test.go | 6 +- .../pingfederate_authentication_selector.go | 6 +- ...ngfederate_authentication_selector_test.go | 6 +- .../resources/pingfederate_certificate_ca.go | 6 +- .../pingfederate_certificate_ca_test.go | 6 +- .../resources/pingfederate_data_store.go | 6 +- .../resources/pingfederate_data_store_test.go | 6 +- .../pingfederate_extended_properties.go | 6 +- .../pingfederate_extended_properties_test.go | 6 +- .../resources/pingfederate_idp_adapter.go | 6 +- .../pingfederate_idp_adapter_test.go | 6 +- .../pingfederate_idp_default_urls.go | 6 +- .../pingfederate_idp_default_urls_test.go | 6 +- .../pingfederate_idp_sp_connection.go | 6 +- .../pingfederate_idp_sp_connection_test.go | 6 +- .../pingfederate_incoming_proxy_settings.go | 6 +- ...ngfederate_incoming_proxy_settings_test.go | 6 +- .../resources/pingfederate_kerberos_realm.go | 6 +- .../pingfederate_kerberos_realm_test.go | 6 +- .../pingfederate_local_identity_profile.go | 6 +- ...ingfederate_local_identity_profile_test.go | 6 +- ...ederate_notification_publisher_settings.go | 6 +- ...te_notification_publisher_settings_test.go | 6 +- ...pingfederate_oauth_access_token_manager.go | 6 +- ...ederate_oauth_access_token_manager_test.go | 6 +- ...pingfederate_oauth_access_token_mapping.go | 6 +- ...ederate_oauth_access_token_mapping_test.go | 6 +- ...erate_oauth_ciba_server_policy_settings.go | 6 +- ..._oauth_ciba_server_policy_settings_test.go | 6 +- .../resources/pingfederate_oauth_client.go | 6 +- .../pingfederate_oauth_client_test.go | 6 +- .../resources/pingfederate_oauth_issuer.go | 6 +- .../pingfederate_oauth_issuer_test.go | 6 +- .../pingfederate_oauth_server_settings.go | 6 +- ...pingfederate_oauth_server_settings_test.go | 6 +- .../pingfederate_openid_connect_policy.go | 6 +- ...pingfederate_openid_connect_policy_test.go | 6 +- .../pingfederate_openid_connect_settings.go | 6 +- ...ngfederate_openid_connect_settings_test.go | 6 +- ...gfederate_password_credential_validator.go | 6 +- ...rate_password_credential_validator_test.go | 6 +- .../pingfederate_pingone_connection.go | 6 +- .../pingfederate_pingone_connection_test.go | 6 +- .../pingfederate_redirect_validation.go | 6 +- .../pingfederate_redirect_validation_test.go | 6 +- .../resources/pingfederate_server_settings.go | 6 +- .../pingfederate_server_settings_general.go | 6 +- ...ngfederate_server_settings_general_test.go | 6 +- ...ingfederate_server_settings_system_keys.go | 6 +- ...derate_server_settings_system_keys_test.go | 6 +- .../pingfederate_server_settings_test.go | 6 +- ...pingfederate_session_application_policy.go | 6 +- ...ederate_session_application_policy_test.go | 6 +- ..._session_authentication_policies_global.go | 6 +- ...ion_authentication_policies_global_test.go | 6 +- .../pingfederate_session_settings.go | 6 +- .../pingfederate_session_settings_test.go | 6 +- ..._authentication_policy_contract_mapping.go | 6 +- ...entication_policy_contract_mapping_test.go | 6 +- .../pingfederate_virtual_host_names.go | 6 +- .../pingfederate_virtual_host_names_test.go | 6 +- .../pingone/mfa/pingone_mfa_connector.go | 8 +-- .../pingone/mfa/pingone_mfa_connector_test.go | 8 +-- ...pingone_mfa_application_push_credential.go | 6 +- ...ne_mfa_application_push_credential_test.go | 6 +- .../resources/pingone_mfa_device_policy.go | 6 +- .../pingone_mfa_device_policy_test.go | 6 +- .../mfa/resources/pingone_mfa_fido2_policy.go | 6 +- .../pingone_mfa_fido2_policy_test.go | 6 +- .../mfa/resources/pingone_mfa_settings.go | 6 +- .../resources/pingone_mfa_settings_test.go | 6 +- .../platform/pingone_platform_connector.go | 8 +-- .../pingone_platform_connector_test.go | 8 +-- .../platform/resources/pingone_agreement.go | 6 +- .../resources/pingone_agreement_enable.go | 4 +- .../pingone_agreement_enable_test.go | 6 +- .../pingone_agreement_localization.go | 6 +- .../pingone_agreement_localization_enable.go | 4 +- ...gone_agreement_localization_enable_test.go | 6 +- ...pingone_agreement_localization_revision.go | 6 +- ...ne_agreement_localization_revision_test.go | 6 +- .../pingone_agreement_localization_test.go | 6 +- .../resources/pingone_agreement_test.go | 6 +- .../resources/pingone_branding_settings.go | 6 +- .../pingone_branding_settings_test.go | 6 +- .../resources/pingone_branding_theme.go | 6 +- .../pingone_branding_theme_default.go | 6 +- .../pingone_branding_theme_default_test.go | 6 +- .../resources/pingone_branding_theme_test.go | 6 +- .../platform/resources/pingone_certificate.go | 6 +- .../resources/pingone_certificate_test.go | 6 +- .../resources/pingone_custom_domain.go | 6 +- .../resources/pingone_custom_domain_test.go | 6 +- .../platform/resources/pingone_environment.go | 6 +- .../resources/pingone_environment_test.go | 6 +- .../platform/resources/pingone_form.go | 6 +- .../platform/resources/pingone_form_test.go | 6 +- .../resources/pingone_forms_recaptcha_v2.go | 6 +- .../pingone_forms_recaptcha_v2_test.go | 6 +- .../platform/resources/pingone_gateway.go | 6 +- .../resources/pingone_gateway_credential.go | 6 +- .../pingone_gateway_credential_test.go | 6 +- .../pingone_gateway_role_assignment.go | 6 +- .../pingone_gateway_role_assignment_test.go | 6 +- .../resources/pingone_gateway_test.go | 6 +- .../pingone_identity_propagation_plan.go | 6 +- .../pingone_identity_propagation_plan_test.go | 6 +- .../pingone/platform/resources/pingone_key.go | 6 +- .../resources/pingone_key_rotation_policy.go | 6 +- .../pingone_key_rotation_policy_test.go | 6 +- .../platform/resources/pingone_key_test.go | 6 +- .../platform/resources/pingone_language.go | 6 +- .../resources/pingone_language_test.go | 6 +- .../resources/pingone_language_update.go | 6 +- .../resources/pingone_language_update_test.go | 6 +- .../resources/pingone_notification_policy.go | 6 +- .../pingone_notification_policy_test.go | 6 +- .../pingone_notification_settings.go | 6 +- .../pingone_notification_settings_email.go | 6 +- ...ingone_notification_settings_email_test.go | 6 +- .../pingone_notification_settings_test.go | 6 +- .../pingone_notification_template_content.go | 6 +- ...gone_notification_template_content_test.go | 6 +- .../pingone_phone_delivery_settings.go | 6 +- .../pingone_phone_delivery_settings_test.go | 6 +- .../resources/pingone_system_application.go | 6 +- .../pingone_system_application_test.go | 6 +- .../pingone_trusted_email_address.go | 6 +- .../pingone_trusted_email_address_test.go | 6 +- .../resources/pingone_trusted_email_domain.go | 6 +- .../pingone_trusted_email_domain_test.go | 6 +- .../platform/resources/pingone_webhook.go | 6 +- .../resources/pingone_webhook_test.go | 6 +- .../protect/pingone_protect_connector.go | 8 +-- .../protect/pingone_protect_connector_test.go | 8 +-- .../protect/resources/pingone_risk_policy.go | 6 +- .../resources/pingone_risk_policy_test.go | 6 +- .../resources/pingone_risk_predictor.go | 6 +- .../resources/pingone_risk_predictor_test.go | 6 +- .../pingone/sso/pingone_sso_connector.go | 8 +-- .../pingone/sso/pingone_sso_connector_test.go | 8 +-- .../sso/resources/pingone_application.go | 6 +- .../pingone_application_attribute_mapping.go | 6 +- ...gone_application_attribute_mapping_test.go | 6 +- ...gone_application_flow_policy_assignment.go | 6 +- ...application_flow_policy_assignment_test.go | 6 +- .../pingone_application_resource_grant.go | 6 +- ...pingone_application_resource_grant_test.go | 6 +- .../pingone_application_role_assignment.go | 6 +- ...ingone_application_role_assignment_test.go | 6 +- .../resources/pingone_application_secret.go | 6 +- .../pingone_application_secret_test.go | 6 +- ...e_application_sign_on_policy_assignment.go | 6 +- ...lication_sign_on_policy_assignment_test.go | 6 +- .../sso/resources/pingone_application_test.go | 6 +- .../pingone/sso/resources/pingone_group.go | 6 +- .../sso/resources/pingone_group_nesting.go | 6 +- .../resources/pingone_group_nesting_test.go | 6 +- .../pingone_group_role_assignment.go | 6 +- .../pingone_group_role_assignment_test.go | 6 +- .../sso/resources/pingone_group_test.go | 6 +- .../resources/pingone_identity_provider.go | 6 +- .../pingone_identity_provider_attribute.go | 6 +- ...ingone_identity_provider_attribute_test.go | 6 +- .../pingone_identity_provider_test.go | 6 +- .../sso/resources/pingone_password_policy.go | 6 +- .../resources/pingone_password_policy_test.go | 6 +- .../sso/resources/pingone_population.go | 6 +- .../resources/pingone_population_default.go | 6 +- .../pingone_population_default_test.go | 6 +- .../sso/resources/pingone_population_test.go | 6 +- .../pingone/sso/resources/pingone_resource.go | 6 +- .../resources/pingone_resource_attribute.go | 6 +- .../pingone_resource_attribute_test.go | 6 +- .../sso/resources/pingone_resource_scope.go | 6 +- .../pingone_resource_scope_openid.go | 6 +- .../pingone_resource_scope_openid_test.go | 6 +- .../pingone_resource_scope_pingone_api.go | 6 +- ...pingone_resource_scope_pingone_api_test.go | 6 +- .../resources/pingone_resource_scope_test.go | 6 +- .../sso/resources/pingone_resource_test.go | 6 +- .../sso/resources/pingone_schema_attribute.go | 6 +- .../pingone_schema_attribute_test.go | 6 +- .../sso/resources/pingone_sign_on_policy.go | 6 +- .../pingone_sign_on_policy_action.go | 6 +- .../pingone_sign_on_policy_action_test.go | 6 +- .../resources/pingone_sign_on_policy_test.go | 6 +- internal/customtypes/bool_test.go | 4 +- internal/customtypes/export_format_test.go | 4 +- internal/customtypes/export_services_test.go | 4 +- internal/customtypes/http_method.go | 2 +- internal/customtypes/http_method_test.go | 4 +- internal/customtypes/int_test.go | 4 +- internal/customtypes/output_format.go | 2 +- internal/customtypes/output_format_test.go | 4 +- .../pingfederate_auth_type_test.go | 4 +- .../customtypes/pingone_auth_type_test.go | 4 +- .../customtypes/pingone_region_code_test.go | 4 +- internal/customtypes/request_services_test.go | 4 +- internal/customtypes/string_slice_test.go | 4 +- internal/customtypes/uuid_test.go | 4 +- internal/input/input_test.go | 2 +- internal/logger/logger.go | 6 +- internal/output/output.go | 8 +-- internal/profiles/validate.go | 12 ++-- internal/profiles/validate_test.go | 8 +-- internal/profiles/viper.go | 2 +- internal/profiles/viper_test.go | 8 +-- internal/testing/testutils/utils.go | 6 +- .../testing/testutils_cobra/cobra_utils.go | 16 ++--- .../testutils_terraform/terraform_utils.go | 22 +++---- .../testing/testutils_viper/viper_utils.go | 6 +- main.go | 6 +- 302 files changed, 1191 insertions(+), 1195 deletions(-) diff --git a/.gitattributes b/.gitattributes index 07915dc5..dc91aded 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,7 +4,3 @@ .gitattributes export-ignore .github export-ignore .gitignore export-ignore -mkdocs.yml export-ignore -docs export-ignore -install.sh export-ignore -pingctl-test.sh export-ignore diff --git a/.github/workflows/code-analysis-lint-test.yaml b/.github/workflows/code-analysis-lint-test.yaml index 5bdeb81b..2cfefc72 100644 --- a/.github/workflows/code-analysis-lint-test.yaml +++ b/.github/workflows/code-analysis-lint-test.yaml @@ -124,27 +124,27 @@ jobs: runs-on: ubuntu-latest env: PING_IDENTITY_CONFIG: ${{ secrets.PING_IDENTITY_CONFIG }} - PINGCTL_PINGONE_WORKER_CLIENT_ID: ${{ secrets.PINGCTL_PINGONE_WORKER_CLIENT_ID }} - PINGCTL_PINGONE_WORKER_CLIENT_SECRET: ${{ secrets.PINGCTL_PINGONE_WORKER_CLIENT_SECRET }} - PINGCTL_PINGONE_REGION_CODE: ${{ secrets.PINGCTL_PINGONE_REGION_CODE }} - PINGCTL_PINGONE_WORKER_ENVIRONMENT_ID: ${{ secrets.PINGCTL_PINGONE_WORKER_ENVIRONMENT_ID }} - PINGCTL_PINGONE_EXPORT_ENVIRONMENT_ID: ${{ secrets.PINGCTL_PINGONE_EXPORT_ENVIRONMENT_ID }} + PINGCLI_PINGONE_WORKER_CLIENT_ID: ${{ secrets.PINGCLI_PINGONE_WORKER_CLIENT_ID }} + PINGCLI_PINGONE_WORKER_CLIENT_SECRET: ${{ secrets.PINGCLI_PINGONE_WORKER_CLIENT_SECRET }} + PINGCLI_PINGONE_REGION_CODE: ${{ secrets.PINGCLI_PINGONE_REGION_CODE }} + PINGCLI_PINGONE_WORKER_ENVIRONMENT_ID: ${{ secrets.PINGCLI_PINGONE_WORKER_ENVIRONMENT_ID }} + PINGCLI_PINGONE_EXPORT_ENVIRONMENT_ID: ${{ secrets.PINGCLI_PINGONE_EXPORT_ENVIRONMENT_ID }} PINGONE_CLIENT_ID: ${{ secrets.PINGONE_CLIENT_ID }} PINGONE_CLIENT_SECRET: ${{ secrets.PINGONE_CLIENT_SECRET }} PINGONE_ENVIRONMENT_ID: ${{ secrets.PINGONE_ENVIRONMENT_ID }} PINGONE_REGION_CODE: ${{ secrets.PINGONE_REGION_CODE }} - PINGCTL_LOG_LEVEL: ${{ vars.PINGCTL_LOG_LEVEL }} - PINGCTL_LOG_PATH: ${{ vars.PINGCTL_LOG_PATH }} - PINGCTL_PINGONE_PROVIDER_VERSION: ${{ vars.PINGCTL_PINGONE_PROVIDER_VERSION }} - PINGCTL_PINGFEDERATE_ADMIN_API_PATH: ${{ secrets.PINGCTL_PINGFEDERATE_ADMIN_API_PATH }} - PINGCTL_PINGFEDERATE_CLIENT_ID: ${{ secrets.PINGCTL_PINGFEDERATE_CLIENT_ID }} - PINGCTL_PINGFEDERATE_CLIENT_SECRET: ${{ secrets.PINGCTL_PINGFEDERATE_CLIENT_SECRET }} - PINGCTL_PINGFEDERATE_HTTPS_HOST: ${{ secrets.PINGCTL_PINGFEDERATE_HTTPS_HOST }} - PINGCTL_PINGFEDERATE_PASSWORD: ${{ secrets.PINGCTL_PINGFEDERATE_PASSWORD }} - PINGCTL_PINGFEDERATE_SCOPES: ${{ secrets.PINGCTL_PINGFEDERATE_SCOPES }} - PINGCTL_PINGFEDERATE_TOKEN_URL: ${{ secrets.PINGCTL_PINGFEDERATE_TOKEN_URL }} - PINGCTL_PINGFEDERATE_USERNAME: ${{ secrets.PINGCTL_PINGFEDERATE_USERNAME }} - PINGCTL_PINGFEDERATE_PROVIDER_VERSION: ${{ vars.PINGCTL_PINGFEDERATE_PROVIDER_VERSION }} + PINGCLI_LOG_LEVEL: ${{ vars.PINGCLI_LOG_LEVEL }} + PINGCLI_LOG_PATH: ${{ vars.PINGCLI_LOG_PATH }} + PINGCLI_PINGONE_PROVIDER_VERSION: ${{ vars.PINGCLI_PINGONE_PROVIDER_VERSION }} + PINGCLI_PINGFEDERATE_ADMIN_API_PATH: ${{ secrets.PINGCLI_PINGFEDERATE_ADMIN_API_PATH }} + PINGCLI_PINGFEDERATE_CLIENT_ID: ${{ secrets.PINGCLI_PINGFEDERATE_CLIENT_ID }} + PINGCLI_PINGFEDERATE_CLIENT_SECRET: ${{ secrets.PINGCLI_PINGFEDERATE_CLIENT_SECRET }} + PINGCLI_PINGFEDERATE_HTTPS_HOST: ${{ secrets.PINGCLI_PINGFEDERATE_HTTPS_HOST }} + PINGCLI_PINGFEDERATE_PASSWORD: ${{ secrets.PINGCLI_PINGFEDERATE_PASSWORD }} + PINGCLI_PINGFEDERATE_SCOPES: ${{ secrets.PINGCLI_PINGFEDERATE_SCOPES }} + PINGCLI_PINGFEDERATE_TOKEN_URL: ${{ secrets.PINGCLI_PINGFEDERATE_TOKEN_URL }} + PINGCLI_PINGFEDERATE_USERNAME: ${{ secrets.PINGCLI_PINGFEDERATE_USERNAME }} + PINGCLI_PINGFEDERATE_PROVIDER_VERSION: ${{ vars.PINGCLI_PINGFEDERATE_PROVIDER_VERSION }} steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 diff --git a/.goreleaser.yaml b/.goreleaser.yaml index cb89ce56..8415e639 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -4,13 +4,13 @@ builds: # ID of the build. # # Default: Project directory name - id: "pingctl" + id: "pingcli" # Binary name. # Can be a path (e.g. `bin/app`) to wrap the binary in a directory. # # Default: Project directory name - binary: pingctl + binary: pingcli # GOOS list to build for. # For more info refer to: https://golang.org/doc/install/source#environment diff --git a/cmd/auth/login.go b/cmd/auth/login.go index e2304b9e..662a689d 100644 --- a/cmd/auth/login.go +++ b/cmd/auth/login.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/pingidentity/pingctl/cmd/common" + "github.com/pingidentity/pingcli/cmd/common" "github.com/spf13/cobra" ) diff --git a/cmd/auth/logout.go b/cmd/auth/logout.go index 3cd69123..2f741d5d 100644 --- a/cmd/auth/logout.go +++ b/cmd/auth/logout.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/pingidentity/pingctl/cmd/common" + "github.com/pingidentity/pingcli/cmd/common" "github.com/spf13/cobra" ) diff --git a/cmd/common/cobra_utils_test.go b/cmd/common/cobra_utils_test.go index 24cc6664..2858887e 100644 --- a/cmd/common/cobra_utils_test.go +++ b/cmd/common/cobra_utils_test.go @@ -3,8 +3,8 @@ package common_test import ( "testing" - "github.com/pingidentity/pingctl/cmd/common" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/cmd/common" + "github.com/pingidentity/pingcli/internal/testing/testutils" "github.com/spf13/cobra" ) diff --git a/cmd/config/add_profile.go b/cmd/config/add_profile.go index 3fee307a..3c2e842d 100644 --- a/cmd/config/add_profile.go +++ b/cmd/config/add_profile.go @@ -3,17 +3,17 @@ package config import ( "os" - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - addProfilecommandExamples = ` pingctl config add-profile - pingctl config add-profile --name myprofile --description "My Profile desc" - pingctl config add-profile --set-active=true` + addProfilecommandExamples = ` pingcli config add-profile + pingcli config add-profile --name myprofile --description "My Profile desc" + pingcli config add-profile --set-active=true` ) func NewConfigAddProfileCommand() *cobra.Command { @@ -21,9 +21,9 @@ func NewConfigAddProfileCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: addProfilecommandExamples, - Long: `Add a new configuration profile to pingctl.`, + Long: `Add a new configuration profile to pingcli.`, RunE: configAddProfileRunE, - Short: "Add a new configuration profile to pingctl.", + Short: "Add a new configuration profile to pingcli.", Use: "add-profile [flags]", } diff --git a/cmd/config/add_profile_test.go b/cmd/config/add_profile_test.go index c5146cb6..455d2528 100644 --- a/cmd/config/add_profile_test.go +++ b/cmd/config/add_profile_test.go @@ -3,13 +3,13 @@ package config_test import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test config add profile command executes without issue func TestConfigAddProfileCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "add-profile", + err := testutils_cobra.ExecutePingcli(t, "config", "add-profile", "--name", "test-profile", "--description", "test description", "--set-active=false") @@ -18,29 +18,29 @@ func TestConfigAddProfileCmd_Execute(t *testing.T) { // Test config add profile command fails when provided too many arguments func TestConfigAddProfileCmd_TooManyArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config add-profile': command accepts 0 arg\(s\), received 1$` - err := testutils_cobra.ExecutePingctl(t, "config", "add-profile", "extra-arg") + expectedErrorPattern := `^failed to execute 'pingcli config add-profile': command accepts 0 arg\(s\), received 1$` + err := testutils_cobra.ExecutePingcli(t, "config", "add-profile", "extra-arg") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test config add profile command fails when provided an invalid flag func TestConfigAddProfileCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid-flag$` - err := testutils_cobra.ExecutePingctl(t, "config", "add-profile", "--invalid-flag") + err := testutils_cobra.ExecutePingcli(t, "config", "add-profile", "--invalid-flag") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test config add profile command fails when provided an invalid value for a flag func TestConfigAddProfileCmd_InvalidFlagValue(t *testing.T) { expectedErrorPattern := `^invalid argument ".*" for ".*" flag: strconv\.ParseBool: parsing ".*": invalid syntax$` - err := testutils_cobra.ExecutePingctl(t, "config", "add-profile", "--set-active", "invalid-value") + err := testutils_cobra.ExecutePingcli(t, "config", "add-profile", "--set-active", "invalid-value") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test config add profile command fails when provided a duplicate profile name func TestConfigAddProfileCmd_DuplicateProfileName(t *testing.T) { expectedErrorPattern := `^failed to add profile: invalid profile name: '.*'\. profile already exists$` - err := testutils_cobra.ExecutePingctl(t, "config", "add-profile", + err := testutils_cobra.ExecutePingcli(t, "config", "add-profile", "--name", "default", "--description", "test description", "--set-active=false") @@ -50,7 +50,7 @@ func TestConfigAddProfileCmd_DuplicateProfileName(t *testing.T) { // Test config add profile command fails when provided an invalid profile name func TestConfigAddProfileCmd_InvalidProfileName(t *testing.T) { expectedErrorPattern := `^failed to add profile: invalid profile name: '.*'\. name must contain only alphanumeric characters, underscores, and dashes$` - err := testutils_cobra.ExecutePingctl(t, "config", "add-profile", + err := testutils_cobra.ExecutePingcli(t, "config", "add-profile", "--name", "pname&*^*&^$&@!", "--description", "test description", "--set-active=false") @@ -60,7 +60,7 @@ func TestConfigAddProfileCmd_InvalidProfileName(t *testing.T) { // Test config add profile command fails when provided an invalid set-active value func TestConfigAddProfileCmd_InvalidSetActiveValue(t *testing.T) { expectedErrorPattern := `^invalid argument ".*" for "-s, --set-active" flag: strconv\.ParseBool: parsing ".*": invalid syntax$` - err := testutils_cobra.ExecutePingctl(t, "config", "add-profile", + err := testutils_cobra.ExecutePingcli(t, "config", "add-profile", "--name", "test-profile", "--description", "test description", "--set-active", "invalid-value") diff --git a/cmd/config/config.go b/cmd/config/config.go index b31b89c6..6285f08a 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -3,17 +3,17 @@ package config import ( "os" - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - configCommandExamples = ` pingctl config - pingctl config --profile myprofile - pingctl config --name myprofile --description "My Profile"` + configCommandExamples = ` pingcli config + pingcli config --profile myprofile + pingcli config --name myprofile --description "My Profile"` ) func NewConfigCommand() *cobra.Command { diff --git a/cmd/config/config_test.go b/cmd/config/config_test.go index ba554b59..dbe59f4f 100644 --- a/cmd/config/config_test.go +++ b/cmd/config/config_test.go @@ -3,13 +3,13 @@ package config_test import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Config Command Executes without issue func TestConfigCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", + err := testutils_cobra.ExecutePingcli(t, "config", "--profile", "production", "--name", "myProfile", "--description", "hello") @@ -20,23 +20,23 @@ func TestConfigCmd_Execute(t *testing.T) { // Test Config Command fails when provided invalid flag func TestConfigCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "config", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Command --help, -h flag func TestConfigCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "--help") + err := testutils_cobra.ExecutePingcli(t, "config", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "config", "-h") + err = testutils_cobra.ExecutePingcli(t, "config", "-h") testutils.CheckExpectedError(t, err, nil) } // Test Config Command fails when provided a profile name that does not exist func TestConfigCmd_ProfileDoesNotExist(t *testing.T) { expectedErrorPattern := `^failed to update profile '.*' name to: .*\. invalid profile name: '.*' profile does not exist$` - err := testutils_cobra.ExecutePingctl(t, "config", + err := testutils_cobra.ExecutePingcli(t, "config", "--profile", "nonexistent", "--name", "myProfile", "--description", "hello") @@ -47,7 +47,7 @@ func TestConfigCmd_ProfileDoesNotExist(t *testing.T) { // Test Config Command fails when attempting to update the active profile func TestConfigCmd_UpdateActiveProfile(t *testing.T) { expectedErrorPattern := `^failed to update profile '.*' name to: .*\. '.*' is the active profile and cannot be deleted$` - err := testutils_cobra.ExecutePingctl(t, "config", + err := testutils_cobra.ExecutePingcli(t, "config", "--profile", "default", "--name", "myProfile", "--description", "hello") @@ -58,7 +58,7 @@ func TestConfigCmd_UpdateActiveProfile(t *testing.T) { // Test Config Command fails when provided an invalid profile name func TestConfigCmd_InvalidProfileName(t *testing.T) { expectedErrorPattern := `^failed to update profile '.*' name to: .*\. invalid profile name: '.*'\. name must contain only alphanumeric characters, underscores, and dashes$` - err := testutils_cobra.ExecutePingctl(t, "config", + err := testutils_cobra.ExecutePingcli(t, "config", "--profile", "production", "--name", "pname&*^*&^$&@!", "--description", "hello") diff --git a/cmd/config/delete_profile.go b/cmd/config/delete_profile.go index 1983661a..296f1869 100644 --- a/cmd/config/delete_profile.go +++ b/cmd/config/delete_profile.go @@ -3,16 +3,16 @@ package config import ( "os" - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - deleteProfileCommandExamples = ` pingctl config delete-profile - pingctl config delete-profile --profile myprofile` + deleteProfileCommandExamples = ` pingcli config delete-profile + pingcli config delete-profile --profile myprofile` ) func NewConfigDeleteProfileCommand() *cobra.Command { @@ -20,9 +20,9 @@ func NewConfigDeleteProfileCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: deleteProfileCommandExamples, - Long: `Delete a configuration profile from pingctl.`, + Long: `Delete a configuration profile from pingcli.`, RunE: configDeleteProfileRunE, - Short: "Delete a configuration profile from pingctl.", + Short: "Delete a configuration profile from pingcli.", Use: "delete-profile [flags]", } diff --git a/cmd/config/delete_profile_test.go b/cmd/config/delete_profile_test.go index 20dfae34..aa259f1e 100644 --- a/cmd/config/delete_profile_test.go +++ b/cmd/config/delete_profile_test.go @@ -3,47 +3,47 @@ package config_test import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Config delete-profile Command Executes without issue func TestConfigDeleteProfileCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "delete-profile", "--profile", "production") + err := testutils_cobra.ExecutePingcli(t, "config", "delete-profile", "--profile", "production") testutils.CheckExpectedError(t, err, nil) } // Test Config delete-profile Command fails when provided too many arguments func TestConfigDeleteProfileCmd_TooManyArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config delete-profile': command accepts 0 arg\(s\), received 1$` - err := testutils_cobra.ExecutePingctl(t, "config", "delete-profile", "extra-arg") + expectedErrorPattern := `^failed to execute 'pingcli config delete-profile': command accepts 0 arg\(s\), received 1$` + err := testutils_cobra.ExecutePingcli(t, "config", "delete-profile", "extra-arg") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config delete-profile Command fails when provided an invalid flag func TestConfigDeleteProfileCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "config", "delete-profile", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "delete-profile", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config delete-profile Command fails when provided an non-existent profile name func TestConfigDeleteProfileCmd_NonExistentProfileName(t *testing.T) { expectedErrorPattern := `^failed to delete profile: invalid profile name: '.*' profile does not exist$` - err := testutils_cobra.ExecutePingctl(t, "config", "delete-profile", "--profile", "nonexistent") + err := testutils_cobra.ExecutePingcli(t, "config", "delete-profile", "--profile", "nonexistent") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config delete-profile Command fails when provided the active profile func TestConfigDeleteProfileCmd_ActiveProfile(t *testing.T) { expectedErrorPattern := `^failed to delete profile: '.*' is the active profile and cannot be deleted$` - err := testutils_cobra.ExecutePingctl(t, "config", "delete-profile", "--profile", "default") + err := testutils_cobra.ExecutePingcli(t, "config", "delete-profile", "--profile", "default") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config delete-profile Command fails when provided an invalid profile name func TestConfigDeleteProfileCmd_InvalidProfileName(t *testing.T) { expectedErrorPattern := `^failed to delete profile: invalid profile name: '.*'\. name must contain only alphanumeric characters, underscores, and dashes$` - err := testutils_cobra.ExecutePingctl(t, "config", "delete-profile", "--profile", "pname&*^*&^$&@!") + err := testutils_cobra.ExecutePingcli(t, "config", "delete-profile", "--profile", "pname&*^*&^$&@!") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } diff --git a/cmd/config/get.go b/cmd/config/get.go index 2623631d..89fc2dfe 100644 --- a/cmd/config/get.go +++ b/cmd/config/get.go @@ -1,17 +1,17 @@ package config import ( - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - configGetCommandExamples = ` pingctl config get pingone - pingctl config get --profile myProfile color - pingctl config get service.pingone.authentication.worker.environmentID` + configGetCommandExamples = ` pingcli config get pingone + pingcli config get --profile myProfile color + pingcli config get service.pingone.authentication.worker.environmentID` ) func NewConfigGetCommand() *cobra.Command { @@ -19,9 +19,9 @@ func NewConfigGetCommand() *cobra.Command { Args: common.ExactArgs(1), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: configGetCommandExamples, - Long: `Get pingctl configuration settings.`, + Long: `Get pingcli configuration settings.`, RunE: configGetRunE, - Short: "Get pingctl configuration settings.", + Short: "Get pingcli configuration settings.", Use: "get [flags] key", } diff --git a/cmd/config/get_test.go b/cmd/config/get_test.go index e5dcd4d1..e3b38baa 100644 --- a/cmd/config/get_test.go +++ b/cmd/config/get_test.go @@ -3,62 +3,62 @@ package config_test import ( "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Config Get Command Executes without issue func TestConfigGetCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "get", "export") + err := testutils_cobra.ExecutePingcli(t, "config", "get", "export") testutils.CheckExpectedError(t, err, nil) } // Test Config Get Command fails when provided too many arguments func TestConfigGetCmd_TooManyArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config get': command accepts 1 arg\(s\), received 2$` - err := testutils_cobra.ExecutePingctl(t, "config", "get", options.RootColorOption.ViperKey, options.RootOutputFormatOption.ViperKey) + expectedErrorPattern := `^failed to execute 'pingcli config get': command accepts 1 arg\(s\), received 2$` + err := testutils_cobra.ExecutePingcli(t, "config", "get", options.RootColorOption.ViperKey, options.RootOutputFormatOption.ViperKey) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Get Command Executes when provided a full key func TestConfigGetCmd_FullKey(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "get", options.PingoneAuthenticationWorkerClientIDOption.ViperKey) + err := testutils_cobra.ExecutePingcli(t, "config", "get", options.PingoneAuthenticationWorkerClientIDOption.ViperKey) testutils.CheckExpectedError(t, err, nil) } // Test Config Get Command Executes when provided a partial key func TestConfigGetCmd_PartialKey(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "get", "service.pingone") + err := testutils_cobra.ExecutePingcli(t, "config", "get", "service.pingone") testutils.CheckExpectedError(t, err, nil) } // Test Config Get Command fails when provided an invalid key func TestConfigGetCmd_InvalidKey(t *testing.T) { expectedErrorPattern := `^failed to get configuration: key '.*' is not recognized as a valid configuration key\. Valid keys: [A-Za-z\.\s,]+$` - err := testutils_cobra.ExecutePingctl(t, "config", "get", "pingctl.invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "get", "pingcli.invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Get Command fails when provided an invalid flag func TestConfigGetCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "config", "get", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "get", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Get Command --help, -h flag func TestConfigGetCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "get", "--help") + err := testutils_cobra.ExecutePingcli(t, "config", "get", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "config", "get", "-h") + err = testutils_cobra.ExecutePingcli(t, "config", "get", "-h") testutils.CheckExpectedError(t, err, nil) } // Test Config Get Command fails when provided no key func TestConfigGetCmd_NoKey(t *testing.T) { expectedErrorPattern := `^failed to execute '.*': command accepts 1 arg\(s\), received 0$` - err := testutils_cobra.ExecutePingctl(t, "config", "get") + err := testutils_cobra.ExecutePingcli(t, "config", "get") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } diff --git a/cmd/config/list_profiles.go b/cmd/config/list_profiles.go index 88a52b4e..fe030cf7 100644 --- a/cmd/config/list_profiles.go +++ b/cmd/config/list_profiles.go @@ -1,14 +1,14 @@ package config import ( - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - listProfilesCommandExamples = ` pingctl config list-profiles` + listProfilesCommandExamples = ` pingcli config list-profiles` ) func NewConfigListProfilesCommand() *cobra.Command { @@ -16,9 +16,9 @@ func NewConfigListProfilesCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: listProfilesCommandExamples, - Long: `List all configuration profiles from pingctl.`, + Long: `List all configuration profiles from pingcli.`, RunE: configListProfilesRunE, - Short: "List all configuration profiles from pingctl.", + Short: "List all configuration profiles from pingcli.", Use: "list-profiles", } diff --git a/cmd/config/list_profiles_test.go b/cmd/config/list_profiles_test.go index c2cb422a..fff88e63 100644 --- a/cmd/config/list_profiles_test.go +++ b/cmd/config/list_profiles_test.go @@ -3,35 +3,35 @@ package config_test import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Config list-profiles Command Executes without issue func TestConfigListProfilesCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "list-profiles") + err := testutils_cobra.ExecutePingcli(t, "config", "list-profiles") testutils.CheckExpectedError(t, err, nil) } // Test Config list-profiles Command fails when provided too many arguments func TestConfigListProfilesCmd_TooManyArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config list-profiles': command accepts 0 arg\(s\), received 1$` - err := testutils_cobra.ExecutePingctl(t, "config", "list-profiles", "extra-arg") + expectedErrorPattern := `^failed to execute 'pingcli config list-profiles': command accepts 0 arg\(s\), received 1$` + err := testutils_cobra.ExecutePingcli(t, "config", "list-profiles", "extra-arg") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config list-profiles Command fails when provided an invalid flag func TestConfigListProfilesCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "config", "list-profiles", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "list-profiles", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config list-profiles Command --help, -h flag func TestConfigListProfilesCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "list-profiles", "--help") + err := testutils_cobra.ExecutePingcli(t, "config", "list-profiles", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "config", "list-profiles", "-h") + err = testutils_cobra.ExecutePingcli(t, "config", "list-profiles", "-h") testutils.CheckExpectedError(t, err, nil) } diff --git a/cmd/config/set.go b/cmd/config/set.go index e5e3526c..09331cc1 100644 --- a/cmd/config/set.go +++ b/cmd/config/set.go @@ -1,16 +1,16 @@ package config import ( - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - configSetCommandExamples = ` pingctl config set color=true - pingctl config set --profile myProfile service.pingone.regionCode=AP` + configSetCommandExamples = ` pingcli config set color=true + pingcli config set --profile myProfile service.pingone.regionCode=AP` ) func NewConfigSetCommand() *cobra.Command { @@ -18,9 +18,9 @@ func NewConfigSetCommand() *cobra.Command { Args: common.ExactArgs(1), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: configSetCommandExamples, - Long: `Set pingctl configuration settings.`, + Long: `Set pingcli configuration settings.`, RunE: configSetRunE, - Short: "Set pingctl configuration settings.", + Short: "Set pingcli configuration settings.", Use: "set [flags] key=value", } diff --git a/cmd/config/set_active_profile.go b/cmd/config/set_active_profile.go index 329f5ce6..07b21ef3 100644 --- a/cmd/config/set_active_profile.go +++ b/cmd/config/set_active_profile.go @@ -3,16 +3,16 @@ package config import ( "os" - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - setActiveProfileCommandExamples = ` pingctl config set-active-profile - pingctl config set-active-profile --profile myprofile` + setActiveProfileCommandExamples = ` pingcli config set-active-profile + pingcli config set-active-profile --profile myprofile` ) func NewConfigSetActiveProfileCommand() *cobra.Command { @@ -20,9 +20,9 @@ func NewConfigSetActiveProfileCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: setActiveProfileCommandExamples, - Long: `Set a configuration profile as the in-use profile for pingctl.`, + Long: `Set a configuration profile as the in-use profile for pingcli.`, RunE: configSetActiveProfileRunE, - Short: "Set a configuration profile as the in-use profile for pingctl.", + Short: "Set a configuration profile as the in-use profile for pingcli.", Use: "set-active-profile [flags]", } diff --git a/cmd/config/set_active_profile_test.go b/cmd/config/set_active_profile_test.go index 9b1047c9..209c9fae 100644 --- a/cmd/config/set_active_profile_test.go +++ b/cmd/config/set_active_profile_test.go @@ -3,55 +3,55 @@ package config_test import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Config set-active-profile Command Executes without issue func TestConfigSetActiveProfileCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "set-active-profile", "--profile", "production") + err := testutils_cobra.ExecutePingcli(t, "config", "set-active-profile", "--profile", "production") testutils.CheckExpectedError(t, err, nil) } // Test Config set-active-profile Command fails when provided too many arguments func TestConfigSetActiveProfileCmd_TooManyArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config set-active-profile': command accepts 0 arg\(s\), received 1$` - err := testutils_cobra.ExecutePingctl(t, "config", "set-active-profile", "extra-arg") + expectedErrorPattern := `^failed to execute 'pingcli config set-active-profile': command accepts 0 arg\(s\), received 1$` + err := testutils_cobra.ExecutePingcli(t, "config", "set-active-profile", "extra-arg") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config set-active-profile Command fails when provided an invalid flag func TestConfigSetActiveProfileCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "config", "set-active-profile", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "set-active-profile", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config set-active-profile Command fails when provided an non-existent profile name func TestConfigSetActiveProfileCmd_NonExistentProfileName(t *testing.T) { expectedErrorPattern := `^failed to set active profile: invalid profile name: '.*' profile does not exist$` - err := testutils_cobra.ExecutePingctl(t, "config", "set-active-profile", "--profile", "nonexistent") + err := testutils_cobra.ExecutePingcli(t, "config", "set-active-profile", "--profile", "nonexistent") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config set-active-profile Command succeeds when provided the active profile func TestConfigSetActiveProfileCmd_ActiveProfile(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "set-active-profile", "--profile", "default") + err := testutils_cobra.ExecutePingcli(t, "config", "set-active-profile", "--profile", "default") testutils.CheckExpectedError(t, err, nil) } // Test Config set-active-profile Command fails when provided an invalid profile name func TestConfigSetActiveProfileCmd_InvalidProfileName(t *testing.T) { expectedErrorPattern := `^failed to set active profile: invalid profile name: '.*'\. name must contain only alphanumeric characters, underscores, and dashes$` - err := testutils_cobra.ExecutePingctl(t, "config", "set-active-profile", "--profile", "pname&*^*&^$&@!") + err := testutils_cobra.ExecutePingcli(t, "config", "set-active-profile", "--profile", "pname&*^*&^$&@!") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config set-active-profile Command --help, -h flag func TestConfigSetActiveProfileCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "set-active-profile", "--help") + err := testutils_cobra.ExecutePingcli(t, "config", "set-active-profile", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "config", "set-active-profile", "-h") + err = testutils_cobra.ExecutePingcli(t, "config", "set-active-profile", "-h") testutils.CheckExpectedError(t, err, nil) } diff --git a/cmd/config/set_test.go b/cmd/config/set_test.go index 3108b3dc..a3fbe95a 100644 --- a/cmd/config/set_test.go +++ b/cmd/config/set_test.go @@ -4,50 +4,50 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/profiles" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/profiles" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Config Set Command Executes without issue func TestConfigSetCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "set", fmt.Sprintf("%s=false", options.RootColorOption.ViperKey)) + err := testutils_cobra.ExecutePingcli(t, "config", "set", fmt.Sprintf("%s=false", options.RootColorOption.ViperKey)) testutils.CheckExpectedError(t, err, nil) } // Test Config Set Command Fails when provided too few arguments func TestConfigSetCmd_TooFewArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config set': command accepts 1 arg\(s\), received 0$` - err := testutils_cobra.ExecutePingctl(t, "config", "set") + expectedErrorPattern := `^failed to execute 'pingcli config set': command accepts 1 arg\(s\), received 0$` + err := testutils_cobra.ExecutePingcli(t, "config", "set") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Set Command Fails when provided too many arguments func TestConfigSetCmd_TooManyArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config set': command accepts 1 arg\(s\), received 2$` - err := testutils_cobra.ExecutePingctl(t, "config", "set", fmt.Sprintf("%s=false", options.RootColorOption.ViperKey), fmt.Sprintf("%s=true", options.RootColorOption.ViperKey)) + expectedErrorPattern := `^failed to execute 'pingcli config set': command accepts 1 arg\(s\), received 2$` + err := testutils_cobra.ExecutePingcli(t, "config", "set", fmt.Sprintf("%s=false", options.RootColorOption.ViperKey), fmt.Sprintf("%s=true", options.RootColorOption.ViperKey)) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Set Command Fails when an invalid key is provided func TestConfigSetCmd_InvalidKey(t *testing.T) { - expectedErrorPattern := `^failed to set configuration: key 'pingctl\.invalid' is not recognized as a valid configuration key\. Valid keys: [A-Za-z\.\s,]+$` - err := testutils_cobra.ExecutePingctl(t, "config", "set", "pingctl.invalid=true") + expectedErrorPattern := `^failed to set configuration: key 'pingcli\.invalid' is not recognized as a valid configuration key\. Valid keys: [A-Za-z\.\s,]+$` + err := testutils_cobra.ExecutePingcli(t, "config", "set", "pingcli.invalid=true") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Set Command Fails when an invalid value type is provided func TestConfigSetCmd_InvalidValueType(t *testing.T) { expectedErrorPattern := `^failed to set configuration: value for key '.*' must be a boolean\. Allowed .*: strconv\.ParseBool: parsing ".*": invalid syntax$` - err := testutils_cobra.ExecutePingctl(t, "config", "set", fmt.Sprintf("%s=invalid", options.RootColorOption.ViperKey)) + err := testutils_cobra.ExecutePingcli(t, "config", "set", fmt.Sprintf("%s=invalid", options.RootColorOption.ViperKey)) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Set Command Fails when no value is provided func TestConfigSetCmd_NoValueProvided(t *testing.T) { - expectedErrorPattern := `^failed to set configuration: value for key '.*' is empty\. Use 'pingctl config unset .*' to unset the key$` - err := testutils_cobra.ExecutePingctl(t, "config", "set", fmt.Sprintf("%s=", options.RootColorOption.ViperKey)) + expectedErrorPattern := `^failed to set configuration: value for key '.*' is empty\. Use 'pingcli config unset .*' to unset the key$` + err := testutils_cobra.ExecutePingcli(t, "config", "set", fmt.Sprintf("%s=", options.RootColorOption.ViperKey)) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -56,7 +56,7 @@ func TestConfigSetCmd_CheckViperConfig(t *testing.T) { viperKey := options.PingoneAuthenticationWorkerClientIDOption.ViperKey viperNewUUID := "12345678-1234-1234-1234-123456789012" - err := testutils_cobra.ExecutePingctl(t, "config", "set", fmt.Sprintf("%s=%s", viperKey, viperNewUUID)) + err := testutils_cobra.ExecutePingcli(t, "config", "set", fmt.Sprintf("%s=%s", viperKey, viperNewUUID)) testutils.CheckExpectedError(t, err, nil) mainViper := profiles.GetMainConfig().ViperInstance() @@ -70,16 +70,16 @@ func TestConfigSetCmd_CheckViperConfig(t *testing.T) { // Test Config Set Command --help, -h flag func TestConfigSetCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "set", "--help") + err := testutils_cobra.ExecutePingcli(t, "config", "set", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "config", "set", "-h") + err = testutils_cobra.ExecutePingcli(t, "config", "set", "-h") testutils.CheckExpectedError(t, err, nil) } // Test Config Set Command Fails when provided an invalid flag func TestConfigSetCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "config", "set", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "set", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } diff --git a/cmd/config/unset.go b/cmd/config/unset.go index 4a653b94..fdd4ee3b 100644 --- a/cmd/config/unset.go +++ b/cmd/config/unset.go @@ -1,16 +1,16 @@ package config import ( - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - configUnsetCommandExamples = ` pingctl config unset color - pingctl config unset --profile myProfile service.pingone.regionCode` + configUnsetCommandExamples = ` pingcli config unset color + pingcli config unset --profile myProfile service.pingone.regionCode` ) func NewConfigUnsetCommand() *cobra.Command { @@ -18,9 +18,9 @@ func NewConfigUnsetCommand() *cobra.Command { Args: common.ExactArgs(1), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: configUnsetCommandExamples, - Long: `Unset pingctl configuration settings.`, + Long: `Unset pingcli configuration settings.`, RunE: configUnsetRunE, - Short: "Unset pingctl configuration settings.", + Short: "Unset pingcli configuration settings.", Use: "unset [flags] key", } diff --git a/cmd/config/unset_test.go b/cmd/config/unset_test.go index 87ae82b8..ba08a341 100644 --- a/cmd/config/unset_test.go +++ b/cmd/config/unset_test.go @@ -4,36 +4,36 @@ import ( "os" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/profiles" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/profiles" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Config Unset Command Executes without issue func TestConfigUnsetCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "unset", options.RootColorOption.ViperKey) + err := testutils_cobra.ExecutePingcli(t, "config", "unset", options.RootColorOption.ViperKey) testutils.CheckExpectedError(t, err, nil) } // Test Config Set Command Fails when provided too few arguments func TestConfigUnsetCmd_TooFewArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config unset': command accepts 1 arg\(s\), received 0$` - err := testutils_cobra.ExecutePingctl(t, "config", "unset") + expectedErrorPattern := `^failed to execute 'pingcli config unset': command accepts 1 arg\(s\), received 0$` + err := testutils_cobra.ExecutePingcli(t, "config", "unset") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Set Command Fails when provided too many arguments func TestConfigUnsetCmd_TooManyArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl config unset': command accepts 1 arg\(s\), received 2$` - err := testutils_cobra.ExecutePingctl(t, "config", "unset", options.RootColorOption.ViperKey, options.RootOutputFormatOption.ViperKey) + expectedErrorPattern := `^failed to execute 'pingcli config unset': command accepts 1 arg\(s\), received 2$` + err := testutils_cobra.ExecutePingcli(t, "config", "unset", options.RootColorOption.ViperKey, options.RootOutputFormatOption.ViperKey) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Unset Command Fails when an invalid key is provided func TestConfigUnsetCmd_InvalidKey(t *testing.T) { expectedErrorPattern := `^failed to unset configuration: key '.*' is not recognized as a valid configuration key\. Valid keys: [A-Za-z\.\s,]+$` - err := testutils_cobra.ExecutePingctl(t, "config", "unset", "pingctl.invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "unset", "pingcli.invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -42,7 +42,7 @@ func TestConfigUnsetCmd_CheckViperConfig(t *testing.T) { viperKey := options.PingoneAuthenticationWorkerClientIDOption.ViperKey viperOldValue := os.Getenv(options.PingoneAuthenticationWorkerClientIDOption.EnvVar) - err := testutils_cobra.ExecutePingctl(t, "config", "unset", viperKey) + err := testutils_cobra.ExecutePingcli(t, "config", "unset", viperKey) testutils.CheckExpectedError(t, err, nil) mainViper := profiles.GetMainConfig().ViperInstance() @@ -60,15 +60,15 @@ func TestConfigUnsetCmd_CheckViperConfig(t *testing.T) { // Test Config Unset Command Fails when provided an invalid flag func TestConfigUnsetCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "config", "unset", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "unset", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Unset Command --help, -h flag func TestConfigUnsetCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "unset", "--help") + err := testutils_cobra.ExecutePingcli(t, "config", "unset", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "config", "unset", "-h") + err = testutils_cobra.ExecutePingcli(t, "config", "unset", "-h") testutils.CheckExpectedError(t, err, nil) } diff --git a/cmd/config/view_profile.go b/cmd/config/view_profile.go index c1cebad4..262c120f 100644 --- a/cmd/config/view_profile.go +++ b/cmd/config/view_profile.go @@ -1,16 +1,16 @@ package config import ( - "github.com/pingidentity/pingctl/cmd/common" - config_internal "github.com/pingidentity/pingctl/internal/commands/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + config_internal "github.com/pingidentity/pingcli/internal/commands/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - viewProfileCommandExamples = ` pingctl config view-profile - pingctl config view-profile --profile myprofile` + viewProfileCommandExamples = ` pingcli config view-profile + pingcli config view-profile --profile myprofile` ) func NewConfigViewProfileCommand() *cobra.Command { @@ -18,9 +18,9 @@ func NewConfigViewProfileCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: viewProfileCommandExamples, - Long: `View a configuration profile from pingctl.`, + Long: `View a configuration profile from pingcli.`, RunE: configViewProfileRunE, - Short: "View a configuration profile from pingctl.", + Short: "View a configuration profile from pingcli.", Use: "view-profile [flags]", } diff --git a/cmd/config/view_profile_test.go b/cmd/config/view_profile_test.go index 082e4075..38103437 100644 --- a/cmd/config/view_profile_test.go +++ b/cmd/config/view_profile_test.go @@ -3,39 +3,39 @@ package config_test import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Config Set Command Executes without issue func TestConfigViewProfileCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "view-profile") + err := testutils_cobra.ExecutePingcli(t, "config", "view-profile") testutils.CheckExpectedError(t, err, nil) } // Test Config Set Command Executes with --profile flag func TestConfigViewProfileCmd_Execute_WithProfileFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "config", "view-profile", "--profile", "production") + err := testutils_cobra.ExecutePingcli(t, "config", "view-profile", "--profile", "production") testutils.CheckExpectedError(t, err, nil) } // Test Config Set Command fails with invalid flag func TestConfigViewProfileCmd_Execute_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "config", "view-profile", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "config", "view-profile", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Set Command fails with non-existent profile func TestConfigViewProfileCmd_Execute_NonExistentProfile(t *testing.T) { expectedErrorPattern := `^failed to view profile: invalid profile name: '.*' profile does not exist$` - err := testutils_cobra.ExecutePingctl(t, "config", "view-profile", "--profile", "non-existent") + err := testutils_cobra.ExecutePingcli(t, "config", "view-profile", "--profile", "non-existent") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Config Set Command fails with invalid profile func TestConfigViewProfileCmd_Execute_InvalidProfile(t *testing.T) { expectedErrorPattern := `^failed to view profile: invalid profile name: '.*'\. name must contain only alphanumeric characters, underscores, and dashes$` - err := testutils_cobra.ExecutePingctl(t, "config", "view-profile", "--profile", "(*&*(#))") + err := testutils_cobra.ExecutePingcli(t, "config", "view-profile", "--profile", "(*&*(#))") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } diff --git a/cmd/feedback/feedback.go b/cmd/feedback/feedback.go index a0c37aef..e3fb281f 100644 --- a/cmd/feedback/feedback.go +++ b/cmd/feedback/feedback.go @@ -1,9 +1,9 @@ package feedback import ( - "github.com/pingidentity/pingctl/cmd/common" - feedback_internal "github.com/pingidentity/pingctl/internal/commands/feedback" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + feedback_internal "github.com/pingidentity/pingcli/internal/commands/feedback" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) @@ -11,7 +11,7 @@ func NewFeedbackCommand() *cobra.Command { cmd := &cobra.Command{ Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute - Example: ` pingctl feedback`, + Example: ` pingcli feedback`, Long: `A command to provide the user information on how to give feedback or get help with the tool through the use of the GitHub repository's issue tracker.`, diff --git a/cmd/feedback/feedback_test.go b/cmd/feedback/feedback_test.go index 792a8414..affac942 100644 --- a/cmd/feedback/feedback_test.go +++ b/cmd/feedback/feedback_test.go @@ -3,35 +3,35 @@ package feedback_test import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Feedback Command Executes without issue func TestFeedbackCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "feedback") + err := testutils_cobra.ExecutePingcli(t, "feedback") testutils.CheckExpectedError(t, err, nil) } // Test Feedback Command fails when provided too many arguments func TestFeedbackCmd_TooManyArgs(t *testing.T) { - expectedErrorPattern := `^failed to execute 'pingctl feedback': command accepts 0 arg\(s\), received 1$` - err := testutils_cobra.ExecutePingctl(t, "feedback", "extra-arg") + expectedErrorPattern := `^failed to execute 'pingcli feedback': command accepts 0 arg\(s\), received 1$` + err := testutils_cobra.ExecutePingcli(t, "feedback", "extra-arg") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Feedback Command help flag func TestFeedbackCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "feedback", "--help") + err := testutils_cobra.ExecutePingcli(t, "feedback", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "feedback", "-h") + err = testutils_cobra.ExecutePingcli(t, "feedback", "-h") testutils.CheckExpectedError(t, err, nil) } // Test Feedback Command fails with invalid flag func TestFeedbackCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "feedback", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "feedback", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } diff --git a/cmd/platform/export.go b/cmd/platform/export.go index 5a4a8451..76902d4c 100644 --- a/cmd/platform/export.go +++ b/cmd/platform/export.go @@ -3,23 +3,23 @@ package platform import ( "fmt" - "github.com/pingidentity/pingctl/cmd/common" - platform_internal "github.com/pingidentity/pingctl/internal/commands/platform" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + platform_internal "github.com/pingidentity/pingcli/internal/commands/platform" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - commandExamples = ` pingctl platform export - pingctl platform export --output-directory dir --overwrite - pingctl platform export --export-format HCL - pingctl platform export --services pingone-platform,pingone-sso - pingctl platform export --services pingone-platform --pingone-client-environment-id envID --pingone-worker-client-id clientID --pingone-worker-client-secret clientSecret --pingone-region-code regionCode - pingctl platform export --service pingfederate --pingfederate-username user --pingfederate-password password - pingctl platform export --service pingfederate --pingfederate-client-id clientID --pingfederate-client-secret clientSecret --pingfederate-token-url tokenURL - pingctl platform export --service pingfederate --pingfederate-access-token accessToken - pingctl platform export --service pingfederate --x-bypass-external-validation=false --ca-certificate-pem-files "/path/to/cert.pem,/path/to/cert2.pem" --insecure-trust-all-tls=false` + commandExamples = ` pingcli platform export + pingcli platform export --output-directory dir --overwrite + pingcli platform export --export-format HCL + pingcli platform export --services pingone-platform,pingone-sso + pingcli platform export --services pingone-platform --pingone-client-environment-id envID --pingone-worker-client-id clientID --pingone-worker-client-secret clientSecret --pingone-region-code regionCode + pingcli platform export --service pingfederate --pingfederate-username user --pingfederate-password password + pingcli platform export --service pingfederate --pingfederate-client-id clientID --pingfederate-client-secret clientSecret --pingfederate-token-url tokenURL + pingcli platform export --service pingfederate --pingfederate-access-token accessToken + pingcli platform export --service pingfederate --x-bypass-external-validation=false --ca-certificate-pem-files "/path/to/cert.pem,/path/to/cert2.pem" --insecure-trust-all-tls=false` profileConfigurationFormat = `Profile Configuration Format: export: diff --git a/cmd/platform/export_test.go b/cmd/platform/export_test.go index d53015f8..d72b489b 100644 --- a/cmd/platform/export_test.go +++ b/cmd/platform/export_test.go @@ -4,17 +4,17 @@ import ( "os" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test Platform Export Command Executes without issue func TestPlatformExportCmd_Execute(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true") testutils.CheckExpectedError(t, err, nil) @@ -24,24 +24,24 @@ func TestPlatformExportCmd_Execute(t *testing.T) { func TestPlatformExportCmd_TooManyArgs(t *testing.T) { testutils_viper.InitVipers(t) - expectedErrorPattern := `^failed to execute 'pingctl platform export': command accepts 0 arg\(s\), received 1$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", "extra-arg") + expectedErrorPattern := `^failed to execute 'pingcli platform export': command accepts 0 arg\(s\), received 1$` + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "extra-arg") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Platform Export Command fails when provided invalid flag func TestPlatformExportCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Platform Export Command --help, -h flag func TestPlatformExportCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "platform", "export", "--help") + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "platform", "export", "-h") + err = testutils_cobra.ExecutePingcli(t, "platform", "export", "-h") testutils.CheckExpectedError(t, err, nil) } @@ -49,7 +49,7 @@ func TestPlatformExportCmd_HelpFlag(t *testing.T) { func TestPlatformExportCmd_ServiceFlag(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingone-protect") @@ -59,7 +59,7 @@ func TestPlatformExportCmd_ServiceFlag(t *testing.T) { // Test Platform Export Command --services flag with invalid service func TestPlatformExportCmd_ServiceFlagInvalidService(t *testing.T) { expectedErrorPattern := `^invalid argument ".*" for "-s, --services" flag: failed to set ExportServices: Invalid service: .*\. Allowed services: .*$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", "--services", "invalid") + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--services", "invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -67,7 +67,7 @@ func TestPlatformExportCmd_ServiceFlagInvalidService(t *testing.T) { func TestPlatformExportCmd_ExportFormatFlag(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--format", "HCL", "--overwrite", "true", @@ -78,7 +78,7 @@ func TestPlatformExportCmd_ExportFormatFlag(t *testing.T) { // Test Platform Export Command --format flag with invalid format func TestPlatformExportCmd_ExportFormatFlagInvalidFormat(t *testing.T) { expectedErrorPattern := `^invalid argument ".*" for "-f, --format" flag: unrecognized export format '.*'\. Must be one of: .*$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", "--format", "invalid") + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--format", "invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -86,7 +86,7 @@ func TestPlatformExportCmd_ExportFormatFlagInvalidFormat(t *testing.T) { func TestPlatformExportCmd_OutputDirectoryFlag(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingone-protect") @@ -96,7 +96,7 @@ func TestPlatformExportCmd_OutputDirectoryFlag(t *testing.T) { // Test Platform Export Command --output-directory flag with invalid directory func TestPlatformExportCmd_OutputDirectoryFlagInvalidDirectory(t *testing.T) { expectedErrorPattern := `^failed to create 'platform export' output directory '\/invalid': mkdir \/invalid: .+$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", "--output-directory", "/invalid") + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", "/invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -104,7 +104,7 @@ func TestPlatformExportCmd_OutputDirectoryFlagInvalidDirectory(t *testing.T) { func TestPlatformExportCmd_OverwriteFlag(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingone-protect") @@ -122,7 +122,7 @@ func TestPlatformExportCmd_OverwriteFlagFalseWithExistingDirectory(t *testing.T) } expectedErrorPattern := `^'platform export' output directory '[A-Za-z0-9_\-\/]+' is not empty\. Use --overwrite to overwrite existing export data$` - err = testutils_cobra.ExecutePingctl(t, "platform", "export", + err = testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--services", "pingone-protect", "--overwrite", "false") @@ -139,7 +139,7 @@ func TestPlatformExportCmd_OverwriteFlagTrueWithExistingDirectory(t *testing.T) t.Errorf("Error creating file in output directory: %v", err) } - err = testutils_cobra.ExecutePingctl(t, "platform", "export", + err = testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--services", "pingone-protect", "--overwrite", "true") @@ -154,7 +154,7 @@ func TestPlatformExportCmd_OverwriteFlagTrueWithExistingDirectory(t *testing.T) func TestPlatformExportCmd_PingOneWorkerEnvironmentIdFlag(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingone-protect", @@ -168,7 +168,7 @@ func TestPlatformExportCmd_PingOneWorkerEnvironmentIdFlag(t *testing.T) { // Test Platform Export Command fails when not provided required pingone flags together func TestPlatformExportCmd_PingOneWorkerEnvironmentIdFlagRequiredTogether(t *testing.T) { expectedErrorPattern := `^if any flags in the group \[pingone-worker-environment-id pingone-worker-client-id pingone-worker-client-secret pingone-region-code] are set they must all be set; missing \[pingone-region-code pingone-worker-client-id pingone-worker-client-secret]$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--pingone-worker-environment-id", os.Getenv(options.PingoneAuthenticationWorkerEnvironmentIDOption.EnvVar)) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -177,7 +177,7 @@ func TestPlatformExportCmd_PingOneWorkerEnvironmentIdFlagRequiredTogether(t *tes func TestPlatformExportCmd_PingFederateBasicAuthFlags(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -191,7 +191,7 @@ func TestPlatformExportCmd_PingFederateBasicAuthFlags(t *testing.T) { // Test Platform Export Command fails when not provided required PingFederate Basic Auth flags together func TestPlatformExportCmd_PingFederateBasicAuthFlagsRequiredTogether(t *testing.T) { expectedErrorPattern := `^if any flags in the group \[pingfederate-username pingfederate-password] are set they must all be set; missing \[pingfederate-password]$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--pingfederate-username", "Administrator") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -201,7 +201,7 @@ func TestPlatformExportCmd_PingFederateBasicAuthFlagsInvalid(t *testing.T) { outputDir := t.TempDir() expectedErrorPattern := `^failed to export 'pingfederate' service: failed to export resource .*\. err: .* Request for resource '.*' was not successful\.\s+Response Code: 401 Unauthorized\s+Response Body: {{"resultId":"invalid_credentials","message":"The credentials you provided were not recognized\."}}\s+Error: 401 Unauthorized$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -216,7 +216,7 @@ func TestPlatformExportCmd_PingFederateBasicAuthFlagsInvalid(t *testing.T) { func TestPlatformExportCmd_PingFederateClientCredentialsAuthFlags(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -232,7 +232,7 @@ func TestPlatformExportCmd_PingFederateClientCredentialsAuthFlags(t *testing.T) // Test Platform Export Command fails when not provided required PingFederate Client Credentials Auth flags together func TestPlatformExportCmd_PingFederateClientCredentialsAuthFlagsRequiredTogether(t *testing.T) { expectedErrorPattern := `^if any flags in the group \[pingfederate-client-id pingfederate-client-secret pingfederate-token-url] are set they must all be set; missing \[pingfederate-client-secret pingfederate-token-url]$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--pingfederate-client-id", "test") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -242,7 +242,7 @@ func TestPlatformExportCmd_PingFederateClientCredentialsAuthFlagsInvalid(t *test outputDir := t.TempDir() expectedErrorPattern := `^failed to export 'pingfederate' service: failed to export resource .*\. err: .* Request for resource '.*' was not successful\. Response is nil\. Error: oauth2: "invalid_client" "Invalid client or client credentials\."$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -259,7 +259,7 @@ func TestPlatformExportCmd_PingFederateClientCredentialsAuthFlagsInvalidTokenURL outputDir := t.TempDir() expectedErrorPattern := `(?s)^failed to export 'pingfederate' service: failed to export resource.*\. err:.*Request for resource '.*' was not successful\. Response is nil\. Error: oauth2: cannot fetch token: 404 Not Found\s+Response: \\s+.*$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -275,7 +275,7 @@ func TestPlatformExportCmd_PingFederateClientCredentialsAuthFlagsInvalidTokenURL func TestPlatformExportCmd_PingFederateXBypassHeaderFlag(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -291,7 +291,7 @@ func TestPlatformExportCmd_PingFederateXBypassHeaderFlag(t *testing.T) { func TestPlatformExportCmd_PingFederateTrustAllTLSFlag(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -308,7 +308,7 @@ func TestPlatformExportCmd_PingFederateTrustAllTLSFlagFalse(t *testing.T) { outputDir := t.TempDir() expectedErrorPattern := `^failed to export '.*' service: failed to export resource .*\. err: .* Request for resource '.*' was not successful\. Response is nil\. Error: Get "https.*": tls: failed to verify certificate: x509: certificate signed by unknown authority$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -324,7 +324,7 @@ func TestPlatformExportCmd_PingFederateTrustAllTLSFlagFalse(t *testing.T) { func TestPlatformExportCmd_PingFederateCaCertificatePemFiles(t *testing.T) { outputDir := t.TempDir() - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", @@ -340,7 +340,7 @@ func TestPlatformExportCmd_PingFederateCaCertificatePemFiles(t *testing.T) { // Test Platform Export command fails with --pingfederate-ca-certificate-pem-files set to non-existent file. func TestPlatformExportCmd_PingFederateCaCertificatePemFilesInvalid(t *testing.T) { expectedErrorPattern := `^failed to read CA certificate PEM file '.*': open .*: no such file or directory$` - err := testutils_cobra.ExecutePingctl(t, "platform", "export", + err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--services", "pingfederate", "--pingfederate-ca-certificate-pem-files", "invalid/crt.pem", "--pingfederate-username", os.Getenv(options.PingfederateBasicAuthUsernameOption.EnvVar), diff --git a/cmd/platform/platform_test.go b/cmd/platform/platform_test.go index c939bba3..bb528b4f 100644 --- a/cmd/platform/platform_test.go +++ b/cmd/platform/platform_test.go @@ -3,28 +3,28 @@ package platform_test import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Platform Command Executes without issue func TestPlatformCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "platform") + err := testutils_cobra.ExecutePingcli(t, "platform") testutils.CheckExpectedError(t, err, nil) } // Test Platform Command fails when provided invalid flag func TestPlatformCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "platform", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "platform", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Platform Command --help, -h flag func TestPlatformCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "platform", "--help") + err := testutils_cobra.ExecutePingcli(t, "platform", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "platform", "-h") + err = testutils_cobra.ExecutePingcli(t, "platform", "-h") testutils.CheckExpectedError(t, err, nil) } diff --git a/cmd/request/request.go b/cmd/request/request.go index 07474d28..d7e2d245 100644 --- a/cmd/request/request.go +++ b/cmd/request/request.go @@ -3,19 +3,19 @@ package request import ( "fmt" - "github.com/pingidentity/pingctl/cmd/common" - request_internal "github.com/pingidentity/pingctl/internal/commands/request" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/cmd/common" + request_internal "github.com/pingidentity/pingcli/internal/commands/request" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) const ( - commandExamples = ` pingctl request --service pingone environments - pingctl request --service pingone --http-method GET environments/{{environmentID}} - pingctl request --service pingone --http-method POST --data {{raw-data}} environments - pingctl request --service pingone --http-method POST --data @{{filepath}} environments - pingctl request --service pingone --http-method DELETE environments/{{environmentID}}` + commandExamples = ` pingcli request --service pingone environments + pingcli request --service pingone --http-method GET environments/{{environmentID}} + pingcli request --service pingone --http-method POST --data {{raw-data}} environments + pingcli request --service pingone --http-method POST --data @{{filepath}} environments + pingcli request --service pingone --http-method DELETE environments/{{environmentID}}` profileConfigurationFormat = `Profile Configuration Format: request: diff --git a/cmd/request/request_test.go b/cmd/request/request_test.go index c644f635..8356ef79 100644 --- a/cmd/request/request_test.go +++ b/cmd/request/request_test.go @@ -8,8 +8,8 @@ import ( "regexp" "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Request Command Executes without issue @@ -22,7 +22,7 @@ func TestRequestCmd_Execute(t *testing.T) { defer pipeReader.Close() os.Stdout = pipeWriter - err = testutils_cobra.ExecutePingctl(t, "request", + err = testutils_cobra.ExecutePingcli(t, "request", "--service", "pingone", "--http-method", "GET", "environments", @@ -57,30 +57,30 @@ func TestRequestCmd_Execute(t *testing.T) { // Test Request Command fails when provided too many arguments func TestRequestCmd_Execute_TooManyArguments(t *testing.T) { expectedErrorPattern := `accepts 1 arg\(s\), received 2` - err := testutils_cobra.ExecutePingctl(t, "request", "arg1", "arg2") + err := testutils_cobra.ExecutePingcli(t, "request", "arg1", "arg2") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Request Command fails when provided invalid flag func TestRequestCmd_Execute_InvalidFlag(t *testing.T) { expectedErrorPattern := `unknown flag: --invalid` - err := testutils_cobra.ExecutePingctl(t, "request", "--invalid") + err := testutils_cobra.ExecutePingcli(t, "request", "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Request Command --help, -h flag func TestRequestCmd_Execute_Help(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "request", "--help") + err := testutils_cobra.ExecutePingcli(t, "request", "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "request", "-h") + err = testutils_cobra.ExecutePingcli(t, "request", "-h") testutils.CheckExpectedError(t, err, nil) } // Test Request Command with Invalid Service func TestRequestCmd_Execute_InvalidService(t *testing.T) { expectedErrorPattern := `^invalid argument ".*" for "-s, --service" flag: unrecognized Request Service: '.*'. Must be one of: .*$` - err := testutils_cobra.ExecutePingctl(t, "request", + err := testutils_cobra.ExecutePingcli(t, "request", "--service", "invalid-service", "--http-method", "GET", "environments", @@ -91,7 +91,7 @@ func TestRequestCmd_Execute_InvalidService(t *testing.T) { // Test Request Command with Invalid HTTP Method func TestRequestCmd_Execute_InvalidHTTPMethod(t *testing.T) { expectedErrorPattern := `^invalid argument ".*" for "-m, --http-method" flag: unrecognized HTTP Method: '.*'. Must be one of: .*$` - err := testutils_cobra.ExecutePingctl(t, "request", + err := testutils_cobra.ExecutePingcli(t, "request", "--service", "pingone", "--http-method", "INVALID", "environments", @@ -102,6 +102,6 @@ func TestRequestCmd_Execute_InvalidHTTPMethod(t *testing.T) { // Test Request Command with Missing Required Service Flag func TestRequestCmd_Execute_MissingRequiredServiceFlag(t *testing.T) { expectedErrorPattern := `failed to send custom request: service is required` - err := testutils_cobra.ExecutePingctl(t, "request", "environments") + err := testutils_cobra.ExecutePingcli(t, "request", "environments") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } diff --git a/cmd/root.go b/cmd/root.go index bda3e1f5..ab4a0963 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -5,15 +5,15 @@ import ( "os" "path/filepath" - "github.com/pingidentity/pingctl/cmd/config" - "github.com/pingidentity/pingctl/cmd/feedback" - "github.com/pingidentity/pingctl/cmd/platform" - "github.com/pingidentity/pingctl/cmd/request" - "github.com/pingidentity/pingctl/internal/configuration" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/logger" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/cmd/config" + "github.com/pingidentity/pingcli/cmd/feedback" + "github.com/pingidentity/pingcli/cmd/platform" + "github.com/pingidentity/pingcli/cmd/request" + "github.com/pingidentity/pingcli/internal/configuration" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/logger" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -31,7 +31,7 @@ activeProfile: func init() { l := logger.Get() - l.Debug().Msgf("Initializing Pingctl options...") + l.Debug().Msgf("Initializing Pingcli options...") configuration.InitAllOptions() l.Debug().Msgf("Initializing Root command...") @@ -45,7 +45,7 @@ func NewRootCommand() *cobra.Command { Long: `A CLI tool for managing Ping Identity products.`, Short: "A CLI tool for managing Ping Identity products.", SilenceErrors: true, // Upon error in RunE method, let output package in main.go handle error output - Use: "pingctl", + Use: "pingcli", Version: "v2.0.0-alpha.4", } @@ -114,7 +114,7 @@ func initViperProfile() { // Validate the configuration if err := profiles.Validate(); err != nil { output.Print(output.Opts{ - Message: "Failed to validate pingctl configuration", + Message: "Failed to validate pingcli configuration", Result: output.ENUM_RESULT_FAILURE, FatalMessage: err.Error(), }) @@ -128,7 +128,7 @@ func checkCfgFileLocation(cfgFile string) { // Only create a new configuration file if it is the default configuration file location if cfgFile == options.RootConfigOption.DefaultValue.String() { output.Print(output.Opts{ - Message: fmt.Sprintf("Pingctl configuration file '%s' does not exist.", cfgFile), + Message: fmt.Sprintf("Pingcli configuration file '%s' does not exist.", cfgFile), Result: output.ENUM_RESULT_NOACTION_WARN, }) @@ -152,13 +152,13 @@ func checkCfgFileLocation(cfgFile string) { func createConfigFile(cfgFile string) { l := logger.Get() - l.Debug().Msgf("Creating new pingctl configuration file at: %s", cfgFile) + l.Debug().Msgf("Creating new pingcli configuration file at: %s", cfgFile) // MkdirAll does nothing if directories already exist. Create needed directories for config file location. err := os.MkdirAll(filepath.Dir(cfgFile), os.ModePerm) if err != nil { output.Print(output.Opts{ - Message: fmt.Sprintf("Failed to make directories needed for new pingctl configuration file: %s", cfgFile), + Message: fmt.Sprintf("Failed to make directories needed for new pingcli configuration file: %s", cfgFile), Result: output.ENUM_RESULT_FAILURE, FatalMessage: err.Error(), }) @@ -166,7 +166,7 @@ func createConfigFile(cfgFile string) { tempViper := viper.New() tempViper.Set(options.RootActiveProfileOption.ViperKey, options.RootActiveProfileOption.DefaultValue) - tempViper.Set(fmt.Sprintf("%s.%v", options.RootActiveProfileOption.DefaultValue.String(), options.ProfileDescriptionOption.ViperKey), "Default profile created by pingctl") + tempViper.Set(fmt.Sprintf("%s.%v", options.RootActiveProfileOption.DefaultValue.String(), options.ProfileDescriptionOption.ViperKey), "Default profile created by pingcli") err = tempViper.WriteConfigAs(cfgFile) if err != nil { diff --git a/cmd/root_test.go b/cmd/root_test.go index 9221d31d..028fe607 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -3,53 +3,53 @@ package cmd_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_cobra" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_cobra" ) // Test Root Command Executes without issue func TestRootCmd_Execute(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t) + err := testutils_cobra.ExecutePingcli(t) testutils.CheckExpectedError(t, err, nil) } // Test Root Command Executes fails when provided an invalid command func TestRootCmd_InvalidCommand(t *testing.T) { - expectedErrorPattern := `^unknown command "invalid" for "pingctl"$` - err := testutils_cobra.ExecutePingctl(t, "invalid") + expectedErrorPattern := `^unknown command "invalid" for "pingcli"$` + err := testutils_cobra.ExecutePingcli(t, "invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Root Command --help, -h flag func TestRootCmd_HelpFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "--help") + err := testutils_cobra.ExecutePingcli(t, "--help") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "-h") + err = testutils_cobra.ExecutePingcli(t, "-h") testutils.CheckExpectedError(t, err, nil) } // Test Root Command fails with invalid flag func TestRootCmd_InvalidFlag(t *testing.T) { expectedErrorPattern := `^unknown flag: --invalid$` - err := testutils_cobra.ExecutePingctl(t, "--invalid") + err := testutils_cobra.ExecutePingcli(t, "--invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Root Command Executes when provided the --version, -v flag func TestRootCmd_VersionFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "--version") + err := testutils_cobra.ExecutePingcli(t, "--version") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "-v") + err = testutils_cobra.ExecutePingcli(t, "-v") testutils.CheckExpectedError(t, err, nil) } // Test Root Command Executes when provided the --output-format flag func TestRootCmd_OutputFormatFlag(t *testing.T) { for _, outputFormat := range customtypes.OutputFormatValidValues() { - err := testutils_cobra.ExecutePingctl(t, "--output-format", outputFormat) + err := testutils_cobra.ExecutePingcli(t, "--output-format", outputFormat) testutils.CheckExpectedError(t, err, nil) } } @@ -57,23 +57,23 @@ func TestRootCmd_OutputFormatFlag(t *testing.T) { // Test Root Command fails when provided an invalid value for the --output-format flag func TestRootCmd_InvalidOutputFlag(t *testing.T) { expectedErrorPattern := `^invalid argument "invalid" for "-O, --output-format" flag: unrecognized Output Format: 'invalid'\. Must be one of: [a-z\s,]+$` - err := testutils_cobra.ExecutePingctl(t, "--output-format", "invalid") + err := testutils_cobra.ExecutePingcli(t, "--output-format", "invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Root Command fails when provided no value for the --output-format flag func TestRootCmd_NoValueOutputFlag(t *testing.T) { expectedErrorPattern := `^flag needs an argument: --output-format$` - err := testutils_cobra.ExecutePingctl(t, "--output-format") + err := testutils_cobra.ExecutePingcli(t, "--output-format") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Root Command Executes output does not change with output-format=text vs output-format=json func TestRootCmd_OutputFlagTextVsJSON(t *testing.T) { - textOutput, err := testutils_cobra.ExecutePingctlCaptureCobraOutput(t, "--output-format", "text") + textOutput, err := testutils_cobra.ExecutePingcliCaptureCobraOutput(t, "--output-format", "text") testutils.CheckExpectedError(t, err, nil) - jsonOutput, err := testutils_cobra.ExecutePingctlCaptureCobraOutput(t, "--output-format", "json") + jsonOutput, err := testutils_cobra.ExecutePingcliCaptureCobraOutput(t, "--output-format", "json") testutils.CheckExpectedError(t, err, nil) if textOutput != jsonOutput { @@ -83,42 +83,42 @@ func TestRootCmd_OutputFlagTextVsJSON(t *testing.T) { // Test Root Command Executes when provided the --color flag func TestRootCmd_ColorFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "--color=true") + err := testutils_cobra.ExecutePingcli(t, "--color=true") testutils.CheckExpectedError(t, err, nil) - err = testutils_cobra.ExecutePingctl(t, "--color=false") + err = testutils_cobra.ExecutePingcli(t, "--color=false") testutils.CheckExpectedError(t, err, nil) } // Test Root Command fails when provided an invalid value for the --color flag func TestRootCmd_InvalidColorFlag(t *testing.T) { expectedErrorPattern := `^invalid argument "invalid" for "--color" flag: strconv\.ParseBool: parsing "invalid": invalid syntax$` - err := testutils_cobra.ExecutePingctl(t, "--color=invalid") + err := testutils_cobra.ExecutePingcli(t, "--color=invalid") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Root Command Executes when provided the --config flag func TestRootCmd_ConfigFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "--config", "config.yaml") + err := testutils_cobra.ExecutePingcli(t, "--config", "config.yaml") testutils.CheckExpectedError(t, err, nil) } // Test Root Command fails when provided no value for the --config flag func TestRootCmd_NoValueConfigFlag(t *testing.T) { expectedErrorPattern := `^flag needs an argument: --config$` - err := testutils_cobra.ExecutePingctl(t, "--config") + err := testutils_cobra.ExecutePingcli(t, "--config") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Root Command Executes when provided the --active-profile flag func TestRootCmd_ActiveProfileFlag(t *testing.T) { - err := testutils_cobra.ExecutePingctl(t, "--active-profile", "default") + err := testutils_cobra.ExecutePingcli(t, "--active-profile", "default") testutils.CheckExpectedError(t, err, nil) } // Test Root Command fails when provided no value for the --active-profile flag func TestRootCmd_NoValueActiveProfileFlag(t *testing.T) { expectedErrorPattern := `^flag needs an argument: --active-profile$` - err := testutils_cobra.ExecutePingctl(t, "--active-profile") + err := testutils_cobra.ExecutePingcli(t, "--active-profile") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } diff --git a/go.mod b/go.mod index e90a456c..0ba86d49 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pingidentity/pingctl +module github.com/pingidentity/pingcli go 1.22.0 diff --git a/internal/commands/config/add_profile_internal.go b/internal/commands/config/add_profile_internal.go index 7710dbcd..f2523dcc 100644 --- a/internal/commands/config/add_profile_internal.go +++ b/internal/commands/config/add_profile_internal.go @@ -5,10 +5,10 @@ import ( "io" "strconv" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/input" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/input" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" "github.com/spf13/viper" ) @@ -36,7 +36,7 @@ func RunInternalConfigAddProfile(rc io.ReadCloser) (err error) { } output.Print(output.Opts{ - Message: fmt.Sprintf("Profile created. Update additional profile attributes via 'pingctl config set' or directly within the config file at '%s'", profiles.GetMainConfig().ViperInstance().ConfigFileUsed()), + Message: fmt.Sprintf("Profile created. Update additional profile attributes via 'pingcli config set' or directly within the config file at '%s'", profiles.GetMainConfig().ViperInstance().ConfigFileUsed()), Result: output.ENUM_RESULT_SUCCESS, }) diff --git a/internal/commands/config/add_profile_internal_test.go b/internal/commands/config/add_profile_internal_test.go index 9a24f0ed..f3e6ec7c 100644 --- a/internal/commands/config/add_profile_internal_test.go +++ b/internal/commands/config/add_profile_internal_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfigAddProfile function diff --git a/internal/commands/config/config_internal.go b/internal/commands/config/config_internal.go index 294017aa..9d7bf2f2 100644 --- a/internal/commands/config/config_internal.go +++ b/internal/commands/config/config_internal.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/input" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/input" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" ) func RunInternalConfig(rc io.ReadCloser) (err error) { @@ -30,7 +30,7 @@ func RunInternalConfig(rc io.ReadCloser) (err error) { } output.Print(output.Opts{ - Message: fmt.Sprintf("Profile updated. Update additional profile attributes via 'pingctl config set' or directly within the config file at '%s'", profiles.GetMainConfig().ViperInstance().ConfigFileUsed()), + Message: fmt.Sprintf("Profile updated. Update additional profile attributes via 'pingcli config set' or directly within the config file at '%s'", profiles.GetMainConfig().ViperInstance().ConfigFileUsed()), Result: output.ENUM_RESULT_SUCCESS, }) diff --git a/internal/commands/config/config_internal_test.go b/internal/commands/config/config_internal_test.go index 771c620b..f768746e 100644 --- a/internal/commands/config/config_internal_test.go +++ b/internal/commands/config/config_internal_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfig function diff --git a/internal/commands/config/delete_profile_internal.go b/internal/commands/config/delete_profile_internal.go index 6d8d5782..5a032ec9 100644 --- a/internal/commands/config/delete_profile_internal.go +++ b/internal/commands/config/delete_profile_internal.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/input" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/input" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" ) func RunInternalConfigDeleteProfile(rc io.ReadCloser) (err error) { diff --git a/internal/commands/config/delete_profile_internal_test.go b/internal/commands/config/delete_profile_internal_test.go index 47cb6454..d665aa4a 100644 --- a/internal/commands/config/delete_profile_internal_test.go +++ b/internal/commands/config/delete_profile_internal_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfigDeleteProfile function diff --git a/internal/commands/config/get_internal.go b/internal/commands/config/get_internal.go index 73f544a3..6ee2beda 100644 --- a/internal/commands/config/get_internal.go +++ b/internal/commands/config/get_internal.go @@ -3,10 +3,10 @@ package config_internal import ( "fmt" - "github.com/pingidentity/pingctl/internal/configuration" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" ) func RunInternalConfigGet(viperKey string) (err error) { diff --git a/internal/commands/config/get_internal_test.go b/internal/commands/config/get_internal_test.go index 21fbbd9e..a5cd6bfd 100644 --- a/internal/commands/config/get_internal_test.go +++ b/internal/commands/config/get_internal_test.go @@ -3,10 +3,10 @@ package config_internal import ( "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfigGet function diff --git a/internal/commands/config/list_profiles_internal.go b/internal/commands/config/list_profiles_internal.go index cb6c25e9..2b56a152 100644 --- a/internal/commands/config/list_profiles_internal.go +++ b/internal/commands/config/list_profiles_internal.go @@ -1,8 +1,8 @@ package config_internal import ( - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" ) func RunInternalConfigListProfiles() { diff --git a/internal/commands/config/list_profiles_internal_test.go b/internal/commands/config/list_profiles_internal_test.go index 6c85cc98..d7b67cac 100644 --- a/internal/commands/config/list_profiles_internal_test.go +++ b/internal/commands/config/list_profiles_internal_test.go @@ -3,7 +3,7 @@ package config_internal import ( "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfigListProfiles function diff --git a/internal/commands/config/set_active_profile_internal.go b/internal/commands/config/set_active_profile_internal.go index cafbbeab..77d80114 100644 --- a/internal/commands/config/set_active_profile_internal.go +++ b/internal/commands/config/set_active_profile_internal.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/input" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/input" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" ) func RunInternalConfigSetActiveProfile(rc io.ReadCloser) (err error) { diff --git a/internal/commands/config/set_active_profile_internal_test.go b/internal/commands/config/set_active_profile_internal_test.go index 98898442..cfd867c6 100644 --- a/internal/commands/config/set_active_profile_internal_test.go +++ b/internal/commands/config/set_active_profile_internal_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfigSetActiveProfile function diff --git a/internal/commands/config/set_internal.go b/internal/commands/config/set_internal.go index f481da0d..53a25fd8 100644 --- a/internal/commands/config/set_internal.go +++ b/internal/commands/config/set_internal.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/pingidentity/pingctl/internal/configuration" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" "github.com/spf13/viper" ) @@ -24,7 +24,7 @@ func RunInternalConfigSet(kvPair string) (err error) { // Make sure value is not empty, and suggest unset command if it is if vValue == "" { - return fmt.Errorf("failed to set configuration: value for key '%s' is empty. Use 'pingctl config unset %s' to unset the key", vKey, vKey) + return fmt.Errorf("failed to set configuration: value for key '%s' is empty. Use 'pingcli config unset %s' to unset the key", vKey, vKey) } if err = profiles.GetMainConfig().ValidateExistingProfileName(pName); err != nil { diff --git a/internal/commands/config/set_internal_test.go b/internal/commands/config/set_internal_test.go index d1b13e7c..d01a1edb 100644 --- a/internal/commands/config/set_internal_test.go +++ b/internal/commands/config/set_internal_test.go @@ -3,10 +3,10 @@ package config_internal import ( "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfigSet function @@ -90,7 +90,7 @@ func Test_RunInternalConfigSet_InvalidProfileName(t *testing.T) { func Test_RunInternalConfigSet_NoValue(t *testing.T) { testutils_viper.InitVipers(t) - expectedErrorPattern := `^failed to set configuration: value for key '.*' is empty. Use 'pingctl config unset .*' to unset the key$` + expectedErrorPattern := `^failed to set configuration: value for key '.*' is empty. Use 'pingcli config unset .*' to unset the key$` err := RunInternalConfigSet("color=") testutils.CheckExpectedError(t, err, &expectedErrorPattern) } diff --git a/internal/commands/config/unset_internal.go b/internal/commands/config/unset_internal.go index fde6b70d..9a2e72ad 100644 --- a/internal/commands/config/unset_internal.go +++ b/internal/commands/config/unset_internal.go @@ -3,10 +3,10 @@ package config_internal import ( "fmt" - "github.com/pingidentity/pingctl/internal/configuration" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" ) func RunInternalConfigUnset(viperKey string) (err error) { diff --git a/internal/commands/config/unset_internal_test.go b/internal/commands/config/unset_internal_test.go index 8446e768..61089aea 100644 --- a/internal/commands/config/unset_internal_test.go +++ b/internal/commands/config/unset_internal_test.go @@ -3,10 +3,10 @@ package config_internal import ( "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfigUnset function diff --git a/internal/commands/config/view_profile_internal.go b/internal/commands/config/view_profile_internal.go index cf4c5fc6..b5e39e1f 100644 --- a/internal/commands/config/view_profile_internal.go +++ b/internal/commands/config/view_profile_internal.go @@ -3,9 +3,9 @@ package config_internal import ( "fmt" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" ) func RunInternalConfigViewProfile() (err error) { diff --git a/internal/commands/config/view_profile_internal_test.go b/internal/commands/config/view_profile_internal_test.go index 6deb5f47..75de0df4 100644 --- a/internal/commands/config/view_profile_internal_test.go +++ b/internal/commands/config/view_profile_internal_test.go @@ -3,10 +3,10 @@ package config_internal import ( "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalConfigViewProfile function diff --git a/internal/commands/feedback/feedback_internal.go b/internal/commands/feedback/feedback_internal.go index 96da0fa3..0e28eedd 100644 --- a/internal/commands/feedback/feedback_internal.go +++ b/internal/commands/feedback/feedback_internal.go @@ -1,7 +1,7 @@ package feedback_internal import ( - "github.com/pingidentity/pingctl/internal/output" + "github.com/pingidentity/pingcli/internal/output" ) const FeedbackMessage string = `Thank you for participating in early adoption of the refreshed Ping Identity universal CLI! @@ -14,7 +14,7 @@ Please visit the following URL in your browser to fill out a short, anonymous su If you encounter any bugs while using the tool, please open an issue on the project's GitHub repository's issue tracker: - https://github.com/pingidentity/pingctl/issues/new + https://github.com/pingidentity/pingcli/issues/new ` diff --git a/internal/commands/platform/export_internal.go b/internal/commands/platform/export_internal.go index 508877ca..7742bc0a 100644 --- a/internal/commands/platform/export_internal.go +++ b/internal/commands/platform/export_internal.go @@ -13,18 +13,18 @@ import ( "github.com/patrickcping/pingone-go-sdk-v2/management" pingoneGoClient "github.com/patrickcping/pingone-go-sdk-v2/pingone" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/connector/pingfederate" - "github.com/pingidentity/pingctl/internal/connector/pingone/mfa" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform" - "github.com/pingidentity/pingctl/internal/connector/pingone/protect" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/logger" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/connector/pingfederate" + "github.com/pingidentity/pingcli/internal/connector/pingone/mfa" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform" + "github.com/pingidentity/pingcli/internal/connector/pingone/protect" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/logger" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" pingfederateGoClient "github.com/pingidentity/pingfederate-go-client/v1210/configurationapi" "github.com/rs/zerolog" ) @@ -100,7 +100,7 @@ func RunInternalExport(ctx context.Context, commandVersion string) (err error) { return nil } -func initPingFederateServices(ctx context.Context, pingctlVersion string) (err error) { +func initPingFederateServices(ctx context.Context, pingcliVersion string) (err error) { if ctx == nil { return fmt.Errorf("failed to initialize PingFederate services. context is nil") } @@ -143,7 +143,7 @@ func initPingFederateServices(ctx context.Context, pingctlVersion string) (err e }, } - if err = initPingFederateApiClient(tr, pingctlVersion); err != nil { + if err = initPingFederateApiClient(tr, pingcliVersion); err != nil { return err } @@ -237,7 +237,7 @@ func initPingOneServices(ctx context.Context, cmdVersion string) (err error) { return nil } -func initPingFederateApiClient(tr *http.Transport, pingctlVersion string) (err error) { +func initPingFederateApiClient(tr *http.Transport, pingcliVersion string) (err error) { l := logger.Get() l.Debug().Msgf("Initializing PingFederate API client.") @@ -264,12 +264,12 @@ func initPingFederateApiClient(tr *http.Transport, pingctlVersion string) (err e } if httpsHost == "" { - return fmt.Errorf(`failed to initialize pingfederate API client. the pingfederate https host configuration value is not set: configure this property via parameter flags, environment variables, or the tool's configuration file (default: $HOME/.pingctl/config.yaml)`) + return fmt.Errorf(`failed to initialize pingfederate API client. the pingfederate https host configuration value is not set: configure this property via parameter flags, environment variables, or the tool's configuration file (default: $HOME/.pingcli/config.yaml)`) } - userAgent := fmt.Sprintf("pingctl/%s", pingctlVersion) + userAgent := fmt.Sprintf("pingcli/%s", pingcliVersion) - if v := strings.TrimSpace(os.Getenv("PINGCTL_PINGFEDERATE_APPEND_USER_AGENT")); v != "" { + if v := strings.TrimSpace(os.Getenv("PINGCLI_PINGFEDERATE_APPEND_USER_AGENT")); v != "" { userAgent = fmt.Sprintf("%s %s", userAgent, v) } @@ -290,7 +290,7 @@ func initPingFederateApiClient(tr *http.Transport, pingctlVersion string) (err e return nil } -func initPingOneApiClient(ctx context.Context, pingctlVersion string) (err error) { +func initPingOneApiClient(ctx context.Context, pingcliVersion string) (err error) { l := logger.Get() l.Debug().Msgf("Initializing PingOne API client.") @@ -316,12 +316,12 @@ func initPingOneApiClient(ctx context.Context, pingctlVersion string) (err error } if pingoneApiClientId == "" || clientSecret == "" || environmentID == "" || regionCode == "" { - return fmt.Errorf(`failed to initialize pingone API client. one of worker client ID, worker client secret, pingone region code, and/or worker environment ID is empty. configure these properties via parameter flags, environment variables, or the tool's configuration file (default: $HOME/.pingctl/config.yaml)`) + return fmt.Errorf(`failed to initialize pingone API client. one of worker client ID, worker client secret, pingone region code, and/or worker environment ID is empty. configure these properties via parameter flags, environment variables, or the tool's configuration file (default: $HOME/.pingcli/config.yaml)`) } - userAgent := fmt.Sprintf("pingctl/%s", pingctlVersion) + userAgent := fmt.Sprintf("pingcli/%s", pingcliVersion) - if v := strings.TrimSpace(os.Getenv("PINGCTL_PINGONE_APPEND_USER_AGENT")); v != "" { + if v := strings.TrimSpace(os.Getenv("PINGCLI_PINGONE_APPEND_USER_AGENT")); v != "" { userAgent = fmt.Sprintf("%s %s", userAgent, v) } diff --git a/internal/commands/platform/export_internal_test.go b/internal/commands/platform/export_internal_test.go index 06122bd3..f57943c7 100644 --- a/internal/commands/platform/export_internal_test.go +++ b/internal/commands/platform/export_internal_test.go @@ -8,12 +8,12 @@ import ( "regexp" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/profiles" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/profiles" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" pingfederateGoClient "github.com/pingidentity/pingfederate-go-client/v1210/configurationapi" ) diff --git a/internal/commands/request/request_internal.go b/internal/commands/request/request_internal.go index 91a52ef8..499e0a92 100644 --- a/internal/commands/request/request_internal.go +++ b/internal/commands/request/request_internal.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/output" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/output" + "github.com/pingidentity/pingcli/internal/profiles" ) type PingoneAuthResponse struct { diff --git a/internal/commands/request/request_internal_test.go b/internal/commands/request/request_internal_test.go index 720b944b..628f0616 100644 --- a/internal/commands/request/request_internal_test.go +++ b/internal/commands/request/request_internal_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test RunInternalRequest function diff --git a/internal/configuration/config/add_profile.go b/internal/configuration/config/add_profile.go index c40fa029..9031abbc 100644 --- a/internal/configuration/config/add_profile.go +++ b/internal/configuration/config/add_profile.go @@ -1,8 +1,8 @@ package configuration_config import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) @@ -69,7 +69,7 @@ func initAddProfileSetActiveOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "s", - Usage: "Set the new configuration profile as the active profile for pingctl.", + Usage: "Set the new configuration profile as the active profile for pingcli.", Value: cobraValue, DefValue: "false", }, diff --git a/internal/configuration/config/config.go b/internal/configuration/config/config.go index 5a94ce4f..8d485867 100644 --- a/internal/configuration/config/config.go +++ b/internal/configuration/config/config.go @@ -1,8 +1,8 @@ package configuration_config import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) diff --git a/internal/configuration/config/delete_profile.go b/internal/configuration/config/delete_profile.go index 5adf4ecf..f9550708 100644 --- a/internal/configuration/config/delete_profile.go +++ b/internal/configuration/config/delete_profile.go @@ -1,8 +1,8 @@ package configuration_config import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) diff --git a/internal/configuration/config/get.go b/internal/configuration/config/get.go index 77c5621d..8a5f4de5 100644 --- a/internal/configuration/config/get.go +++ b/internal/configuration/config/get.go @@ -1,8 +1,8 @@ package configuration_config import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) diff --git a/internal/configuration/config/set.go b/internal/configuration/config/set.go index f0ecf06e..e166e0c0 100644 --- a/internal/configuration/config/set.go +++ b/internal/configuration/config/set.go @@ -1,8 +1,8 @@ package configuration_config import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) diff --git a/internal/configuration/config/set_active_profile.go b/internal/configuration/config/set_active_profile.go index 1f5c2376..daa2bc72 100644 --- a/internal/configuration/config/set_active_profile.go +++ b/internal/configuration/config/set_active_profile.go @@ -1,8 +1,8 @@ package configuration_config import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) diff --git a/internal/configuration/config/unset.go b/internal/configuration/config/unset.go index f0de7948..dc1b1ac0 100644 --- a/internal/configuration/config/unset.go +++ b/internal/configuration/config/unset.go @@ -1,8 +1,8 @@ package configuration_config import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) diff --git a/internal/configuration/config/view_profile.go b/internal/configuration/config/view_profile.go index 99e91dc1..9a67a24a 100644 --- a/internal/configuration/config/view_profile.go +++ b/internal/configuration/config/view_profile.go @@ -1,8 +1,8 @@ package configuration_config import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) diff --git a/internal/configuration/configuration.go b/internal/configuration/configuration.go index 33584d3b..3e3e63e9 100644 --- a/internal/configuration/configuration.go +++ b/internal/configuration/configuration.go @@ -5,13 +5,13 @@ import ( "slices" "strings" - configuration_config "github.com/pingidentity/pingctl/internal/configuration/config" - "github.com/pingidentity/pingctl/internal/configuration/options" - configuration_platform "github.com/pingidentity/pingctl/internal/configuration/platform" - configuration_profiles "github.com/pingidentity/pingctl/internal/configuration/profiles" - configuration_request "github.com/pingidentity/pingctl/internal/configuration/request" - configuration_root "github.com/pingidentity/pingctl/internal/configuration/root" - configuration_services "github.com/pingidentity/pingctl/internal/configuration/services" + configuration_config "github.com/pingidentity/pingcli/internal/configuration/config" + "github.com/pingidentity/pingcli/internal/configuration/options" + configuration_platform "github.com/pingidentity/pingcli/internal/configuration/platform" + configuration_profiles "github.com/pingidentity/pingcli/internal/configuration/profiles" + configuration_request "github.com/pingidentity/pingcli/internal/configuration/request" + configuration_root "github.com/pingidentity/pingcli/internal/configuration/root" + configuration_services "github.com/pingidentity/pingcli/internal/configuration/services" ) func ViperKeys() (keys []string) { diff --git a/internal/configuration/configuration_test.go b/internal/configuration/configuration_test.go index 0f22a1c9..af08730d 100644 --- a/internal/configuration/configuration_test.go +++ b/internal/configuration/configuration_test.go @@ -3,9 +3,9 @@ package configuration_test import ( "testing" - "github.com/pingidentity/pingctl/internal/configuration" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test ValidateViperKey function diff --git a/internal/configuration/options/options.go b/internal/configuration/options/options.go index fe55e3de..b4af62f0 100644 --- a/internal/configuration/options/options.go +++ b/internal/configuration/options/options.go @@ -113,7 +113,7 @@ var ( PingfederateAuthenticationTypeOption Option ) -// 'pingctl config' command options +// 'pingcli config' command options var ( ConfigProfileOption Option ConfigNameOption Option @@ -136,7 +136,7 @@ var ( ConfigUnsetProfileOption Option ) -// 'pingctl platform export' command options +// 'pingcli platform export' command options var ( PlatformExportExportFormatOption Option PlatformExportServiceOption Option @@ -158,7 +158,7 @@ var ( RootOutputFormatOption Option ) -// 'pingctl request' command options +// 'pingcli request' command options var ( RequestDataOption Option RequestHTTPMethodOption Option diff --git a/internal/configuration/platform/export.go b/internal/configuration/platform/export.go index fb5a8731..bd6fd4c4 100644 --- a/internal/configuration/platform/export.go +++ b/internal/configuration/platform/export.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/pflag" ) @@ -23,7 +23,7 @@ func initFormatOption() { cobraParamName := "format" cobraValue := new(customtypes.ExportFormat) defaultValue := customtypes.ExportFormat(customtypes.ENUM_EXPORT_FORMAT_HCL) - envVar := "PINGCTL_EXPORT_FORMAT" + envVar := "PINGCLI_EXPORT_FORMAT" options.PlatformExportExportFormatOption = options.Option{ CobraParamName: cobraParamName, @@ -46,7 +46,7 @@ func initServicesOption() { cobraParamName := "services" cobraValue := new(customtypes.ExportServices) defaultValue := customtypes.ExportServices(customtypes.ExportServicesValidValues()) - envVar := "PINGCTL_EXPORT_SERVICES" + envVar := "PINGCLI_EXPORT_SERVICES" options.PlatformExportServiceOption = options.Option{ CobraParamName: cobraParamName, @@ -69,7 +69,7 @@ func initOutputDirectoryOption() { cobraParamName := "output-directory" cobraValue := new(customtypes.String) defaultValue := getDefaultExportDir() - envVar := "PINGCTL_EXPORT_OUTPUT_DIRECTORY" + envVar := "PINGCLI_EXPORT_OUTPUT_DIRECTORY" options.PlatformExportOutputDirectoryOption = options.Option{ CobraParamName: cobraParamName, @@ -97,7 +97,7 @@ func initOverwriteOption() { CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, - EnvVar: "PINGCTL_EXPORT_OVERWRITE", + EnvVar: "PINGCLI_EXPORT_OVERWRITE", Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "o", @@ -133,7 +133,7 @@ func initPingOneEnvironmentIDOption() { cobraParamName := "pingone-export-environment-id" cobraValue := new(customtypes.UUID) defaultValue := customtypes.UUID("") - envVar := "PINGCTL_PINGONE_EXPORT_ENVIRONMENT_ID" + envVar := "PINGCLI_PINGONE_EXPORT_ENVIRONMENT_ID" options.PlatformExportPingoneEnvironmentIDOption = options.Option{ CobraParamName: cobraParamName, diff --git a/internal/configuration/profiles/profiles.go b/internal/configuration/profiles/profiles.go index a6404cda..fe8801e5 100644 --- a/internal/configuration/profiles/profiles.go +++ b/internal/configuration/profiles/profiles.go @@ -1,8 +1,8 @@ package configuration_profiles import ( - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" ) func InitProfilesOptions() { diff --git a/internal/configuration/request/request.go b/internal/configuration/request/request.go index 1c3fafd6..44cef535 100644 --- a/internal/configuration/request/request.go +++ b/internal/configuration/request/request.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) @@ -22,7 +22,7 @@ func initDataOption() { cobraParamName := "data" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_REQUEST_DATA" + envVar := "PINGCLI_REQUEST_DATA" options.RequestDataOption = options.Option{ CobraParamName: cobraParamName, @@ -44,7 +44,7 @@ func initHTTPMethodOption() { cobraParamName := "http-method" cobraValue := new(customtypes.HTTPMethod) defaultValue := customtypes.HTTPMethod(customtypes.ENUM_HTTP_METHOD_GET) - envVar := "PINGCTL_REQUEST_HTTP_METHOD" + envVar := "PINGCLI_REQUEST_HTTP_METHOD" options.RequestHTTPMethodOption = options.Option{ CobraParamName: cobraParamName, @@ -67,7 +67,7 @@ func initServiceOption() { cobraParamName := "service" cobraValue := new(customtypes.RequestService) defaultValue := customtypes.RequestService("") - envVar := "PINGCTL_REQUEST_SERVICE" + envVar := "PINGCLI_REQUEST_SERVICE" options.RequestServiceOption = options.Option{ CobraParamName: cobraParamName, diff --git a/internal/configuration/root/root.go b/internal/configuration/root/root.go index d8158166..fb72f123 100644 --- a/internal/configuration/root/root.go +++ b/internal/configuration/root/root.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/pflag" ) @@ -27,7 +27,7 @@ func initActiveProfileOption() { CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, - EnvVar: "PINGCTL_ACTIVE_PROFILE", + EnvVar: "PINGCLI_ACTIVE_PROFILE", Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "P", @@ -49,7 +49,7 @@ func initColorOption() { CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, - EnvVar: "PINGCTL_COLOR", + EnvVar: "PINGCLI_COLOR", Flag: &pflag.Flag{ Name: cobraParamName, Usage: "Use colorized output", @@ -70,13 +70,13 @@ func initConfigOption() { CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: defaultValue, - EnvVar: "PINGCTL_CONFIG", + EnvVar: "PINGCLI_CONFIG", Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "C", Usage: "Configuration file location", Value: cobraValue, - DefValue: "\"$HOME/.pingctl/config.yaml\"", + DefValue: "\"$HOME/.pingcli/config.yaml\"", }, Type: options.ENUM_STRING, ViperKey: "", // No viper key @@ -92,11 +92,11 @@ func initOutputFormatOption() { CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, - EnvVar: "PINGCTL_OUTPUT_FORMAT", + EnvVar: "PINGCLI_OUTPUT_FORMAT", Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "O", - Usage: fmt.Sprintf("Specifies pingctl's console output format. Allowed: %s", strings.Join(customtypes.OutputFormatValidValues(), ", ")), + Usage: fmt.Sprintf("Specifies pingcli's console output format. Allowed: %s", strings.Join(customtypes.OutputFormatValidValues(), ", ")), Value: cobraValue, DefValue: customtypes.ENUM_OUTPUT_FORMAT_TEXT, }, @@ -116,7 +116,7 @@ func getDefaultConfigFilepath() (defaultConfigFilepath *customtypes.String) { return nil } - err = defaultConfigFilepath.Set(fmt.Sprintf("%s/.pingctl/config.yaml", homeDir)) + err = defaultConfigFilepath.Set(fmt.Sprintf("%s/.pingcli/config.yaml", homeDir)) if err != nil { l.Err(err).Msg("Failed to set default config file path") return nil diff --git a/internal/configuration/services/pingfederate.go b/internal/configuration/services/pingfederate.go index 8128ef62..012bc608 100644 --- a/internal/configuration/services/pingfederate.go +++ b/internal/configuration/services/pingfederate.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) @@ -29,7 +29,7 @@ func initHTTPSHostOption() { cobraParamName := "pingfederate-https-host" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_PINGFEDERATE_HTTPS_HOST" + envVar := "PINGCLI_PINGFEDERATE_HTTPS_HOST" options.PingfederateHTTPSHostOption = options.Option{ CobraParamName: cobraParamName, @@ -51,7 +51,7 @@ func initAdminAPIPathOption() { cobraParamName := "pingfederate-admin-api-path" cobraValue := new(customtypes.String) defaultValue := customtypes.String("/pf-admin-api/v1") - envVar := "PINGCTL_PINGFEDERATE_ADMIN_API_PATH" + envVar := "PINGCLI_PINGFEDERATE_ADMIN_API_PATH" options.PingfederateAdminAPIPathOption = options.Option{ CobraParamName: cobraParamName, @@ -73,7 +73,7 @@ func initXBypassExternalValidationHeaderOption() { cobraParamName := "pingfederate-x-bypass-external-validation-header" cobraValue := new(customtypes.Bool) defaultValue := customtypes.Bool(false) - envVar := "PINGCTL_PINGFEDERATE_X_BYPASS_EXTERNAL_VALIDATION_HEADER" + envVar := "PINGCLI_PINGFEDERATE_X_BYPASS_EXTERNAL_VALIDATION_HEADER" options.PingfederateXBypassExternalValidationHeaderOption = options.Option{ CobraParamName: cobraParamName, @@ -95,7 +95,7 @@ func initCACertificatePemFilesOption() { cobraParamName := "pingfederate-ca-certificate-pem-files" cobraValue := new(customtypes.StringSlice) defaultValue := customtypes.StringSlice{} - envVar := "PINGCTL_PINGFEDERATE_CA_CERTIFICATE_PEM_FILES" + envVar := "PINGCLI_PINGFEDERATE_CA_CERTIFICATE_PEM_FILES" options.PingfederateCACertificatePemFilesOption = options.Option{ CobraParamName: cobraParamName, @@ -117,7 +117,7 @@ func initInsecureTrustAllTLSOption() { cobraParamName := "pingfederate-insecure-trust-all-tls" cobraValue := new(customtypes.Bool) defaultValue := customtypes.Bool(false) - envVar := "PINGCTL_PINGFEDERATE_INSECURE_TRUST_ALL_TLS" + envVar := "PINGCLI_PINGFEDERATE_INSECURE_TRUST_ALL_TLS" options.PingfederateInsecureTrustAllTLSOption = options.Option{ CobraParamName: cobraParamName, @@ -139,7 +139,7 @@ func initUsernameOption() { cobraParamName := "pingfederate-username" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_PINGFEDERATE_USERNAME" + envVar := "PINGCLI_PINGFEDERATE_USERNAME" options.PingfederateBasicAuthUsernameOption = options.Option{ CobraParamName: cobraParamName, @@ -161,7 +161,7 @@ func initPasswordOption() { cobraParamName := "pingfederate-password" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_PINGFEDERATE_PASSWORD" + envVar := "PINGCLI_PINGFEDERATE_PASSWORD" options.PingfederateBasicAuthPasswordOption = options.Option{ CobraParamName: cobraParamName, @@ -183,7 +183,7 @@ func initAccessTokenOption() { cobraParamName := "pingfederate-access-token" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_PINGFEDERATE_ACCESS_TOKEN" + envVar := "PINGCLI_PINGFEDERATE_ACCESS_TOKEN" options.PingfederateAccessTokenAuthAccessTokenOption = options.Option{ CobraParamName: cobraParamName, @@ -205,7 +205,7 @@ func initClientIDOption() { cobraParamName := "pingfederate-client-id" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_PINGFEDERATE_CLIENT_ID" + envVar := "PINGCLI_PINGFEDERATE_CLIENT_ID" options.PingfederateClientCredentialsAuthClientIDOption = options.Option{ CobraParamName: cobraParamName, @@ -227,7 +227,7 @@ func initClientSecretOption() { cobraParamName := "pingfederate-client-secret" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_PINGFEDERATE_CLIENT_SECRET" + envVar := "PINGCLI_PINGFEDERATE_CLIENT_SECRET" options.PingfederateClientCredentialsAuthClientSecretOption = options.Option{ CobraParamName: cobraParamName, @@ -249,7 +249,7 @@ func initTokenURLOption() { cobraParamName := "pingfederate-token-url" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_PINGFEDERATE_TOKEN_URL" + envVar := "PINGCLI_PINGFEDERATE_TOKEN_URL" options.PingfederateClientCredentialsAuthTokenURLOption = options.Option{ CobraParamName: cobraParamName, @@ -271,7 +271,7 @@ func initScopesOption() { cobraParamName := "pingfederate-scopes" cobraValue := new(customtypes.StringSlice) defaultValue := customtypes.StringSlice{} - envVar := "PINGCTL_PINGFEDERATE_SCOPES" + envVar := "PINGCLI_PINGFEDERATE_SCOPES" options.PingfederateClientCredentialsAuthScopesOption = options.Option{ CobraParamName: cobraParamName, @@ -293,7 +293,7 @@ func initPingfederateAuthenticationTypeOption() { cobraParamName := "pingfederate-authentication-type" cobraValue := new(customtypes.PingfederateAuthenticationType) defaultValue := customtypes.PingfederateAuthenticationType("") - envVar := "PINGCTL_PINGFEDERATE_AUTHENTICATION_TYPE" + envVar := "PINGCLI_PINGFEDERATE_AUTHENTICATION_TYPE" options.PingfederateAuthenticationTypeOption = options.Option{ CobraParamName: cobraParamName, diff --git a/internal/configuration/services/pingone.go b/internal/configuration/services/pingone.go index a8708f5b..0fb48376 100644 --- a/internal/configuration/services/pingone.go +++ b/internal/configuration/services/pingone.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/pflag" ) @@ -22,7 +22,7 @@ func initAuthenticationWorkerClientIDOption() { cobraParamName := "pingone-worker-client-id" cobraValue := new(customtypes.UUID) defaultValue := customtypes.UUID("") - envVar := "PINGCTL_PINGONE_WORKER_CLIENT_ID" + envVar := "PINGCLI_PINGONE_WORKER_CLIENT_ID" options.PingoneAuthenticationWorkerClientIDOption = options.Option{ CobraParamName: cobraParamName, @@ -44,7 +44,7 @@ func initAuthenticationWorkerClientSecretOption() { cobraParamName := "pingone-worker-client-secret" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCTL_PINGONE_WORKER_CLIENT_SECRET" + envVar := "PINGCLI_PINGONE_WORKER_CLIENT_SECRET" options.PingoneAuthenticationWorkerClientSecretOption = options.Option{ CobraParamName: cobraParamName, @@ -66,7 +66,7 @@ func initAuthenticationWorkerEnvironmentIDOption() { cobraParamName := "pingone-worker-environment-id" cobraValue := new(customtypes.UUID) defaultValue := customtypes.UUID("") - envVar := "PINGCTL_PINGONE_WORKER_ENVIRONMENT_ID" + envVar := "PINGCLI_PINGONE_WORKER_ENVIRONMENT_ID" options.PingoneAuthenticationWorkerEnvironmentIDOption = options.Option{ CobraParamName: cobraParamName, @@ -88,7 +88,7 @@ func initPingoneAuthenticationTypeOption() { cobraParamName := "pingone-authentication-type" cobraValue := new(customtypes.PingoneAuthenticationType) defaultValue := customtypes.PingoneAuthenticationType("") - envVar := "PINGCTL_PINGONE_AUTHENTICATION_TYPE" + envVar := "PINGCLI_PINGONE_AUTHENTICATION_TYPE" options.PingoneAuthenticationTypeOption = options.Option{ CobraParamName: cobraParamName, @@ -110,7 +110,7 @@ func initRegionCodeOption() { cobraParamName := "pingone-region-code" cobraValue := new(customtypes.PingoneRegionCode) defaultValue := customtypes.PingoneRegionCode("") - envVar := "PINGCTL_PINGONE_REGION_CODE" + envVar := "PINGCLI_PINGONE_REGION_CODE" options.PingoneRegionCodeOption = options.Option{ CobraParamName: cobraParamName, diff --git a/internal/connector/common/common_utils.go b/internal/connector/common/common_utils.go index 8c221f60..fd8e4c90 100644 --- a/internal/connector/common/common_utils.go +++ b/internal/connector/common/common_utils.go @@ -6,9 +6,9 @@ import ( "path/filepath" "text/template" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/logger" ) func WriteFiles(exportableResources []connector.ExportableResource, format, outputDir string, overwriteExport bool) error { diff --git a/internal/connector/common/resources_common.go b/internal/connector/common/resources_common.go index c3c1c9e3..e6289dd8 100644 --- a/internal/connector/common/resources_common.go +++ b/internal/connector/common/resources_common.go @@ -7,7 +7,7 @@ import ( "github.com/patrickcping/pingone-go-sdk-v2/management" "github.com/patrickcping/pingone-go-sdk-v2/mfa" "github.com/patrickcping/pingone-go-sdk-v2/risk" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/logger" ) const ( diff --git a/internal/connector/pingfederate/pingfederate_connector.go b/internal/connector/pingfederate/pingfederate_connector.go index b50054f7..653e7394 100644 --- a/internal/connector/pingfederate/pingfederate_connector.go +++ b/internal/connector/pingfederate/pingfederate_connector.go @@ -3,10 +3,10 @@ package pingfederate import ( "context" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/logger" pingfederateGoClient "github.com/pingidentity/pingfederate-go-client/v1210/configurationapi" ) diff --git a/internal/connector/pingfederate/pingfederate_connector_test.go b/internal/connector/pingfederate/pingfederate_connector_test.go index 847dc1d1..394a49c4 100644 --- a/internal/connector/pingfederate/pingfederate_connector_test.go +++ b/internal/connector/pingfederate/pingfederate_connector_test.go @@ -3,10 +3,10 @@ package pingfederate_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_terraform" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_terraform" ) func TestPingFederateTerraformPlan(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_api_application.go b/internal/connector/pingfederate/resources/pingfederate_authentication_api_application.go index e694d0b8..98ac3827 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_api_application.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_api_application.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_api_application_test.go b/internal/connector/pingfederate/resources/pingfederate_authentication_api_application_test.go index 685997f4..1314270d 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_api_application_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_api_application_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateAuthenticationApiApplicationExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_api_settings.go b/internal/connector/pingfederate/resources/pingfederate_authentication_api_settings.go index e3a75497..b1d932d2 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_api_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_api_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_api_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_authentication_api_settings_test.go index 442a64f9..b636a3d0 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_api_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_api_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateAuthenticationApiSettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_policies.go b/internal/connector/pingfederate/resources/pingfederate_authentication_policies.go index 5c05f229..9763c97f 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_policies.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_policies.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_fragment.go b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_fragment.go index 7455860a..b83d5f3b 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_fragment.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_fragment.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_fragment_test.go b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_fragment_test.go index 192a582b..7e574c09 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_fragment_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_fragment_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateAuthenticationPoliciesFragmentExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_settings.go b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_settings.go index 5d3f782f..b85c3288 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_settings_test.go index b2799551..22a6f8c1 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateAuthenticationPoliciesSettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_test.go b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_test.go index f88dd2da..001ff946 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_policies_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_policies_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateAuthenticationPoliciesExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_policy_contract.go b/internal/connector/pingfederate/resources/pingfederate_authentication_policy_contract.go index 619c51cb..a22af855 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_policy_contract.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_policy_contract.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_policy_contract_test.go b/internal/connector/pingfederate/resources/pingfederate_authentication_policy_contract_test.go index c1c6789e..1369e243 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_policy_contract_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_policy_contract_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateAuthenticationPolicyContractExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_selector.go b/internal/connector/pingfederate/resources/pingfederate_authentication_selector.go index 5deb1bac..e2a21500 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_selector.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_selector.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_authentication_selector_test.go b/internal/connector/pingfederate/resources/pingfederate_authentication_selector_test.go index bee1dc9a..13cf6ed9 100644 --- a/internal/connector/pingfederate/resources/pingfederate_authentication_selector_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_authentication_selector_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateAuthenticationSelectorExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_certificate_ca.go b/internal/connector/pingfederate/resources/pingfederate_certificate_ca.go index 2b524aca..e8ed4ee4 100644 --- a/internal/connector/pingfederate/resources/pingfederate_certificate_ca.go +++ b/internal/connector/pingfederate/resources/pingfederate_certificate_ca.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_certificate_ca_test.go b/internal/connector/pingfederate/resources/pingfederate_certificate_ca_test.go index 7ddef7c0..1829049d 100644 --- a/internal/connector/pingfederate/resources/pingfederate_certificate_ca_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_certificate_ca_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateCertificateCAExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_data_store.go b/internal/connector/pingfederate/resources/pingfederate_data_store.go index 3944ab9f..fb984520 100644 --- a/internal/connector/pingfederate/resources/pingfederate_data_store.go +++ b/internal/connector/pingfederate/resources/pingfederate_data_store.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_data_store_test.go b/internal/connector/pingfederate/resources/pingfederate_data_store_test.go index 569717f1..e3b832fa 100644 --- a/internal/connector/pingfederate/resources/pingfederate_data_store_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_data_store_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateDataStoreExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_extended_properties.go b/internal/connector/pingfederate/resources/pingfederate_extended_properties.go index cfd2ae82..f95d1cda 100644 --- a/internal/connector/pingfederate/resources/pingfederate_extended_properties.go +++ b/internal/connector/pingfederate/resources/pingfederate_extended_properties.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_extended_properties_test.go b/internal/connector/pingfederate/resources/pingfederate_extended_properties_test.go index 8c7afb48..bac7a70f 100644 --- a/internal/connector/pingfederate/resources/pingfederate_extended_properties_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_extended_properties_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateExtendedPropertiesExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_idp_adapter.go b/internal/connector/pingfederate/resources/pingfederate_idp_adapter.go index f4509fe4..baf1ba56 100644 --- a/internal/connector/pingfederate/resources/pingfederate_idp_adapter.go +++ b/internal/connector/pingfederate/resources/pingfederate_idp_adapter.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_idp_adapter_test.go b/internal/connector/pingfederate/resources/pingfederate_idp_adapter_test.go index 4610b8fc..a682a15b 100644 --- a/internal/connector/pingfederate/resources/pingfederate_idp_adapter_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_idp_adapter_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateIDPAdapterExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_idp_default_urls.go b/internal/connector/pingfederate/resources/pingfederate_idp_default_urls.go index 440f9b79..11771dd1 100644 --- a/internal/connector/pingfederate/resources/pingfederate_idp_default_urls.go +++ b/internal/connector/pingfederate/resources/pingfederate_idp_default_urls.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_idp_default_urls_test.go b/internal/connector/pingfederate/resources/pingfederate_idp_default_urls_test.go index 3d42ce25..73f3c2dd 100644 --- a/internal/connector/pingfederate/resources/pingfederate_idp_default_urls_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_idp_default_urls_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateIDPDefaultURLsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_idp_sp_connection.go b/internal/connector/pingfederate/resources/pingfederate_idp_sp_connection.go index 87ffc483..11dbd1c3 100644 --- a/internal/connector/pingfederate/resources/pingfederate_idp_sp_connection.go +++ b/internal/connector/pingfederate/resources/pingfederate_idp_sp_connection.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_idp_sp_connection_test.go b/internal/connector/pingfederate/resources/pingfederate_idp_sp_connection_test.go index 36433ecf..a49c9f49 100644 --- a/internal/connector/pingfederate/resources/pingfederate_idp_sp_connection_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_idp_sp_connection_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateIDPSPConnectionExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_incoming_proxy_settings.go b/internal/connector/pingfederate/resources/pingfederate_incoming_proxy_settings.go index f78aae83..02a12055 100644 --- a/internal/connector/pingfederate/resources/pingfederate_incoming_proxy_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_incoming_proxy_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_incoming_proxy_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_incoming_proxy_settings_test.go index 58456b91..5a69783c 100644 --- a/internal/connector/pingfederate/resources/pingfederate_incoming_proxy_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_incoming_proxy_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateIncomingProxySettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_kerberos_realm.go b/internal/connector/pingfederate/resources/pingfederate_kerberos_realm.go index 9fabdbf6..b90e689d 100644 --- a/internal/connector/pingfederate/resources/pingfederate_kerberos_realm.go +++ b/internal/connector/pingfederate/resources/pingfederate_kerberos_realm.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_kerberos_realm_test.go b/internal/connector/pingfederate/resources/pingfederate_kerberos_realm_test.go index 690bf520..20f0eccf 100644 --- a/internal/connector/pingfederate/resources/pingfederate_kerberos_realm_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_kerberos_realm_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateKerberosRealmExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_local_identity_profile.go b/internal/connector/pingfederate/resources/pingfederate_local_identity_profile.go index 1e9466f1..ec0797ff 100644 --- a/internal/connector/pingfederate/resources/pingfederate_local_identity_profile.go +++ b/internal/connector/pingfederate/resources/pingfederate_local_identity_profile.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_local_identity_profile_test.go b/internal/connector/pingfederate/resources/pingfederate_local_identity_profile_test.go index 61c4b4de..7783ea60 100644 --- a/internal/connector/pingfederate/resources/pingfederate_local_identity_profile_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_local_identity_profile_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateLocalIdentityIdentityProfileExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_notification_publisher_settings.go b/internal/connector/pingfederate/resources/pingfederate_notification_publisher_settings.go index 5ab0c7de..043192c5 100644 --- a/internal/connector/pingfederate/resources/pingfederate_notification_publisher_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_notification_publisher_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_notification_publisher_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_notification_publisher_settings_test.go index 64f061d9..9a3d1b30 100644 --- a/internal/connector/pingfederate/resources/pingfederate_notification_publisher_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_notification_publisher_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateNotificationPublisherSettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_manager.go b/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_manager.go index 59f53de8..c3f0eee2 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_manager.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_manager.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_manager_test.go b/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_manager_test.go index 23c8516c..c195735d 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_manager_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_manager_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateOAuthAccessTokenManagerExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_mapping.go b/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_mapping.go index e7f898d2..f71f6208 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_mapping.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_mapping.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_mapping_test.go b/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_mapping_test.go index 72b4c4c9..18b9098f 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_mapping_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_access_token_mapping_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateOAuthAccessTokenMappingExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_ciba_server_policy_settings.go b/internal/connector/pingfederate/resources/pingfederate_oauth_ciba_server_policy_settings.go index 7cde0649..5acbfe67 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_ciba_server_policy_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_ciba_server_policy_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_ciba_server_policy_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_oauth_ciba_server_policy_settings_test.go index b18a64d5..2bd2cf15 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_ciba_server_policy_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_ciba_server_policy_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateOAuthCIBAServerPolicySettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_client.go b/internal/connector/pingfederate/resources/pingfederate_oauth_client.go index 871dbfa2..752080ec 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_client.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_client.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_client_test.go b/internal/connector/pingfederate/resources/pingfederate_oauth_client_test.go index 8403d046..2992fdfd 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_client_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_client_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateOAuthClientExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_issuer.go b/internal/connector/pingfederate/resources/pingfederate_oauth_issuer.go index 42dc72ff..79d51236 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_issuer.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_issuer.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_issuer_test.go b/internal/connector/pingfederate/resources/pingfederate_oauth_issuer_test.go index 06bd35e4..26fa1259 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_issuer_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_issuer_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateOAuthIssuerExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_server_settings.go b/internal/connector/pingfederate/resources/pingfederate_oauth_server_settings.go index 08996631..b42b146a 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_server_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_server_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_oauth_server_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_oauth_server_settings_test.go index 9dd31a86..1f27934e 100644 --- a/internal/connector/pingfederate/resources/pingfederate_oauth_server_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_oauth_server_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateOAuthServerSettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_openid_connect_policy.go b/internal/connector/pingfederate/resources/pingfederate_openid_connect_policy.go index e19a351b..149c618e 100644 --- a/internal/connector/pingfederate/resources/pingfederate_openid_connect_policy.go +++ b/internal/connector/pingfederate/resources/pingfederate_openid_connect_policy.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_openid_connect_policy_test.go b/internal/connector/pingfederate/resources/pingfederate_openid_connect_policy_test.go index 67a79696..0352cc46 100644 --- a/internal/connector/pingfederate/resources/pingfederate_openid_connect_policy_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_openid_connect_policy_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateOpenIDConnectPolicyExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_openid_connect_settings.go b/internal/connector/pingfederate/resources/pingfederate_openid_connect_settings.go index f76ee8bc..05b01c65 100644 --- a/internal/connector/pingfederate/resources/pingfederate_openid_connect_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_openid_connect_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_openid_connect_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_openid_connect_settings_test.go index 0e4e8664..330d0316 100644 --- a/internal/connector/pingfederate/resources/pingfederate_openid_connect_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_openid_connect_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateOpenIDConnectSettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_password_credential_validator.go b/internal/connector/pingfederate/resources/pingfederate_password_credential_validator.go index fae46cab..6814b2f3 100644 --- a/internal/connector/pingfederate/resources/pingfederate_password_credential_validator.go +++ b/internal/connector/pingfederate/resources/pingfederate_password_credential_validator.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_password_credential_validator_test.go b/internal/connector/pingfederate/resources/pingfederate_password_credential_validator_test.go index 8fb9f495..3f83d4f8 100644 --- a/internal/connector/pingfederate/resources/pingfederate_password_credential_validator_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_password_credential_validator_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederatePasswordCredentialValidatorExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_pingone_connection.go b/internal/connector/pingfederate/resources/pingfederate_pingone_connection.go index 6be3ec2f..24c3d689 100644 --- a/internal/connector/pingfederate/resources/pingfederate_pingone_connection.go +++ b/internal/connector/pingfederate/resources/pingfederate_pingone_connection.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_pingone_connection_test.go b/internal/connector/pingfederate/resources/pingfederate_pingone_connection_test.go index 731603f0..7aaa4a78 100644 --- a/internal/connector/pingfederate/resources/pingfederate_pingone_connection_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_pingone_connection_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederatePingoneConnectionExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_redirect_validation.go b/internal/connector/pingfederate/resources/pingfederate_redirect_validation.go index ac750582..ae160566 100644 --- a/internal/connector/pingfederate/resources/pingfederate_redirect_validation.go +++ b/internal/connector/pingfederate/resources/pingfederate_redirect_validation.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_redirect_validation_test.go b/internal/connector/pingfederate/resources/pingfederate_redirect_validation_test.go index 3129b61c..1afde62b 100644 --- a/internal/connector/pingfederate/resources/pingfederate_redirect_validation_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_redirect_validation_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateRedirectValidationExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings.go b/internal/connector/pingfederate/resources/pingfederate_server_settings.go index 58136022..445349c1 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings_general.go b/internal/connector/pingfederate/resources/pingfederate_server_settings_general.go index 3aa02c27..8c71e672 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings_general.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings_general.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 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 352bdbe3..ba2ac6f9 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings_general_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings_general_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateServerSettingsGeneralExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings_system_keys.go b/internal/connector/pingfederate/resources/pingfederate_server_settings_system_keys.go index 56c368fc..1779efdd 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings_system_keys.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings_system_keys.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings_system_keys_test.go b/internal/connector/pingfederate/resources/pingfederate_server_settings_system_keys_test.go index c242abbc..2da30338 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings_system_keys_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings_system_keys_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateServerSettingsSystemKeysExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_server_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_server_settings_test.go index 868ede60..dca0856d 100644 --- a/internal/connector/pingfederate/resources/pingfederate_server_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_server_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateServerSettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_session_application_policy.go b/internal/connector/pingfederate/resources/pingfederate_session_application_policy.go index 29cdcbca..37839d7a 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_application_policy.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_application_policy.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 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 a2ae9549..f9ec120c 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_application_policy_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_application_policy_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateSessionApplicationPolicyExport(t *testing.T) { 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 e20eba93..7094ada9 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_authentication_policies_global.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 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 0dac5d35..5109915a 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 @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateSessionAuthenticationPoliciesGlobalExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_session_settings.go b/internal/connector/pingfederate/resources/pingfederate_session_settings.go index a7dc5c62..5fc993ed 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_settings.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_session_settings_test.go b/internal/connector/pingfederate/resources/pingfederate_session_settings_test.go index 67cd14c9..cddb90ce 100644 --- a/internal/connector/pingfederate/resources/pingfederate_session_settings_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_session_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateSessionSettingsExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_sp_authentication_policy_contract_mapping.go b/internal/connector/pingfederate/resources/pingfederate_sp_authentication_policy_contract_mapping.go index eeda75da..a70ab7f8 100644 --- a/internal/connector/pingfederate/resources/pingfederate_sp_authentication_policy_contract_mapping.go +++ b/internal/connector/pingfederate/resources/pingfederate_sp_authentication_policy_contract_mapping.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_sp_authentication_policy_contract_mapping_test.go b/internal/connector/pingfederate/resources/pingfederate_sp_authentication_policy_contract_mapping_test.go index e66a1375..b000916d 100644 --- a/internal/connector/pingfederate/resources/pingfederate_sp_authentication_policy_contract_mapping_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_sp_authentication_policy_contract_mapping_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateSPAuthenticationPolicyContractMappingExport(t *testing.T) { diff --git a/internal/connector/pingfederate/resources/pingfederate_virtual_host_names.go b/internal/connector/pingfederate/resources/pingfederate_virtual_host_names.go index 926ebfd4..51f1ecd1 100644 --- a/internal/connector/pingfederate/resources/pingfederate_virtual_host_names.go +++ b/internal/connector/pingfederate/resources/pingfederate_virtual_host_names.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingfederate/resources/pingfederate_virtual_host_names_test.go b/internal/connector/pingfederate/resources/pingfederate_virtual_host_names_test.go index 5db3d6f8..cfc18661 100644 --- a/internal/connector/pingfederate/resources/pingfederate_virtual_host_names_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_virtual_host_names_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingfederate/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingfederate/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPingFederateVirtualHostNamesExport(t *testing.T) { diff --git a/internal/connector/pingone/mfa/pingone_mfa_connector.go b/internal/connector/pingone/mfa/pingone_mfa_connector.go index ed17a3b9..906b98ba 100644 --- a/internal/connector/pingone/mfa/pingone_mfa_connector.go +++ b/internal/connector/pingone/mfa/pingone_mfa_connector.go @@ -4,10 +4,10 @@ import ( "context" pingoneGoClient "github.com/patrickcping/pingone-go-sdk-v2/pingone" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/connector/pingone/mfa/resources" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/connector/pingone/mfa/resources" + "github.com/pingidentity/pingcli/internal/logger" ) const ( diff --git a/internal/connector/pingone/mfa/pingone_mfa_connector_test.go b/internal/connector/pingone/mfa/pingone_mfa_connector_test.go index db6ef7f6..0ece684e 100644 --- a/internal/connector/pingone/mfa/pingone_mfa_connector_test.go +++ b/internal/connector/pingone/mfa/pingone_mfa_connector_test.go @@ -3,10 +3,10 @@ package mfa_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/mfa/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_terraform" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/mfa/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_terraform" ) func TestMFATerraformPlan(t *testing.T) { diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential.go b/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential.go index 3e36b8a1..d86e8b8e 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential_test.go b/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential_test.go index 21c1607e..5f01dfe9 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential_test.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/mfa/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/mfa/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestMFAApplicationPushCredentialExport(t *testing.T) { diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy.go b/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy.go index 1209bd84..4bc69213 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy_test.go b/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy_test.go index 39d9b90a..e5c33403 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy_test.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/mfa/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/mfa/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestMFAPolicyExport(t *testing.T) { diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy.go b/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy.go index 2298e2b4..10f28ea3 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy_test.go b/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy_test.go index 2efd55c9..31ed48f8 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy_test.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/mfa/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/mfa/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestMFAFido2PolicyExport(t *testing.T) { diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_settings.go b/internal/connector/pingone/mfa/resources/pingone_mfa_settings.go index 9ef1fb88..0362207d 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_settings.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_settings_test.go b/internal/connector/pingone/mfa/resources/pingone_mfa_settings_test.go index 647244aa..5387a5ce 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_settings_test.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/mfa/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/mfa/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestMFASettingsExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/pingone_platform_connector.go b/internal/connector/pingone/platform/pingone_platform_connector.go index f588903b..7855b516 100644 --- a/internal/connector/pingone/platform/pingone_platform_connector.go +++ b/internal/connector/pingone/platform/pingone_platform_connector.go @@ -4,10 +4,10 @@ import ( "context" pingoneGoClient "github.com/patrickcping/pingone-go-sdk-v2/pingone" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/logger" ) const ( diff --git a/internal/connector/pingone/platform/pingone_platform_connector_test.go b/internal/connector/pingone/platform/pingone_platform_connector_test.go index 2caa80cc..cba53a05 100644 --- a/internal/connector/pingone/platform/pingone_platform_connector_test.go +++ b/internal/connector/pingone/platform/pingone_platform_connector_test.go @@ -3,10 +3,10 @@ package platform_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_terraform" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_terraform" ) func TestPlatformTerraformPlan(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_agreement.go b/internal/connector/pingone/platform/resources/pingone_agreement.go index 41c5349b..639b143b 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_enable.go b/internal/connector/pingone/platform/resources/pingone_agreement_enable.go index 1f8e6a58..d26669a9 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_enable.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_enable.go @@ -3,8 +3,8 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/logger" ) // Verify that the resource satisfies the exportable resource interface diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_enable_test.go b/internal/connector/pingone/platform/resources/pingone_agreement_enable_test.go index 2e8940e3..556e3c55 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_enable_test.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_enable_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestAgreementEnableExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization.go index 9e1b67fc..dbe6334c 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable.go index 6117ac5c..cefef7f6 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable.go @@ -3,8 +3,8 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/logger" ) // Verify that the resource satisfies the exportable resource interface diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable_test.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable_test.go index 5308b4ff..404860d0 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable_test.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestAgreementLocalizationEnableExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision.go index 74667da3..89134875 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision_test.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision_test.go index 7b462199..29c8f512 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision_test.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestAgreementLocalizationRevisionExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization_test.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization_test.go index b4d1082b..5ad34b60 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization_test.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestAgreementLocalizationExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_test.go b/internal/connector/pingone/platform/resources/pingone_agreement_test.go index f65c66ff..e655b8c8 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_test.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestAgreementExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_branding_settings.go b/internal/connector/pingone/platform/resources/pingone_branding_settings.go index 3d0da837..2afe2cc1 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_settings.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_branding_settings_test.go b/internal/connector/pingone/platform/resources/pingone_branding_settings_test.go index 466485f0..37211710 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_settings_test.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestBrandingSettingsExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_branding_theme.go b/internal/connector/pingone/platform/resources/pingone_branding_theme.go index cf1a6757..0204924a 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_theme.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_theme.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_branding_theme_default.go b/internal/connector/pingone/platform/resources/pingone_branding_theme_default.go index 33e9ba4c..0f501d66 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_theme_default.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_theme_default.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_branding_theme_default_test.go b/internal/connector/pingone/platform/resources/pingone_branding_theme_default_test.go index 4258b0a0..95cafb14 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_theme_default_test.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_theme_default_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestBrandingThemeDefaultExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_branding_theme_test.go b/internal/connector/pingone/platform/resources/pingone_branding_theme_test.go index d1a58596..1dea4362 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_theme_test.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_theme_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestBrandingThemeExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_certificate.go b/internal/connector/pingone/platform/resources/pingone_certificate.go index e7de3013..33e87c33 100644 --- a/internal/connector/pingone/platform/resources/pingone_certificate.go +++ b/internal/connector/pingone/platform/resources/pingone_certificate.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_certificate_test.go b/internal/connector/pingone/platform/resources/pingone_certificate_test.go index 3f07391d..fda5dd95 100644 --- a/internal/connector/pingone/platform/resources/pingone_certificate_test.go +++ b/internal/connector/pingone/platform/resources/pingone_certificate_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestCertificateExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_custom_domain.go b/internal/connector/pingone/platform/resources/pingone_custom_domain.go index a5edcd0b..ceed1155 100644 --- a/internal/connector/pingone/platform/resources/pingone_custom_domain.go +++ b/internal/connector/pingone/platform/resources/pingone_custom_domain.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_custom_domain_test.go b/internal/connector/pingone/platform/resources/pingone_custom_domain_test.go index 5795f468..8eca9d7a 100644 --- a/internal/connector/pingone/platform/resources/pingone_custom_domain_test.go +++ b/internal/connector/pingone/platform/resources/pingone_custom_domain_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestCustomDomainExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_environment.go b/internal/connector/pingone/platform/resources/pingone_environment.go index d86f917f..23e6abb9 100644 --- a/internal/connector/pingone/platform/resources/pingone_environment.go +++ b/internal/connector/pingone/platform/resources/pingone_environment.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_environment_test.go b/internal/connector/pingone/platform/resources/pingone_environment_test.go index 526105f7..ceb86f1a 100644 --- a/internal/connector/pingone/platform/resources/pingone_environment_test.go +++ b/internal/connector/pingone/platform/resources/pingone_environment_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestEnvironmentExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_form.go b/internal/connector/pingone/platform/resources/pingone_form.go index 34a0b7f3..9a142d11 100644 --- a/internal/connector/pingone/platform/resources/pingone_form.go +++ b/internal/connector/pingone/platform/resources/pingone_form.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_form_test.go b/internal/connector/pingone/platform/resources/pingone_form_test.go index d0760373..1a4fdd2c 100644 --- a/internal/connector/pingone/platform/resources/pingone_form_test.go +++ b/internal/connector/pingone/platform/resources/pingone_form_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestFormExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2.go b/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2.go index d90b48a2..a8b9ccdf 100644 --- a/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2.go +++ b/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2_test.go b/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2_test.go index 5ddf7cd1..30d413ac 100644 --- a/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2_test.go +++ b/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestFormRecaptchaV2Export(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_gateway.go b/internal/connector/pingone/platform/resources/pingone_gateway.go index 97198b49..83d491ed 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_gateway_credential.go b/internal/connector/pingone/platform/resources/pingone_gateway_credential.go index 2b383759..7c65788e 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway_credential.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway_credential.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_gateway_credential_test.go b/internal/connector/pingone/platform/resources/pingone_gateway_credential_test.go index 90401d56..fea3a203 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway_credential_test.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway_credential_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestGatewayCredentialExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment.go b/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment.go index 92714099..46a51529 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment_test.go b/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment_test.go index 6c5c69c5..e6f3f2e7 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment_test.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestGatewayRoleAssignmentExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_gateway_test.go b/internal/connector/pingone/platform/resources/pingone_gateway_test.go index b56e88c0..8a28ac37 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway_test.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestGatewayExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan.go b/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan.go index 54d533f4..ecc2ba7d 100644 --- a/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan.go +++ b/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan_test.go b/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan_test.go index 7d4e994d..128d3339 100644 --- a/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan_test.go +++ b/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestIdentityPropagationPlanExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_key.go b/internal/connector/pingone/platform/resources/pingone_key.go index 05f0f2cd..5c26bfd3 100644 --- a/internal/connector/pingone/platform/resources/pingone_key.go +++ b/internal/connector/pingone/platform/resources/pingone_key.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_key_rotation_policy.go b/internal/connector/pingone/platform/resources/pingone_key_rotation_policy.go index 5b3770a1..d52b1bf0 100644 --- a/internal/connector/pingone/platform/resources/pingone_key_rotation_policy.go +++ b/internal/connector/pingone/platform/resources/pingone_key_rotation_policy.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_key_rotation_policy_test.go b/internal/connector/pingone/platform/resources/pingone_key_rotation_policy_test.go index e461b87f..2bfac4cc 100644 --- a/internal/connector/pingone/platform/resources/pingone_key_rotation_policy_test.go +++ b/internal/connector/pingone/platform/resources/pingone_key_rotation_policy_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestKeyRotationPolicyExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_key_test.go b/internal/connector/pingone/platform/resources/pingone_key_test.go index 56d34072..5e830bce 100644 --- a/internal/connector/pingone/platform/resources/pingone_key_test.go +++ b/internal/connector/pingone/platform/resources/pingone_key_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestKeyExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_language.go b/internal/connector/pingone/platform/resources/pingone_language.go index f1be2959..f8a6fc94 100644 --- a/internal/connector/pingone/platform/resources/pingone_language.go +++ b/internal/connector/pingone/platform/resources/pingone_language.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_language_test.go b/internal/connector/pingone/platform/resources/pingone_language_test.go index c29775ea..a7403db0 100644 --- a/internal/connector/pingone/platform/resources/pingone_language_test.go +++ b/internal/connector/pingone/platform/resources/pingone_language_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestLanguageExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_language_update.go b/internal/connector/pingone/platform/resources/pingone_language_update.go index 8225619b..8651774a 100644 --- a/internal/connector/pingone/platform/resources/pingone_language_update.go +++ b/internal/connector/pingone/platform/resources/pingone_language_update.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_language_update_test.go b/internal/connector/pingone/platform/resources/pingone_language_update_test.go index e3eaac27..b38a778f 100644 --- a/internal/connector/pingone/platform/resources/pingone_language_update_test.go +++ b/internal/connector/pingone/platform/resources/pingone_language_update_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestLanguageUpdateExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_notification_policy.go b/internal/connector/pingone/platform/resources/pingone_notification_policy.go index 4038b75e..077b4d96 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_policy.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_policy.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_notification_policy_test.go b/internal/connector/pingone/platform/resources/pingone_notification_policy_test.go index 230281d1..c4aef5d7 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_policy_test.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_policy_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestNotificationPolicyExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_notification_settings.go b/internal/connector/pingone/platform/resources/pingone_notification_settings.go index d54a99ba..ad4fc3d1 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_settings.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_settings.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_notification_settings_email.go b/internal/connector/pingone/platform/resources/pingone_notification_settings_email.go index 22523a95..80db2417 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_settings_email.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_settings_email.go @@ -1,9 +1,9 @@ package resources import ( - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_notification_settings_email_test.go b/internal/connector/pingone/platform/resources/pingone_notification_settings_email_test.go index ab923d8e..564453cb 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_settings_email_test.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_settings_email_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestNotificationSettingsEmailExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_notification_settings_test.go b/internal/connector/pingone/platform/resources/pingone_notification_settings_test.go index 389776e2..4ff98a11 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_settings_test.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_settings_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestNotificationSettingsExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_notification_template_content.go b/internal/connector/pingone/platform/resources/pingone_notification_template_content.go index 5919c3dd..408f6955 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_template_content.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_template_content.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_notification_template_content_test.go b/internal/connector/pingone/platform/resources/pingone_notification_template_content_test.go index fa6810ea..f14960d1 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_template_content_test.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_template_content_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestNotificationTemplateContentExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings.go b/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings.go index 8df7e041..0db835ef 100644 --- a/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings.go +++ b/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings_test.go b/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings_test.go index e77582cf..07ab6bfd 100644 --- a/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings_test.go +++ b/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPhoneDeliverySettingsExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_system_application.go b/internal/connector/pingone/platform/resources/pingone_system_application.go index 76a13c20..783d0931 100644 --- a/internal/connector/pingone/platform/resources/pingone_system_application.go +++ b/internal/connector/pingone/platform/resources/pingone_system_application.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_system_application_test.go b/internal/connector/pingone/platform/resources/pingone_system_application_test.go index 9556a76d..7676f9ee 100644 --- a/internal/connector/pingone/platform/resources/pingone_system_application_test.go +++ b/internal/connector/pingone/platform/resources/pingone_system_application_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestSystemApplicationExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_trusted_email_address.go b/internal/connector/pingone/platform/resources/pingone_trusted_email_address.go index ac1dbd30..72193c80 100644 --- a/internal/connector/pingone/platform/resources/pingone_trusted_email_address.go +++ b/internal/connector/pingone/platform/resources/pingone_trusted_email_address.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_trusted_email_address_test.go b/internal/connector/pingone/platform/resources/pingone_trusted_email_address_test.go index b3f707b1..409a9d50 100644 --- a/internal/connector/pingone/platform/resources/pingone_trusted_email_address_test.go +++ b/internal/connector/pingone/platform/resources/pingone_trusted_email_address_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestTrustedEmailAddressExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_trusted_email_domain.go b/internal/connector/pingone/platform/resources/pingone_trusted_email_domain.go index 39a5704d..3fc78735 100644 --- a/internal/connector/pingone/platform/resources/pingone_trusted_email_domain.go +++ b/internal/connector/pingone/platform/resources/pingone_trusted_email_domain.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_trusted_email_domain_test.go b/internal/connector/pingone/platform/resources/pingone_trusted_email_domain_test.go index f64fd70f..c47cb0d8 100644 --- a/internal/connector/pingone/platform/resources/pingone_trusted_email_domain_test.go +++ b/internal/connector/pingone/platform/resources/pingone_trusted_email_domain_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestTrustedEmailDomainExport(t *testing.T) { diff --git a/internal/connector/pingone/platform/resources/pingone_webhook.go b/internal/connector/pingone/platform/resources/pingone_webhook.go index 77acf556..17367300 100644 --- a/internal/connector/pingone/platform/resources/pingone_webhook.go +++ b/internal/connector/pingone/platform/resources/pingone_webhook.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/platform/resources/pingone_webhook_test.go b/internal/connector/pingone/platform/resources/pingone_webhook_test.go index 9732e4af..913f364f 100644 --- a/internal/connector/pingone/platform/resources/pingone_webhook_test.go +++ b/internal/connector/pingone/platform/resources/pingone_webhook_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/platform/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/platform/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestWebhookExport(t *testing.T) { diff --git a/internal/connector/pingone/protect/pingone_protect_connector.go b/internal/connector/pingone/protect/pingone_protect_connector.go index 71174806..771e190a 100644 --- a/internal/connector/pingone/protect/pingone_protect_connector.go +++ b/internal/connector/pingone/protect/pingone_protect_connector.go @@ -4,10 +4,10 @@ import ( "context" pingoneGoClient "github.com/patrickcping/pingone-go-sdk-v2/pingone" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/connector/pingone/protect/resources" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/connector/pingone/protect/resources" + "github.com/pingidentity/pingcli/internal/logger" ) const ( diff --git a/internal/connector/pingone/protect/pingone_protect_connector_test.go b/internal/connector/pingone/protect/pingone_protect_connector_test.go index 65690eb4..b42595e7 100644 --- a/internal/connector/pingone/protect/pingone_protect_connector_test.go +++ b/internal/connector/pingone/protect/pingone_protect_connector_test.go @@ -3,10 +3,10 @@ package protect_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/protect/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_terraform" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/protect/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_terraform" ) func TestProtectTerraformPlan(t *testing.T) { diff --git a/internal/connector/pingone/protect/resources/pingone_risk_policy.go b/internal/connector/pingone/protect/resources/pingone_risk_policy.go index 7d927832..35f996aa 100644 --- a/internal/connector/pingone/protect/resources/pingone_risk_policy.go +++ b/internal/connector/pingone/protect/resources/pingone_risk_policy.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/protect/resources/pingone_risk_policy_test.go b/internal/connector/pingone/protect/resources/pingone_risk_policy_test.go index c1f1cf12..051c5944 100644 --- a/internal/connector/pingone/protect/resources/pingone_risk_policy_test.go +++ b/internal/connector/pingone/protect/resources/pingone_risk_policy_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/protect/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/protect/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestRiskPolicyExport(t *testing.T) { diff --git a/internal/connector/pingone/protect/resources/pingone_risk_predictor.go b/internal/connector/pingone/protect/resources/pingone_risk_predictor.go index 22cf333c..9313a2e7 100644 --- a/internal/connector/pingone/protect/resources/pingone_risk_predictor.go +++ b/internal/connector/pingone/protect/resources/pingone_risk_predictor.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/risk" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/protect/resources/pingone_risk_predictor_test.go b/internal/connector/pingone/protect/resources/pingone_risk_predictor_test.go index ee9bedbf..53c9d281 100644 --- a/internal/connector/pingone/protect/resources/pingone_risk_predictor_test.go +++ b/internal/connector/pingone/protect/resources/pingone_risk_predictor_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/protect/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/protect/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestRiskPredictorExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/pingone_sso_connector.go b/internal/connector/pingone/sso/pingone_sso_connector.go index 6123bb03..0d715973 100644 --- a/internal/connector/pingone/sso/pingone_sso_connector.go +++ b/internal/connector/pingone/sso/pingone_sso_connector.go @@ -4,10 +4,10 @@ import ( "context" pingoneGoClient "github.com/patrickcping/pingone-go-sdk-v2/pingone" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/logger" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/logger" ) const ( diff --git a/internal/connector/pingone/sso/pingone_sso_connector_test.go b/internal/connector/pingone/sso/pingone_sso_connector_test.go index 82eb42f7..86b350dd 100644 --- a/internal/connector/pingone/sso/pingone_sso_connector_test.go +++ b/internal/connector/pingone/sso/pingone_sso_connector_test.go @@ -3,10 +3,10 @@ package sso_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_terraform" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_terraform" ) func TestSSOTerraformPlan(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_application.go b/internal/connector/pingone/sso/resources/pingone_application.go index 895d9db7..2baa856f 100644 --- a/internal/connector/pingone/sso/resources/pingone_application.go +++ b/internal/connector/pingone/sso/resources/pingone_application.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping.go b/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping.go index c7726c64..65a17fdb 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping.go +++ b/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping_test.go b/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping_test.go index 14e4e5f0..beeb7942 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping_test.go +++ b/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestApplicationAttributeMappingExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment.go b/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment.go index 406e6545..29da908a 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment.go +++ b/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment_test.go b/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment_test.go index 3e036955..6834f0e5 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment_test.go +++ b/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestApplicationFlowPolicyAssignmentExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_application_resource_grant.go b/internal/connector/pingone/sso/resources/pingone_application_resource_grant.go index 43c29ab4..97d10f1c 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_resource_grant.go +++ b/internal/connector/pingone/sso/resources/pingone_application_resource_grant.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_application_resource_grant_test.go b/internal/connector/pingone/sso/resources/pingone_application_resource_grant_test.go index 5d0f67fa..c688cdf9 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_resource_grant_test.go +++ b/internal/connector/pingone/sso/resources/pingone_application_resource_grant_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestApplicationResourceGrantExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_application_role_assignment.go b/internal/connector/pingone/sso/resources/pingone_application_role_assignment.go index 8f82dc53..0445d29c 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_role_assignment.go +++ b/internal/connector/pingone/sso/resources/pingone_application_role_assignment.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_application_role_assignment_test.go b/internal/connector/pingone/sso/resources/pingone_application_role_assignment_test.go index 0feb2775..ea1ed3eb 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_role_assignment_test.go +++ b/internal/connector/pingone/sso/resources/pingone_application_role_assignment_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestApplicationRoleAssignmentExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_application_secret.go b/internal/connector/pingone/sso/resources/pingone_application_secret.go index 63a2b794..6441c86a 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_secret.go +++ b/internal/connector/pingone/sso/resources/pingone_application_secret.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_application_secret_test.go b/internal/connector/pingone/sso/resources/pingone_application_secret_test.go index 812d175e..73413b46 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_secret_test.go +++ b/internal/connector/pingone/sso/resources/pingone_application_secret_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestApplicationSecretExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment.go b/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment.go index 2599e1ea..24d76ba6 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment.go +++ b/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment_test.go b/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment_test.go index aaa58abf..e62ecbab 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment_test.go +++ b/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestApplicationSignOnPolicyAssignmentExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_application_test.go b/internal/connector/pingone/sso/resources/pingone_application_test.go index 7785780f..716e79af 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_test.go +++ b/internal/connector/pingone/sso/resources/pingone_application_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestApplicationExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_group.go b/internal/connector/pingone/sso/resources/pingone_group.go index 884b155b..2701bc5b 100644 --- a/internal/connector/pingone/sso/resources/pingone_group.go +++ b/internal/connector/pingone/sso/resources/pingone_group.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_group_nesting.go b/internal/connector/pingone/sso/resources/pingone_group_nesting.go index 80058ee3..a0952dba 100644 --- a/internal/connector/pingone/sso/resources/pingone_group_nesting.go +++ b/internal/connector/pingone/sso/resources/pingone_group_nesting.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_group_nesting_test.go b/internal/connector/pingone/sso/resources/pingone_group_nesting_test.go index c548b80b..8c9d0112 100644 --- a/internal/connector/pingone/sso/resources/pingone_group_nesting_test.go +++ b/internal/connector/pingone/sso/resources/pingone_group_nesting_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestGroupNestingExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_group_role_assignment.go b/internal/connector/pingone/sso/resources/pingone_group_role_assignment.go index 058656b4..ca836972 100644 --- a/internal/connector/pingone/sso/resources/pingone_group_role_assignment.go +++ b/internal/connector/pingone/sso/resources/pingone_group_role_assignment.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_group_role_assignment_test.go b/internal/connector/pingone/sso/resources/pingone_group_role_assignment_test.go index cdf97bbd..e6ad74d0 100644 --- a/internal/connector/pingone/sso/resources/pingone_group_role_assignment_test.go +++ b/internal/connector/pingone/sso/resources/pingone_group_role_assignment_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestGroupRoleAssignmentExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_group_test.go b/internal/connector/pingone/sso/resources/pingone_group_test.go index 330434d8..3e654e5e 100644 --- a/internal/connector/pingone/sso/resources/pingone_group_test.go +++ b/internal/connector/pingone/sso/resources/pingone_group_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestGroupExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_identity_provider.go b/internal/connector/pingone/sso/resources/pingone_identity_provider.go index 3f1ae11c..c6bbb750 100644 --- a/internal/connector/pingone/sso/resources/pingone_identity_provider.go +++ b/internal/connector/pingone/sso/resources/pingone_identity_provider.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute.go b/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute.go index 990a3181..06c4e364 100644 --- a/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute.go +++ b/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute_test.go b/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute_test.go index c8d0757d..a989b488 100644 --- a/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute_test.go +++ b/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestIdentityProviderAttributeExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_identity_provider_test.go b/internal/connector/pingone/sso/resources/pingone_identity_provider_test.go index bb868c61..73b023f4 100644 --- a/internal/connector/pingone/sso/resources/pingone_identity_provider_test.go +++ b/internal/connector/pingone/sso/resources/pingone_identity_provider_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestIdentityProviderExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_password_policy.go b/internal/connector/pingone/sso/resources/pingone_password_policy.go index 74d06523..c23f87e9 100644 --- a/internal/connector/pingone/sso/resources/pingone_password_policy.go +++ b/internal/connector/pingone/sso/resources/pingone_password_policy.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_password_policy_test.go b/internal/connector/pingone/sso/resources/pingone_password_policy_test.go index 4e48244d..4554330c 100644 --- a/internal/connector/pingone/sso/resources/pingone_password_policy_test.go +++ b/internal/connector/pingone/sso/resources/pingone_password_policy_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPasswordPolicyExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_population.go b/internal/connector/pingone/sso/resources/pingone_population.go index 38acfb08..6e35bc13 100644 --- a/internal/connector/pingone/sso/resources/pingone_population.go +++ b/internal/connector/pingone/sso/resources/pingone_population.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_population_default.go b/internal/connector/pingone/sso/resources/pingone_population_default.go index 8a26d279..990416fe 100644 --- a/internal/connector/pingone/sso/resources/pingone_population_default.go +++ b/internal/connector/pingone/sso/resources/pingone_population_default.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_population_default_test.go b/internal/connector/pingone/sso/resources/pingone_population_default_test.go index 405ab275..56862023 100644 --- a/internal/connector/pingone/sso/resources/pingone_population_default_test.go +++ b/internal/connector/pingone/sso/resources/pingone_population_default_test.go @@ -3,9 +3,9 @@ package resources_test import ( "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPopulationDefaultExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_population_test.go b/internal/connector/pingone/sso/resources/pingone_population_test.go index 76997b2f..384f2010 100644 --- a/internal/connector/pingone/sso/resources/pingone_population_test.go +++ b/internal/connector/pingone/sso/resources/pingone_population_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestPopulationExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_resource.go b/internal/connector/pingone/sso/resources/pingone_resource.go index 2e325d96..ceadf9e2 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource.go +++ b/internal/connector/pingone/sso/resources/pingone_resource.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_resource_attribute.go b/internal/connector/pingone/sso/resources/pingone_resource_attribute.go index a3f0916d..64f8e702 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_attribute.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_attribute.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_resource_attribute_test.go b/internal/connector/pingone/sso/resources/pingone_resource_attribute_test.go index 634ad209..8c8eb4a5 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_attribute_test.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_attribute_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestResourceAttributeExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope.go b/internal/connector/pingone/sso/resources/pingone_resource_scope.go index ebf56824..27ecc09d 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope_openid.go b/internal/connector/pingone/sso/resources/pingone_resource_scope_openid.go index e80f7a92..c1a7c3e5 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope_openid.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope_openid.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope_openid_test.go b/internal/connector/pingone/sso/resources/pingone_resource_scope_openid_test.go index 1f8fc6d3..a2ac903e 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope_openid_test.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope_openid_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestResourceScopeOpenIdExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api.go b/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api.go index 7958e6f6..e40ed73c 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api.go @@ -5,9 +5,9 @@ import ( "regexp" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api_test.go b/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api_test.go index 18daba04..e8f18cd6 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api_test.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestResourceScopePingOneApiExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope_test.go b/internal/connector/pingone/sso/resources/pingone_resource_scope_test.go index d9df4aea..74bd1bd0 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope_test.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestResourceScopeExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_resource_test.go b/internal/connector/pingone/sso/resources/pingone_resource_test.go index f814f00b..49ad7154 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_test.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestResourceExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_schema_attribute.go b/internal/connector/pingone/sso/resources/pingone_schema_attribute.go index 8a0c3f1d..d102eb29 100644 --- a/internal/connector/pingone/sso/resources/pingone_schema_attribute.go +++ b/internal/connector/pingone/sso/resources/pingone_schema_attribute.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_schema_attribute_test.go b/internal/connector/pingone/sso/resources/pingone_schema_attribute_test.go index 14881e06..8534e55f 100644 --- a/internal/connector/pingone/sso/resources/pingone_schema_attribute_test.go +++ b/internal/connector/pingone/sso/resources/pingone_schema_attribute_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestSchemaAttributeExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_sign_on_policy.go b/internal/connector/pingone/sso/resources/pingone_sign_on_policy.go index f8c19ea7..48608d16 100644 --- a/internal/connector/pingone/sso/resources/pingone_sign_on_policy.go +++ b/internal/connector/pingone/sso/resources/pingone_sign_on_policy.go @@ -3,9 +3,9 @@ package resources import ( "fmt" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action.go b/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action.go index 92e73f92..26e2bae0 100644 --- a/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action.go +++ b/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/patrickcping/pingone-go-sdk-v2/management" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/logger" + "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 diff --git a/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action_test.go b/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action_test.go index 687be947..ea0b50bd 100644 --- a/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action_test.go +++ b/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestSignOnPolicyActionExport(t *testing.T) { diff --git a/internal/connector/pingone/sso/resources/pingone_sign_on_policy_test.go b/internal/connector/pingone/sso/resources/pingone_sign_on_policy_test.go index 136ab840..f50dd7a1 100644 --- a/internal/connector/pingone/sso/resources/pingone_sign_on_policy_test.go +++ b/internal/connector/pingone/sso/resources/pingone_sign_on_policy_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/pingone/sso/resources" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/pingone/sso/resources" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func TestSignOnPolicyExport(t *testing.T) { diff --git a/internal/customtypes/bool_test.go b/internal/customtypes/bool_test.go index b4214184..c1a98235 100644 --- a/internal/customtypes/bool_test.go +++ b/internal/customtypes/bool_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test Bool Set function diff --git a/internal/customtypes/export_format_test.go b/internal/customtypes/export_format_test.go index 296beefa..bef0c91f 100644 --- a/internal/customtypes/export_format_test.go +++ b/internal/customtypes/export_format_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test ExportFormat Set function diff --git a/internal/customtypes/export_services_test.go b/internal/customtypes/export_services_test.go index 4a816008..6d780f57 100644 --- a/internal/customtypes/export_services_test.go +++ b/internal/customtypes/export_services_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test ExportServices Set function diff --git a/internal/customtypes/http_method.go b/internal/customtypes/http_method.go index 5656d3a3..ccc3a849 100644 --- a/internal/customtypes/http_method.go +++ b/internal/customtypes/http_method.go @@ -21,7 +21,7 @@ type HTTPMethod string // Verify that the custom type satisfies the pflag.Value interface var _ pflag.Value = (*HTTPMethod)(nil) -// Implement pflag.Value interface for custom type in cobra pingctl-output parameter +// Implement pflag.Value interface for custom type in cobra pingcli-output parameter func (hm *HTTPMethod) Set(httpMethod string) error { if hm == nil { diff --git a/internal/customtypes/http_method_test.go b/internal/customtypes/http_method_test.go index c8212fb3..049f5fa0 100644 --- a/internal/customtypes/http_method_test.go +++ b/internal/customtypes/http_method_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test HTTP Method Set function diff --git a/internal/customtypes/int_test.go b/internal/customtypes/int_test.go index 8c5f3756..b955bb08 100644 --- a/internal/customtypes/int_test.go +++ b/internal/customtypes/int_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test Int Set function diff --git a/internal/customtypes/output_format.go b/internal/customtypes/output_format.go index 66ef2c45..1aa8b05f 100644 --- a/internal/customtypes/output_format.go +++ b/internal/customtypes/output_format.go @@ -18,7 +18,7 @@ type OutputFormat string // Verify that the custom type satisfies the pflag.Value interface var _ pflag.Value = (*OutputFormat)(nil) -// Implement pflag.Value interface for custom type in cobra pingctl-output parameter +// Implement pflag.Value interface for custom type in cobra pingcli-output parameter func (o *OutputFormat) Set(outputFormat string) error { if o == nil { diff --git a/internal/customtypes/output_format_test.go b/internal/customtypes/output_format_test.go index 693e8ac7..ab40b20a 100644 --- a/internal/customtypes/output_format_test.go +++ b/internal/customtypes/output_format_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test OutputFormat Set function diff --git a/internal/customtypes/pingfederate_auth_type_test.go b/internal/customtypes/pingfederate_auth_type_test.go index c6db8034..97fb1b17 100644 --- a/internal/customtypes/pingfederate_auth_type_test.go +++ b/internal/customtypes/pingfederate_auth_type_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test PingfederateAuthType Set function diff --git a/internal/customtypes/pingone_auth_type_test.go b/internal/customtypes/pingone_auth_type_test.go index 3aba300a..27ef2c97 100644 --- a/internal/customtypes/pingone_auth_type_test.go +++ b/internal/customtypes/pingone_auth_type_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test Pingone Authentication Type Set function diff --git a/internal/customtypes/pingone_region_code_test.go b/internal/customtypes/pingone_region_code_test.go index 3883ec8e..f59e12c6 100644 --- a/internal/customtypes/pingone_region_code_test.go +++ b/internal/customtypes/pingone_region_code_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test PingOneRegion Set function diff --git a/internal/customtypes/request_services_test.go b/internal/customtypes/request_services_test.go index dfe0d1fb..97211617 100644 --- a/internal/customtypes/request_services_test.go +++ b/internal/customtypes/request_services_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test Request Services Set function diff --git a/internal/customtypes/string_slice_test.go b/internal/customtypes/string_slice_test.go index e0d22ef3..ed1ec424 100644 --- a/internal/customtypes/string_slice_test.go +++ b/internal/customtypes/string_slice_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test StringSlice Set function diff --git a/internal/customtypes/uuid_test.go b/internal/customtypes/uuid_test.go index e6b2a6f9..b1f7a4b1 100644 --- a/internal/customtypes/uuid_test.go +++ b/internal/customtypes/uuid_test.go @@ -3,8 +3,8 @@ package customtypes_test import ( "testing" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) // Test UUID Set function diff --git a/internal/input/input_test.go b/internal/input/input_test.go index 63337bf1..3c954627 100644 --- a/internal/input/input_test.go +++ b/internal/input/input_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/pingidentity/pingctl/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils" ) func mockValidateFunc(input string) error { diff --git a/internal/logger/logger.go b/internal/logger/logger.go index e2347a67..de0f4196 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -20,8 +20,8 @@ func Get() zerolog.Logger { once.Do(func() { // Viper config is not initialized yet, so read environment variables directly - logLevelEnv := os.Getenv("PINGCTL_LOG_LEVEL") - logPathEnv := os.Getenv("PINGCTL_LOG_PATH") + logLevelEnv := os.Getenv("PINGCLI_LOG_LEVEL") + logPathEnv := os.Getenv("PINGCLI_LOG_PATH") var logLevel zerolog.Level @@ -48,7 +48,7 @@ func Get() zerolog.Logger { var output io.Writer - // Handle log file creation when PINGCTL_LOG_PATH is defined + // Handle log file creation when PINGCLI_LOG_PATH is defined if logPathEnv != "" && logLevel != zerolog.Disabled { var err error diff --git a/internal/output/output.go b/internal/output/output.go index a8a5c82a..607258fb 100644 --- a/internal/output/output.go +++ b/internal/output/output.go @@ -6,10 +6,10 @@ import ( "strconv" "github.com/fatih/color" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" - "github.com/pingidentity/pingctl/internal/logger" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" + "github.com/pingidentity/pingcli/internal/logger" + "github.com/pingidentity/pingcli/internal/profiles" ) var ( diff --git a/internal/profiles/validate.go b/internal/profiles/validate.go index d63885e0..a712a13b 100644 --- a/internal/profiles/validate.go +++ b/internal/profiles/validate.go @@ -5,9 +5,9 @@ import ( "slices" "strings" - "github.com/pingidentity/pingctl/internal/configuration" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/configuration" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/customtypes" "github.com/spf13/viper" ) @@ -23,7 +23,7 @@ func Validate() error { // Make sure selected active profile is in the configuration file activeProfile := GetMainConfig().ActiveProfile().Name() if !slices.Contains(profileNames, activeProfile) { - return fmt.Errorf("failed to validate pingctl configuration: active profile '%s' not found in configuration file %s", activeProfile, GetMainConfig().ViperInstance().ConfigFileUsed()) + return fmt.Errorf("failed to validate pingcli configuration: active profile '%s' not found in configuration file %s", activeProfile, GetMainConfig().ViperInstance().ConfigFileUsed()) } // for each profile key, set the profile based on mainViper.Sub() and validate the profile @@ -31,11 +31,11 @@ func Validate() error { subViper := GetMainConfig().ViperInstance().Sub(pName) if err := validateProfileKeys(pName, subViper); err != nil { - return fmt.Errorf("failed to validate pingctl configuration: %v", err) + return fmt.Errorf("failed to validate pingcli configuration: %v", err) } if err := validateProfileValues(pName, subViper); err != nil { - return fmt.Errorf("failed to validate pingctl configuration: %v", err) + return fmt.Errorf("failed to validate pingcli configuration: %v", err) } } diff --git a/internal/profiles/validate_test.go b/internal/profiles/validate_test.go index 33bcb9e4..aa27f6e5 100644 --- a/internal/profiles/validate_test.go +++ b/internal/profiles/validate_test.go @@ -3,8 +3,8 @@ package profiles_test import ( "testing" - "github.com/pingidentity/pingctl/internal/profiles" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/profiles" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) // Test Validate function @@ -55,7 +55,7 @@ func TestValidateInvalidBool(t *testing.T) { fileContents := `activeProfile: default default: description: "default description" - pingctl: + pingcli: color: invalid` testutils_viper.InitVipersCustomFile(t, fileContents) @@ -71,7 +71,7 @@ func TestValidateInvalidOutputFormat(t *testing.T) { fileContents := `activeProfile: default default: description: "default description" - pingctl: + pingcli: outputFormat: invalid` testutils_viper.InitVipersCustomFile(t, fileContents) diff --git a/internal/profiles/viper.go b/internal/profiles/viper.go index aa3b6c9a..34aa8846 100644 --- a/internal/profiles/viper.go +++ b/internal/profiles/viper.go @@ -17,7 +17,7 @@ import ( "slices" "strings" - "github.com/pingidentity/pingctl/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/configuration/options" "github.com/spf13/viper" "gopkg.in/yaml.v3" ) diff --git a/internal/profiles/viper_test.go b/internal/profiles/viper_test.go index dbc071bf..4a1ea1b9 100644 --- a/internal/profiles/viper_test.go +++ b/internal/profiles/viper_test.go @@ -4,10 +4,10 @@ import ( "slices" "testing" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/profiles" - "github.com/pingidentity/pingctl/internal/testing/testutils" - "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/profiles" + "github.com/pingidentity/pingcli/internal/testing/testutils" + "github.com/pingidentity/pingcli/internal/testing/testutils_viper" "github.com/spf13/viper" ) diff --git a/internal/testing/testutils/utils.go b/internal/testing/testutils/utils.go index f43f9100..013d5ed1 100644 --- a/internal/testing/testutils/utils.go +++ b/internal/testing/testutils/utils.go @@ -11,9 +11,9 @@ import ( "github.com/patrickcping/pingone-go-sdk-v2/management" "github.com/patrickcping/pingone-go-sdk-v2/pingone" - "github.com/pingidentity/pingctl/internal/configuration" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/connector" + "github.com/pingidentity/pingcli/internal/configuration" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/connector" pingfederateGoClient "github.com/pingidentity/pingfederate-go-client/v1210/configurationapi" ) diff --git a/internal/testing/testutils_cobra/cobra_utils.go b/internal/testing/testutils_cobra/cobra_utils.go index 025bfd40..1fada3cb 100644 --- a/internal/testing/testutils_cobra/cobra_utils.go +++ b/internal/testing/testutils_cobra/cobra_utils.go @@ -4,17 +4,17 @@ import ( "bytes" "testing" - "github.com/pingidentity/pingctl/cmd" - "github.com/pingidentity/pingctl/internal/configuration" - testutils_viper "github.com/pingidentity/pingctl/internal/testing/testutils_viper" + "github.com/pingidentity/pingcli/cmd" + "github.com/pingidentity/pingcli/internal/configuration" + testutils_viper "github.com/pingidentity/pingcli/internal/testing/testutils_viper" ) -// ExecutePingctl executes the pingctl command with the provided arguments +// ExecutePingcli executes the pingcli command with the provided arguments // and returns the error if any -func ExecutePingctl(t *testing.T, args ...string) (err error) { +func ExecutePingcli(t *testing.T, args ...string) (err error) { t.Helper() - // Reset options for testing individual executions of pingctl + // Reset options for testing individual executions of pingcli configuration.InitAllOptions() root := cmd.NewRootCommand() @@ -27,13 +27,13 @@ func ExecutePingctl(t *testing.T, args ...string) (err error) { return root.Execute() } -// ExecutePingctlCaptureCobraOutput executes the pingctl command with +// ExecutePingcliCaptureCobraOutput executes the pingcli command with // the provided arguments and returns the output and error if any // Note: The returned output will only contain cobra module specific output // such as usage, help, and cobra errors // It will NOT include internal/output/output.go output // nor with it contain zerolog logs -func ExecutePingctlCaptureCobraOutput(t *testing.T, args ...string) (output string, err error) { +func ExecutePingcliCaptureCobraOutput(t *testing.T, args ...string) (output string, err error) { t.Helper() root := cmd.NewRootCommand() diff --git a/internal/testing/testutils_terraform/terraform_utils.go b/internal/testing/testutils_terraform/terraform_utils.go index dae0a5db..41726d9b 100644 --- a/internal/testing/testutils_terraform/terraform_utils.go +++ b/internal/testing/testutils_terraform/terraform_utils.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/pingidentity/pingctl/internal/connector" - "github.com/pingidentity/pingctl/internal/connector/common" - "github.com/pingidentity/pingctl/internal/customtypes" + "github.com/pingidentity/pingcli/internal/connector" + "github.com/pingidentity/pingcli/internal/connector/common" + "github.com/pingidentity/pingcli/internal/customtypes" ) var ( @@ -160,7 +160,7 @@ func InitPingOneTerraform(t *testing.T) { } provider "pingone" {} -`, os.Getenv("PINGCTL_PINGONE_PROVIDER_VERSION")) +`, os.Getenv("PINGCLI_PINGONE_PROVIDER_VERSION")) // Write main.tf to testing directory mainTFFilepath := filepath.Join(exportDir, "main.tf") @@ -209,13 +209,13 @@ provider "pingfederate" { insecure_trust_all_tls = true x_bypass_external_validation_header = true } -`, os.Getenv("PINGCTL_PINGFEDERATE_PROVIDER_VERSION"), - os.Getenv("PINGCTL_PINGFEDERATE_CLIENT_ID"), - os.Getenv("PINGCTL_PINGFEDERATE_CLIENT_SECRET"), - os.Getenv("PINGCTL_PINGFEDERATE_SCOPES"), - os.Getenv("PINGCTL_PINGFEDERATE_TOKEN_URL"), - os.Getenv("PINGCTL_PINGFEDERATE_HTTPS_HOST"), - os.Getenv("PINGCTL_PINGFEDERATE_ADMIN_API_PATH")) +`, os.Getenv("PINGCLI_PINGFEDERATE_PROVIDER_VERSION"), + os.Getenv("PINGCLI_PINGFEDERATE_CLIENT_ID"), + os.Getenv("PINGCLI_PINGFEDERATE_CLIENT_SECRET"), + os.Getenv("PINGCLI_PINGFEDERATE_SCOPES"), + os.Getenv("PINGCLI_PINGFEDERATE_TOKEN_URL"), + os.Getenv("PINGCLI_PINGFEDERATE_HTTPS_HOST"), + os.Getenv("PINGCLI_PINGFEDERATE_ADMIN_API_PATH")) // Write main.tf to testing directory mainTFFilepath := filepath.Join(exportDir, "main.tf") diff --git a/internal/testing/testutils_viper/viper_utils.go b/internal/testing/testutils_viper/viper_utils.go index 9e814959..94878cb2 100644 --- a/internal/testing/testutils_viper/viper_utils.go +++ b/internal/testing/testutils_viper/viper_utils.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/pingidentity/pingctl/internal/configuration" - "github.com/pingidentity/pingctl/internal/configuration/options" - "github.com/pingidentity/pingctl/internal/profiles" + "github.com/pingidentity/pingcli/internal/configuration" + "github.com/pingidentity/pingcli/internal/configuration/options" + "github.com/pingidentity/pingcli/internal/profiles" ) const ( diff --git a/main.go b/main.go index c1f8228d..40745689 100644 --- a/main.go +++ b/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/pingidentity/pingctl/cmd" - "github.com/pingidentity/pingctl/internal/output" + "github.com/pingidentity/pingcli/cmd" + "github.com/pingidentity/pingcli/internal/output" ) func main() { @@ -12,7 +12,7 @@ func main() { if err != nil { output.Print(output.Opts{ ErrorMessage: err.Error(), - Message: "Failed to execute pingctl", + Message: "Failed to execute pingcli", Result: output.ENUM_RESULT_FAILURE, }) } From a363970ef021e98ea390c27708fca9f6bf0cce9f Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 11:49:21 +0200 Subject: [PATCH 02/16] Remove env var and viper key from http-method and data flags for custom requests --- internal/configuration/request/request.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/internal/configuration/request/request.go b/internal/configuration/request/request.go index 44cef535..1d0d7dd3 100644 --- a/internal/configuration/request/request.go +++ b/internal/configuration/request/request.go @@ -22,16 +22,15 @@ func initDataOption() { cobraParamName := "data" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") - envVar := "PINGCLI_REQUEST_DATA" options.RequestDataOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, - EnvVar: envVar, + EnvVar: "", // No environment variable Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The data to send in the request. Use prefix '@' to specify data filepath instead of raw data. Also configurable via environment variable %s.", envVar), + Usage: "The data to send in the request. Use prefix '@' to specify data filepath instead of raw data.", Value: cobraValue, DefValue: "", }, @@ -44,22 +43,21 @@ func initHTTPMethodOption() { cobraParamName := "http-method" cobraValue := new(customtypes.HTTPMethod) defaultValue := customtypes.HTTPMethod(customtypes.ENUM_HTTP_METHOD_GET) - envVar := "PINGCLI_REQUEST_HTTP_METHOD" options.RequestHTTPMethodOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, - EnvVar: envVar, + EnvVar: "", // No environment variable Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "m", - Usage: fmt.Sprintf("The HTTP method to use for the request. Allowed: %s. Also configurable via environment variable %s.", strings.Join(customtypes.HTTPMethodValidValues(), ", "), envVar), + Usage: fmt.Sprintf("The HTTP method to use for the request. Allowed: %s.", strings.Join(customtypes.HTTPMethodValidValues(), ", ")), Value: cobraValue, DefValue: customtypes.ENUM_HTTP_METHOD_GET, }, Type: options.ENUM_REQUEST_HTTP_METHOD, - ViperKey: "request.httpMethod", + ViperKey: "", // No viper key } } From e35adab3b68ab0e0a797a676da655cd76bc70b92 Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 11:54:23 +0200 Subject: [PATCH 03/16] Add messaging for when creating new default config file --- cmd/root.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index ab4a0963..1a0e6777 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -151,8 +151,10 @@ func checkCfgFileLocation(cfgFile string) { } func createConfigFile(cfgFile string) { - l := logger.Get() - l.Debug().Msgf("Creating new pingcli configuration file at: %s", cfgFile) + output.Print(output.Opts{ + Message: fmt.Sprintf("Creating new pingcli configuration file at: %s", cfgFile), + Result: output.ENUM_RESULT_NIL, + }) // MkdirAll does nothing if directories already exist. Create needed directories for config file location. err := os.MkdirAll(filepath.Dir(cfgFile), os.ModePerm) From e0766f34e8970f318b61e4b6f55b375f1c0014a6 Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 17:00:10 +0200 Subject: [PATCH 04/16] Default values and write all options to config file on start --- cmd/root.go | 20 +++++++++++++++++++ internal/customtypes/export_format.go | 2 ++ internal/customtypes/export_services.go | 5 +++++ internal/customtypes/http_method.go | 2 ++ internal/customtypes/output_format.go | 2 ++ .../customtypes/pingfederate_auth_type.go | 2 ++ internal/customtypes/pingone_auth_type.go | 2 ++ internal/customtypes/pingone_region_code.go | 2 ++ internal/customtypes/request_services.go | 2 ++ internal/customtypes/string_slice.go | 9 ++++++--- internal/customtypes/uuid.go | 5 +++++ 11 files changed, 50 insertions(+), 3 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 1a0e6777..0d71698d 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -191,6 +191,26 @@ func initMainViper(cfgFile string) { createConfigFile(cfgFile) loadMainViperConfig(cfgFile) } + + // For each profile, if a viper key from an option doesn't exist, set it to nil + for _, pName := range profiles.GetMainConfig().ProfileNames() { + subViper := profiles.GetMainConfig().ViperInstance().Sub(pName) + for _, opt := range options.Options() { + if opt.ViperKey == "" || opt.ViperKey == options.RootActiveProfileOption.ViperKey { + continue + } + if !subViper.IsSet(opt.ViperKey) { + subViper.Set(opt.ViperKey, opt.DefaultValue) + } + } + err := profiles.GetMainConfig().SaveProfile(pName, subViper) + if err != nil { + output.Print(output.Opts{ + Message: fmt.Sprintf("Error: Failed to save profile %s.", pName), + Result: output.ENUM_RESULT_FAILURE, + }) + } + } } func loadMainViperConfig(cfgFile string) { diff --git a/internal/customtypes/export_format.go b/internal/customtypes/export_format.go index ce25685e..b5fdef8f 100644 --- a/internal/customtypes/export_format.go +++ b/internal/customtypes/export_format.go @@ -27,6 +27,8 @@ func (ef *ExportFormat) Set(format string) error { switch { case strings.EqualFold(format, ENUM_EXPORT_FORMAT_HCL): *ef = ExportFormat(ENUM_EXPORT_FORMAT_HCL) + case strings.EqualFold(format, ""): + *ef = ExportFormat("") default: return fmt.Errorf("unrecognized export format '%s'. Must be one of: %s", format, strings.Join(ExportFormatValidValues(), ", ")) } diff --git a/internal/customtypes/export_services.go b/internal/customtypes/export_services.go index 41f90d6b..b5f1badc 100644 --- a/internal/customtypes/export_services.go +++ b/internal/customtypes/export_services.go @@ -31,6 +31,11 @@ func (es *ExportServices) Set(services string) error { return fmt.Errorf("failed to set ExportServices value: %s. ExportServices is nil", services) } + if services == "" || services == "[]" { + *es = ExportServices([]string{}) + return nil + } + validServices := ExportServicesValidValues() serviceList := strings.Split(services, ",") diff --git a/internal/customtypes/http_method.go b/internal/customtypes/http_method.go index ccc3a849..f72bf3de 100644 --- a/internal/customtypes/http_method.go +++ b/internal/customtypes/http_method.go @@ -39,6 +39,8 @@ func (hm *HTTPMethod) Set(httpMethod string) error { *hm = HTTPMethod(ENUM_HTTP_METHOD_DELETE) case strings.EqualFold(httpMethod, ENUM_HTTP_METHOD_PATCH): *hm = HTTPMethod(ENUM_HTTP_METHOD_PATCH) + case strings.EqualFold(httpMethod, ""): + *hm = HTTPMethod("") default: return fmt.Errorf("unrecognized HTTP Method: '%s'. Must be one of: %s", httpMethod, strings.Join(HTTPMethodValidValues(), ", ")) } diff --git a/internal/customtypes/output_format.go b/internal/customtypes/output_format.go index 1aa8b05f..16a4bf3e 100644 --- a/internal/customtypes/output_format.go +++ b/internal/customtypes/output_format.go @@ -30,6 +30,8 @@ func (o *OutputFormat) Set(outputFormat string) error { *o = OutputFormat(ENUM_OUTPUT_FORMAT_TEXT) case strings.EqualFold(outputFormat, ENUM_OUTPUT_FORMAT_JSON): *o = OutputFormat(ENUM_OUTPUT_FORMAT_JSON) + case strings.EqualFold(outputFormat, ""): + *o = OutputFormat("") default: return fmt.Errorf("unrecognized Output Format: '%s'. Must be one of: %s", outputFormat, strings.Join(OutputFormatValidValues(), ", ")) } diff --git a/internal/customtypes/pingfederate_auth_type.go b/internal/customtypes/pingfederate_auth_type.go index 115169e0..c99e57ea 100644 --- a/internal/customtypes/pingfederate_auth_type.go +++ b/internal/customtypes/pingfederate_auth_type.go @@ -32,6 +32,8 @@ func (pat *PingfederateAuthenticationType) Set(authType string) error { *pat = PingfederateAuthenticationType(ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_ACCESS_TOKEN) case strings.EqualFold(authType, ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_CLIENT_CREDENTIALS): *pat = PingfederateAuthenticationType(ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_CLIENT_CREDENTIALS) + case strings.EqualFold(authType, ""): + *pat = PingfederateAuthenticationType("") default: return fmt.Errorf("unrecognized Pingfederate Authentication Type: '%s'. Must be one of: %s", authType, strings.Join(PingfederateAuthenticationTypeValidValues(), ", ")) } diff --git a/internal/customtypes/pingone_auth_type.go b/internal/customtypes/pingone_auth_type.go index 3628ed7f..ab7d6197 100644 --- a/internal/customtypes/pingone_auth_type.go +++ b/internal/customtypes/pingone_auth_type.go @@ -26,6 +26,8 @@ func (pat *PingoneAuthenticationType) Set(authType string) error { switch { case strings.EqualFold(authType, ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER): *pat = PingoneAuthenticationType(ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER) + case strings.EqualFold(authType, ""): + *pat = PingoneAuthenticationType("") default: return fmt.Errorf("unrecognized Pingone Authentication Type: '%s'. Must be one of: %s", authType, strings.Join(PingoneAuthenticationTypeValidValues(), ", ")) } diff --git a/internal/customtypes/pingone_region_code.go b/internal/customtypes/pingone_region_code.go index 24c99e95..93a240db 100644 --- a/internal/customtypes/pingone_region_code.go +++ b/internal/customtypes/pingone_region_code.go @@ -44,6 +44,8 @@ func (prc *PingoneRegionCode) Set(regionCode string) error { *prc = PingoneRegionCode(ENUM_PINGONE_REGION_CODE_EU) case strings.EqualFold(regionCode, ENUM_PINGONE_REGION_CODE_NA): *prc = PingoneRegionCode(ENUM_PINGONE_REGION_CODE_NA) + case strings.EqualFold(regionCode, ""): + *prc = PingoneRegionCode("") default: return fmt.Errorf("unrecognized Pingone Region Code: '%s'. Must be one of: %s", regionCode, strings.Join(PingoneRegionCodeValidValues(), ", ")) } diff --git a/internal/customtypes/request_services.go b/internal/customtypes/request_services.go index 27ce1ce2..e51000bf 100644 --- a/internal/customtypes/request_services.go +++ b/internal/customtypes/request_services.go @@ -26,6 +26,8 @@ func (rs *RequestService) Set(service string) error { switch { case strings.EqualFold(service, ENUM_REQUEST_SERVICE_PINGONE): *rs = RequestService(ENUM_REQUEST_SERVICE_PINGONE) + case strings.EqualFold(service, ""): + *rs = RequestService("") default: return fmt.Errorf("unrecognized Request Service: '%s'. Must be one of: %s", service, strings.Join(RequestServiceValidValues(), ", ")) } diff --git a/internal/customtypes/string_slice.go b/internal/customtypes/string_slice.go index 1c6cec3c..069578d0 100644 --- a/internal/customtypes/string_slice.go +++ b/internal/customtypes/string_slice.go @@ -17,9 +17,12 @@ func (ss *StringSlice) Set(val string) error { return fmt.Errorf("failed to set StringSlice value: %s. StringSlice is nil", val) } - valSs := strings.Split(val, ",") - - *ss = StringSlice(valSs) + if val == "" || val == "[]" { + *ss = StringSlice([]string{}) + } else { + valSs := strings.Split(val, ",") + *ss = StringSlice(valSs) + } return nil } diff --git a/internal/customtypes/uuid.go b/internal/customtypes/uuid.go index 55e280f7..935faba7 100644 --- a/internal/customtypes/uuid.go +++ b/internal/customtypes/uuid.go @@ -17,6 +17,11 @@ func (u *UUID) Set(val string) error { return fmt.Errorf("failed to set UUID value: %s. UUID is nil", val) } + if val == "" { + *u = UUID(val) + return nil + } + _, err := uuid.ParseUUID(val) if err != nil { return err From 666b555b51633fec71c15a21e2d221cedf3cbb54 Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 17:08:59 +0200 Subject: [PATCH 05/16] Only run pipelines on main branch --- .github/workflows/code-analysis-lint-test.yaml | 2 +- .github/workflows/codeql.yaml | 2 +- .github/workflows/docs.yml | 18 ------------------ 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/code-analysis-lint-test.yaml b/.github/workflows/code-analysis-lint-test.yaml index 2cfefc72..d21d3af6 100644 --- a/.github/workflows/code-analysis-lint-test.yaml +++ b/.github/workflows/code-analysis-lint-test.yaml @@ -2,7 +2,7 @@ name: Code Analysis and Tests on: push: - branches: ["main", "go-cli"] + branches: ["main"] pull_request: paths: - ".github/workflows/*" diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 82c99d0a..18b96bb3 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -13,7 +13,7 @@ name: "CodeQL" on: push: - branches: ["main", "go-cli"] + branches: ["main"] pull_request: paths: - "**.go" diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index c1b85ee0..00000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Deploy Docs -on: - push: - branches: - - main - paths: - - 'mkdocs.yml' - - 'docs/**' -jobs: - deploy-docs: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: 3.x - - run: pip install mkdocs-material - - run: mkdocs gh-deploy --force From 0185c27878cf70a766d46177b0e8174867993234 Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 17:41:06 +0200 Subject: [PATCH 06/16] Add data env var for testing --- internal/configuration/request/request.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/configuration/request/request.go b/internal/configuration/request/request.go index 1d0d7dd3..9e9413b1 100644 --- a/internal/configuration/request/request.go +++ b/internal/configuration/request/request.go @@ -22,12 +22,13 @@ func initDataOption() { cobraParamName := "data" cobraValue := new(customtypes.String) defaultValue := customtypes.String("") + envVar := "PINGCLI_REQUEST_DATA" options.RequestDataOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, - EnvVar: "", // No environment variable + EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, Usage: "The data to send in the request. Use prefix '@' to specify data filepath instead of raw data.", From b95140d21e37464a665a795e6b9fc79e7d91285d Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 17:42:09 +0200 Subject: [PATCH 07/16] Update dependecies --- go.mod | 4 ++-- go.sum | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 0ba86d49..15d226bb 100644 --- a/go.mod +++ b/go.mod @@ -194,8 +194,8 @@ require ( golang.org/x/mod v0.21.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 // indirect golang.org/x/tools v0.25.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 348dfb0c..f65a9c5a 100644 --- a/go.sum +++ b/go.sum @@ -437,6 +437,7 @@ github.com/patrickcping/pingone-go-sdk-v2/verify v0.7.0 h1:m6aLDyttXySQaUTNMubJM github.com/patrickcping/pingone-go-sdk-v2/verify v0.7.0/go.mod h1:CYnq6n5E8YDg3FYieSfldjjT/2EyMyYCgdoNAiqNZFc= github.com/pavius/impi v0.0.3 h1:DND6MzU+BLABhOZXbELR3FU8b+zDgcq4dOCNLhiTYuI= github.com/pavius/impi v0.0.3/go.mod h1:x/hU0bfdWIhuOT1SKwiJg++yvkk6EuOtJk8WtDZqgr8= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pingidentity/pingfederate-go-client/v1210 v1210.0.3 h1:KY6GmIfOJB5Nc3fX/f66fsWnPt1Fc0+QqQIbvAsyYkM= @@ -791,6 +792,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -809,6 +812,8 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 1d0752eede71080ad5c74c0f621b0c7c79636149 Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 17:45:53 +0200 Subject: [PATCH 08/16] Disable pingcli config logic to just return help or use as parent command --- cmd/config/config.go | 52 ++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/cmd/config/config.go b/cmd/config/config.go index 6285f08a..9c3b3cde 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -1,30 +1,24 @@ package config import ( - "os" - - "github.com/pingidentity/pingcli/cmd/common" - config_internal "github.com/pingidentity/pingcli/internal/commands/config" - "github.com/pingidentity/pingcli/internal/configuration/options" - "github.com/pingidentity/pingcli/internal/logger" "github.com/spf13/cobra" ) -const ( - configCommandExamples = ` pingcli config - pingcli config --profile myprofile - pingcli config --name myprofile --description "My Profile"` -) +// const ( +// configCommandExamples = ` pingcli config +// pingcli config --profile myprofile +// pingcli config --name myprofile --description "My Profile"` +// ) func NewConfigCommand() *cobra.Command { cmd := &cobra.Command{ - Args: common.ExactArgs(0), - DisableFlagsInUseLine: true, // We write our own flags in @Use attribute - Example: configCommandExamples, - Long: `Update an existing configuration profile's name and description. See subcommands for more profile configuration management options.`, - RunE: configRunE, - Short: "Update an existing configuration profile's name and description. See subcommands for more profile configuration management options.", - Use: "config [flags]", + // Args: common.ExactArgs(0), + // DisableFlagsInUseLine: true, // We write our own flags in @Use attribute + // Example: configCommandExamples, + Long: `A set of command for profile configuration management.`, + // RunE: configRunE, + Short: "A set of command for profile configuration management.", + Use: "config", } // Add subcommands @@ -39,20 +33,20 @@ func NewConfigCommand() *cobra.Command { NewConfigUnsetCommand(), ) - cmd.Flags().AddFlag(options.ConfigProfileOption.Flag) - cmd.Flags().AddFlag(options.ConfigNameOption.Flag) - cmd.Flags().AddFlag(options.ConfigDescriptionOption.Flag) + // cmd.Flags().AddFlag(options.ConfigProfileOption.Flag) + // cmd.Flags().AddFlag(options.ConfigNameOption.Flag) + // cmd.Flags().AddFlag(options.ConfigDescriptionOption.Flag) return cmd } -func configRunE(cmd *cobra.Command, args []string) error { - l := logger.Get() - l.Debug().Msgf("Config Subcommand Called.") +// func configRunE(cmd *cobra.Command, args []string) error { +// l := logger.Get() +// l.Debug().Msgf("Config Subcommand Called.") - if err := config_internal.RunInternalConfig(os.Stdin); err != nil { - return err - } +// if err := config_internal.RunInternalConfig(os.Stdin); err != nil { +// return err +// } - return nil -} +// return nil +// } From baee5e9c9698c249adfb7bb9ee828ed3b3161888 Mon Sep 17 00:00:00 2001 From: Erik Ostien Date: Fri, 4 Oct 2024 17:46:58 +0200 Subject: [PATCH 09/16] go mod tidy --- go.sum | 5 ----- 1 file changed, 5 deletions(-) diff --git a/go.sum b/go.sum index f65a9c5a..7dc5187f 100644 --- a/go.sum +++ b/go.sum @@ -437,7 +437,6 @@ github.com/patrickcping/pingone-go-sdk-v2/verify v0.7.0 h1:m6aLDyttXySQaUTNMubJM github.com/patrickcping/pingone-go-sdk-v2/verify v0.7.0/go.mod h1:CYnq6n5E8YDg3FYieSfldjjT/2EyMyYCgdoNAiqNZFc= github.com/pavius/impi v0.0.3 h1:DND6MzU+BLABhOZXbELR3FU8b+zDgcq4dOCNLhiTYuI= github.com/pavius/impi v0.0.3/go.mod h1:x/hU0bfdWIhuOT1SKwiJg++yvkk6EuOtJk8WtDZqgr8= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pingidentity/pingfederate-go-client/v1210 v1210.0.3 h1:KY6GmIfOJB5Nc3fX/f66fsWnPt1Fc0+QqQIbvAsyYkM= @@ -790,8 +789,6 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -810,8 +807,6 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 5529002f5a1ee90e11e38f55ce76d410f339a835 Mon Sep 17 00:00:00 2001 From: samirgandhi19 <17574913+samir-gandhi@users.noreply.github.com> Date: Thu, 10 Oct 2024 17:27:00 -0600 Subject: [PATCH 10/16] initial usage docs --- README.md | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 489f87e0..6218633d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,91 @@ # pingcli -Ping Identity Command Line Interface (CLI) tool. +The Ping CLI is a unified command line interface for configuring and managing Ping Identity Services. + +## Install + + + +## Configure Ping CLI + +Before using the Ping CLI, you need to configure your Ping Identity Service profile(s). The following steps show the quickest path to configuration. + +Start by running the command to create a new profile and answering the prompts. + +```text +$ pingcli config add-profile +Pingcli configuration file '/Users//.pingcli/config.yaml' does not exist. - No Action (Warning) +Creating new pingcli configuration file at: /Users//.pingcli/config.yaml +New profile name: : dev +New profile description: : configuration for development environment +Set new profile as active: : y +Adding new profile 'dev'... +Profile created. Update additional profile attributes via 'pingcli config set' or directly within the config file at '/Users//.pingcli/config.yaml' - Success +Profile 'dev' set as active. - Success +``` + +Run `pingcli config view-profile` to generate a set of empty configuration. + +```text +$ pingcli config view-profile +Profile: dev + +color: true +description: configuration for development environment +export: + format: HCL + outputdirectory: /Users/samirgandhi/projects/terraform/UAT/pingcli-uat/export + overwrite: false + pingone: + environmentid: "" +# additional configuration trimmed +``` + +The available settings can be configured by editing the empty fields within the generated `~/.pingcli/config.yaml`. General Ping Identity service connection settings are found under the `service` key, and settings relevant to individual commands are found under their command names e.g. `export` and `request`. + +To see descriptions for the settings the `export` command's help option. +``` +pingcli platform export --help +``` + +## Commands + +Ping CLI commands have the following structure: + +```shell +pingcli [options and parameters] +``` + +To get the version of Ping CLI: + +```shell +pingcli --version +``` + +### Platform Export + +The `pingcli platform export` command uses your configured settings to connect to the requested services and generate [Terraform import blocks](https://developer.hashicorp.com/terraform/language/import) for every supported resource available. + +An example command to export a PingOne environment for HCL generation looks like: + +```shell +pingctl platform export --services "pingone-platform,pingone-sso" +``` + +The generated import blocks are organized into one folder with a file per resource type found. These import blocks can be used to [generate terraform configuration](https://developer.hashicorp.com/terraform/language/import/generating-configuration). + +### Custom Request + +The `pingcli request` command uses your configured settings to authenticate to the desired ping service before executing your API request. + +An example command to view PingOne Environments looks like: + +```shell +pingcli request --http-method GET --service pingone environments +``` + +## Getting Help + +The best way to interact with our team is through Github. You can [open an issue](https://github.com/pingidentity/pingcli/issues/new) for guidance, bug reports, or feature requests. + +Please check for similar open issues before opening a new one. From 188fbb1af341eccdf1dbdfd70d3aed19f2d21b14 Mon Sep 17 00:00:00 2001 From: Patrick Cowland Date: Fri, 11 Oct 2024 16:37:33 +0100 Subject: [PATCH 11/16] draft presentation updates --- cmd/config/add_profile.go | 21 ++-- cmd/config/config.go | 6 +- cmd/config/delete_profile.go | 17 ++- cmd/config/get.go | 21 ++-- cmd/config/get_test.go | 2 +- cmd/config/list_profiles.go | 7 +- cmd/config/set.go | 17 ++- cmd/config/set_active_profile.go | 11 +- cmd/config/set_test.go | 2 +- cmd/config/unset.go | 17 ++- cmd/config/unset_test.go | 4 +- cmd/config/view_profile.go | 4 +- cmd/feedback/feedback.go | 10 +- cmd/platform/export.go | 106 +++++------------- cmd/platform/export_test.go | 46 ++++---- cmd/root.go | 15 +-- internal/commands/config/set_internal.go | 12 +- .../commands/feedback/feedback_internal.go | 14 ++- internal/commands/platform/export_internal.go | 38 +++---- internal/commands/request/request_internal.go | 14 +-- .../commands/request/request_internal_test.go | 8 +- internal/configuration/config/add_profile.go | 2 +- .../configuration/config/delete_profile.go | 2 +- internal/configuration/config/get.go | 2 +- internal/configuration/config/set.go | 2 +- .../config/set_active_profile.go | 2 +- internal/configuration/config/unset.go | 2 +- internal/configuration/config/view_profile.go | 2 +- internal/configuration/configuration.go | 4 +- internal/configuration/options/options.go | 78 ++++++------- internal/configuration/platform/export.go | 12 +- internal/configuration/request/request.go | 6 +- internal/configuration/root/root.go | 8 +- .../configuration/services/pingfederate.go | 62 +++++----- internal/configuration/services/pingone.go | 36 +++--- .../pingfederate/pingfederate_connector.go | 24 ++-- .../pingfederate_connector_test.go | 4 +- .../pingfederate_pingone_connection.go | 14 +-- .../pingfederate_pingone_connection_test.go | 4 +- .../pingone/mfa/pingone_mfa_connector.go | 20 ++-- ...pingone_mfa_application_push_credential.go | 14 +-- .../resources/pingone_mfa_device_policy.go | 14 +-- .../mfa/resources/pingone_mfa_fido2_policy.go | 14 +-- .../mfa/resources/pingone_mfa_settings.go | 14 +-- .../platform/pingone_platform_connector.go | 20 ++-- .../platform/resources/pingone_agreement.go | 14 +-- .../resources/pingone_agreement_enable.go | 14 +-- .../pingone_agreement_localization.go | 14 +-- .../pingone_agreement_localization_enable.go | 14 +-- ...pingone_agreement_localization_revision.go | 14 +-- .../resources/pingone_branding_settings.go | 14 +-- .../resources/pingone_branding_theme.go | 14 +-- .../pingone_branding_theme_default.go | 14 +-- .../platform/resources/pingone_certificate.go | 14 +-- .../resources/pingone_custom_domain.go | 14 +-- .../platform/resources/pingone_environment.go | 14 +-- .../platform/resources/pingone_form.go | 14 +-- .../resources/pingone_forms_recaptcha_v2.go | 14 +-- .../platform/resources/pingone_gateway.go | 14 +-- .../resources/pingone_gateway_credential.go | 14 +-- .../pingone_gateway_role_assignment.go | 14 +-- .../pingone_identity_propagation_plan.go | 14 +-- .../pingone/platform/resources/pingone_key.go | 14 +-- .../resources/pingone_key_rotation_policy.go | 14 +-- .../platform/resources/pingone_language.go | 14 +-- .../resources/pingone_language_update.go | 14 +-- .../resources/pingone_notification_policy.go | 14 +-- .../pingone_notification_settings.go | 14 +-- .../pingone_notification_settings_email.go | 14 +-- .../pingone_notification_template_content.go | 14 +-- .../pingone_phone_delivery_settings.go | 14 +-- .../resources/pingone_system_application.go | 14 +-- .../pingone_trusted_email_address.go | 14 +-- .../resources/pingone_trusted_email_domain.go | 14 +-- .../platform/resources/pingone_webhook.go | 14 +-- .../protect/pingone_protect_connector.go | 20 ++-- .../protect/resources/pingone_risk_policy.go | 14 +-- .../resources/pingone_risk_predictor.go | 14 +-- .../pingone/sso/pingone_sso_connector.go | 20 ++-- .../sso/resources/pingone_application.go | 14 +-- .../pingone_application_attribute_mapping.go | 14 +-- ...gone_application_flow_policy_assignment.go | 14 +-- .../pingone_application_resource_grant.go | 14 +-- .../pingone_application_role_assignment.go | 14 +-- .../resources/pingone_application_secret.go | 14 +-- ...e_application_sign_on_policy_assignment.go | 14 +-- .../pingone/sso/resources/pingone_group.go | 14 +-- .../sso/resources/pingone_group_nesting.go | 14 +-- .../pingone_group_role_assignment.go | 14 +-- .../resources/pingone_identity_provider.go | 14 +-- .../pingone_identity_provider_attribute.go | 14 +-- .../sso/resources/pingone_password_policy.go | 14 +-- .../sso/resources/pingone_population.go | 14 +-- .../resources/pingone_population_default.go | 14 +-- .../pingone/sso/resources/pingone_resource.go | 14 +-- .../resources/pingone_resource_attribute.go | 14 +-- .../sso/resources/pingone_resource_scope.go | 14 +-- .../pingone_resource_scope_openid.go | 14 +-- .../pingone_resource_scope_pingone_api.go | 14 +-- .../sso/resources/pingone_schema_attribute.go | 14 +-- .../sso/resources/pingone_sign_on_policy.go | 14 +-- .../pingone_sign_on_policy_action.go | 14 +-- .../customtypes/pingfederate_auth_type.go | 24 ++-- .../pingfederate_auth_type_test.go | 24 ++-- internal/customtypes/pingone_auth_type.go | 20 ++-- .../customtypes/pingone_auth_type_test.go | 24 ++-- internal/customtypes/pingone_region_code.go | 28 ++--- .../customtypes/pingone_region_code_test.go | 12 +- internal/profiles/validate.go | 16 +-- internal/testing/testutils/utils.go | 16 +-- .../testing/testutils_viper/viper_utils.go | 20 ++-- 111 files changed, 866 insertions(+), 882 deletions(-) diff --git a/cmd/config/add_profile.go b/cmd/config/add_profile.go index 3c2e842d..a6ede486 100644 --- a/cmd/config/add_profile.go +++ b/cmd/config/add_profile.go @@ -11,9 +11,14 @@ import ( ) const ( - addProfilecommandExamples = ` pingcli config add-profile - pingcli config add-profile --name myprofile --description "My Profile desc" - pingcli config add-profile --set-active=true` + addProfilecommandExamples = ` Add a new configuration profile with a guided experience. + pingcli config add-profile + + Add a new configuration profile with a specific name and description. + pingcli config add-profile --name MyDeveloperEnv --description "My awesome new profile for my development environment" + + Add a new configuration profile with a guided experience and set it as the active profile. + pingcli config add-profile --set-active=true` ) func NewConfigAddProfileCommand() *cobra.Command { @@ -21,10 +26,12 @@ func NewConfigAddProfileCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: addProfilecommandExamples, - Long: `Add a new configuration profile to pingcli.`, - RunE: configAddProfileRunE, - Short: "Add a new configuration profile to pingcli.", - Use: "add-profile [flags]", + Long: `Add a new custom configuration profile to the CLI. + +The new configuration profile will be stored in the CLI configuration file.`, + RunE: configAddProfileRunE, + Short: "Add a new custom configuration profile.", + Use: "add-profile [flags]", } cmd.Flags().AddFlag(options.ConfigAddProfileNameOption.Flag) diff --git a/cmd/config/config.go b/cmd/config/config.go index 9c3b3cde..2811adf7 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -15,9 +15,11 @@ func NewConfigCommand() *cobra.Command { // Args: common.ExactArgs(0), // DisableFlagsInUseLine: true, // We write our own flags in @Use attribute // Example: configCommandExamples, - Long: `A set of command for profile configuration management.`, + Long: "Manage the configuration of the CLI, including Ping product connection parameters.\n\n" + + "The Ping CLI supports the use of configuration profiles.\nConfiguration profiles can be used when connecting to multiple environments using the same Ping CLI instance, such as when managing multiple development or demonstration environments.\n\n" + + "A pre-defined default profile will be used to store the configuration of the CLI.\nAdditional custom profiles can be created using the `pingcli config add-profile` command.\nTo use a custom profile, the `--profile` flag can be used on supported commands to specify the profile to use for that command.\nTo set a custom profile as the default, use the `pingcli config set-active-profile` command.", // RunE: configRunE, - Short: "A set of command for profile configuration management.", + Short: "Manage the CLI configuration.", Use: "config", } diff --git a/cmd/config/delete_profile.go b/cmd/config/delete_profile.go index 296f1869..359197e8 100644 --- a/cmd/config/delete_profile.go +++ b/cmd/config/delete_profile.go @@ -11,8 +11,11 @@ import ( ) const ( - deleteProfileCommandExamples = ` pingcli config delete-profile - pingcli config delete-profile --profile myprofile` + deleteProfileCommandExamples = ` Delete a configuration profile by selecting from the available profiles. + pingcli config delete-profile + + Delete a configuration profile by specifying the name of an existing configured profile. + pingcli config delete-profile --profile MyDeveloperEnv` ) func NewConfigDeleteProfileCommand() *cobra.Command { @@ -20,10 +23,12 @@ func NewConfigDeleteProfileCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: deleteProfileCommandExamples, - Long: `Delete a configuration profile from pingcli.`, - RunE: configDeleteProfileRunE, - Short: "Delete a configuration profile from pingcli.", - Use: "delete-profile [flags]", + Long: `Delete an existing custom configuration profile from the CLI. + +The profile to delete will be removed from the CLI configuration file.`, + RunE: configDeleteProfileRunE, + Short: "Delete a custom configuration profile.", + Use: "delete-profile [flags]", } cmd.Flags().AddFlag(options.ConfigDeleteProfileOption.Flag) diff --git a/cmd/config/get.go b/cmd/config/get.go index 89fc2dfe..01478e30 100644 --- a/cmd/config/get.go +++ b/cmd/config/get.go @@ -9,9 +9,14 @@ import ( ) const ( - configGetCommandExamples = ` pingcli config get pingone - pingcli config get --profile myProfile color - pingcli config get service.pingone.authentication.worker.environmentID` + configGetCommandExamples = ` Read all the configuration settings for the PingOne service in the active (or default) profile. + pingcli config get pingone + + Read the color setting for the profile named 'myProfile'. + pingcli config get --profile myProfile color + + Read the worker ID used to authenticate to the PingOne service management API. + pingcli config get service.pingone.authentication.worker.environmentID` ) func NewConfigGetCommand() *cobra.Command { @@ -19,10 +24,12 @@ func NewConfigGetCommand() *cobra.Command { Args: common.ExactArgs(1), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: configGetCommandExamples, - Long: `Get pingcli configuration settings.`, - RunE: configGetRunE, - Short: "Get pingcli configuration settings.", - Use: "get [flags] key", + Long: "Read stored configuration settings for the CLI.\n\n" + + "The `--profile` parameter can be used to read configuration settings for a specified custom configuration profile.\n" + + "Where `--profile` is not specified, configuration settings will be read for the currently active profile.", + RunE: configGetRunE, + Short: "Read stored configuration settings for the CLI.", + Use: "get [flags] key", } cmd.Flags().AddFlag(options.ConfigGetProfileOption.Flag) diff --git a/cmd/config/get_test.go b/cmd/config/get_test.go index e3b38baa..7e306552 100644 --- a/cmd/config/get_test.go +++ b/cmd/config/get_test.go @@ -23,7 +23,7 @@ func TestConfigGetCmd_TooManyArgs(t *testing.T) { // Test Config Get Command Executes when provided a full key func TestConfigGetCmd_FullKey(t *testing.T) { - err := testutils_cobra.ExecutePingcli(t, "config", "get", options.PingoneAuthenticationWorkerClientIDOption.ViperKey) + err := testutils_cobra.ExecutePingcli(t, "config", "get", options.PingOneAuthenticationWorkerClientIDOption.ViperKey) testutils.CheckExpectedError(t, err, nil) } diff --git a/cmd/config/list_profiles.go b/cmd/config/list_profiles.go index fe030cf7..7a6dad7f 100644 --- a/cmd/config/list_profiles.go +++ b/cmd/config/list_profiles.go @@ -8,7 +8,8 @@ import ( ) const ( - listProfilesCommandExamples = ` pingcli config list-profiles` + listProfilesCommandExamples = ` List all custom configuration profiles stored in the CLI configuration file. + pingcli config list-profiles` ) func NewConfigListProfilesCommand() *cobra.Command { @@ -16,9 +17,9 @@ func NewConfigListProfilesCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: listProfilesCommandExamples, - Long: `List all configuration profiles from pingcli.`, + Long: `List all custom configuration profiles stored in the CLI configuration file.`, RunE: configListProfilesRunE, - Short: "List all configuration profiles from pingcli.", + Short: "List all custom configuration profiles.", Use: "list-profiles", } diff --git a/cmd/config/set.go b/cmd/config/set.go index 09331cc1..badd90b4 100644 --- a/cmd/config/set.go +++ b/cmd/config/set.go @@ -9,8 +9,11 @@ import ( ) const ( - configSetCommandExamples = ` pingcli config set color=true - pingcli config set --profile myProfile service.pingone.regionCode=AP` + configSetCommandExamples = ` Set the color setting to true for the currently active profile. + pingcli config set color=true + + Set the PingOne tenant region code setting to 'AP' for the profile named 'myProfile'. + pingcli config set --profile myProfile service.pingone.regionCode=AP` ) func NewConfigSetCommand() *cobra.Command { @@ -18,10 +21,12 @@ func NewConfigSetCommand() *cobra.Command { Args: common.ExactArgs(1), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: configSetCommandExamples, - Long: `Set pingcli configuration settings.`, - RunE: configSetRunE, - Short: "Set pingcli configuration settings.", - Use: "set [flags] key=value", + Long: "Set stored configuration settings for the CLI.\n\n" + + "The `--profile` parameter can be used to set configuration settings for a specified custom configuration profile.\n" + + "Where `--profile` is not specified, configuration settings will be set for the currently active profile.", + RunE: configSetRunE, + Short: "Set stored configuration settings for the CLI.", + Use: "set [flags] key=value", } cmd.Flags().AddFlag(options.ConfigSetProfileOption.Flag) diff --git a/cmd/config/set_active_profile.go b/cmd/config/set_active_profile.go index 07b21ef3..6be8fa77 100644 --- a/cmd/config/set_active_profile.go +++ b/cmd/config/set_active_profile.go @@ -11,8 +11,11 @@ import ( ) const ( - setActiveProfileCommandExamples = ` pingcli config set-active-profile - pingcli config set-active-profile --profile myprofile` + setActiveProfileCommandExamples = ` Set an active profile with an interactive prompt to select from an available profile. + pingcli config set-active-profile + + Set an active profile with a specific profile name. + pingcli config set-active-profile --profile myprofile` ) func NewConfigSetActiveProfileCommand() *cobra.Command { @@ -20,9 +23,9 @@ func NewConfigSetActiveProfileCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: setActiveProfileCommandExamples, - Long: `Set a configuration profile as the in-use profile for pingcli.`, + Long: `Set a custom configuration profile as the in-use profile.`, RunE: configSetActiveProfileRunE, - Short: "Set a configuration profile as the in-use profile for pingcli.", + Short: "Set a custom configuration profile as the in-use profile.", Use: "set-active-profile [flags]", } diff --git a/cmd/config/set_test.go b/cmd/config/set_test.go index a3fbe95a..18c9e8ba 100644 --- a/cmd/config/set_test.go +++ b/cmd/config/set_test.go @@ -53,7 +53,7 @@ func TestConfigSetCmd_NoValueProvided(t *testing.T) { // Test Config Set Command for key 'pingone.worker.clientId' updates viper configuration func TestConfigSetCmd_CheckViperConfig(t *testing.T) { - viperKey := options.PingoneAuthenticationWorkerClientIDOption.ViperKey + viperKey := options.PingOneAuthenticationWorkerClientIDOption.ViperKey viperNewUUID := "12345678-1234-1234-1234-123456789012" err := testutils_cobra.ExecutePingcli(t, "config", "set", fmt.Sprintf("%s=%s", viperKey, viperNewUUID)) diff --git a/cmd/config/unset.go b/cmd/config/unset.go index fdd4ee3b..b94ac693 100644 --- a/cmd/config/unset.go +++ b/cmd/config/unset.go @@ -9,8 +9,11 @@ import ( ) const ( - configUnsetCommandExamples = ` pingcli config unset color - pingcli config unset --profile myProfile service.pingone.regionCode` + configUnsetCommandExamples = ` Unset the color setting for the currently active profile. + pingcli config unset color + + Unset the PingOne tenant region code setting for the profile named 'myProfile'. + pingcli config unset --profile myProfile service.pingone.regionCode` ) func NewConfigUnsetCommand() *cobra.Command { @@ -18,10 +21,12 @@ func NewConfigUnsetCommand() *cobra.Command { Args: common.ExactArgs(1), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: configUnsetCommandExamples, - Long: `Unset pingcli configuration settings.`, - RunE: configUnsetRunE, - Short: "Unset pingcli configuration settings.", - Use: "unset [flags] key", + Long: "Unset stored configuration settings for the CLI.\n\n" + + "The `--profile` parameter can be used to unset configuration settings for a specified custom configuration profile.\n" + + "Where `--profile` is not specified, configuration settings will be unset for the currently active profile.", + RunE: configUnsetRunE, + Short: "Unset stored configuration settings for the CLI.", + Use: "unset [flags] key", } cmd.Flags().AddFlag(options.ConfigUnsetProfileOption.Flag) diff --git a/cmd/config/unset_test.go b/cmd/config/unset_test.go index ba08a341..24d13eb5 100644 --- a/cmd/config/unset_test.go +++ b/cmd/config/unset_test.go @@ -39,8 +39,8 @@ func TestConfigUnsetCmd_InvalidKey(t *testing.T) { // Test Config Unset Command for key 'pingone.worker.clientId' updates viper configuration func TestConfigUnsetCmd_CheckViperConfig(t *testing.T) { - viperKey := options.PingoneAuthenticationWorkerClientIDOption.ViperKey - viperOldValue := os.Getenv(options.PingoneAuthenticationWorkerClientIDOption.EnvVar) + viperKey := options.PingOneAuthenticationWorkerClientIDOption.ViperKey + viperOldValue := os.Getenv(options.PingOneAuthenticationWorkerClientIDOption.EnvVar) err := testutils_cobra.ExecutePingcli(t, "config", "unset", viperKey) testutils.CheckExpectedError(t, err, nil) diff --git a/cmd/config/view_profile.go b/cmd/config/view_profile.go index 262c120f..32fa1db5 100644 --- a/cmd/config/view_profile.go +++ b/cmd/config/view_profile.go @@ -18,9 +18,9 @@ func NewConfigViewProfileCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: viewProfileCommandExamples, - Long: `View a configuration profile from pingcli.`, + Long: `View the stored configuration of a custom configuration profile.`, RunE: configViewProfileRunE, - Short: "View a configuration profile from pingcli.", + Short: "View the stored configuration of a custom configuration profile.", Use: "view-profile [flags]", } diff --git a/cmd/feedback/feedback.go b/cmd/feedback/feedback.go index e3fb281f..97f290cf 100644 --- a/cmd/feedback/feedback.go +++ b/cmd/feedback/feedback.go @@ -12,12 +12,10 @@ func NewFeedbackCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: ` pingcli feedback`, - Long: `A command to provide the user information -on how to give feedback or get help with the tool -through the use of the GitHub repository's issue tracker.`, - RunE: feedbackRunE, - Short: "Information on tool feedback", - Use: "feedback [flags]", + Long: "Provides links to report issues and provide feedback on using the CLI to Ping Identity.", + RunE: feedbackRunE, + Short: "Help us improve the CLI. Report issues or send us feedback on using the CLI tool.", + Use: "feedback [flags]", } return cmd diff --git a/cmd/platform/export.go b/cmd/platform/export.go index 76902d4c..cbd75a6e 100644 --- a/cmd/platform/export.go +++ b/cmd/platform/export.go @@ -1,8 +1,6 @@ package platform import ( - "fmt" - "github.com/pingidentity/pingcli/cmd/common" platform_internal "github.com/pingidentity/pingcli/internal/commands/platform" "github.com/pingidentity/pingcli/internal/configuration/options" @@ -20,55 +18,13 @@ const ( pingcli platform export --service pingfederate --pingfederate-client-id clientID --pingfederate-client-secret clientSecret --pingfederate-token-url tokenURL pingcli platform export --service pingfederate --pingfederate-access-token accessToken pingcli platform export --service pingfederate --x-bypass-external-validation=false --ca-certificate-pem-files "/path/to/cert.pem,/path/to/cert2.pem" --insecure-trust-all-tls=false` - - profileConfigurationFormat = `Profile Configuration Format: -export: - format: - services: - - - - - outputDirectory: - overwrite: - pingone: - environmentID: -service: - pingfederate: - httpsHost: - adminAPIPath: - x-bypass-external-validation: - ca-certificate-pem-files: - - - - - insecure-trust-all-tls: - authentication: - type: - basicAuth: - username: - password: - accessTokenAuth: - accessToken: - clientCredentialsAuth: - clientID: - clientSecret: - tokenURL: - scopes: - - - - - pingone: - regionCode: - authentication: - type: - worker: - clientID: - clientSecret: - environmentID: ` ) func NewExportCommand() *cobra.Command { cmd := &cobra.Command{ Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute - Example: fmt.Sprintf("%s\n\n%s", commandExamples, profileConfigurationFormat), + Example: commandExamples, Long: `Export configuration-as-code packages for the Ping Platform.`, Short: "Export configuration-as-code packages for the Ping Platform.", RunE: exportRunE, @@ -98,62 +54,62 @@ func initGeneralExportFlags(cmd *cobra.Command) { cmd.Flags().AddFlag(options.PlatformExportServiceOption.Flag) cmd.Flags().AddFlag(options.PlatformExportOutputDirectoryOption.Flag) cmd.Flags().AddFlag(options.PlatformExportOverwriteOption.Flag) - cmd.Flags().AddFlag(options.PlatformExportPingoneEnvironmentIDOption.Flag) + cmd.Flags().AddFlag(options.PlatformExportPingOneEnvironmentIDOption.Flag) } func initPingOneExportFlags(cmd *cobra.Command) { - cmd.Flags().AddFlag(options.PingoneAuthenticationWorkerEnvironmentIDOption.Flag) - cmd.Flags().AddFlag(options.PingoneAuthenticationWorkerClientIDOption.Flag) - cmd.Flags().AddFlag(options.PingoneAuthenticationWorkerClientSecretOption.Flag) - cmd.Flags().AddFlag(options.PingoneRegionCodeOption.Flag) - cmd.Flags().AddFlag(options.PingoneAuthenticationTypeOption.Flag) + cmd.Flags().AddFlag(options.PingOneAuthenticationWorkerEnvironmentIDOption.Flag) + cmd.Flags().AddFlag(options.PingOneAuthenticationWorkerClientIDOption.Flag) + cmd.Flags().AddFlag(options.PingOneAuthenticationWorkerClientSecretOption.Flag) + cmd.Flags().AddFlag(options.PingOneRegionCodeOption.Flag) + cmd.Flags().AddFlag(options.PingOneAuthenticationTypeOption.Flag) cmd.MarkFlagsRequiredTogether( - options.PingoneAuthenticationWorkerEnvironmentIDOption.CobraParamName, - options.PingoneAuthenticationWorkerClientIDOption.CobraParamName, - options.PingoneAuthenticationWorkerClientSecretOption.CobraParamName, - options.PingoneRegionCodeOption.CobraParamName, + options.PingOneAuthenticationWorkerEnvironmentIDOption.CobraParamName, + options.PingOneAuthenticationWorkerClientIDOption.CobraParamName, + options.PingOneAuthenticationWorkerClientSecretOption.CobraParamName, + options.PingOneRegionCodeOption.CobraParamName, ) } func initPingFederateGeneralFlags(cmd *cobra.Command) { - cmd.Flags().AddFlag(options.PingfederateHTTPSHostOption.Flag) - cmd.Flags().AddFlag(options.PingfederateAdminAPIPathOption.Flag) + cmd.Flags().AddFlag(options.PingFederateHTTPSHostOption.Flag) + cmd.Flags().AddFlag(options.PingFederateAdminAPIPathOption.Flag) cmd.MarkFlagsRequiredTogether( - options.PingfederateHTTPSHostOption.CobraParamName, - options.PingfederateAdminAPIPathOption.CobraParamName) + options.PingFederateHTTPSHostOption.CobraParamName, + options.PingFederateAdminAPIPathOption.CobraParamName) - cmd.Flags().AddFlag(options.PingfederateXBypassExternalValidationHeaderOption.Flag) - cmd.Flags().AddFlag(options.PingfederateCACertificatePemFilesOption.Flag) - cmd.Flags().AddFlag(options.PingfederateInsecureTrustAllTLSOption.Flag) - cmd.Flags().AddFlag(options.PingfederateAuthenticationTypeOption.Flag) + cmd.Flags().AddFlag(options.PingFederateXBypassExternalValidationHeaderOption.Flag) + cmd.Flags().AddFlag(options.PingFederateCACertificatePemFilesOption.Flag) + cmd.Flags().AddFlag(options.PingFederateInsecureTrustAllTLSOption.Flag) + cmd.Flags().AddFlag(options.PingFederateAuthenticationTypeOption.Flag) } func initPingFederateBasicAuthFlags(cmd *cobra.Command) { - cmd.Flags().AddFlag(options.PingfederateBasicAuthUsernameOption.Flag) - cmd.Flags().AddFlag(options.PingfederateBasicAuthPasswordOption.Flag) + cmd.Flags().AddFlag(options.PingFederateBasicAuthUsernameOption.Flag) + cmd.Flags().AddFlag(options.PingFederateBasicAuthPasswordOption.Flag) cmd.MarkFlagsRequiredTogether( - options.PingfederateBasicAuthUsernameOption.CobraParamName, - options.PingfederateBasicAuthPasswordOption.CobraParamName, + options.PingFederateBasicAuthUsernameOption.CobraParamName, + options.PingFederateBasicAuthPasswordOption.CobraParamName, ) } func initPingFederateAccessTokenFlags(cmd *cobra.Command) { - cmd.Flags().AddFlag(options.PingfederateAccessTokenAuthAccessTokenOption.Flag) + cmd.Flags().AddFlag(options.PingFederateAccessTokenAuthAccessTokenOption.Flag) } func initPingFederateClientCredentialsFlags(cmd *cobra.Command) { - cmd.Flags().AddFlag(options.PingfederateClientCredentialsAuthClientIDOption.Flag) - cmd.Flags().AddFlag(options.PingfederateClientCredentialsAuthClientSecretOption.Flag) - cmd.Flags().AddFlag(options.PingfederateClientCredentialsAuthTokenURLOption.Flag) + cmd.Flags().AddFlag(options.PingFederateClientCredentialsAuthClientIDOption.Flag) + cmd.Flags().AddFlag(options.PingFederateClientCredentialsAuthClientSecretOption.Flag) + cmd.Flags().AddFlag(options.PingFederateClientCredentialsAuthTokenURLOption.Flag) cmd.MarkFlagsRequiredTogether( - options.PingfederateClientCredentialsAuthClientIDOption.CobraParamName, - options.PingfederateClientCredentialsAuthClientSecretOption.CobraParamName, - options.PingfederateClientCredentialsAuthTokenURLOption.CobraParamName) + options.PingFederateClientCredentialsAuthClientIDOption.CobraParamName, + options.PingFederateClientCredentialsAuthClientSecretOption.CobraParamName, + options.PingFederateClientCredentialsAuthTokenURLOption.CobraParamName) - cmd.Flags().AddFlag(options.PingfederateClientCredentialsAuthScopesOption.Flag) + cmd.Flags().AddFlag(options.PingFederateClientCredentialsAuthScopesOption.Flag) } diff --git a/cmd/platform/export_test.go b/cmd/platform/export_test.go index d72b489b..c7ca7666 100644 --- a/cmd/platform/export_test.go +++ b/cmd/platform/export_test.go @@ -158,10 +158,10 @@ func TestPlatformExportCmd_PingOneWorkerEnvironmentIdFlag(t *testing.T) { "--output-directory", outputDir, "--overwrite", "true", "--services", "pingone-protect", - "--pingone-worker-environment-id", os.Getenv(options.PingoneAuthenticationWorkerEnvironmentIDOption.EnvVar), - "--pingone-worker-client-id", os.Getenv(options.PingoneAuthenticationWorkerClientIDOption.EnvVar), - "--pingone-worker-client-secret", os.Getenv(options.PingoneAuthenticationWorkerClientSecretOption.EnvVar), - "--pingone-region-code", os.Getenv(options.PingoneRegionCodeOption.EnvVar)) + "--pingone-worker-environment-id", os.Getenv(options.PingOneAuthenticationWorkerEnvironmentIDOption.EnvVar), + "--pingone-worker-client-id", os.Getenv(options.PingOneAuthenticationWorkerClientIDOption.EnvVar), + "--pingone-worker-client-secret", os.Getenv(options.PingOneAuthenticationWorkerClientSecretOption.EnvVar), + "--pingone-region-code", os.Getenv(options.PingOneRegionCodeOption.EnvVar)) testutils.CheckExpectedError(t, err, nil) } @@ -169,7 +169,7 @@ func TestPlatformExportCmd_PingOneWorkerEnvironmentIdFlag(t *testing.T) { func TestPlatformExportCmd_PingOneWorkerEnvironmentIdFlagRequiredTogether(t *testing.T) { expectedErrorPattern := `^if any flags in the group \[pingone-worker-environment-id pingone-worker-client-id pingone-worker-client-secret pingone-region-code] are set they must all be set; missing \[pingone-region-code pingone-worker-client-id pingone-worker-client-secret]$` err := testutils_cobra.ExecutePingcli(t, "platform", "export", - "--pingone-worker-environment-id", os.Getenv(options.PingoneAuthenticationWorkerEnvironmentIDOption.EnvVar)) + "--pingone-worker-environment-id", os.Getenv(options.PingOneAuthenticationWorkerEnvironmentIDOption.EnvVar)) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -181,8 +181,8 @@ func TestPlatformExportCmd_PingFederateBasicAuthFlags(t *testing.T) { "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", - "--pingfederate-username", os.Getenv(options.PingfederateBasicAuthUsernameOption.EnvVar), - "--pingfederate-password", os.Getenv(options.PingfederateBasicAuthPasswordOption.EnvVar), + "--pingfederate-username", os.Getenv(options.PingFederateBasicAuthUsernameOption.EnvVar), + "--pingfederate-password", os.Getenv(options.PingFederateBasicAuthPasswordOption.EnvVar), "--pingfederate-authentication-type", "basicAuth", ) testutils.CheckExpectedError(t, err, nil) @@ -220,10 +220,10 @@ func TestPlatformExportCmd_PingFederateClientCredentialsAuthFlags(t *testing.T) "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", - "--pingfederate-client-id", os.Getenv(options.PingfederateClientCredentialsAuthClientIDOption.EnvVar), - "--pingfederate-client-secret", os.Getenv(options.PingfederateClientCredentialsAuthClientSecretOption.EnvVar), - "--pingfederate-scopes", os.Getenv(options.PingfederateClientCredentialsAuthScopesOption.EnvVar), - "--pingfederate-token-url", os.Getenv(options.PingfederateClientCredentialsAuthTokenURLOption.EnvVar), + "--pingfederate-client-id", os.Getenv(options.PingFederateClientCredentialsAuthClientIDOption.EnvVar), + "--pingfederate-client-secret", os.Getenv(options.PingFederateClientCredentialsAuthClientSecretOption.EnvVar), + "--pingfederate-scopes", os.Getenv(options.PingFederateClientCredentialsAuthScopesOption.EnvVar), + "--pingfederate-token-url", os.Getenv(options.PingFederateClientCredentialsAuthTokenURLOption.EnvVar), "--pingfederate-authentication-type", "clientCredentialsAuth", ) testutils.CheckExpectedError(t, err, nil) @@ -263,8 +263,8 @@ func TestPlatformExportCmd_PingFederateClientCredentialsAuthFlagsInvalidTokenURL "--output-directory", outputDir, "--overwrite", "true", "--services", "pingfederate", - "--pingfederate-client-id", os.Getenv(options.PingfederateClientCredentialsAuthClientIDOption.EnvVar), - "--pingfederate-client-secret", os.Getenv(options.PingfederateClientCredentialsAuthClientSecretOption.EnvVar), + "--pingfederate-client-id", os.Getenv(options.PingFederateClientCredentialsAuthClientIDOption.EnvVar), + "--pingfederate-client-secret", os.Getenv(options.PingFederateClientCredentialsAuthClientSecretOption.EnvVar), "--pingfederate-token-url", "https://localhost:9031/as/invalid", "--pingfederate-authentication-type", "clientCredentialsAuth", ) @@ -280,8 +280,8 @@ func TestPlatformExportCmd_PingFederateXBypassHeaderFlag(t *testing.T) { "--overwrite", "true", "--services", "pingfederate", "--pingfederate-x-bypass-external-validation-header=true", - "--pingfederate-username", os.Getenv(options.PingfederateBasicAuthUsernameOption.EnvVar), - "--pingfederate-password", os.Getenv(options.PingfederateBasicAuthPasswordOption.EnvVar), + "--pingfederate-username", os.Getenv(options.PingFederateBasicAuthUsernameOption.EnvVar), + "--pingfederate-password", os.Getenv(options.PingFederateBasicAuthPasswordOption.EnvVar), "--pingfederate-authentication-type", "basicAuth", ) testutils.CheckExpectedError(t, err, nil) @@ -296,8 +296,8 @@ func TestPlatformExportCmd_PingFederateTrustAllTLSFlag(t *testing.T) { "--overwrite", "true", "--services", "pingfederate", "--pingfederate-insecure-trust-all-tls=true", - "--pingfederate-username", os.Getenv(options.PingfederateBasicAuthUsernameOption.EnvVar), - "--pingfederate-password", os.Getenv(options.PingfederateBasicAuthPasswordOption.EnvVar), + "--pingfederate-username", os.Getenv(options.PingFederateBasicAuthUsernameOption.EnvVar), + "--pingfederate-password", os.Getenv(options.PingFederateBasicAuthPasswordOption.EnvVar), "--pingfederate-authentication-type", "basicAuth", ) testutils.CheckExpectedError(t, err, nil) @@ -313,8 +313,8 @@ func TestPlatformExportCmd_PingFederateTrustAllTLSFlagFalse(t *testing.T) { "--overwrite", "true", "--services", "pingfederate", "--pingfederate-insecure-trust-all-tls=false", - "--pingfederate-username", os.Getenv(options.PingfederateBasicAuthUsernameOption.EnvVar), - "--pingfederate-password", os.Getenv(options.PingfederateBasicAuthPasswordOption.EnvVar), + "--pingfederate-username", os.Getenv(options.PingFederateBasicAuthUsernameOption.EnvVar), + "--pingfederate-password", os.Getenv(options.PingFederateBasicAuthPasswordOption.EnvVar), "--pingfederate-authentication-type", "basicAuth", ) testutils.CheckExpectedError(t, err, &expectedErrorPattern) @@ -330,8 +330,8 @@ func TestPlatformExportCmd_PingFederateCaCertificatePemFiles(t *testing.T) { "--services", "pingfederate", "--pingfederate-insecure-trust-all-tls=false", "--pingfederate-ca-certificate-pem-files", "testdata/ssl-server-crt.pem", - "--pingfederate-username", os.Getenv(options.PingfederateBasicAuthUsernameOption.EnvVar), - "--pingfederate-password", os.Getenv(options.PingfederateBasicAuthPasswordOption.EnvVar), + "--pingfederate-username", os.Getenv(options.PingFederateBasicAuthUsernameOption.EnvVar), + "--pingfederate-password", os.Getenv(options.PingFederateBasicAuthPasswordOption.EnvVar), "--pingfederate-authentication-type", "basicAuth", ) testutils.CheckExpectedError(t, err, nil) @@ -343,8 +343,8 @@ func TestPlatformExportCmd_PingFederateCaCertificatePemFilesInvalid(t *testing.T err := testutils_cobra.ExecutePingcli(t, "platform", "export", "--services", "pingfederate", "--pingfederate-ca-certificate-pem-files", "invalid/crt.pem", - "--pingfederate-username", os.Getenv(options.PingfederateBasicAuthUsernameOption.EnvVar), - "--pingfederate-password", os.Getenv(options.PingfederateBasicAuthPasswordOption.EnvVar), + "--pingfederate-username", os.Getenv(options.PingFederateBasicAuthUsernameOption.EnvVar), + "--pingfederate-password", os.Getenv(options.PingFederateBasicAuthPasswordOption.EnvVar), "--pingfederate-authentication-type", "basicAuth", ) testutils.CheckExpectedError(t, err, &expectedErrorPattern) diff --git a/cmd/root.go b/cmd/root.go index 0d71698d..32cee4f5 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -18,16 +18,6 @@ import ( "github.com/spf13/viper" ) -const ( - ConfigurationFileFormat = `Configuration File Format: -activeProfile: - -: - color: - outputFormat: - ...` -) - func init() { l := logger.Get() @@ -41,9 +31,8 @@ func init() { // rootCmd represents the base command when called without any subcommands func NewRootCommand() *cobra.Command { cmd := &cobra.Command{ - Example: ConfigurationFileFormat, - Long: `A CLI tool for managing Ping Identity products.`, - Short: "A CLI tool for managing Ping Identity products.", + Long: "A CLI tool for managing the configuration of Ping Identity products.", + Short: "A CLI tool for managing the configuration of Ping Identity products.", SilenceErrors: true, // Upon error in RunE method, let output package in main.go handle error output Use: "pingcli", Version: "v2.0.0-alpha.4", diff --git a/internal/commands/config/set_internal.go b/internal/commands/config/set_internal.go index 53a25fd8..39b35948 100644 --- a/internal/commands/config/set_internal.go +++ b/internal/commands/config/set_internal.go @@ -130,9 +130,9 @@ func setValue(profileViper *viper.Viper, vKey, vValue string, valueType options. } profileViper.Set(vKey, outputFormat) case options.ENUM_PINGONE_REGION_CODE: - region := new(customtypes.PingoneRegionCode) + region := new(customtypes.PingOneRegionCode) if err = region.Set(vValue); err != nil { - return fmt.Errorf("value for key '%s' must be a valid Pingone Region Code. Allowed [%s]: %v", vKey, strings.Join(customtypes.PingoneRegionCodeValidValues(), ", "), err) + return fmt.Errorf("value for key '%s' must be a valid PingOne Region Code. Allowed [%s]: %v", vKey, strings.Join(customtypes.PingOneRegionCodeValidValues(), ", "), err) } profileViper.Set(vKey, region) case options.ENUM_STRING: @@ -154,15 +154,15 @@ func setValue(profileViper *viper.Viper, vKey, vValue string, valueType options. } profileViper.Set(vKey, uuid) case options.ENUM_PINGONE_AUTH_TYPE: - authType := new(customtypes.PingoneAuthenticationType) + authType := new(customtypes.PingOneAuthenticationType) if err = authType.Set(vValue); err != nil { - return fmt.Errorf("value for key '%s' must be a valid Pingone Authentication Type. Allowed [%s]: %v", vKey, strings.Join(customtypes.PingoneAuthenticationTypeValidValues(), ", "), err) + return fmt.Errorf("value for key '%s' must be a valid PingOne Authentication Type. Allowed [%s]: %v", vKey, strings.Join(customtypes.PingOneAuthenticationTypeValidValues(), ", "), err) } profileViper.Set(vKey, authType) case options.ENUM_PINGFEDERATE_AUTH_TYPE: - authType := new(customtypes.PingfederateAuthenticationType) + authType := new(customtypes.PingFederateAuthenticationType) if err = authType.Set(vValue); err != nil { - return fmt.Errorf("value for key '%s' must be a valid Pingfederate Authentication Type. Allowed [%s]: %v", vKey, strings.Join(customtypes.PingfederateAuthenticationTypeValidValues(), ", "), err) + return fmt.Errorf("value for key '%s' must be a valid PingFederate Authentication Type. Allowed [%s]: %v", vKey, strings.Join(customtypes.PingFederateAuthenticationTypeValidValues(), ", "), err) } profileViper.Set(vKey, authType) case options.ENUM_INT: diff --git a/internal/commands/feedback/feedback_internal.go b/internal/commands/feedback/feedback_internal.go index 0e28eedd..5393a6e9 100644 --- a/internal/commands/feedback/feedback_internal.go +++ b/internal/commands/feedback/feedback_internal.go @@ -4,15 +4,21 @@ import ( "github.com/pingidentity/pingcli/internal/output" ) -const FeedbackMessage string = `Thank you for participating in early adoption of the refreshed Ping Identity universal CLI! +const FeedbackMessage string = `We want to hear your feedback! -We appreciate your feedback and suggestions for improvement regarding your experiences with the CLI. +New features you'd like to see? +Things you like or dislike? +Bugs you've encountered? -Please visit the following URL in your browser to fill out a short, anonymous survey that will help guide our development efforts and improve the CLI for all users: +We're looking for your comments and suggestions regarding your experiences with the CLI to make the tool better for our developer community. + +Please visit the following URL in your browser to fill out a short, anonymous survey that will help us understand more about your experiences with the CLI. +Most fields are optional, and you can fill out the form as many times as you like, so please do provide feedback whenever you have something to share. https://forms.gle/xLz6ao4Ts86Zn2yt9 -If you encounter any bugs while using the tool, please open an issue on the project's GitHub repository's issue tracker: +If you encounter any bugs while using the tool, please report it to us. +Open an issue on the project's GitHub repository's issue tracker: https://github.com/pingidentity/pingcli/issues/new diff --git a/internal/commands/platform/export_internal.go b/internal/commands/platform/export_internal.go index 7742bc0a..c7669930 100644 --- a/internal/commands/platform/export_internal.go +++ b/internal/commands/platform/export_internal.go @@ -105,11 +105,11 @@ func initPingFederateServices(ctx context.Context, pingcliVersion string) (err e return fmt.Errorf("failed to initialize PingFederate services. context is nil") } - pfInsecureTrustAllTLS, err := profiles.GetOptionValue(options.PingfederateInsecureTrustAllTLSOption) + pfInsecureTrustAllTLS, err := profiles.GetOptionValue(options.PingFederateInsecureTrustAllTLSOption) if err != nil { return err } - caCertPemFiles, err := profiles.GetOptionValue(options.PingfederateCACertificatePemFilesOption) + caCertPemFiles, err := profiles.GetOptionValue(options.PingFederateCACertificatePemFilesOption) if err != nil { return err } @@ -148,18 +148,18 @@ func initPingFederateServices(ctx context.Context, pingcliVersion string) (err e } // Create context based on pingfederate authentication type - authType, err := profiles.GetOptionValue(options.PingfederateAuthenticationTypeOption) + authType, err := profiles.GetOptionValue(options.PingFederateAuthenticationTypeOption) if err != nil { return err } switch { case strings.EqualFold(authType, customtypes.ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC): - pfUsername, err := profiles.GetOptionValue(options.PingfederateBasicAuthUsernameOption) + pfUsername, err := profiles.GetOptionValue(options.PingFederateBasicAuthUsernameOption) if err != nil { return err } - pfPassword, err := profiles.GetOptionValue(options.PingfederateBasicAuthPasswordOption) + pfPassword, err := profiles.GetOptionValue(options.PingFederateBasicAuthPasswordOption) if err != nil { return err } @@ -173,7 +173,7 @@ func initPingFederateServices(ctx context.Context, pingcliVersion string) (err e Password: pfPassword, }) case strings.EqualFold(authType, customtypes.ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_ACCESS_TOKEN): - pfAccessToken, err := profiles.GetOptionValue(options.PingfederateAccessTokenAuthAccessTokenOption) + pfAccessToken, err := profiles.GetOptionValue(options.PingFederateAccessTokenAuthAccessTokenOption) if err != nil { return err } @@ -184,19 +184,19 @@ func initPingFederateServices(ctx context.Context, pingcliVersion string) (err e pingfederateContext = context.WithValue(ctx, pingfederateGoClient.ContextAccessToken, pfAccessToken) case strings.EqualFold(authType, customtypes.ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_CLIENT_CREDENTIALS): - pfClientID, err := profiles.GetOptionValue(options.PingfederateClientCredentialsAuthClientIDOption) + pfClientID, err := profiles.GetOptionValue(options.PingFederateClientCredentialsAuthClientIDOption) if err != nil { return err } - pfClientSecret, err := profiles.GetOptionValue(options.PingfederateClientCredentialsAuthClientSecretOption) + pfClientSecret, err := profiles.GetOptionValue(options.PingFederateClientCredentialsAuthClientSecretOption) if err != nil { return err } - pfTokenUrl, err := profiles.GetOptionValue(options.PingfederateClientCredentialsAuthTokenURLOption) + pfTokenUrl, err := profiles.GetOptionValue(options.PingFederateClientCredentialsAuthTokenURLOption) if err != nil { return err } - pfScopes, err := profiles.GetOptionValue(options.PingfederateClientCredentialsAuthScopesOption) + pfScopes, err := profiles.GetOptionValue(options.PingFederateClientCredentialsAuthScopesOption) if err != nil { return err } @@ -245,15 +245,15 @@ func initPingFederateApiClient(tr *http.Transport, pingcliVersion string) (err e return fmt.Errorf("failed to initialize pingfederate API client. http transport is nil") } - httpsHost, err := profiles.GetOptionValue(options.PingfederateHTTPSHostOption) + httpsHost, err := profiles.GetOptionValue(options.PingFederateHTTPSHostOption) if err != nil { return err } - adminApiPath, err := profiles.GetOptionValue(options.PingfederateAdminAPIPathOption) + adminApiPath, err := profiles.GetOptionValue(options.PingFederateAdminAPIPathOption) if err != nil { return err } - xBypassExternalValidationHeader, err := profiles.GetOptionValue(options.PingfederateXBypassExternalValidationHeaderOption) + xBypassExternalValidationHeader, err := profiles.GetOptionValue(options.PingFederateXBypassExternalValidationHeaderOption) if err != nil { return err } @@ -298,19 +298,19 @@ func initPingOneApiClient(ctx context.Context, pingcliVersion string) (err error return fmt.Errorf("failed to initialize pingone API client. context is nil") } - pingoneApiClientId, err = profiles.GetOptionValue(options.PingoneAuthenticationWorkerClientIDOption) + pingoneApiClientId, err = profiles.GetOptionValue(options.PingOneAuthenticationWorkerClientIDOption) if err != nil { return err } - clientSecret, err := profiles.GetOptionValue(options.PingoneAuthenticationWorkerClientSecretOption) + clientSecret, err := profiles.GetOptionValue(options.PingOneAuthenticationWorkerClientSecretOption) if err != nil { return err } - environmentID, err := profiles.GetOptionValue(options.PingoneAuthenticationWorkerEnvironmentIDOption) + environmentID, err := profiles.GetOptionValue(options.PingOneAuthenticationWorkerEnvironmentIDOption) if err != nil { return err } - regionCode, err := profiles.GetOptionValue(options.PingoneRegionCodeOption) + regionCode, err := profiles.GetOptionValue(options.PingOneRegionCodeOption) if err != nil { return err } @@ -400,13 +400,13 @@ func createOrValidateOutputDir(outputDir string, overwriteExport bool) (err erro } func getPingOneExportEnvID() (err error) { - pingoneExportEnvID, err = profiles.GetOptionValue(options.PlatformExportPingoneEnvironmentIDOption) + pingoneExportEnvID, err = profiles.GetOptionValue(options.PlatformExportPingOneEnvironmentIDOption) if err != nil { return err } if pingoneExportEnvID == "" { - pingoneExportEnvID, err = profiles.GetOptionValue(options.PingoneAuthenticationWorkerEnvironmentIDOption) + pingoneExportEnvID, err = profiles.GetOptionValue(options.PingOneAuthenticationWorkerEnvironmentIDOption) if err != nil { return err } diff --git a/internal/commands/request/request_internal.go b/internal/commands/request/request_internal.go index 499e0a92..822f2f3c 100644 --- a/internal/commands/request/request_internal.go +++ b/internal/commands/request/request_internal.go @@ -17,7 +17,7 @@ import ( "github.com/pingidentity/pingcli/internal/profiles" ) -type PingoneAuthResponse struct { +type PingOneAuthResponse struct { AccessToken string `json:"access_token"` TokenType string `json:"token_type"` ExpiresIn int64 `json:"expires_in"` @@ -120,7 +120,7 @@ func runInternalPingOneRequest(uri string) (err error) { } func getTopLevelDomain() (topLevelDomain string, err error) { - pingoneRegionCode, err := profiles.GetOptionValue(options.PingoneRegionCodeOption) + pingoneRegionCode, err := profiles.GetOptionValue(options.PingOneRegionCodeOption) if err != nil { return "", err } @@ -141,7 +141,7 @@ func getTopLevelDomain() (topLevelDomain string, err error) { case customtypes.ENUM_PINGONE_REGION_CODE_NA: topLevelDomain = customtypes.ENUM_PINGONE_TLD_NA default: - return "", fmt.Errorf("unrecognized Pingone region code: '%s'", pingoneRegionCode) + return "", fmt.Errorf("unrecognized PingOne region code: '%s'", pingoneRegionCode) } return topLevelDomain, nil @@ -194,7 +194,7 @@ func pingoneAuth() (accessToken string, err error) { return "", err } - workerEnvId, err := profiles.GetOptionValue(options.PingoneAuthenticationWorkerEnvironmentIDOption) + workerEnvId, err := profiles.GetOptionValue(options.PingOneAuthenticationWorkerEnvironmentIDOption) if err != nil { return "", err } @@ -205,11 +205,11 @@ func pingoneAuth() (accessToken string, err error) { authURL := fmt.Sprintf("https://auth.pingone.%s/%s/as/token", topLevelDomain, workerEnvId) - clientId, err := profiles.GetOptionValue(options.PingoneAuthenticationWorkerClientIDOption) + clientId, err := profiles.GetOptionValue(options.PingOneAuthenticationWorkerClientIDOption) if err != nil { return "", err } - clientSecret, err := profiles.GetOptionValue(options.PingoneAuthenticationWorkerClientSecretOption) + clientSecret, err := profiles.GetOptionValue(options.PingOneAuthenticationWorkerClientSecretOption) if err != nil { return "", err } @@ -246,7 +246,7 @@ func pingoneAuth() (accessToken string, err error) { return "", fmt.Errorf("failed to authenticate with PingOne: Response Status %s: Response Body %s", res.Status, string(responseBodyBytes)) } - pingoneAuthResponse := new(PingoneAuthResponse) + pingoneAuthResponse := new(PingOneAuthResponse) err = json.Unmarshal(responseBodyBytes, pingoneAuthResponse) if err != nil { return "", err diff --git a/internal/commands/request/request_internal_test.go b/internal/commands/request/request_internal_test.go index 628f0616..7a6702f6 100644 --- a/internal/commands/request/request_internal_test.go +++ b/internal/commands/request/request_internal_test.go @@ -74,7 +74,7 @@ func Test_runInternalPingOneRequest_InvalidURI(t *testing.T) { func Test_getTopLevelDomain(t *testing.T) { testutils_viper.InitVipers(t) - t.Setenv(options.PingoneRegionCodeOption.EnvVar, customtypes.ENUM_PINGONE_REGION_CODE_CA) + t.Setenv(options.PingOneRegionCodeOption.EnvVar, customtypes.ENUM_PINGONE_REGION_CODE_CA) domain, err := getTopLevelDomain() testutils.CheckExpectedError(t, err, nil) @@ -89,10 +89,10 @@ func Test_getTopLevelDomain(t *testing.T) { func Test_getTopLevelDomain_InvalidRegionCode(t *testing.T) { testutils_viper.InitVipers(t) - t.Setenv(options.PingoneRegionCodeOption.EnvVar, "invalid-region") + t.Setenv(options.PingOneRegionCodeOption.EnvVar, "invalid-region") _, err := getTopLevelDomain() - expectedErrorPattern := "unrecognized Pingone region code: 'invalid-region'" + expectedErrorPattern := "unrecognized PingOne region code: 'invalid-region'" testutils.CheckExpectedError(t, err, &expectedErrorPattern) } @@ -132,7 +132,7 @@ func Test_pingoneAuth(t *testing.T) { func Test_pingoneAuth_InvalidCredentials(t *testing.T) { testutils_viper.InitVipers(t) - t.Setenv(options.PingoneAuthenticationWorkerClientIDOption.EnvVar, "invalid") + t.Setenv(options.PingOneAuthenticationWorkerClientIDOption.EnvVar, "invalid") _, err := pingoneAuth() expectedErrorPattern := `(?s)^failed to authenticate with PingOne: Response Status 401 Unauthorized: Response Body .*$` diff --git a/internal/configuration/config/add_profile.go b/internal/configuration/config/add_profile.go index 9031abbc..95026b60 100644 --- a/internal/configuration/config/add_profile.go +++ b/internal/configuration/config/add_profile.go @@ -69,7 +69,7 @@ func initAddProfileSetActiveOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "s", - Usage: "Set the new configuration profile as the active profile for pingcli.", + Usage: "Set the new configuration profile as the active profile.", Value: cobraValue, DefValue: "false", }, diff --git a/internal/configuration/config/delete_profile.go b/internal/configuration/config/delete_profile.go index f9550708..24fb66f2 100644 --- a/internal/configuration/config/delete_profile.go +++ b/internal/configuration/config/delete_profile.go @@ -23,7 +23,7 @@ func initDeleteProfileOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "p", - Usage: "The configuration profile to delete.", + Usage: "The name of the configuration profile to delete.", Value: cobraValue, DefValue: "", }, diff --git a/internal/configuration/config/get.go b/internal/configuration/config/get.go index 8a5f4de5..5e7b433d 100644 --- a/internal/configuration/config/get.go +++ b/internal/configuration/config/get.go @@ -23,7 +23,7 @@ func initGetProfileOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "p", - Usage: "The configuration profile used to get the configuration value from.", + Usage: "The name of the configuration profile used to get the configuration value from.", Value: cobraValue, DefValue: "The active profile", }, diff --git a/internal/configuration/config/set.go b/internal/configuration/config/set.go index e166e0c0..952d5fd9 100644 --- a/internal/configuration/config/set.go +++ b/internal/configuration/config/set.go @@ -23,7 +23,7 @@ func initSetProfileOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "p", - Usage: "The configuration profile used to set the configuration value.", + Usage: "The name of the configuration profile used to set the configuration value to.", Value: cobraValue, DefValue: "The active profile", }, diff --git a/internal/configuration/config/set_active_profile.go b/internal/configuration/config/set_active_profile.go index daa2bc72..4d29081b 100644 --- a/internal/configuration/config/set_active_profile.go +++ b/internal/configuration/config/set_active_profile.go @@ -23,7 +23,7 @@ func initSetActiveProfileOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "p", - Usage: "The configuration profile to set as the active profile.", + Usage: "The name of the configuration profile to set as the active profile.", Value: cobraValue, DefValue: "", }, diff --git a/internal/configuration/config/unset.go b/internal/configuration/config/unset.go index dc1b1ac0..50becd04 100644 --- a/internal/configuration/config/unset.go +++ b/internal/configuration/config/unset.go @@ -23,7 +23,7 @@ func initUnsetProfileOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "p", - Usage: "The configuration profile used to unset the configuration value.", + Usage: "The name of the configuration profile to unset a configuration value from.", Value: cobraValue, DefValue: "The active profile", }, diff --git a/internal/configuration/config/view_profile.go b/internal/configuration/config/view_profile.go index 9a67a24a..8d3f296a 100644 --- a/internal/configuration/config/view_profile.go +++ b/internal/configuration/config/view_profile.go @@ -23,7 +23,7 @@ func initViewProfileOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "p", - Usage: "The configuration profile name to view.", + Usage: "The name of configuration profile to view.", Value: cobraValue, DefValue: "The active profile", }, diff --git a/internal/configuration/configuration.go b/internal/configuration/configuration.go index 3e3e63e9..19ff6704 100644 --- a/internal/configuration/configuration.go +++ b/internal/configuration/configuration.go @@ -98,6 +98,6 @@ func InitAllOptions() { configuration_request.InitRequestOptions() - configuration_services.InitPingfederateServiceOptions() - configuration_services.InitPingoneServiceOptions() + configuration_services.InitPingFederateServiceOptions() + configuration_services.InitPingOneServiceOptions() } diff --git a/internal/configuration/options/options.go b/internal/configuration/options/options.go index b4af62f0..42e9de69 100644 --- a/internal/configuration/options/options.go +++ b/internal/configuration/options/options.go @@ -33,31 +33,31 @@ type Option struct { func Options() []Option { return []Option{ - PingoneAuthenticationTypeOption, - PingoneAuthenticationWorkerClientIDOption, - PingoneAuthenticationWorkerClientSecretOption, - PingoneAuthenticationWorkerEnvironmentIDOption, - PingoneRegionCodeOption, + PingOneAuthenticationTypeOption, + PingOneAuthenticationWorkerClientIDOption, + PingOneAuthenticationWorkerClientSecretOption, + PingOneAuthenticationWorkerEnvironmentIDOption, + PingOneRegionCodeOption, PlatformExportExportFormatOption, PlatformExportServiceOption, PlatformExportOutputDirectoryOption, PlatformExportOverwriteOption, - PlatformExportPingoneEnvironmentIDOption, - - PingfederateHTTPSHostOption, - PingfederateAdminAPIPathOption, - PingfederateXBypassExternalValidationHeaderOption, - PingfederateCACertificatePemFilesOption, - PingfederateInsecureTrustAllTLSOption, - PingfederateBasicAuthUsernameOption, - PingfederateBasicAuthPasswordOption, - PingfederateAccessTokenAuthAccessTokenOption, - PingfederateClientCredentialsAuthClientIDOption, - PingfederateClientCredentialsAuthClientSecretOption, - PingfederateClientCredentialsAuthTokenURLOption, - PingfederateClientCredentialsAuthScopesOption, - PingfederateAuthenticationTypeOption, + PlatformExportPingOneEnvironmentIDOption, + + PingFederateHTTPSHostOption, + PingFederateAdminAPIPathOption, + PingFederateXBypassExternalValidationHeaderOption, + PingFederateCACertificatePemFilesOption, + PingFederateInsecureTrustAllTLSOption, + PingFederateBasicAuthUsernameOption, + PingFederateBasicAuthPasswordOption, + PingFederateAccessTokenAuthAccessTokenOption, + PingFederateClientCredentialsAuthClientIDOption, + PingFederateClientCredentialsAuthClientSecretOption, + PingFederateClientCredentialsAuthTokenURLOption, + PingFederateClientCredentialsAuthScopesOption, + PingFederateAuthenticationTypeOption, RootActiveProfileOption, RootColorOption, @@ -89,28 +89,28 @@ func Options() []Option { // pingone service options var ( - PingoneAuthenticationTypeOption Option - PingoneAuthenticationWorkerClientIDOption Option - PingoneAuthenticationWorkerClientSecretOption Option - PingoneAuthenticationWorkerEnvironmentIDOption Option - PingoneRegionCodeOption Option + PingOneAuthenticationTypeOption Option + PingOneAuthenticationWorkerClientIDOption Option + PingOneAuthenticationWorkerClientSecretOption Option + PingOneAuthenticationWorkerEnvironmentIDOption Option + PingOneRegionCodeOption Option ) // pingfederate service options var ( - PingfederateHTTPSHostOption Option - PingfederateAdminAPIPathOption Option - PingfederateXBypassExternalValidationHeaderOption Option - PingfederateCACertificatePemFilesOption Option - PingfederateInsecureTrustAllTLSOption Option - PingfederateBasicAuthUsernameOption Option - PingfederateBasicAuthPasswordOption Option - PingfederateAccessTokenAuthAccessTokenOption Option - PingfederateClientCredentialsAuthClientIDOption Option - PingfederateClientCredentialsAuthClientSecretOption Option - PingfederateClientCredentialsAuthTokenURLOption Option - PingfederateClientCredentialsAuthScopesOption Option - PingfederateAuthenticationTypeOption Option + PingFederateHTTPSHostOption Option + PingFederateAdminAPIPathOption Option + PingFederateXBypassExternalValidationHeaderOption Option + PingFederateCACertificatePemFilesOption Option + PingFederateInsecureTrustAllTLSOption Option + PingFederateBasicAuthUsernameOption Option + PingFederateBasicAuthPasswordOption Option + PingFederateAccessTokenAuthAccessTokenOption Option + PingFederateClientCredentialsAuthClientIDOption Option + PingFederateClientCredentialsAuthClientSecretOption Option + PingFederateClientCredentialsAuthTokenURLOption Option + PingFederateClientCredentialsAuthScopesOption Option + PingFederateAuthenticationTypeOption Option ) // 'pingcli config' command options @@ -142,7 +142,7 @@ var ( PlatformExportServiceOption Option PlatformExportOutputDirectoryOption Option PlatformExportOverwriteOption Option - PlatformExportPingoneEnvironmentIDOption Option + PlatformExportPingOneEnvironmentIDOption Option ) // Generic viper profile options diff --git a/internal/configuration/platform/export.go b/internal/configuration/platform/export.go index bd6fd4c4..ac28c82c 100644 --- a/internal/configuration/platform/export.go +++ b/internal/configuration/platform/export.go @@ -33,7 +33,7 @@ func initFormatOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "f", - Usage: fmt.Sprintf("Specifies export format\nAllowed: [%s]. Also configurable via environment variable %s", strings.Join(customtypes.ExportFormatValidValues(), ", "), envVar), + Usage: fmt.Sprintf("Specifies the export format\nOptions are: [%s]. Also configurable via environment variable %s", strings.Join(customtypes.ExportFormatValidValues(), ", "), envVar), Value: cobraValue, DefValue: customtypes.ENUM_EXPORT_FORMAT_HCL, }, @@ -56,7 +56,7 @@ func initServicesOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "s", - Usage: fmt.Sprintf("Specifies service(s) to export. Accepts comma-separated string to delimit multiple services. Allowed: [%s]. Also configurable via environment variable %s", strings.Join(customtypes.ExportServicesValidValues(), ", "), envVar), + Usage: fmt.Sprintf("Specifies the service(s) to export. Accepts a comma-separated string to delimit multiple services. Options are: [%s]. Also configurable via environment variable %s", strings.Join(customtypes.ExportServicesValidValues(), ", "), envVar), Value: cobraValue, DefValue: strings.Join(customtypes.ExportServicesValidValues(), ", "), }, @@ -79,7 +79,7 @@ func initOutputDirectoryOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "d", - Usage: fmt.Sprintf("Specifies output directory for export. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("Specifies the output directory for export. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "$(pwd)/export", }, @@ -101,7 +101,7 @@ func initOverwriteOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "o", - Usage: "Overwrite existing generated exports in output directory.", + Usage: "Overwrite the existing generated exports in output directory.", Value: cobraValue, DefValue: "false", }, @@ -135,14 +135,14 @@ func initPingOneEnvironmentIDOption() { defaultValue := customtypes.UUID("") envVar := "PINGCLI_PINGONE_EXPORT_ENVIRONMENT_ID" - options.PlatformExportPingoneEnvironmentIDOption = options.Option{ + options.PlatformExportPingOneEnvironmentIDOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The ID of the Pingone environment to export. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The ID of the PingOne environment to export. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, diff --git a/internal/configuration/request/request.go b/internal/configuration/request/request.go index 9e9413b1..1aeab8ac 100644 --- a/internal/configuration/request/request.go +++ b/internal/configuration/request/request.go @@ -31,7 +31,7 @@ func initDataOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: "The data to send in the request. Use prefix '@' to specify data filepath instead of raw data.", + Usage: "The data to send in the request. Use prefix '@' to specify data file path instead of raw data. (e.g. @data.json)", Value: cobraValue, DefValue: "", }, @@ -53,7 +53,7 @@ func initHTTPMethodOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "m", - Usage: fmt.Sprintf("The HTTP method to use for the request. Allowed: %s.", strings.Join(customtypes.HTTPMethodValidValues(), ", ")), + Usage: fmt.Sprintf("The HTTP method to use for the request. Options are: %s.", strings.Join(customtypes.HTTPMethodValidValues(), ", ")), Value: cobraValue, DefValue: customtypes.ENUM_HTTP_METHOD_GET, }, @@ -76,7 +76,7 @@ func initServiceOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "s", - Usage: fmt.Sprintf("The service to send a custom request. Allowed: %s. Also configurable via environment variable %s.", strings.Join(customtypes.RequestServiceValidValues(), ", "), envVar), + Usage: fmt.Sprintf("The Ping service (configured in the active profile) to send the custom request to. Options are: %s. Also configurable via environment variable %s.", strings.Join(customtypes.RequestServiceValidValues(), ", "), envVar), Value: cobraValue, DefValue: "", }, diff --git a/internal/configuration/root/root.go b/internal/configuration/root/root.go index fb72f123..b68197af 100644 --- a/internal/configuration/root/root.go +++ b/internal/configuration/root/root.go @@ -31,7 +31,7 @@ func initActiveProfileOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "P", - Usage: "Profile to use from configuration file", + Usage: "The name of the stored custom configuration profile to use.", Value: cobraValue, DefValue: "default", }, @@ -52,7 +52,7 @@ func initColorOption() { EnvVar: "PINGCLI_COLOR", Flag: &pflag.Flag{ Name: cobraParamName, - Usage: "Use colorized output", + Usage: "Show text output in color.", Value: cobraValue, DefValue: "true", }, @@ -74,7 +74,7 @@ func initConfigOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "C", - Usage: "Configuration file location", + Usage: "The relative or full path to a custom Ping CLI configuration file.", Value: cobraValue, DefValue: "\"$HOME/.pingcli/config.yaml\"", }, @@ -96,7 +96,7 @@ func initOutputFormatOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "O", - Usage: fmt.Sprintf("Specifies pingcli's console output format. Allowed: %s", strings.Join(customtypes.OutputFormatValidValues(), ", ")), + Usage: fmt.Sprintf("Specify the console output format. Options are: %s", strings.Join(customtypes.OutputFormatValidValues(), ", ")), Value: cobraValue, DefValue: customtypes.ENUM_OUTPUT_FORMAT_TEXT, }, diff --git a/internal/configuration/services/pingfederate.go b/internal/configuration/services/pingfederate.go index 012bc608..20fa789c 100644 --- a/internal/configuration/services/pingfederate.go +++ b/internal/configuration/services/pingfederate.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/pflag" ) -func InitPingfederateServiceOptions() { +func InitPingFederateServiceOptions() { initHTTPSHostOption() initAdminAPIPathOption() initXBypassExternalValidationHeaderOption() @@ -22,7 +22,7 @@ func InitPingfederateServiceOptions() { initClientSecretOption() initTokenURLOption() initScopesOption() - initPingfederateAuthenticationTypeOption() + initPingFederateAuthenticationTypeOption() } func initHTTPSHostOption() { @@ -31,14 +31,14 @@ func initHTTPSHostOption() { defaultValue := customtypes.String("") envVar := "PINGCLI_PINGFEDERATE_HTTPS_HOST" - options.PingfederateHTTPSHostOption = options.Option{ + options.PingFederateHTTPSHostOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate HTTPS host used to communicate with PingFederate's API. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate HTTPS host used to communicate with PingFederate's admin API. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -53,14 +53,14 @@ func initAdminAPIPathOption() { defaultValue := customtypes.String("/pf-admin-api/v1") envVar := "PINGCLI_PINGFEDERATE_ADMIN_API_PATH" - options.PingfederateAdminAPIPathOption = options.Option{ + options.PingFederateAdminAPIPathOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate API URL path used to communicate with PingFederate's API. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate API URL path used to communicate with PingFederate's admin API. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "/pf-admin-api/v1", }, @@ -75,14 +75,14 @@ func initXBypassExternalValidationHeaderOption() { defaultValue := customtypes.Bool(false) envVar := "PINGCLI_PINGFEDERATE_X_BYPASS_EXTERNAL_VALIDATION_HEADER" - options.PingfederateXBypassExternalValidationHeaderOption = options.Option{ + options.PingFederateXBypassExternalValidationHeaderOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("Header value in request for PingFederate. PingFederate's connection tests will be bypassed when set to true. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("Bypass connection tests when configuring PingFederate (the `X-BypassExternalValidation` header when using PingFederate's admin API). Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "false", }, @@ -97,14 +97,14 @@ func initCACertificatePemFilesOption() { defaultValue := customtypes.StringSlice{} envVar := "PINGCLI_PINGFEDERATE_CA_CERTIFICATE_PEM_FILES" - options.PingfederateCACertificatePemFilesOption = options.Option{ + options.PingFederateCACertificatePemFilesOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("Paths to files containing PEM-encoded certificates to be trusted as root CAs when connecting to the PingFederate server over HTTPS. Accepts comma-separated string to delimit multiple PEM files. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("Relative or full paths to PEM-encoded certificate files to be trusted as root CAs when connecting to the PingFederate server over HTTPS. Accepts a comma-separated string to delimit multiple PEM files. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "[]", }, @@ -119,14 +119,14 @@ func initInsecureTrustAllTLSOption() { defaultValue := customtypes.Bool(false) envVar := "PINGCLI_PINGFEDERATE_INSECURE_TRUST_ALL_TLS" - options.PingfederateInsecureTrustAllTLSOption = options.Option{ + options.PingFederateInsecureTrustAllTLSOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("Set to true to trust any certificate when connecting to the PingFederate server. This is insecure and should not be enabled outside of testing. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("Trust any certificate when connecting to the PingFederate server admin API. This is insecure and should not be enabled outside of testing. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "false", }, @@ -141,14 +141,14 @@ func initUsernameOption() { defaultValue := customtypes.String("") envVar := "PINGCLI_PINGFEDERATE_USERNAME" - options.PingfederateBasicAuthUsernameOption = options.Option{ + options.PingFederateBasicAuthUsernameOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate username used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate username used to authenticate to the PingFederate admin API when using basic authentication. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -163,14 +163,14 @@ func initPasswordOption() { defaultValue := customtypes.String("") envVar := "PINGCLI_PINGFEDERATE_PASSWORD" - options.PingfederateBasicAuthPasswordOption = options.Option{ + options.PingFederateBasicAuthPasswordOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate password used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate password used to authenticate to the PingFederate admin API when using basic authentication. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -185,14 +185,14 @@ func initAccessTokenOption() { defaultValue := customtypes.String("") envVar := "PINGCLI_PINGFEDERATE_ACCESS_TOKEN" - options.PingfederateAccessTokenAuthAccessTokenOption = options.Option{ + options.PingFederateAccessTokenAuthAccessTokenOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate access token used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate access token used to authenticate to the PingFederate admin API when using a custom OAuth 2.0 token method. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -207,14 +207,14 @@ func initClientIDOption() { defaultValue := customtypes.String("") envVar := "PINGCLI_PINGFEDERATE_CLIENT_ID" - options.PingfederateClientCredentialsAuthClientIDOption = options.Option{ + options.PingFederateClientCredentialsAuthClientIDOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate OAuth client ID used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate OAuth client ID used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -229,14 +229,14 @@ func initClientSecretOption() { defaultValue := customtypes.String("") envVar := "PINGCLI_PINGFEDERATE_CLIENT_SECRET" - options.PingfederateClientCredentialsAuthClientSecretOption = options.Option{ + options.PingFederateClientCredentialsAuthClientSecretOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate OAuth client secret used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate OAuth client secret used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -251,14 +251,14 @@ func initTokenURLOption() { defaultValue := customtypes.String("") envVar := "PINGCLI_PINGFEDERATE_TOKEN_URL" - options.PingfederateClientCredentialsAuthTokenURLOption = options.Option{ + options.PingFederateClientCredentialsAuthTokenURLOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate OAuth token URL used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate OAuth token URL used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -273,14 +273,14 @@ func initScopesOption() { defaultValue := customtypes.StringSlice{} envVar := "PINGCLI_PINGFEDERATE_SCOPES" - options.PingfederateClientCredentialsAuthScopesOption = options.Option{ + options.PingFederateClientCredentialsAuthScopesOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate OAuth scopes used to authenticate. Accepts comma-separated string to delimit multiple scopes. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The PingFederate OAuth scopes used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Accepts a comma-separated string to delimit multiple scopes. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "[]", }, @@ -289,20 +289,20 @@ func initScopesOption() { } } -func initPingfederateAuthenticationTypeOption() { +func initPingFederateAuthenticationTypeOption() { cobraParamName := "pingfederate-authentication-type" - cobraValue := new(customtypes.PingfederateAuthenticationType) - defaultValue := customtypes.PingfederateAuthenticationType("") + cobraValue := new(customtypes.PingFederateAuthenticationType) + defaultValue := customtypes.PingFederateAuthenticationType("") envVar := "PINGCLI_PINGFEDERATE_AUTHENTICATION_TYPE" - options.PingfederateAuthenticationTypeOption = options.Option{ + options.PingFederateAuthenticationTypeOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The authentication type to use with the PingFederate service. Allowed: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingfederateAuthenticationTypeValidValues(), ", "), envVar), + Usage: fmt.Sprintf("The authentication type to use when connecting to the PingFederate admin API. Options are: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingFederateAuthenticationTypeValidValues(), ", "), envVar), Value: cobraValue, DefValue: "", }, diff --git a/internal/configuration/services/pingone.go b/internal/configuration/services/pingone.go index 0fb48376..acaebfae 100644 --- a/internal/configuration/services/pingone.go +++ b/internal/configuration/services/pingone.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/pflag" ) -func InitPingoneServiceOptions() { - initPingoneAuthenticationTypeOption() +func InitPingOneServiceOptions() { + initPingOneAuthenticationTypeOption() initAuthenticationWorkerClientIDOption() initAuthenticationWorkerClientSecretOption() initAuthenticationWorkerEnvironmentIDOption() @@ -24,14 +24,14 @@ func initAuthenticationWorkerClientIDOption() { defaultValue := customtypes.UUID("") envVar := "PINGCLI_PINGONE_WORKER_CLIENT_ID" - options.PingoneAuthenticationWorkerClientIDOption = options.Option{ + options.PingOneAuthenticationWorkerClientIDOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The Pingone worker client ID used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The worker client ID used to authenticate to the PingOne management API. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -46,14 +46,14 @@ func initAuthenticationWorkerClientSecretOption() { defaultValue := customtypes.String("") envVar := "PINGCLI_PINGONE_WORKER_CLIENT_SECRET" - options.PingoneAuthenticationWorkerClientSecretOption = options.Option{ + options.PingOneAuthenticationWorkerClientSecretOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The Pingone worker client secret used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The worker client secret used to authenticate to the PingOne management API. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -68,14 +68,14 @@ func initAuthenticationWorkerEnvironmentIDOption() { defaultValue := customtypes.UUID("") envVar := "PINGCLI_PINGONE_WORKER_ENVIRONMENT_ID" - options.PingoneAuthenticationWorkerEnvironmentIDOption = options.Option{ + options.PingOneAuthenticationWorkerEnvironmentIDOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The ID of the Pingone environment that contains the worker client used to authenticate. Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("The ID of the PingOne environment that contains the worker client used to authenticate to the PingOne management API. Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "", }, @@ -84,22 +84,22 @@ func initAuthenticationWorkerEnvironmentIDOption() { } } -func initPingoneAuthenticationTypeOption() { +func initPingOneAuthenticationTypeOption() { cobraParamName := "pingone-authentication-type" - cobraValue := new(customtypes.PingoneAuthenticationType) - defaultValue := customtypes.PingoneAuthenticationType("") + cobraValue := new(customtypes.PingOneAuthenticationType) + defaultValue := customtypes.PingOneAuthenticationType("") envVar := "PINGCLI_PINGONE_AUTHENTICATION_TYPE" - options.PingoneAuthenticationTypeOption = options.Option{ + options.PingOneAuthenticationTypeOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The authentication type to use with the Pingone service. Allowed: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingoneAuthenticationTypeValidValues(), ", "), envVar), + Usage: fmt.Sprintf("The authentication type to use to authenticate to the PingOne management API. Options are: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingOneAuthenticationTypeValidValues(), ", "), envVar), Value: cobraValue, - DefValue: "", + DefValue: customtypes.ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER, }, Type: options.ENUM_PINGONE_AUTH_TYPE, ViperKey: "service.pingone.authentication.type", @@ -108,18 +108,18 @@ func initPingoneAuthenticationTypeOption() { func initRegionCodeOption() { cobraParamName := "pingone-region-code" - cobraValue := new(customtypes.PingoneRegionCode) - defaultValue := customtypes.PingoneRegionCode("") + cobraValue := new(customtypes.PingOneRegionCode) + defaultValue := customtypes.PingOneRegionCode("") envVar := "PINGCLI_PINGONE_REGION_CODE" - options.PingoneRegionCodeOption = options.Option{ + options.PingOneRegionCodeOption = options.Option{ CobraParamName: cobraParamName, CobraParamValue: cobraValue, DefaultValue: &defaultValue, EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The region code of the Pingone service. Allowed: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingoneRegionCodeValidValues(), ", "), envVar), + Usage: fmt.Sprintf("The region code of the PingOne tenant. Options are: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingOneRegionCodeValidValues(), ", "), envVar), Value: cobraValue, DefValue: "", }, diff --git a/internal/connector/pingfederate/pingfederate_connector.go b/internal/connector/pingfederate/pingfederate_connector.go index 653e7394..ca785d4a 100644 --- a/internal/connector/pingfederate/pingfederate_connector.go +++ b/internal/connector/pingfederate/pingfederate_connector.go @@ -16,17 +16,17 @@ const ( // Verify that the connector satisfies the expected interfaces var ( - _ connector.Exportable = &PingfederateConnector{} - _ connector.Authenticatable = &PingfederateConnector{} + _ connector.Exportable = &PingFederateConnector{} + _ connector.Authenticatable = &PingFederateConnector{} ) -type PingfederateConnector struct { +type PingFederateConnector struct { clientInfo connector.PingFederateClientInfo } -// Utility method for creating a PingfederateConnector -func PFConnector(ctx context.Context, apiClient *pingfederateGoClient.APIClient) *PingfederateConnector { - return &PingfederateConnector{ +// Utility method for creating a PingFederateConnector +func PFConnector(ctx context.Context, apiClient *pingfederateGoClient.APIClient) *PingFederateConnector { + return &PingFederateConnector{ clientInfo: connector.PingFederateClientInfo{ ApiClient: apiClient, Context: ctx, @@ -34,10 +34,10 @@ func PFConnector(ctx context.Context, apiClient *pingfederateGoClient.APIClient) } } -func (c *PingfederateConnector) Export(format, outputDir string, overwriteExport bool) error { +func (c *PingFederateConnector) Export(format, outputDir string, overwriteExport bool) error { l := logger.Get() - l.Debug().Msgf("Exporting all Pingfederate Resources...") + l.Debug().Msgf("Exporting all PingFederate Resources...") exportableResources := []connector.ExportableResource{ resources.AuthenticationApiApplication(&c.clientInfo), @@ -66,7 +66,7 @@ func (c *PingfederateConnector) Export(format, outputDir string, overwriteExport resources.OpenIDConnectPolicy(&c.clientInfo), resources.OpenIDConnectSettings(&c.clientInfo), resources.PasswordCredentialValidator(&c.clientInfo), - resources.PingoneConnection(&c.clientInfo), + resources.PingOneConnection(&c.clientInfo), resources.RedirectValidation(&c.clientInfo), resources.ServerSettings(&c.clientInfo), resources.ServerSettingsGeneral(&c.clientInfo), @@ -81,14 +81,14 @@ func (c *PingfederateConnector) Export(format, outputDir string, overwriteExport return common.WriteFiles(exportableResources, format, outputDir, overwriteExport) } -func (c *PingfederateConnector) ConnectorServiceName() string { +func (c *PingFederateConnector) ConnectorServiceName() string { return serviceName } -func (c *PingfederateConnector) Login() error { +func (c *PingFederateConnector) Login() error { return nil } -func (c *PingfederateConnector) Logout() error { +func (c *PingFederateConnector) Logout() error { return nil } diff --git a/internal/connector/pingfederate/pingfederate_connector_test.go b/internal/connector/pingfederate/pingfederate_connector_test.go index 394a49c4..5ce0b53d 100644 --- a/internal/connector/pingfederate/pingfederate_connector_test.go +++ b/internal/connector/pingfederate/pingfederate_connector_test.go @@ -168,8 +168,8 @@ func TestPingFederateTerraformPlan(t *testing.T) { }, }, { - name: "PingFederatePingoneConnection", - resource: resources.PingoneConnection(PingFederateClientInfo), + name: "PingFederatePingOneConnection", + resource: resources.PingOneConnection(PingFederateClientInfo), ignoredErrors: []string{ "Error: Missing Configuration for Required Attribute", }, diff --git a/internal/connector/pingfederate/resources/pingfederate_pingone_connection.go b/internal/connector/pingfederate/resources/pingfederate_pingone_connection.go index 24c3d689..c751e7a1 100644 --- a/internal/connector/pingfederate/resources/pingfederate_pingone_connection.go +++ b/internal/connector/pingfederate/resources/pingfederate_pingone_connection.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingFederatePingoneConnectionResource{} + _ connector.ExportableResource = &PingFederatePingOneConnectionResource{} ) -type PingFederatePingoneConnectionResource struct { +type PingFederatePingOneConnectionResource struct { clientInfo *connector.PingFederateClientInfo } -// Utility method for creating a PingFederatePingoneConnectionResource -func PingoneConnection(clientInfo *connector.PingFederateClientInfo) *PingFederatePingoneConnectionResource { - return &PingFederatePingoneConnectionResource{ +// Utility method for creating a PingFederatePingOneConnectionResource +func PingOneConnection(clientInfo *connector.PingFederateClientInfo) *PingFederatePingOneConnectionResource { + return &PingFederatePingOneConnectionResource{ clientInfo: clientInfo, } } -func (r *PingFederatePingoneConnectionResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingFederatePingOneConnectionResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -79,6 +79,6 @@ func (r *PingFederatePingoneConnectionResource) ExportAll() (*[]connector.Import return &importBlocks, nil } -func (r *PingFederatePingoneConnectionResource) ResourceType() string { +func (r *PingFederatePingOneConnectionResource) ResourceType() string { return "pingfederate_pingone_connection" } diff --git a/internal/connector/pingfederate/resources/pingfederate_pingone_connection_test.go b/internal/connector/pingfederate/resources/pingfederate_pingone_connection_test.go index 7aaa4a78..a9170ca7 100644 --- a/internal/connector/pingfederate/resources/pingfederate_pingone_connection_test.go +++ b/internal/connector/pingfederate/resources/pingfederate_pingone_connection_test.go @@ -8,10 +8,10 @@ import ( "github.com/pingidentity/pingcli/internal/testing/testutils" ) -func TestPingFederatePingoneConnectionExport(t *testing.T) { +func TestPingFederatePingOneConnectionExport(t *testing.T) { // Get initialized apiClient and resource PingFederateClientInfo := testutils.GetPingFederateClientInfo(t) - resource := resources.PingoneConnection(PingFederateClientInfo) + resource := resources.PingOneConnection(PingFederateClientInfo) // Defined the expected ImportBlocks for the resource expectedImportBlocks := []connector.ImportBlock{ diff --git a/internal/connector/pingone/mfa/pingone_mfa_connector.go b/internal/connector/pingone/mfa/pingone_mfa_connector.go index 906b98ba..efd59045 100644 --- a/internal/connector/pingone/mfa/pingone_mfa_connector.go +++ b/internal/connector/pingone/mfa/pingone_mfa_connector.go @@ -16,17 +16,17 @@ const ( // Verify that the connector satisfies the expected interfaces var ( - _ connector.Exportable = &PingoneMFAConnector{} - _ connector.Authenticatable = &PingoneMFAConnector{} + _ connector.Exportable = &PingOneMFAConnector{} + _ connector.Authenticatable = &PingOneMFAConnector{} ) -type PingoneMFAConnector struct { +type PingOneMFAConnector struct { clientInfo connector.PingOneClientInfo } -// Utility method for creating a PingoneMFAConnector -func MFAConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiClientId *string, exportEnvironmentID string) *PingoneMFAConnector { - return &PingoneMFAConnector{ +// Utility method for creating a PingOneMFAConnector +func MFAConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiClientId *string, exportEnvironmentID string) *PingOneMFAConnector { + return &PingOneMFAConnector{ clientInfo: connector.PingOneClientInfo{ Context: ctx, ApiClient: apiClient, @@ -36,7 +36,7 @@ func MFAConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiCli } } -func (c *PingoneMFAConnector) Export(format, outputDir string, overwriteExport bool) error { +func (c *PingOneMFAConnector) Export(format, outputDir string, overwriteExport bool) error { l := logger.Get() l.Debug().Msgf("Exporting all PingOne MFA Resources...") @@ -51,14 +51,14 @@ func (c *PingoneMFAConnector) Export(format, outputDir string, overwriteExport b return common.WriteFiles(exportableResources, format, outputDir, overwriteExport) } -func (c *PingoneMFAConnector) ConnectorServiceName() string { +func (c *PingOneMFAConnector) ConnectorServiceName() string { return serviceName } -func (c *PingoneMFAConnector) Login() error { +func (c *PingOneMFAConnector) Login() error { return nil } -func (c *PingoneMFAConnector) Logout() error { +func (c *PingOneMFAConnector) Logout() error { return nil } diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential.go b/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential.go index d86e8b8e..610aae4b 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_application_push_credential.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneMFAApplicationPushCredentialResource{} + _ connector.ExportableResource = &PingOneMFAApplicationPushCredentialResource{} ) -type PingoneMFAApplicationPushCredentialResource struct { +type PingOneMFAApplicationPushCredentialResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneMFAApplicationPushCredentialResource -func MFAApplicationPushCredential(clientInfo *connector.PingOneClientInfo) *PingoneMFAApplicationPushCredentialResource { - return &PingoneMFAApplicationPushCredentialResource{ +// Utility method for creating a PingOneMFAApplicationPushCredentialResource +func MFAApplicationPushCredential(clientInfo *connector.PingOneClientInfo) *PingOneMFAApplicationPushCredentialResource { + return &PingOneMFAApplicationPushCredentialResource{ clientInfo: clientInfo, } } -func (r *PingoneMFAApplicationPushCredentialResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneMFAApplicationPushCredentialResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -100,6 +100,6 @@ func (r *PingoneMFAApplicationPushCredentialResource) ExportAll() (*[]connector. return &importBlocks, nil } -func (r *PingoneMFAApplicationPushCredentialResource) ResourceType() string { +func (r *PingOneMFAApplicationPushCredentialResource) ResourceType() string { return "pingone_mfa_application_push_credential" } diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy.go b/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy.go index 4bc69213..c26a0b5b 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_device_policy.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneMFADevicePolicyResource{} + _ connector.ExportableResource = &PingOneMFADevicePolicyResource{} ) -type PingoneMFADevicePolicyResource struct { +type PingOneMFADevicePolicyResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneMFADevicePolicyResource -func MFADevicePolicy(clientInfo *connector.PingOneClientInfo) *PingoneMFADevicePolicyResource { - return &PingoneMFADevicePolicyResource{ +// Utility method for creating a PingOneMFADevicePolicyResource +func MFADevicePolicy(clientInfo *connector.PingOneClientInfo) *PingOneMFADevicePolicyResource { + return &PingOneMFADevicePolicyResource{ clientInfo: clientInfo, } } -func (r *PingoneMFADevicePolicyResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneMFADevicePolicyResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneMFADevicePolicyResource) ExportAll() (*[]connector.ImportBlock, return &importBlocks, nil } -func (r *PingoneMFADevicePolicyResource) ResourceType() string { +func (r *PingOneMFADevicePolicyResource) ResourceType() string { return "pingone_mfa_device_policy" } diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy.go b/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy.go index 10f28ea3..baf14c1b 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_fido2_policy.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneMFAFido2PolicyResource{} + _ connector.ExportableResource = &PingOneMFAFido2PolicyResource{} ) -type PingoneMFAFido2PolicyResource struct { +type PingOneMFAFido2PolicyResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneMFAFido2PolicyResource -func MFAFido2Policy(clientInfo *connector.PingOneClientInfo) *PingoneMFAFido2PolicyResource { - return &PingoneMFAFido2PolicyResource{ +// Utility method for creating a PingOneMFAFido2PolicyResource +func MFAFido2Policy(clientInfo *connector.PingOneClientInfo) *PingOneMFAFido2PolicyResource { + return &PingOneMFAFido2PolicyResource{ clientInfo: clientInfo, } } -func (r *PingoneMFAFido2PolicyResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneMFAFido2PolicyResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneMFAFido2PolicyResource) ExportAll() (*[]connector.ImportBlock, e return &importBlocks, nil } -func (r *PingoneMFAFido2PolicyResource) ResourceType() string { +func (r *PingOneMFAFido2PolicyResource) ResourceType() string { return "pingone_mfa_fido2_policy" } diff --git a/internal/connector/pingone/mfa/resources/pingone_mfa_settings.go b/internal/connector/pingone/mfa/resources/pingone_mfa_settings.go index 0362207d..4979858a 100644 --- a/internal/connector/pingone/mfa/resources/pingone_mfa_settings.go +++ b/internal/connector/pingone/mfa/resources/pingone_mfa_settings.go @@ -8,21 +8,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneMFASettingsResource{} + _ connector.ExportableResource = &PingOneMFASettingsResource{} ) -type PingoneMFASettingsResource struct { +type PingOneMFASettingsResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneMFASettingsResource -func MFASettings(clientInfo *connector.PingOneClientInfo) *PingoneMFASettingsResource { - return &PingoneMFASettingsResource{ +// Utility method for creating a PingOneMFASettingsResource +func MFASettings(clientInfo *connector.PingOneClientInfo) *PingOneMFASettingsResource { + return &PingOneMFASettingsResource{ clientInfo: clientInfo, } } -func (r *PingoneMFASettingsResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneMFASettingsResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -57,6 +57,6 @@ func (r *PingoneMFASettingsResource) ExportAll() (*[]connector.ImportBlock, erro return &importBlocks, nil } -func (r *PingoneMFASettingsResource) ResourceType() string { +func (r *PingOneMFASettingsResource) ResourceType() string { return "pingone_mfa_settings" } diff --git a/internal/connector/pingone/platform/pingone_platform_connector.go b/internal/connector/pingone/platform/pingone_platform_connector.go index 7855b516..4dc30f0b 100644 --- a/internal/connector/pingone/platform/pingone_platform_connector.go +++ b/internal/connector/pingone/platform/pingone_platform_connector.go @@ -16,17 +16,17 @@ const ( // Verify that the connector satisfies the expected interfaces var ( - _ connector.Exportable = &PingonePlatformConnector{} - _ connector.Authenticatable = &PingonePlatformConnector{} + _ connector.Exportable = &PingOnePlatformConnector{} + _ connector.Authenticatable = &PingOnePlatformConnector{} ) -type PingonePlatformConnector struct { +type PingOnePlatformConnector struct { clientInfo connector.PingOneClientInfo } -// Utility method for creating a PingonePlatformConnector -func PlatformConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiClientId *string, exportEnvironmentID string) *PingonePlatformConnector { - return &PingonePlatformConnector{ +// Utility method for creating a PingOnePlatformConnector +func PlatformConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiClientId *string, exportEnvironmentID string) *PingOnePlatformConnector { + return &PingOnePlatformConnector{ clientInfo: connector.PingOneClientInfo{ Context: ctx, ApiClient: apiClient, @@ -36,7 +36,7 @@ func PlatformConnector(ctx context.Context, apiClient *pingoneGoClient.Client, a } } -func (c *PingonePlatformConnector) Export(format, outputDir string, overwriteExport bool) error { +func (c *PingOnePlatformConnector) Export(format, outputDir string, overwriteExport bool) error { l := logger.Get() l.Debug().Msgf("Exporting all PingOne Platform Resources...") @@ -77,14 +77,14 @@ func (c *PingonePlatformConnector) Export(format, outputDir string, overwriteExp return common.WriteFiles(exportableResources, format, outputDir, overwriteExport) } -func (c *PingonePlatformConnector) ConnectorServiceName() string { +func (c *PingOnePlatformConnector) ConnectorServiceName() string { return serviceName } -func (c *PingonePlatformConnector) Login() error { +func (c *PingOnePlatformConnector) Login() error { return nil } -func (c *PingonePlatformConnector) Logout() error { +func (c *PingOnePlatformConnector) Logout() error { return nil } diff --git a/internal/connector/pingone/platform/resources/pingone_agreement.go b/internal/connector/pingone/platform/resources/pingone_agreement.go index 639b143b..4066b37f 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneAgreementResource{} + _ connector.ExportableResource = &PingOneAgreementResource{} ) -type PingoneAgreementResource struct { +type PingOneAgreementResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneAgreementResource -func Agreement(clientInfo *connector.PingOneClientInfo) *PingoneAgreementResource { - return &PingoneAgreementResource{ +// Utility method for creating a PingOneAgreementResource +func Agreement(clientInfo *connector.PingOneClientInfo) *PingOneAgreementResource { + return &PingOneAgreementResource{ clientInfo: clientInfo, } } -func (r *PingoneAgreementResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneAgreementResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -64,6 +64,6 @@ func (r *PingoneAgreementResource) ExportAll() (*[]connector.ImportBlock, error) return &importBlocks, nil } -func (r *PingoneAgreementResource) ResourceType() string { +func (r *PingOneAgreementResource) ResourceType() string { return "pingone_agreement" } diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_enable.go b/internal/connector/pingone/platform/resources/pingone_agreement_enable.go index d26669a9..c72db9a2 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_enable.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_enable.go @@ -9,21 +9,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneAgreementEnableResource{} + _ connector.ExportableResource = &PingOneAgreementEnableResource{} ) -type PingoneAgreementEnableResource struct { +type PingOneAgreementEnableResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneAgreementEnableResource -func AgreementEnable(clientInfo *connector.PingOneClientInfo) *PingoneAgreementEnableResource { - return &PingoneAgreementEnableResource{ +// Utility method for creating a PingOneAgreementEnableResource +func AgreementEnable(clientInfo *connector.PingOneClientInfo) *PingOneAgreementEnableResource { + return &PingOneAgreementEnableResource{ clientInfo: clientInfo, } } -func (r *PingoneAgreementEnableResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneAgreementEnableResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all pingone_agreement_enable resources...") @@ -49,6 +49,6 @@ func (r *PingoneAgreementEnableResource) ExportAll() (*[]connector.ImportBlock, return &importBlocks, nil } -func (r *PingoneAgreementEnableResource) ResourceType() string { +func (r *PingOneAgreementEnableResource) ResourceType() string { return "pingone_agreement_enable" } diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization.go index dbe6334c..cfbfd7d1 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneAgreementLocalizationResource{} + _ connector.ExportableResource = &PingOneAgreementLocalizationResource{} ) -type PingoneAgreementLocalizationResource struct { +type PingOneAgreementLocalizationResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneAgreementLocalizationResource -func AgreementLocalization(clientInfo *connector.PingOneClientInfo) *PingoneAgreementLocalizationResource { - return &PingoneAgreementLocalizationResource{ +// Utility method for creating a PingOneAgreementLocalizationResource +func AgreementLocalization(clientInfo *connector.PingOneClientInfo) *PingOneAgreementLocalizationResource { + return &PingOneAgreementLocalizationResource{ clientInfo: clientInfo, } } -func (r *PingoneAgreementLocalizationResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneAgreementLocalizationResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -86,6 +86,6 @@ func (r *PingoneAgreementLocalizationResource) ExportAll() (*[]connector.ImportB return &importBlocks, nil } -func (r *PingoneAgreementLocalizationResource) ResourceType() string { +func (r *PingOneAgreementLocalizationResource) ResourceType() string { return "pingone_agreement_localization" } diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable.go index cefef7f6..bb97939e 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization_enable.go @@ -9,21 +9,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneAgreementLocalizationEnableResource{} + _ connector.ExportableResource = &PingOneAgreementLocalizationEnableResource{} ) -type PingoneAgreementLocalizationEnableResource struct { +type PingOneAgreementLocalizationEnableResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneAgreementLocalizationEnableResource -func AgreementLocalizationEnable(clientInfo *connector.PingOneClientInfo) *PingoneAgreementLocalizationEnableResource { - return &PingoneAgreementLocalizationEnableResource{ +// Utility method for creating a PingOneAgreementLocalizationEnableResource +func AgreementLocalizationEnable(clientInfo *connector.PingOneClientInfo) *PingOneAgreementLocalizationEnableResource { + return &PingOneAgreementLocalizationEnableResource{ clientInfo: clientInfo, } } -func (r *PingoneAgreementLocalizationEnableResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneAgreementLocalizationEnableResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all pingone_agreement_localization_enable resources...") @@ -49,6 +49,6 @@ func (r *PingoneAgreementLocalizationEnableResource) ExportAll() (*[]connector.I return &importBlocks, nil } -func (r *PingoneAgreementLocalizationEnableResource) ResourceType() string { +func (r *PingOneAgreementLocalizationEnableResource) ResourceType() string { return "pingone_agreement_localization_enable" } diff --git a/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision.go b/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision.go index 89134875..82093bcd 100644 --- a/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision.go +++ b/internal/connector/pingone/platform/resources/pingone_agreement_localization_revision.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneAgreementLocalizationRevisionResource{} + _ connector.ExportableResource = &PingOneAgreementLocalizationRevisionResource{} ) -type PingoneAgreementLocalizationRevisionResource struct { +type PingOneAgreementLocalizationRevisionResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneAgreementLocalizationRevisionResource -func AgreementLocalizationRevision(clientInfo *connector.PingOneClientInfo) *PingoneAgreementLocalizationRevisionResource { - return &PingoneAgreementLocalizationRevisionResource{ +// Utility method for creating a PingOneAgreementLocalizationRevisionResource +func AgreementLocalizationRevision(clientInfo *connector.PingOneClientInfo) *PingOneAgreementLocalizationRevisionResource { + return &PingOneAgreementLocalizationRevisionResource{ clientInfo: clientInfo, } } -func (r *PingoneAgreementLocalizationRevisionResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneAgreementLocalizationRevisionResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -100,6 +100,6 @@ func (r *PingoneAgreementLocalizationRevisionResource) ExportAll() (*[]connector return &importBlocks, nil } -func (r *PingoneAgreementLocalizationRevisionResource) ResourceType() string { +func (r *PingOneAgreementLocalizationRevisionResource) ResourceType() string { return "pingone_agreement_localization_revision" } diff --git a/internal/connector/pingone/platform/resources/pingone_branding_settings.go b/internal/connector/pingone/platform/resources/pingone_branding_settings.go index 2afe2cc1..cc2cf214 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_settings.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_settings.go @@ -8,21 +8,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneBrandingSettingsResource{} + _ connector.ExportableResource = &PingOneBrandingSettingsResource{} ) -type PingoneBrandingSettingsResource struct { +type PingOneBrandingSettingsResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneBrandingSettingsResource -func BrandingSettings(clientInfo *connector.PingOneClientInfo) *PingoneBrandingSettingsResource { - return &PingoneBrandingSettingsResource{ +// Utility method for creating a PingOneBrandingSettingsResource +func BrandingSettings(clientInfo *connector.PingOneClientInfo) *PingOneBrandingSettingsResource { + return &PingOneBrandingSettingsResource{ clientInfo: clientInfo, } } -func (r *PingoneBrandingSettingsResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneBrandingSettingsResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -57,6 +57,6 @@ func (r *PingoneBrandingSettingsResource) ExportAll() (*[]connector.ImportBlock, return &importBlocks, nil } -func (r *PingoneBrandingSettingsResource) ResourceType() string { +func (r *PingOneBrandingSettingsResource) ResourceType() string { return "pingone_branding_settings" } diff --git a/internal/connector/pingone/platform/resources/pingone_branding_theme.go b/internal/connector/pingone/platform/resources/pingone_branding_theme.go index 0204924a..147cd2ae 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_theme.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_theme.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneBrandingThemeResource{} + _ connector.ExportableResource = &PingOneBrandingThemeResource{} ) -type PingoneBrandingThemeResource struct { +type PingOneBrandingThemeResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneBrandingThemeResource -func BrandingTheme(clientInfo *connector.PingOneClientInfo) *PingoneBrandingThemeResource { - return &PingoneBrandingThemeResource{ +// Utility method for creating a PingOneBrandingThemeResource +func BrandingTheme(clientInfo *connector.PingOneClientInfo) *PingOneBrandingThemeResource { + return &PingOneBrandingThemeResource{ clientInfo: clientInfo, } } -func (r *PingoneBrandingThemeResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneBrandingThemeResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -70,6 +70,6 @@ func (r *PingoneBrandingThemeResource) ExportAll() (*[]connector.ImportBlock, er return &importBlocks, nil } -func (r *PingoneBrandingThemeResource) ResourceType() string { +func (r *PingOneBrandingThemeResource) ResourceType() string { return "pingone_branding_theme" } diff --git a/internal/connector/pingone/platform/resources/pingone_branding_theme_default.go b/internal/connector/pingone/platform/resources/pingone_branding_theme_default.go index 0f501d66..c3763087 100644 --- a/internal/connector/pingone/platform/resources/pingone_branding_theme_default.go +++ b/internal/connector/pingone/platform/resources/pingone_branding_theme_default.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneBrandingThemeDefaultResource{} + _ connector.ExportableResource = &PingOneBrandingThemeDefaultResource{} ) -type PingoneBrandingThemeDefaultResource struct { +type PingOneBrandingThemeDefaultResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneBrandingThemeDefaultResource -func BrandingThemeDefault(clientInfo *connector.PingOneClientInfo) *PingoneBrandingThemeDefaultResource { - return &PingoneBrandingThemeDefaultResource{ +// Utility method for creating a PingOneBrandingThemeDefaultResource +func BrandingThemeDefault(clientInfo *connector.PingOneClientInfo) *PingOneBrandingThemeDefaultResource { + return &PingOneBrandingThemeDefaultResource{ clientInfo: clientInfo, } } -func (r *PingoneBrandingThemeDefaultResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneBrandingThemeDefaultResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -84,6 +84,6 @@ func (r *PingoneBrandingThemeDefaultResource) ExportAll() (*[]connector.ImportBl return &importBlocks, nil } -func (r *PingoneBrandingThemeDefaultResource) ResourceType() string { +func (r *PingOneBrandingThemeDefaultResource) ResourceType() string { return "pingone_branding_theme_default" } diff --git a/internal/connector/pingone/platform/resources/pingone_certificate.go b/internal/connector/pingone/platform/resources/pingone_certificate.go index 33e87c33..a6022acb 100644 --- a/internal/connector/pingone/platform/resources/pingone_certificate.go +++ b/internal/connector/pingone/platform/resources/pingone_certificate.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneCertificateResource{} + _ connector.ExportableResource = &PingOneCertificateResource{} ) -type PingoneCertificateResource struct { +type PingOneCertificateResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneCertificateResource -func Certificate(clientInfo *connector.PingOneClientInfo) *PingoneCertificateResource { - return &PingoneCertificateResource{ +// Utility method for creating a PingOneCertificateResource +func Certificate(clientInfo *connector.PingOneClientInfo) *PingOneCertificateResource { + return &PingOneCertificateResource{ clientInfo: clientInfo, } } -func (r *PingoneCertificateResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneCertificateResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneCertificateResource) ExportAll() (*[]connector.ImportBlock, erro return &importBlocks, nil } -func (r *PingoneCertificateResource) ResourceType() string { +func (r *PingOneCertificateResource) ResourceType() string { return "pingone_certificate" } diff --git a/internal/connector/pingone/platform/resources/pingone_custom_domain.go b/internal/connector/pingone/platform/resources/pingone_custom_domain.go index ceed1155..2a7b98ad 100644 --- a/internal/connector/pingone/platform/resources/pingone_custom_domain.go +++ b/internal/connector/pingone/platform/resources/pingone_custom_domain.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneCustomDomainResource{} + _ connector.ExportableResource = &PingOneCustomDomainResource{} ) -type PingoneCustomDomainResource struct { +type PingOneCustomDomainResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneCustomDomainResource -func CustomDomain(clientInfo *connector.PingOneClientInfo) *PingoneCustomDomainResource { - return &PingoneCustomDomainResource{ +// Utility method for creating a PingOneCustomDomainResource +func CustomDomain(clientInfo *connector.PingOneClientInfo) *PingOneCustomDomainResource { + return &PingOneCustomDomainResource{ clientInfo: clientInfo, } } -func (r *PingoneCustomDomainResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneCustomDomainResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneCustomDomainResource) ExportAll() (*[]connector.ImportBlock, err return &importBlocks, nil } -func (r *PingoneCustomDomainResource) ResourceType() string { +func (r *PingOneCustomDomainResource) ResourceType() string { return "pingone_custom_domain" } diff --git a/internal/connector/pingone/platform/resources/pingone_environment.go b/internal/connector/pingone/platform/resources/pingone_environment.go index 23e6abb9..c5ad3e9f 100644 --- a/internal/connector/pingone/platform/resources/pingone_environment.go +++ b/internal/connector/pingone/platform/resources/pingone_environment.go @@ -8,21 +8,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneCustomDomainResource{} + _ connector.ExportableResource = &PingOneCustomDomainResource{} ) -type PingoneEnvironmentResource struct { +type PingOneEnvironmentResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneEnvironmentResource -func Environment(clientInfo *connector.PingOneClientInfo) *PingoneEnvironmentResource { - return &PingoneEnvironmentResource{ +// Utility method for creating a PingOneEnvironmentResource +func Environment(clientInfo *connector.PingOneClientInfo) *PingOneEnvironmentResource { + return &PingOneEnvironmentResource{ clientInfo: clientInfo, } } -func (r *PingoneEnvironmentResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneEnvironmentResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -46,6 +46,6 @@ func (r *PingoneEnvironmentResource) ExportAll() (*[]connector.ImportBlock, erro return &importBlocks, nil } -func (r *PingoneEnvironmentResource) ResourceType() string { +func (r *PingOneEnvironmentResource) ResourceType() string { return "pingone_environment" } diff --git a/internal/connector/pingone/platform/resources/pingone_form.go b/internal/connector/pingone/platform/resources/pingone_form.go index 9a142d11..5abeb800 100644 --- a/internal/connector/pingone/platform/resources/pingone_form.go +++ b/internal/connector/pingone/platform/resources/pingone_form.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneFormResource{} + _ connector.ExportableResource = &PingOneFormResource{} ) -type PingoneFormResource struct { +type PingOneFormResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneFormResource -func Form(clientInfo *connector.PingOneClientInfo) *PingoneFormResource { - return &PingoneFormResource{ +// Utility method for creating a PingOneFormResource +func Form(clientInfo *connector.PingOneClientInfo) *PingOneFormResource { + return &PingOneFormResource{ clientInfo: clientInfo, } } -func (r *PingoneFormResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneFormResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneFormResource) ExportAll() (*[]connector.ImportBlock, error) { return &importBlocks, nil } -func (r *PingoneFormResource) ResourceType() string { +func (r *PingOneFormResource) ResourceType() string { return "pingone_form" } diff --git a/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2.go b/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2.go index a8b9ccdf..febb58a1 100644 --- a/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2.go +++ b/internal/connector/pingone/platform/resources/pingone_forms_recaptcha_v2.go @@ -8,21 +8,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneFormRecaptchaV2Resource{} + _ connector.ExportableResource = &PingOneFormRecaptchaV2Resource{} ) -type PingoneFormRecaptchaV2Resource struct { +type PingOneFormRecaptchaV2Resource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneFormRecaptchaV2Resource -func FormRecaptchaV2(clientInfo *connector.PingOneClientInfo) *PingoneFormRecaptchaV2Resource { - return &PingoneFormRecaptchaV2Resource{ +// Utility method for creating a PingOneFormRecaptchaV2Resource +func FormRecaptchaV2(clientInfo *connector.PingOneClientInfo) *PingOneFormRecaptchaV2Resource { + return &PingOneFormRecaptchaV2Resource{ clientInfo: clientInfo, } } -func (r *PingoneFormRecaptchaV2Resource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneFormRecaptchaV2Resource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -59,6 +59,6 @@ func (r *PingoneFormRecaptchaV2Resource) ExportAll() (*[]connector.ImportBlock, return &importBlocks, nil } -func (r *PingoneFormRecaptchaV2Resource) ResourceType() string { +func (r *PingOneFormRecaptchaV2Resource) ResourceType() string { return "pingone_forms_recaptcha_v2" } diff --git a/internal/connector/pingone/platform/resources/pingone_gateway.go b/internal/connector/pingone/platform/resources/pingone_gateway.go index 83d491ed..c6ad38f3 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneGatewayResource{} + _ connector.ExportableResource = &PingOneGatewayResource{} ) -type PingoneGatewayResource struct { +type PingOneGatewayResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneGatewayResource -func Gateway(clientInfo *connector.PingOneClientInfo) *PingoneGatewayResource { - return &PingoneGatewayResource{ +// Utility method for creating a PingOneGatewayResource +func Gateway(clientInfo *connector.PingOneClientInfo) *PingOneGatewayResource { + return &PingOneGatewayResource{ clientInfo: clientInfo, } } -func (r *PingoneGatewayResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneGatewayResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -83,6 +83,6 @@ func (r *PingoneGatewayResource) ExportAll() (*[]connector.ImportBlock, error) { return &importBlocks, nil } -func (r *PingoneGatewayResource) ResourceType() string { +func (r *PingOneGatewayResource) ResourceType() string { return "pingone_gateway" } diff --git a/internal/connector/pingone/platform/resources/pingone_gateway_credential.go b/internal/connector/pingone/platform/resources/pingone_gateway_credential.go index 7c65788e..7fe3548c 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway_credential.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway_credential.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneGatewayCredentialResource{} + _ connector.ExportableResource = &PingOneGatewayCredentialResource{} ) -type PingoneGatewayCredentialResource struct { +type PingOneGatewayCredentialResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneGatewayCredentialResource -func GatewayCredential(clientInfo *connector.PingOneClientInfo) *PingoneGatewayCredentialResource { - return &PingoneGatewayCredentialResource{ +// Utility method for creating a PingOneGatewayCredentialResource +func GatewayCredential(clientInfo *connector.PingOneClientInfo) *PingOneGatewayCredentialResource { + return &PingOneGatewayCredentialResource{ clientInfo: clientInfo, } } -func (r *PingoneGatewayCredentialResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneGatewayCredentialResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -98,6 +98,6 @@ func (r *PingoneGatewayCredentialResource) ExportAll() (*[]connector.ImportBlock return &importBlocks, nil } -func (r *PingoneGatewayCredentialResource) ResourceType() string { +func (r *PingOneGatewayCredentialResource) ResourceType() string { return "pingone_gateway_credential" } diff --git a/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment.go b/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment.go index 46a51529..dbc52ef1 100644 --- a/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment.go +++ b/internal/connector/pingone/platform/resources/pingone_gateway_role_assignment.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneGatewayRoleAssignmentResource{} + _ connector.ExportableResource = &PingOneGatewayRoleAssignmentResource{} ) -type PingoneGatewayRoleAssignmentResource struct { +type PingOneGatewayRoleAssignmentResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneGatewayRoleAssignmentResource -func GatewayRoleAssignment(clientInfo *connector.PingOneClientInfo) *PingoneGatewayRoleAssignmentResource { - return &PingoneGatewayRoleAssignmentResource{ +// Utility method for creating a PingOneGatewayRoleAssignmentResource +func GatewayRoleAssignment(clientInfo *connector.PingOneClientInfo) *PingOneGatewayRoleAssignmentResource { + return &PingOneGatewayRoleAssignmentResource{ clientInfo: clientInfo, } } -func (r *PingoneGatewayRoleAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneGatewayRoleAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -101,6 +101,6 @@ func (r *PingoneGatewayRoleAssignmentResource) ExportAll() (*[]connector.ImportB return &importBlocks, nil } -func (r *PingoneGatewayRoleAssignmentResource) ResourceType() string { +func (r *PingOneGatewayRoleAssignmentResource) ResourceType() string { return "pingone_gateway_role_assignment" } diff --git a/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan.go b/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan.go index ecc2ba7d..164b910c 100644 --- a/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan.go +++ b/internal/connector/pingone/platform/resources/pingone_identity_propagation_plan.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneIdentityPropagationPlanResource{} + _ connector.ExportableResource = &PingOneIdentityPropagationPlanResource{} ) -type PingoneIdentityPropagationPlanResource struct { +type PingOneIdentityPropagationPlanResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneIdentityPropagationPlanResource -func IdentityPropagationPlan(clientInfo *connector.PingOneClientInfo) *PingoneIdentityPropagationPlanResource { - return &PingoneIdentityPropagationPlanResource{ +// Utility method for creating a PingOneIdentityPropagationPlanResource +func IdentityPropagationPlan(clientInfo *connector.PingOneClientInfo) *PingOneIdentityPropagationPlanResource { + return &PingOneIdentityPropagationPlanResource{ clientInfo: clientInfo, } } -func (r *PingoneIdentityPropagationPlanResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneIdentityPropagationPlanResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneIdentityPropagationPlanResource) ExportAll() (*[]connector.Impor return &importBlocks, nil } -func (r *PingoneIdentityPropagationPlanResource) ResourceType() string { +func (r *PingOneIdentityPropagationPlanResource) ResourceType() string { return "pingone_identity_propagation_plan" } diff --git a/internal/connector/pingone/platform/resources/pingone_key.go b/internal/connector/pingone/platform/resources/pingone_key.go index 5c26bfd3..00018427 100644 --- a/internal/connector/pingone/platform/resources/pingone_key.go +++ b/internal/connector/pingone/platform/resources/pingone_key.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneKeyResource{} + _ connector.ExportableResource = &PingOneKeyResource{} ) -type PingoneKeyResource struct { +type PingOneKeyResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneKeyResource -func Key(clientInfo *connector.PingOneClientInfo) *PingoneKeyResource { - return &PingoneKeyResource{ +// Utility method for creating a PingOneKeyResource +func Key(clientInfo *connector.PingOneClientInfo) *PingOneKeyResource { + return &PingOneKeyResource{ clientInfo: clientInfo, } } -func (r *PingoneKeyResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneKeyResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -67,6 +67,6 @@ func (r *PingoneKeyResource) ExportAll() (*[]connector.ImportBlock, error) { return &importBlocks, nil } -func (r *PingoneKeyResource) ResourceType() string { +func (r *PingOneKeyResource) ResourceType() string { return "pingone_key" } diff --git a/internal/connector/pingone/platform/resources/pingone_key_rotation_policy.go b/internal/connector/pingone/platform/resources/pingone_key_rotation_policy.go index d52b1bf0..f88ecb4e 100644 --- a/internal/connector/pingone/platform/resources/pingone_key_rotation_policy.go +++ b/internal/connector/pingone/platform/resources/pingone_key_rotation_policy.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneKeyRotationPolicyResource{} + _ connector.ExportableResource = &PingOneKeyRotationPolicyResource{} ) -type PingoneKeyRotationPolicyResource struct { +type PingOneKeyRotationPolicyResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneKeyRotationPolicyResource -func KeyRotationPolicy(clientInfo *connector.PingOneClientInfo) *PingoneKeyRotationPolicyResource { - return &PingoneKeyRotationPolicyResource{ +// Utility method for creating a PingOneKeyRotationPolicyResource +func KeyRotationPolicy(clientInfo *connector.PingOneClientInfo) *PingOneKeyRotationPolicyResource { + return &PingOneKeyRotationPolicyResource{ clientInfo: clientInfo, } } -func (r *PingoneKeyRotationPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneKeyRotationPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneKeyRotationPolicyResource) ExportAll() (*[]connector.ImportBlock return &importBlocks, nil } -func (r *PingoneKeyRotationPolicyResource) ResourceType() string { +func (r *PingOneKeyRotationPolicyResource) ResourceType() string { return "pingone_key_rotation_policy" } diff --git a/internal/connector/pingone/platform/resources/pingone_language.go b/internal/connector/pingone/platform/resources/pingone_language.go index f8a6fc94..78adc546 100644 --- a/internal/connector/pingone/platform/resources/pingone_language.go +++ b/internal/connector/pingone/platform/resources/pingone_language.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneLanguageResource{} + _ connector.ExportableResource = &PingOneLanguageResource{} ) -type PingoneLanguageResource struct { +type PingOneLanguageResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneLanguageResource -func Language(clientInfo *connector.PingOneClientInfo) *PingoneLanguageResource { - return &PingoneLanguageResource{ +// Utility method for creating a PingOneLanguageResource +func Language(clientInfo *connector.PingOneClientInfo) *PingOneLanguageResource { + return &PingOneLanguageResource{ clientInfo: clientInfo, } } -func (r *PingoneLanguageResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneLanguageResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -75,6 +75,6 @@ func (r *PingoneLanguageResource) ExportAll() (*[]connector.ImportBlock, error) return &importBlocks, nil } -func (r *PingoneLanguageResource) ResourceType() string { +func (r *PingOneLanguageResource) ResourceType() string { return "pingone_language" } diff --git a/internal/connector/pingone/platform/resources/pingone_language_update.go b/internal/connector/pingone/platform/resources/pingone_language_update.go index 8651774a..1007e6b2 100644 --- a/internal/connector/pingone/platform/resources/pingone_language_update.go +++ b/internal/connector/pingone/platform/resources/pingone_language_update.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneLanguageUpdateResource{} + _ connector.ExportableResource = &PingOneLanguageUpdateResource{} ) -type PingoneLanguageUpdateResource struct { +type PingOneLanguageUpdateResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneLanguageUpdateResource -func LanguageUpdate(clientInfo *connector.PingOneClientInfo) *PingoneLanguageUpdateResource { - return &PingoneLanguageUpdateResource{ +// Utility method for creating a PingOneLanguageUpdateResource +func LanguageUpdate(clientInfo *connector.PingOneClientInfo) *PingOneLanguageUpdateResource { + return &PingOneLanguageUpdateResource{ clientInfo: clientInfo, } } -func (r *PingoneLanguageUpdateResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneLanguageUpdateResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -77,6 +77,6 @@ func (r *PingoneLanguageUpdateResource) ExportAll() (*[]connector.ImportBlock, e return &importBlocks, nil } -func (r *PingoneLanguageUpdateResource) ResourceType() string { +func (r *PingOneLanguageUpdateResource) ResourceType() string { return "pingone_language_update" } diff --git a/internal/connector/pingone/platform/resources/pingone_notification_policy.go b/internal/connector/pingone/platform/resources/pingone_notification_policy.go index 077b4d96..a305e141 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_policy.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_policy.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneNotificationPolicyResource{} + _ connector.ExportableResource = &PingOneNotificationPolicyResource{} ) -type PingoneNotificationPolicyResource struct { +type PingOneNotificationPolicyResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneNotificationPolicyResource -func NotificationPolicy(clientInfo *connector.PingOneClientInfo) *PingoneNotificationPolicyResource { - return &PingoneNotificationPolicyResource{ +// Utility method for creating a PingOneNotificationPolicyResource +func NotificationPolicy(clientInfo *connector.PingOneClientInfo) *PingOneNotificationPolicyResource { + return &PingOneNotificationPolicyResource{ clientInfo: clientInfo, } } -func (r *PingoneNotificationPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneNotificationPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneNotificationPolicyResource) ExportAll() (*[]connector.ImportBloc return &importBlocks, nil } -func (r *PingoneNotificationPolicyResource) ResourceType() string { +func (r *PingOneNotificationPolicyResource) ResourceType() string { return "pingone_notification_policy" } diff --git a/internal/connector/pingone/platform/resources/pingone_notification_settings.go b/internal/connector/pingone/platform/resources/pingone_notification_settings.go index ad4fc3d1..bfe2242f 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_settings.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_settings.go @@ -8,21 +8,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneNotificationSettingsResource{} + _ connector.ExportableResource = &PingOneNotificationSettingsResource{} ) -type PingoneNotificationSettingsResource struct { +type PingOneNotificationSettingsResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneNotificationSettingsResource -func NotificationSettings(clientInfo *connector.PingOneClientInfo) *PingoneNotificationSettingsResource { - return &PingoneNotificationSettingsResource{ +// Utility method for creating a PingOneNotificationSettingsResource +func NotificationSettings(clientInfo *connector.PingOneClientInfo) *PingOneNotificationSettingsResource { + return &PingOneNotificationSettingsResource{ clientInfo: clientInfo, } } -func (r *PingoneNotificationSettingsResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneNotificationSettingsResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -57,6 +57,6 @@ func (r *PingoneNotificationSettingsResource) ExportAll() (*[]connector.ImportBl return &importBlocks, nil } -func (r *PingoneNotificationSettingsResource) ResourceType() string { +func (r *PingOneNotificationSettingsResource) ResourceType() string { return "pingone_notification_settings" } diff --git a/internal/connector/pingone/platform/resources/pingone_notification_settings_email.go b/internal/connector/pingone/platform/resources/pingone_notification_settings_email.go index 80db2417..3bd0e2dd 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_settings_email.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_settings_email.go @@ -8,21 +8,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneNotificationSettingsEmailResource{} + _ connector.ExportableResource = &PingOneNotificationSettingsEmailResource{} ) -type PingoneNotificationSettingsEmailResource struct { +type PingOneNotificationSettingsEmailResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneNotificationSettingsEmailResource -func NotificationSettingsEmail(clientInfo *connector.PingOneClientInfo) *PingoneNotificationSettingsEmailResource { - return &PingoneNotificationSettingsEmailResource{ +// Utility method for creating a PingOneNotificationSettingsEmailResource +func NotificationSettingsEmail(clientInfo *connector.PingOneClientInfo) *PingOneNotificationSettingsEmailResource { + return &PingOneNotificationSettingsEmailResource{ clientInfo: clientInfo, } } -func (r *PingoneNotificationSettingsEmailResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneNotificationSettingsEmailResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -77,6 +77,6 @@ func (r *PingoneNotificationSettingsEmailResource) ExportAll() (*[]connector.Imp return &importBlocks, nil } -func (r *PingoneNotificationSettingsEmailResource) ResourceType() string { +func (r *PingOneNotificationSettingsEmailResource) ResourceType() string { return "pingone_notification_settings_email" } diff --git a/internal/connector/pingone/platform/resources/pingone_notification_template_content.go b/internal/connector/pingone/platform/resources/pingone_notification_template_content.go index 408f6955..8bd6c12c 100644 --- a/internal/connector/pingone/platform/resources/pingone_notification_template_content.go +++ b/internal/connector/pingone/platform/resources/pingone_notification_template_content.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneNotificationTemplateContentResource{} + _ connector.ExportableResource = &PingOneNotificationTemplateContentResource{} ) -type PingoneNotificationTemplateContentResource struct { +type PingOneNotificationTemplateContentResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneNotificationTemplateContentResource -func NotificationTemplateContent(clientInfo *connector.PingOneClientInfo) *PingoneNotificationTemplateContentResource { - return &PingoneNotificationTemplateContentResource{ +// Utility method for creating a PingOneNotificationTemplateContentResource +func NotificationTemplateContent(clientInfo *connector.PingOneClientInfo) *PingOneNotificationTemplateContentResource { + return &PingOneNotificationTemplateContentResource{ clientInfo: clientInfo, } } -func (r *PingoneNotificationTemplateContentResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneNotificationTemplateContentResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -161,6 +161,6 @@ func (r *PingoneNotificationTemplateContentResource) ExportAll() (*[]connector.I return &importBlocks, nil } -func (r *PingoneNotificationTemplateContentResource) ResourceType() string { +func (r *PingOneNotificationTemplateContentResource) ResourceType() string { return "pingone_notification_template_content" } diff --git a/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings.go b/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings.go index 0db835ef..bb8fd405 100644 --- a/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings.go +++ b/internal/connector/pingone/platform/resources/pingone_phone_delivery_settings.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingonePhoneDeliverySettingsResource{} + _ connector.ExportableResource = &PingOnePhoneDeliverySettingsResource{} ) -type PingonePhoneDeliverySettingsResource struct { +type PingOnePhoneDeliverySettingsResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingonePhoneDeliverySettingsResource -func PhoneDeliverySettings(clientInfo *connector.PingOneClientInfo) *PingonePhoneDeliverySettingsResource { - return &PingonePhoneDeliverySettingsResource{ +// Utility method for creating a PingOnePhoneDeliverySettingsResource +func PhoneDeliverySettings(clientInfo *connector.PingOneClientInfo) *PingOnePhoneDeliverySettingsResource { + return &PingOnePhoneDeliverySettingsResource{ clientInfo: clientInfo, } } -func (r *PingonePhoneDeliverySettingsResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOnePhoneDeliverySettingsResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -93,6 +93,6 @@ func (r *PingonePhoneDeliverySettingsResource) ExportAll() (*[]connector.ImportB return &importBlocks, nil } -func (r *PingonePhoneDeliverySettingsResource) ResourceType() string { +func (r *PingOnePhoneDeliverySettingsResource) ResourceType() string { return "pingone_phone_delivery_settings" } diff --git a/internal/connector/pingone/platform/resources/pingone_system_application.go b/internal/connector/pingone/platform/resources/pingone_system_application.go index 783d0931..9bda3eaf 100644 --- a/internal/connector/pingone/platform/resources/pingone_system_application.go +++ b/internal/connector/pingone/platform/resources/pingone_system_application.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneSystemApplicationResource{} + _ connector.ExportableResource = &PingOneSystemApplicationResource{} ) -type PingoneSystemApplicationResource struct { +type PingOneSystemApplicationResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneSystemApplicationResource -func SystemApplication(clientInfo *connector.PingOneClientInfo) *PingoneSystemApplicationResource { - return &PingoneSystemApplicationResource{ +// Utility method for creating a PingOneSystemApplicationResource +func SystemApplication(clientInfo *connector.PingOneClientInfo) *PingOneSystemApplicationResource { + return &PingOneSystemApplicationResource{ clientInfo: clientInfo, } } -func (r *PingoneSystemApplicationResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneSystemApplicationResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -80,6 +80,6 @@ func (r *PingoneSystemApplicationResource) ExportAll() (*[]connector.ImportBlock return &importBlocks, nil } -func (r *PingoneSystemApplicationResource) ResourceType() string { +func (r *PingOneSystemApplicationResource) ResourceType() string { return "pingone_system_application" } diff --git a/internal/connector/pingone/platform/resources/pingone_trusted_email_address.go b/internal/connector/pingone/platform/resources/pingone_trusted_email_address.go index 72193c80..27274fa2 100644 --- a/internal/connector/pingone/platform/resources/pingone_trusted_email_address.go +++ b/internal/connector/pingone/platform/resources/pingone_trusted_email_address.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneTrustedEmailAddressResource{} + _ connector.ExportableResource = &PingOneTrustedEmailAddressResource{} ) -type PingoneTrustedEmailAddressResource struct { +type PingOneTrustedEmailAddressResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneTrustedEmailAddressResource -func TrustedEmailAddress(clientInfo *connector.PingOneClientInfo) *PingoneTrustedEmailAddressResource { - return &PingoneTrustedEmailAddressResource{ +// Utility method for creating a PingOneTrustedEmailAddressResource +func TrustedEmailAddress(clientInfo *connector.PingOneClientInfo) *PingOneTrustedEmailAddressResource { + return &PingOneTrustedEmailAddressResource{ clientInfo: clientInfo, } } -func (r *PingoneTrustedEmailAddressResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneTrustedEmailAddressResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -82,6 +82,6 @@ func (r *PingoneTrustedEmailAddressResource) ExportAll() (*[]connector.ImportBlo return &importBlocks, nil } -func (r *PingoneTrustedEmailAddressResource) ResourceType() string { +func (r *PingOneTrustedEmailAddressResource) ResourceType() string { return "pingone_trusted_email_address" } diff --git a/internal/connector/pingone/platform/resources/pingone_trusted_email_domain.go b/internal/connector/pingone/platform/resources/pingone_trusted_email_domain.go index 3fc78735..9f55d1fc 100644 --- a/internal/connector/pingone/platform/resources/pingone_trusted_email_domain.go +++ b/internal/connector/pingone/platform/resources/pingone_trusted_email_domain.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneTrustedEmailDomainResource{} + _ connector.ExportableResource = &PingOneTrustedEmailDomainResource{} ) -type PingoneTrustedEmailDomainResource struct { +type PingOneTrustedEmailDomainResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a Pingone Trusted Email Domain Resource -func TrustedEmailDomain(clientInfo *connector.PingOneClientInfo) *PingoneTrustedEmailDomainResource { - return &PingoneTrustedEmailDomainResource{ +// Utility method for creating a PingOne Trusted Email Domain Resource +func TrustedEmailDomain(clientInfo *connector.PingOneClientInfo) *PingOneTrustedEmailDomainResource { + return &PingOneTrustedEmailDomainResource{ clientInfo: clientInfo, } } -func (r *PingoneTrustedEmailDomainResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneTrustedEmailDomainResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneTrustedEmailDomainResource) ExportAll() (*[]connector.ImportBloc return &importBlocks, nil } -func (r *PingoneTrustedEmailDomainResource) ResourceType() string { +func (r *PingOneTrustedEmailDomainResource) ResourceType() string { return "pingone_trusted_email_domain" } diff --git a/internal/connector/pingone/platform/resources/pingone_webhook.go b/internal/connector/pingone/platform/resources/pingone_webhook.go index 17367300..b154cbfb 100644 --- a/internal/connector/pingone/platform/resources/pingone_webhook.go +++ b/internal/connector/pingone/platform/resources/pingone_webhook.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneWebhookResource{} + _ connector.ExportableResource = &PingOneWebhookResource{} ) -type PingoneWebhookResource struct { +type PingOneWebhookResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneWebhookResource -func Webhook(clientInfo *connector.PingOneClientInfo) *PingoneWebhookResource { - return &PingoneWebhookResource{ +// Utility method for creating a PingOneWebhookResource +func Webhook(clientInfo *connector.PingOneClientInfo) *PingOneWebhookResource { + return &PingOneWebhookResource{ clientInfo: clientInfo, } } -func (r *PingoneWebhookResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneWebhookResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneWebhookResource) ExportAll() (*[]connector.ImportBlock, error) { return &importBlocks, nil } -func (r *PingoneWebhookResource) ResourceType() string { +func (r *PingOneWebhookResource) ResourceType() string { return "pingone_webhook" } diff --git a/internal/connector/pingone/protect/pingone_protect_connector.go b/internal/connector/pingone/protect/pingone_protect_connector.go index 771e190a..20d3ee25 100644 --- a/internal/connector/pingone/protect/pingone_protect_connector.go +++ b/internal/connector/pingone/protect/pingone_protect_connector.go @@ -16,17 +16,17 @@ const ( // Verify that the connector satisfies the expected interfaces var ( - _ connector.Exportable = &PingoneProtectConnector{} - _ connector.Authenticatable = &PingoneProtectConnector{} + _ connector.Exportable = &PingOneProtectConnector{} + _ connector.Authenticatable = &PingOneProtectConnector{} ) -type PingoneProtectConnector struct { +type PingOneProtectConnector struct { clientInfo connector.PingOneClientInfo } -// Utility method for creating a PingoneProtectConnector -func ProtectConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiClientId *string, exportEnvironmentID string) *PingoneProtectConnector { - return &PingoneProtectConnector{ +// Utility method for creating a PingOneProtectConnector +func ProtectConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiClientId *string, exportEnvironmentID string) *PingOneProtectConnector { + return &PingOneProtectConnector{ clientInfo: connector.PingOneClientInfo{ Context: ctx, ApiClient: apiClient, @@ -36,7 +36,7 @@ func ProtectConnector(ctx context.Context, apiClient *pingoneGoClient.Client, ap } } -func (c *PingoneProtectConnector) Export(format, outputDir string, overwriteExport bool) error { +func (c *PingOneProtectConnector) Export(format, outputDir string, overwriteExport bool) error { l := logger.Get() l.Debug().Msgf("Exporting all PingOne MFA Resources...") @@ -49,14 +49,14 @@ func (c *PingoneProtectConnector) Export(format, outputDir string, overwriteExpo return common.WriteFiles(exportableResources, format, outputDir, overwriteExport) } -func (c *PingoneProtectConnector) ConnectorServiceName() string { +func (c *PingOneProtectConnector) ConnectorServiceName() string { return serviceName } -func (c *PingoneProtectConnector) Login() error { +func (c *PingOneProtectConnector) Login() error { return nil } -func (c *PingoneProtectConnector) Logout() error { +func (c *PingOneProtectConnector) Logout() error { return nil } diff --git a/internal/connector/pingone/protect/resources/pingone_risk_policy.go b/internal/connector/pingone/protect/resources/pingone_risk_policy.go index 35f996aa..a6c114dc 100644 --- a/internal/connector/pingone/protect/resources/pingone_risk_policy.go +++ b/internal/connector/pingone/protect/resources/pingone_risk_policy.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneRiskPolicyResource{} + _ connector.ExportableResource = &PingOneRiskPolicyResource{} ) -type PingoneRiskPolicyResource struct { +type PingOneRiskPolicyResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneRiskPolicyResource -func RiskPolicy(clientInfo *connector.PingOneClientInfo) *PingoneRiskPolicyResource { - return &PingoneRiskPolicyResource{ +// Utility method for creating a PingOneRiskPolicyResource +func RiskPolicy(clientInfo *connector.PingOneClientInfo) *PingOneRiskPolicyResource { + return &PingOneRiskPolicyResource{ clientInfo: clientInfo, } } -func (r *PingoneRiskPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneRiskPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -66,6 +66,6 @@ func (r *PingoneRiskPolicyResource) ExportAll() (*[]connector.ImportBlock, error return &importBlocks, nil } -func (r *PingoneRiskPolicyResource) ResourceType() string { +func (r *PingOneRiskPolicyResource) ResourceType() string { return "pingone_risk_policy" } diff --git a/internal/connector/pingone/protect/resources/pingone_risk_predictor.go b/internal/connector/pingone/protect/resources/pingone_risk_predictor.go index 9313a2e7..c27c4501 100644 --- a/internal/connector/pingone/protect/resources/pingone_risk_predictor.go +++ b/internal/connector/pingone/protect/resources/pingone_risk_predictor.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneRiskPredictorResource{} + _ connector.ExportableResource = &PingOneRiskPredictorResource{} ) -type PingoneRiskPredictorResource struct { +type PingOneRiskPredictorResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneRiskPredictorResource -func RiskPredictor(clientInfo *connector.PingOneClientInfo) *PingoneRiskPredictorResource { - return &PingoneRiskPredictorResource{ +// Utility method for creating a PingOneRiskPredictorResource +func RiskPredictor(clientInfo *connector.PingOneClientInfo) *PingOneRiskPredictorResource { + return &PingOneRiskPredictorResource{ clientInfo: clientInfo, } } -func (r *PingoneRiskPredictorResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneRiskPredictorResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -132,6 +132,6 @@ func (r *PingoneRiskPredictorResource) ExportAll() (*[]connector.ImportBlock, er return &importBlocks, nil } -func (r *PingoneRiskPredictorResource) ResourceType() string { +func (r *PingOneRiskPredictorResource) ResourceType() string { return "pingone_risk_predictor" } diff --git a/internal/connector/pingone/sso/pingone_sso_connector.go b/internal/connector/pingone/sso/pingone_sso_connector.go index 0d715973..6fd004ce 100644 --- a/internal/connector/pingone/sso/pingone_sso_connector.go +++ b/internal/connector/pingone/sso/pingone_sso_connector.go @@ -16,17 +16,17 @@ const ( // Verify that the connector satisfies the expected interfaces var ( - _ connector.Exportable = &PingoneSSOConnector{} - _ connector.Authenticatable = &PingoneSSOConnector{} + _ connector.Exportable = &PingOneSSOConnector{} + _ connector.Authenticatable = &PingOneSSOConnector{} ) -type PingoneSSOConnector struct { +type PingOneSSOConnector struct { clientInfo connector.PingOneClientInfo } -// Utility method for creating a PingoneSSOConnector -func SSOConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiClientId *string, exportEnvironmentID string) *PingoneSSOConnector { - return &PingoneSSOConnector{ +// Utility method for creating a PingOneSSOConnector +func SSOConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiClientId *string, exportEnvironmentID string) *PingOneSSOConnector { + return &PingOneSSOConnector{ clientInfo: connector.PingOneClientInfo{ Context: ctx, ApiClient: apiClient, @@ -36,7 +36,7 @@ func SSOConnector(ctx context.Context, apiClient *pingoneGoClient.Client, apiCli } } -func (c *PingoneSSOConnector) Export(format, outputDir string, overwriteExport bool) error { +func (c *PingOneSSOConnector) Export(format, outputDir string, overwriteExport bool) error { l := logger.Get() l.Debug().Msgf("Exporting all PingOne SSO Resources...") @@ -70,14 +70,14 @@ func (c *PingoneSSOConnector) Export(format, outputDir string, overwriteExport b return common.WriteFiles(exportableResources, format, outputDir, overwriteExport) } -func (c *PingoneSSOConnector) ConnectorServiceName() string { +func (c *PingOneSSOConnector) ConnectorServiceName() string { return serviceName } -func (c *PingoneSSOConnector) Login() error { +func (c *PingOneSSOConnector) Login() error { return nil } -func (c *PingoneSSOConnector) Logout() error { +func (c *PingOneSSOConnector) Logout() error { return nil } diff --git a/internal/connector/pingone/sso/resources/pingone_application.go b/internal/connector/pingone/sso/resources/pingone_application.go index 2baa856f..8d0cebba 100644 --- a/internal/connector/pingone/sso/resources/pingone_application.go +++ b/internal/connector/pingone/sso/resources/pingone_application.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneApplicationResource{} + _ connector.ExportableResource = &PingOneApplicationResource{} ) -type PingoneApplicationResource struct { +type PingOneApplicationResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneApplicationResource -func Application(clientInfo *connector.PingOneClientInfo) *PingoneApplicationResource { - return &PingoneApplicationResource{ +// Utility method for creating a PingOneApplicationResource +func Application(clientInfo *connector.PingOneClientInfo) *PingOneApplicationResource { + return &PingOneApplicationResource{ clientInfo: clientInfo, } } -func (r *PingoneApplicationResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneApplicationResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -83,6 +83,6 @@ func (r *PingoneApplicationResource) ExportAll() (*[]connector.ImportBlock, erro return &importBlocks, nil } -func (r *PingoneApplicationResource) ResourceType() string { +func (r *PingOneApplicationResource) ResourceType() string { return "pingone_application" } diff --git a/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping.go b/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping.go index 65a17fdb..05494786 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping.go +++ b/internal/connector/pingone/sso/resources/pingone_application_attribute_mapping.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneApplicationAttributeMappingResource{} + _ connector.ExportableResource = &PingOneApplicationAttributeMappingResource{} ) -type PingoneApplicationAttributeMappingResource struct { +type PingOneApplicationAttributeMappingResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneApplicationAttributeMappingResource -func ApplicationAttributeMapping(clientInfo *connector.PingOneClientInfo) *PingoneApplicationAttributeMappingResource { - return &PingoneApplicationAttributeMappingResource{ +// Utility method for creating a PingOneApplicationAttributeMappingResource +func ApplicationAttributeMapping(clientInfo *connector.PingOneClientInfo) *PingOneApplicationAttributeMappingResource { + return &PingOneApplicationAttributeMappingResource{ clientInfo: clientInfo, } } -func (r *PingoneApplicationAttributeMappingResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneApplicationAttributeMappingResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -101,6 +101,6 @@ func (r *PingoneApplicationAttributeMappingResource) ExportAll() (*[]connector.I return &importBlocks, nil } -func (r *PingoneApplicationAttributeMappingResource) ResourceType() string { +func (r *PingOneApplicationAttributeMappingResource) ResourceType() string { return "pingone_application_attribute_mapping" } diff --git a/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment.go b/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment.go index 29da908a..83eb1e95 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment.go +++ b/internal/connector/pingone/sso/resources/pingone_application_flow_policy_assignment.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneApplicationFlowPolicyAssignmentResource{} + _ connector.ExportableResource = &PingOneApplicationFlowPolicyAssignmentResource{} ) -type PingoneApplicationFlowPolicyAssignmentResource struct { +type PingOneApplicationFlowPolicyAssignmentResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneApplicationFlowPolicyAssignmentResource -func ApplicationFlowPolicyAssignment(clientInfo *connector.PingOneClientInfo) *PingoneApplicationFlowPolicyAssignmentResource { - return &PingoneApplicationFlowPolicyAssignmentResource{ +// Utility method for creating a PingOneApplicationFlowPolicyAssignmentResource +func ApplicationFlowPolicyAssignment(clientInfo *connector.PingOneClientInfo) *PingOneApplicationFlowPolicyAssignmentResource { + return &PingOneApplicationFlowPolicyAssignmentResource{ clientInfo: clientInfo, } } -func (r *PingoneApplicationFlowPolicyAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneApplicationFlowPolicyAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -120,6 +120,6 @@ func (r *PingoneApplicationFlowPolicyAssignmentResource) ExportAll() (*[]connect return &importBlocks, nil } -func (r *PingoneApplicationFlowPolicyAssignmentResource) ResourceType() string { +func (r *PingOneApplicationFlowPolicyAssignmentResource) ResourceType() string { return "pingone_application_flow_policy_assignment" } diff --git a/internal/connector/pingone/sso/resources/pingone_application_resource_grant.go b/internal/connector/pingone/sso/resources/pingone_application_resource_grant.go index 97d10f1c..f5fb8b72 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_resource_grant.go +++ b/internal/connector/pingone/sso/resources/pingone_application_resource_grant.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneApplicationResourceGrantResource{} + _ connector.ExportableResource = &PingOneApplicationResourceGrantResource{} ) -type PingoneApplicationResourceGrantResource struct { +type PingOneApplicationResourceGrantResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneApplicationResourceGrantResource -func ApplicationResourceGrant(clientInfo *connector.PingOneClientInfo) *PingoneApplicationResourceGrantResource { - return &PingoneApplicationResourceGrantResource{ +// Utility method for creating a PingOneApplicationResourceGrantResource +func ApplicationResourceGrant(clientInfo *connector.PingOneClientInfo) *PingOneApplicationResourceGrantResource { + return &PingOneApplicationResourceGrantResource{ clientInfo: clientInfo, } } -func (r *PingoneApplicationResourceGrantResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneApplicationResourceGrantResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -120,6 +120,6 @@ func (r *PingoneApplicationResourceGrantResource) ExportAll() (*[]connector.Impo return &importBlocks, nil } -func (r *PingoneApplicationResourceGrantResource) ResourceType() string { +func (r *PingOneApplicationResourceGrantResource) ResourceType() string { return "pingone_application_resource_grant" } diff --git a/internal/connector/pingone/sso/resources/pingone_application_role_assignment.go b/internal/connector/pingone/sso/resources/pingone_application_role_assignment.go index 0445d29c..2622cf95 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_role_assignment.go +++ b/internal/connector/pingone/sso/resources/pingone_application_role_assignment.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneApplicationRoleAssignmentResource{} + _ connector.ExportableResource = &PingOneApplicationRoleAssignmentResource{} ) -type PingoneApplicationRoleAssignmentResource struct { +type PingOneApplicationRoleAssignmentResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneApplicationRoleAssignmentResource -func ApplicationRoleAssignment(clientInfo *connector.PingOneClientInfo) *PingoneApplicationRoleAssignmentResource { - return &PingoneApplicationRoleAssignmentResource{ +// Utility method for creating a PingOneApplicationRoleAssignmentResource +func ApplicationRoleAssignment(clientInfo *connector.PingOneClientInfo) *PingOneApplicationRoleAssignmentResource { + return &PingOneApplicationRoleAssignmentResource{ clientInfo: clientInfo, } } -func (r *PingoneApplicationRoleAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneApplicationRoleAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -124,6 +124,6 @@ func (r *PingoneApplicationRoleAssignmentResource) ExportAll() (*[]connector.Imp return &importBlocks, nil } -func (r *PingoneApplicationRoleAssignmentResource) ResourceType() string { +func (r *PingOneApplicationRoleAssignmentResource) ResourceType() string { return "pingone_application_role_assignment" } diff --git a/internal/connector/pingone/sso/resources/pingone_application_secret.go b/internal/connector/pingone/sso/resources/pingone_application_secret.go index 6441c86a..37742089 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_secret.go +++ b/internal/connector/pingone/sso/resources/pingone_application_secret.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneApplicationSecretResource{} + _ connector.ExportableResource = &PingOneApplicationSecretResource{} ) -type PingoneApplicationSecretResource struct { +type PingOneApplicationSecretResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneApplicationSecretResource -func ApplicationSecret(clientInfo *connector.PingOneClientInfo) *PingoneApplicationSecretResource { - return &PingoneApplicationSecretResource{ +// Utility method for creating a PingOneApplicationSecretResource +func ApplicationSecret(clientInfo *connector.PingOneClientInfo) *PingOneApplicationSecretResource { + return &PingOneApplicationSecretResource{ clientInfo: clientInfo, } } -func (r *PingoneApplicationSecretResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneApplicationSecretResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -110,6 +110,6 @@ func (r *PingoneApplicationSecretResource) ExportAll() (*[]connector.ImportBlock return &importBlocks, nil } -func (r *PingoneApplicationSecretResource) ResourceType() string { +func (r *PingOneApplicationSecretResource) ResourceType() string { return "pingone_application_secret" } diff --git a/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment.go b/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment.go index 24d76ba6..5c04d18d 100644 --- a/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment.go +++ b/internal/connector/pingone/sso/resources/pingone_application_sign_on_policy_assignment.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneApplicationSignOnPolicyAssignmentResource{} + _ connector.ExportableResource = &PingOneApplicationSignOnPolicyAssignmentResource{} ) -type PingoneApplicationSignOnPolicyAssignmentResource struct { +type PingOneApplicationSignOnPolicyAssignmentResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneApplicationSignOnPolicyAssignmentResource -func ApplicationSignOnPolicyAssignment(clientInfo *connector.PingOneClientInfo) *PingoneApplicationSignOnPolicyAssignmentResource { - return &PingoneApplicationSignOnPolicyAssignmentResource{ +// Utility method for creating a PingOneApplicationSignOnPolicyAssignmentResource +func ApplicationSignOnPolicyAssignment(clientInfo *connector.PingOneClientInfo) *PingOneApplicationSignOnPolicyAssignmentResource { + return &PingOneApplicationSignOnPolicyAssignmentResource{ clientInfo: clientInfo, } } -func (r *PingoneApplicationSignOnPolicyAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneApplicationSignOnPolicyAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -121,6 +121,6 @@ func (r *PingoneApplicationSignOnPolicyAssignmentResource) ExportAll() (*[]conne return &importBlocks, nil } -func (r *PingoneApplicationSignOnPolicyAssignmentResource) ResourceType() string { +func (r *PingOneApplicationSignOnPolicyAssignmentResource) ResourceType() string { return "pingone_application_sign_on_policy_assignment" } diff --git a/internal/connector/pingone/sso/resources/pingone_group.go b/internal/connector/pingone/sso/resources/pingone_group.go index 2701bc5b..12def755 100644 --- a/internal/connector/pingone/sso/resources/pingone_group.go +++ b/internal/connector/pingone/sso/resources/pingone_group.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneGroupResource{} + _ connector.ExportableResource = &PingOneGroupResource{} ) -type PingoneGroupResource struct { +type PingOneGroupResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneGroupResource -func Group(clientInfo *connector.PingOneClientInfo) *PingoneGroupResource { - return &PingoneGroupResource{ +// Utility method for creating a PingOneGroupResource +func Group(clientInfo *connector.PingOneClientInfo) *PingOneGroupResource { + return &PingOneGroupResource{ clientInfo: clientInfo, } } -func (r *PingoneGroupResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneGroupResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneGroupResource) ExportAll() (*[]connector.ImportBlock, error) { return &importBlocks, nil } -func (r *PingoneGroupResource) ResourceType() string { +func (r *PingOneGroupResource) ResourceType() string { return "pingone_group" } diff --git a/internal/connector/pingone/sso/resources/pingone_group_nesting.go b/internal/connector/pingone/sso/resources/pingone_group_nesting.go index a0952dba..88703517 100644 --- a/internal/connector/pingone/sso/resources/pingone_group_nesting.go +++ b/internal/connector/pingone/sso/resources/pingone_group_nesting.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneGroupNestingResource{} + _ connector.ExportableResource = &PingOneGroupNestingResource{} ) -type PingoneGroupNestingResource struct { +type PingOneGroupNestingResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneGroupNestingResource -func GroupNesting(clientInfo *connector.PingOneClientInfo) *PingoneGroupNestingResource { - return &PingoneGroupNestingResource{ +// Utility method for creating a PingOneGroupNestingResource +func GroupNesting(clientInfo *connector.PingOneClientInfo) *PingOneGroupNestingResource { + return &PingOneGroupNestingResource{ clientInfo: clientInfo, } } -func (r *PingoneGroupNestingResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneGroupNestingResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -81,6 +81,6 @@ func (r *PingoneGroupNestingResource) ExportAll() (*[]connector.ImportBlock, err return &importBlocks, nil } -func (r *PingoneGroupNestingResource) ResourceType() string { +func (r *PingOneGroupNestingResource) ResourceType() string { return "pingone_group_nesting" } diff --git a/internal/connector/pingone/sso/resources/pingone_group_role_assignment.go b/internal/connector/pingone/sso/resources/pingone_group_role_assignment.go index ca836972..a275beae 100644 --- a/internal/connector/pingone/sso/resources/pingone_group_role_assignment.go +++ b/internal/connector/pingone/sso/resources/pingone_group_role_assignment.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneGroupRoleAssignmentResource{} + _ connector.ExportableResource = &PingOneGroupRoleAssignmentResource{} ) -type PingoneGroupRoleAssignmentResource struct { +type PingOneGroupRoleAssignmentResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneGroupRoleAssignmentResource -func GroupRoleAssignment(clientInfo *connector.PingOneClientInfo) *PingoneGroupRoleAssignmentResource { - return &PingoneGroupRoleAssignmentResource{ +// Utility method for creating a PingOneGroupRoleAssignmentResource +func GroupRoleAssignment(clientInfo *connector.PingOneClientInfo) *PingOneGroupRoleAssignmentResource { + return &PingOneGroupRoleAssignmentResource{ clientInfo: clientInfo, } } -func (r *PingoneGroupRoleAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneGroupRoleAssignmentResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -103,6 +103,6 @@ func (r *PingoneGroupRoleAssignmentResource) ExportAll() (*[]connector.ImportBlo return &importBlocks, nil } -func (r *PingoneGroupRoleAssignmentResource) ResourceType() string { +func (r *PingOneGroupRoleAssignmentResource) ResourceType() string { return "pingone_group_role_assignment" } diff --git a/internal/connector/pingone/sso/resources/pingone_identity_provider.go b/internal/connector/pingone/sso/resources/pingone_identity_provider.go index c6bbb750..6469e0d1 100644 --- a/internal/connector/pingone/sso/resources/pingone_identity_provider.go +++ b/internal/connector/pingone/sso/resources/pingone_identity_provider.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneIdentityProviderResource{} + _ connector.ExportableResource = &PingOneIdentityProviderResource{} ) -type PingoneIdentityProviderResource struct { +type PingOneIdentityProviderResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneIdentityProviderResource -func IdentityProvider(clientInfo *connector.PingOneClientInfo) *PingoneIdentityProviderResource { - return &PingoneIdentityProviderResource{ +// Utility method for creating a PingOneIdentityProviderResource +func IdentityProvider(clientInfo *connector.PingOneClientInfo) *PingOneIdentityProviderResource { + return &PingOneIdentityProviderResource{ clientInfo: clientInfo, } } -func (r *PingoneIdentityProviderResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneIdentityProviderResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -92,6 +92,6 @@ func (r *PingoneIdentityProviderResource) ExportAll() (*[]connector.ImportBlock, return &importBlocks, nil } -func (r *PingoneIdentityProviderResource) ResourceType() string { +func (r *PingOneIdentityProviderResource) ResourceType() string { return "pingone_identity_provider" } diff --git a/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute.go b/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute.go index 06c4e364..9f6b7ad6 100644 --- a/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute.go +++ b/internal/connector/pingone/sso/resources/pingone_identity_provider_attribute.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneIdentityProviderAttributeResource{} + _ connector.ExportableResource = &PingOneIdentityProviderAttributeResource{} ) -type PingoneIdentityProviderAttributeResource struct { +type PingOneIdentityProviderAttributeResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneIdentityProviderAttributeResource -func IdentityProviderAttribute(clientInfo *connector.PingOneClientInfo) *PingoneIdentityProviderAttributeResource { - return &PingoneIdentityProviderAttributeResource{ +// Utility method for creating a PingOneIdentityProviderAttributeResource +func IdentityProviderAttribute(clientInfo *connector.PingOneClientInfo) *PingOneIdentityProviderAttributeResource { + return &PingOneIdentityProviderAttributeResource{ clientInfo: clientInfo, } } -func (r *PingoneIdentityProviderAttributeResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneIdentityProviderAttributeResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -108,6 +108,6 @@ func (r *PingoneIdentityProviderAttributeResource) ExportAll() (*[]connector.Imp return &importBlocks, nil } -func (r *PingoneIdentityProviderAttributeResource) ResourceType() string { +func (r *PingOneIdentityProviderAttributeResource) ResourceType() string { return "pingone_identity_provider_attribute" } diff --git a/internal/connector/pingone/sso/resources/pingone_password_policy.go b/internal/connector/pingone/sso/resources/pingone_password_policy.go index c23f87e9..e4daf906 100644 --- a/internal/connector/pingone/sso/resources/pingone_password_policy.go +++ b/internal/connector/pingone/sso/resources/pingone_password_policy.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingonePasswordPolicyResource{} + _ connector.ExportableResource = &PingOnePasswordPolicyResource{} ) -type PingonePasswordPolicyResource struct { +type PingOnePasswordPolicyResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingonePasswordPolicyResource -func PasswordPolicy(clientInfo *connector.PingOneClientInfo) *PingonePasswordPolicyResource { - return &PingonePasswordPolicyResource{ +// Utility method for creating a PingOnePasswordPolicyResource +func PasswordPolicy(clientInfo *connector.PingOneClientInfo) *PingOnePasswordPolicyResource { + return &PingOnePasswordPolicyResource{ clientInfo: clientInfo, } } -func (r *PingonePasswordPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOnePasswordPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingonePasswordPolicyResource) ExportAll() (*[]connector.ImportBlock, e return &importBlocks, nil } -func (r *PingonePasswordPolicyResource) ResourceType() string { +func (r *PingOnePasswordPolicyResource) ResourceType() string { return "pingone_password_policy" } diff --git a/internal/connector/pingone/sso/resources/pingone_population.go b/internal/connector/pingone/sso/resources/pingone_population.go index 6e35bc13..afc0298c 100644 --- a/internal/connector/pingone/sso/resources/pingone_population.go +++ b/internal/connector/pingone/sso/resources/pingone_population.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingonePopulationResource{} + _ connector.ExportableResource = &PingOnePopulationResource{} ) -type PingonePopulationResource struct { +type PingOnePopulationResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingonePopulationResource -func Population(clientInfo *connector.PingOneClientInfo) *PingonePopulationResource { - return &PingonePopulationResource{ +// Utility method for creating a PingOnePopulationResource +func Population(clientInfo *connector.PingOneClientInfo) *PingOnePopulationResource { + return &PingOnePopulationResource{ clientInfo: clientInfo, } } -func (r *PingonePopulationResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOnePopulationResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingonePopulationResource) ExportAll() (*[]connector.ImportBlock, error return &importBlocks, nil } -func (r *PingonePopulationResource) ResourceType() string { +func (r *PingOnePopulationResource) ResourceType() string { return "pingone_population" } diff --git a/internal/connector/pingone/sso/resources/pingone_population_default.go b/internal/connector/pingone/sso/resources/pingone_population_default.go index 990416fe..53c01a63 100644 --- a/internal/connector/pingone/sso/resources/pingone_population_default.go +++ b/internal/connector/pingone/sso/resources/pingone_population_default.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingonePopulationDefaultDefaultResource{} + _ connector.ExportableResource = &PingOnePopulationDefaultDefaultResource{} ) -type PingonePopulationDefaultDefaultResource struct { +type PingOnePopulationDefaultDefaultResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingonePopulationDefaultDefaultResource -func PopulationDefault(clientInfo *connector.PingOneClientInfo) *PingonePopulationDefaultDefaultResource { - return &PingonePopulationDefaultDefaultResource{ +// Utility method for creating a PingOnePopulationDefaultDefaultResource +func PopulationDefault(clientInfo *connector.PingOneClientInfo) *PingOnePopulationDefaultDefaultResource { + return &PingOnePopulationDefaultDefaultResource{ clientInfo: clientInfo, } } -func (r *PingonePopulationDefaultDefaultResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOnePopulationDefaultDefaultResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -77,6 +77,6 @@ func (r *PingonePopulationDefaultDefaultResource) ExportAll() (*[]connector.Impo return &importBlocks, nil } -func (r *PingonePopulationDefaultDefaultResource) ResourceType() string { +func (r *PingOnePopulationDefaultDefaultResource) ResourceType() string { return "pingone_population_default" } diff --git a/internal/connector/pingone/sso/resources/pingone_resource.go b/internal/connector/pingone/sso/resources/pingone_resource.go index ceadf9e2..644ea0d0 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource.go +++ b/internal/connector/pingone/sso/resources/pingone_resource.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneResourceResource{} + _ connector.ExportableResource = &PingOneResourceResource{} ) -type PingoneResourceResource struct { +type PingOneResourceResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneResourceResource -func Resource(clientInfo *connector.PingOneClientInfo) *PingoneResourceResource { - return &PingoneResourceResource{ +// Utility method for creating a PingOneResourceResource +func Resource(clientInfo *connector.PingOneClientInfo) *PingOneResourceResource { + return &PingOneResourceResource{ clientInfo: clientInfo, } } -func (r *PingoneResourceResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneResourceResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -66,6 +66,6 @@ func (r *PingoneResourceResource) ExportAll() (*[]connector.ImportBlock, error) return &importBlocks, nil } -func (r *PingoneResourceResource) ResourceType() string { +func (r *PingOneResourceResource) ResourceType() string { return "pingone_resource" } diff --git a/internal/connector/pingone/sso/resources/pingone_resource_attribute.go b/internal/connector/pingone/sso/resources/pingone_resource_attribute.go index 64f8e702..2ab6d805 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_attribute.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_attribute.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneResourceAttributeResource{} + _ connector.ExportableResource = &PingOneResourceAttributeResource{} ) -type PingoneResourceAttributeResource struct { +type PingOneResourceAttributeResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneResourceAttributeResource -func ResourceAttribute(clientInfo *connector.PingOneClientInfo) *PingoneResourceAttributeResource { - return &PingoneResourceAttributeResource{ +// Utility method for creating a PingOneResourceAttributeResource +func ResourceAttribute(clientInfo *connector.PingOneClientInfo) *PingOneResourceAttributeResource { + return &PingOneResourceAttributeResource{ clientInfo: clientInfo, } } -func (r *PingoneResourceAttributeResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneResourceAttributeResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -105,6 +105,6 @@ func (r *PingoneResourceAttributeResource) ExportAll() (*[]connector.ImportBlock return &importBlocks, nil } -func (r *PingoneResourceAttributeResource) ResourceType() string { +func (r *PingOneResourceAttributeResource) ResourceType() string { return "pingone_resource_attribute" } diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope.go b/internal/connector/pingone/sso/resources/pingone_resource_scope.go index 27ecc09d..d9dc27c2 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneResourceScopeResource{} + _ connector.ExportableResource = &PingOneResourceScopeResource{} ) -type PingoneResourceScopeResource struct { +type PingOneResourceScopeResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneResourceScopeResource -func ResourceScope(clientInfo *connector.PingOneClientInfo) *PingoneResourceScopeResource { - return &PingoneResourceScopeResource{ +// Utility method for creating a PingOneResourceScopeResource +func ResourceScope(clientInfo *connector.PingOneClientInfo) *PingOneResourceScopeResource { + return &PingOneResourceScopeResource{ clientInfo: clientInfo, } } -func (r *PingoneResourceScopeResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneResourceScopeResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -84,6 +84,6 @@ func (r *PingoneResourceScopeResource) ExportAll() (*[]connector.ImportBlock, er return &importBlocks, nil } -func (r *PingoneResourceScopeResource) ResourceType() string { +func (r *PingOneResourceScopeResource) ResourceType() string { return "pingone_resource_scope" } diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope_openid.go b/internal/connector/pingone/sso/resources/pingone_resource_scope_openid.go index c1a7c3e5..eb9ec217 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope_openid.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope_openid.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneResourceScopeOpenIdResource{} + _ connector.ExportableResource = &PingOneResourceScopeOpenIdResource{} ) -type PingoneResourceScopeOpenIdResource struct { +type PingOneResourceScopeOpenIdResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneResourceScopeOpenIdResource -func ResourceScopeOpenId(clientInfo *connector.PingOneClientInfo) *PingoneResourceScopeOpenIdResource { - return &PingoneResourceScopeOpenIdResource{ +// Utility method for creating a PingOneResourceScopeOpenIdResource +func ResourceScopeOpenId(clientInfo *connector.PingOneClientInfo) *PingOneResourceScopeOpenIdResource { + return &PingOneResourceScopeOpenIdResource{ clientInfo: clientInfo, } } -func (r *PingoneResourceScopeOpenIdResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneResourceScopeOpenIdResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -83,6 +83,6 @@ func (r *PingoneResourceScopeOpenIdResource) ExportAll() (*[]connector.ImportBlo return &importBlocks, nil } -func (r *PingoneResourceScopeOpenIdResource) ResourceType() string { +func (r *PingOneResourceScopeOpenIdResource) ResourceType() string { return "pingone_resource_scope_openid" } diff --git a/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api.go b/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api.go index e40ed73c..173e26e0 100644 --- a/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api.go +++ b/internal/connector/pingone/sso/resources/pingone_resource_scope_pingone_api.go @@ -12,21 +12,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneResourceScopePingOneApiResource{} + _ connector.ExportableResource = &PingOneResourceScopePingOneApiResource{} ) -type PingoneResourceScopePingOneApiResource struct { +type PingOneResourceScopePingOneApiResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneResourceScopePingOneApiResource -func ResourceScopePingOneApi(clientInfo *connector.PingOneClientInfo) *PingoneResourceScopePingOneApiResource { - return &PingoneResourceScopePingOneApiResource{ +// Utility method for creating a PingOneResourceScopePingOneApiResource +func ResourceScopePingOneApi(clientInfo *connector.PingOneClientInfo) *PingOneResourceScopePingOneApiResource { + return &PingOneResourceScopePingOneApiResource{ clientInfo: clientInfo, } } -func (r *PingoneResourceScopePingOneApiResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneResourceScopePingOneApiResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -94,6 +94,6 @@ func (r *PingoneResourceScopePingOneApiResource) ExportAll() (*[]connector.Impor return &importBlocks, nil } -func (r *PingoneResourceScopePingOneApiResource) ResourceType() string { +func (r *PingOneResourceScopePingOneApiResource) ResourceType() string { return "pingone_resource_scope_pingone_api" } diff --git a/internal/connector/pingone/sso/resources/pingone_schema_attribute.go b/internal/connector/pingone/sso/resources/pingone_schema_attribute.go index d102eb29..0b455f5b 100644 --- a/internal/connector/pingone/sso/resources/pingone_schema_attribute.go +++ b/internal/connector/pingone/sso/resources/pingone_schema_attribute.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneSchemaAttributeResource{} + _ connector.ExportableResource = &PingOneSchemaAttributeResource{} ) -type PingoneSchemaAttributeResource struct { +type PingOneSchemaAttributeResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneSchemaAttributeResource -func SchemaAttribute(clientInfo *connector.PingOneClientInfo) *PingoneSchemaAttributeResource { - return &PingoneSchemaAttributeResource{ +// Utility method for creating a PingOneSchemaAttributeResource +func SchemaAttribute(clientInfo *connector.PingOneClientInfo) *PingOneSchemaAttributeResource { + return &PingOneSchemaAttributeResource{ clientInfo: clientInfo, } } -func (r *PingoneSchemaAttributeResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneSchemaAttributeResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -80,6 +80,6 @@ func (r *PingoneSchemaAttributeResource) ExportAll() (*[]connector.ImportBlock, return &importBlocks, nil } -func (r *PingoneSchemaAttributeResource) ResourceType() string { +func (r *PingOneSchemaAttributeResource) ResourceType() string { return "pingone_schema_attribute" } diff --git a/internal/connector/pingone/sso/resources/pingone_sign_on_policy.go b/internal/connector/pingone/sso/resources/pingone_sign_on_policy.go index 48608d16..27bcfbe8 100644 --- a/internal/connector/pingone/sso/resources/pingone_sign_on_policy.go +++ b/internal/connector/pingone/sso/resources/pingone_sign_on_policy.go @@ -10,21 +10,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneSignOnPolicyResource{} + _ connector.ExportableResource = &PingOneSignOnPolicyResource{} ) -type PingoneSignOnPolicyResource struct { +type PingOneSignOnPolicyResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneSignOnPolicyResource -func SignOnPolicy(clientInfo *connector.PingOneClientInfo) *PingoneSignOnPolicyResource { - return &PingoneSignOnPolicyResource{ +// Utility method for creating a PingOneSignOnPolicyResource +func SignOnPolicy(clientInfo *connector.PingOneClientInfo) *PingOneSignOnPolicyResource { + return &PingOneSignOnPolicyResource{ clientInfo: clientInfo, } } -func (r *PingoneSignOnPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneSignOnPolicyResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -65,6 +65,6 @@ func (r *PingoneSignOnPolicyResource) ExportAll() (*[]connector.ImportBlock, err return &importBlocks, nil } -func (r *PingoneSignOnPolicyResource) ResourceType() string { +func (r *PingOneSignOnPolicyResource) ResourceType() string { return "pingone_sign_on_policy" } diff --git a/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action.go b/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action.go index 26e2bae0..e731fbe5 100644 --- a/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action.go +++ b/internal/connector/pingone/sso/resources/pingone_sign_on_policy_action.go @@ -11,21 +11,21 @@ import ( // Verify that the resource satisfies the exportable resource interface var ( - _ connector.ExportableResource = &PingoneSignOnPolicyActionResource{} + _ connector.ExportableResource = &PingOneSignOnPolicyActionResource{} ) -type PingoneSignOnPolicyActionResource struct { +type PingOneSignOnPolicyActionResource struct { clientInfo *connector.PingOneClientInfo } -// Utility method for creating a PingoneSignOnPolicyActionResource -func SignOnPolicyAction(clientInfo *connector.PingOneClientInfo) *PingoneSignOnPolicyActionResource { - return &PingoneSignOnPolicyActionResource{ +// Utility method for creating a PingOneSignOnPolicyActionResource +func SignOnPolicyAction(clientInfo *connector.PingOneClientInfo) *PingOneSignOnPolicyActionResource { + return &PingOneSignOnPolicyActionResource{ clientInfo: clientInfo, } } -func (r *PingoneSignOnPolicyActionResource) ExportAll() (*[]connector.ImportBlock, error) { +func (r *PingOneSignOnPolicyActionResource) ExportAll() (*[]connector.ImportBlock, error) { l := logger.Get() l.Debug().Msgf("Fetching all %s resources...", r.ResourceType()) @@ -117,6 +117,6 @@ func (r *PingoneSignOnPolicyActionResource) ExportAll() (*[]connector.ImportBloc return &importBlocks, nil } -func (r *PingoneSignOnPolicyActionResource) ResourceType() string { +func (r *PingOneSignOnPolicyActionResource) ResourceType() string { return "pingone_sign_on_policy_action" } diff --git a/internal/customtypes/pingfederate_auth_type.go b/internal/customtypes/pingfederate_auth_type.go index c99e57ea..5204efbc 100644 --- a/internal/customtypes/pingfederate_auth_type.go +++ b/internal/customtypes/pingfederate_auth_type.go @@ -14,41 +14,41 @@ const ( ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_CLIENT_CREDENTIALS string = "clientCredentialsAuth" ) -type PingfederateAuthenticationType string +type PingFederateAuthenticationType string // Verify that the custom type satisfies the pflag.Value interface -var _ pflag.Value = (*PingfederateAuthenticationType)(nil) +var _ pflag.Value = (*PingFederateAuthenticationType)(nil) // Implement pflag.Value interface for custom type in cobra MultiService parameter -func (pat *PingfederateAuthenticationType) Set(authType string) error { +func (pat *PingFederateAuthenticationType) Set(authType string) error { if pat == nil { - return fmt.Errorf("failed to set Pingfederate Authentication Type value: %s. Pingfederate Authentication Type is nil", authType) + return fmt.Errorf("failed to set PingFederate Authentication Type value: %s. PingFederate Authentication Type is nil", authType) } switch { case strings.EqualFold(authType, ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC): - *pat = PingfederateAuthenticationType(ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC) + *pat = PingFederateAuthenticationType(ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC) case strings.EqualFold(authType, ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_ACCESS_TOKEN): - *pat = PingfederateAuthenticationType(ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_ACCESS_TOKEN) + *pat = PingFederateAuthenticationType(ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_ACCESS_TOKEN) case strings.EqualFold(authType, ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_CLIENT_CREDENTIALS): - *pat = PingfederateAuthenticationType(ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_CLIENT_CREDENTIALS) + *pat = PingFederateAuthenticationType(ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_CLIENT_CREDENTIALS) case strings.EqualFold(authType, ""): - *pat = PingfederateAuthenticationType("") + *pat = PingFederateAuthenticationType("") default: - return fmt.Errorf("unrecognized Pingfederate Authentication Type: '%s'. Must be one of: %s", authType, strings.Join(PingfederateAuthenticationTypeValidValues(), ", ")) + return fmt.Errorf("unrecognized PingFederate Authentication Type: '%s'. Must be one of: %s", authType, strings.Join(PingFederateAuthenticationTypeValidValues(), ", ")) } return nil } -func (pat PingfederateAuthenticationType) Type() string { +func (pat PingFederateAuthenticationType) Type() string { return "string" } -func (pat PingfederateAuthenticationType) String() string { +func (pat PingFederateAuthenticationType) String() string { return string(pat) } -func PingfederateAuthenticationTypeValidValues() []string { +func PingFederateAuthenticationTypeValidValues() []string { types := []string{ ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC, ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_ACCESS_TOKEN, diff --git a/internal/customtypes/pingfederate_auth_type_test.go b/internal/customtypes/pingfederate_auth_type_test.go index 97fb1b17..2bdc41e5 100644 --- a/internal/customtypes/pingfederate_auth_type_test.go +++ b/internal/customtypes/pingfederate_auth_type_test.go @@ -7,37 +7,37 @@ import ( "github.com/pingidentity/pingcli/internal/testing/testutils" ) -// Test PingfederateAuthType Set function -func Test_PingfederateAuthType_Set(t *testing.T) { - // Create a new PingfederateAuthType - pingAuthType := new(customtypes.PingfederateAuthenticationType) +// Test PingFederateAuthType Set function +func Test_PingFederateAuthType_Set(t *testing.T) { + // Create a new PingFederateAuthType + pingAuthType := new(customtypes.PingFederateAuthenticationType) err := pingAuthType.Set(customtypes.ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC) testutils.CheckExpectedError(t, err, nil) } // Test Set function fails with invalid value -func Test_PingfederateAuthType_Set_InvalidValue(t *testing.T) { - pingAuthType := new(customtypes.PingfederateAuthenticationType) +func Test_PingFederateAuthType_Set_InvalidValue(t *testing.T) { + pingAuthType := new(customtypes.PingFederateAuthenticationType) invalidValue := "invalid" - expectedErrorPattern := `^unrecognized Pingfederate Authentication Type: '.*'\. Must be one of: .*$` + expectedErrorPattern := `^unrecognized PingFederate Authentication Type: '.*'\. Must be one of: .*$` err := pingAuthType.Set(invalidValue) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Set function fails with nil -func Test_PingfederateAuthType_Set_Nil(t *testing.T) { - var pingAuthType *customtypes.PingfederateAuthenticationType +func Test_PingFederateAuthType_Set_Nil(t *testing.T) { + var pingAuthType *customtypes.PingFederateAuthenticationType - expectedErrorPattern := `^failed to set Pingfederate Authentication Type value: .*\. Pingfederate Authentication Type is nil$` + expectedErrorPattern := `^failed to set PingFederate Authentication Type value: .*\. PingFederate Authentication Type is nil$` err := pingAuthType.Set(customtypes.ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test String function -func Test_PingfederateAuthType_String(t *testing.T) { - pingAuthType := customtypes.PingfederateAuthenticationType(customtypes.ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC) +func Test_PingFederateAuthType_String(t *testing.T) { + pingAuthType := customtypes.PingFederateAuthenticationType(customtypes.ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC) expected := customtypes.ENUM_PINGFEDERATE_AUTHENTICATION_TYPE_BASIC actual := pingAuthType.String() diff --git a/internal/customtypes/pingone_auth_type.go b/internal/customtypes/pingone_auth_type.go index ab7d6197..b647c48d 100644 --- a/internal/customtypes/pingone_auth_type.go +++ b/internal/customtypes/pingone_auth_type.go @@ -12,37 +12,37 @@ const ( ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER string = "worker" ) -type PingoneAuthenticationType string +type PingOneAuthenticationType string // Verify that the custom type satisfies the pflag.Value interface -var _ pflag.Value = (*PingoneAuthenticationType)(nil) +var _ pflag.Value = (*PingOneAuthenticationType)(nil) // Implement pflag.Value interface for custom type in cobra MultiService parameter -func (pat *PingoneAuthenticationType) Set(authType string) error { +func (pat *PingOneAuthenticationType) Set(authType string) error { if pat == nil { - return fmt.Errorf("failed to set Pingone Authentication Type value: %s. Pingone Authentication Type is nil", authType) + return fmt.Errorf("failed to set PingOne Authentication Type value: %s. PingOne Authentication Type is nil", authType) } switch { case strings.EqualFold(authType, ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER): - *pat = PingoneAuthenticationType(ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER) + *pat = PingOneAuthenticationType(ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER) case strings.EqualFold(authType, ""): - *pat = PingoneAuthenticationType("") + *pat = PingOneAuthenticationType("") default: - return fmt.Errorf("unrecognized Pingone Authentication Type: '%s'. Must be one of: %s", authType, strings.Join(PingoneAuthenticationTypeValidValues(), ", ")) + return fmt.Errorf("unrecognized PingOne Authentication Type: '%s'. Must be one of: %s", authType, strings.Join(PingOneAuthenticationTypeValidValues(), ", ")) } return nil } -func (pat PingoneAuthenticationType) Type() string { +func (pat PingOneAuthenticationType) Type() string { return "string" } -func (pat PingoneAuthenticationType) String() string { +func (pat PingOneAuthenticationType) String() string { return string(pat) } -func PingoneAuthenticationTypeValidValues() []string { +func PingOneAuthenticationTypeValidValues() []string { types := []string{ ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER, } diff --git a/internal/customtypes/pingone_auth_type_test.go b/internal/customtypes/pingone_auth_type_test.go index 27ef2c97..6e6d7910 100644 --- a/internal/customtypes/pingone_auth_type_test.go +++ b/internal/customtypes/pingone_auth_type_test.go @@ -7,37 +7,37 @@ import ( "github.com/pingidentity/pingcli/internal/testing/testutils" ) -// Test Pingone Authentication Type Set function -func Test_PingoneAuthType_Set(t *testing.T) { - // Create a new PingoneAuthType - pingAuthType := new(customtypes.PingoneAuthenticationType) +// Test PingOne Authentication Type Set function +func Test_PingOneAuthType_Set(t *testing.T) { + // Create a new PingOneAuthType + pingAuthType := new(customtypes.PingOneAuthenticationType) err := pingAuthType.Set(customtypes.ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER) testutils.CheckExpectedError(t, err, nil) } // Test Set function fails with invalid value -func Test_PingoneAuthType_Set_InvalidValue(t *testing.T) { - pingAuthType := new(customtypes.PingoneAuthenticationType) +func Test_PingOneAuthType_Set_InvalidValue(t *testing.T) { + pingAuthType := new(customtypes.PingOneAuthenticationType) invalidValue := "invalid" - expectedErrorPattern := `^unrecognized Pingone Authentication Type: '.*'\. Must be one of: .*$` + expectedErrorPattern := `^unrecognized PingOne Authentication Type: '.*'\. Must be one of: .*$` err := pingAuthType.Set(invalidValue) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Set function fails with nil -func Test_PingoneAuthType_Set_Nil(t *testing.T) { - var pingAuthType *customtypes.PingoneAuthenticationType +func Test_PingOneAuthType_Set_Nil(t *testing.T) { + var pingAuthType *customtypes.PingOneAuthenticationType - expectedErrorPattern := `^failed to set Pingone Authentication Type value: .*\. Pingone Authentication Type is nil$` + expectedErrorPattern := `^failed to set PingOne Authentication Type value: .*\. PingOne Authentication Type is nil$` err := pingAuthType.Set(customtypes.ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test String function -func Test_PingoneAuthType_String(t *testing.T) { - pingAuthType := customtypes.PingoneAuthenticationType(customtypes.ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER) +func Test_PingOneAuthType_String(t *testing.T) { + pingAuthType := customtypes.PingOneAuthenticationType(customtypes.ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER) expected := customtypes.ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER actual := pingAuthType.String() diff --git a/internal/customtypes/pingone_region_code.go b/internal/customtypes/pingone_region_code.go index 93a240db..b7463346 100644 --- a/internal/customtypes/pingone_region_code.go +++ b/internal/customtypes/pingone_region_code.go @@ -22,45 +22,45 @@ const ( ENUM_PINGONE_TLD_NA string = "com" ) -type PingoneRegionCode string +type PingOneRegionCode string // Verify that the custom type satisfies the pflag.Value interface -var _ pflag.Value = (*PingoneRegionCode)(nil) +var _ pflag.Value = (*PingOneRegionCode)(nil) // Implement pflag.Value interface for custom type in cobra pingone-region parameter -func (prc *PingoneRegionCode) Set(regionCode string) error { +func (prc *PingOneRegionCode) Set(regionCode string) error { if prc == nil { - return fmt.Errorf("failed to set Pingone Region Code value: %s. Pingone Region Code is nil", regionCode) + return fmt.Errorf("failed to set PingOne Region Code value: %s. PingOne Region Code is nil", regionCode) } switch { case strings.EqualFold(regionCode, ENUM_PINGONE_REGION_CODE_AP): - *prc = PingoneRegionCode(ENUM_PINGONE_REGION_CODE_AP) + *prc = PingOneRegionCode(ENUM_PINGONE_REGION_CODE_AP) case strings.EqualFold(regionCode, ENUM_PINGONE_REGION_CODE_AU): - *prc = PingoneRegionCode(ENUM_PINGONE_REGION_CODE_AU) + *prc = PingOneRegionCode(ENUM_PINGONE_REGION_CODE_AU) case strings.EqualFold(regionCode, ENUM_PINGONE_REGION_CODE_CA): - *prc = PingoneRegionCode(ENUM_PINGONE_REGION_CODE_CA) + *prc = PingOneRegionCode(ENUM_PINGONE_REGION_CODE_CA) case strings.EqualFold(regionCode, ENUM_PINGONE_REGION_CODE_EU): - *prc = PingoneRegionCode(ENUM_PINGONE_REGION_CODE_EU) + *prc = PingOneRegionCode(ENUM_PINGONE_REGION_CODE_EU) case strings.EqualFold(regionCode, ENUM_PINGONE_REGION_CODE_NA): - *prc = PingoneRegionCode(ENUM_PINGONE_REGION_CODE_NA) + *prc = PingOneRegionCode(ENUM_PINGONE_REGION_CODE_NA) case strings.EqualFold(regionCode, ""): - *prc = PingoneRegionCode("") + *prc = PingOneRegionCode("") default: - return fmt.Errorf("unrecognized Pingone Region Code: '%s'. Must be one of: %s", regionCode, strings.Join(PingoneRegionCodeValidValues(), ", ")) + return fmt.Errorf("unrecognized PingOne Region Code: '%s'. Must be one of: %s", regionCode, strings.Join(PingOneRegionCodeValidValues(), ", ")) } return nil } -func (prc PingoneRegionCode) Type() string { +func (prc PingOneRegionCode) Type() string { return "string" } -func (prc PingoneRegionCode) String() string { +func (prc PingOneRegionCode) String() string { return string(prc) } -func PingoneRegionCodeValidValues() []string { +func PingOneRegionCodeValidValues() []string { pingoneRegionCodes := []string{ ENUM_PINGONE_REGION_CODE_AP, ENUM_PINGONE_REGION_CODE_AU, diff --git a/internal/customtypes/pingone_region_code_test.go b/internal/customtypes/pingone_region_code_test.go index f59e12c6..e9957d8a 100644 --- a/internal/customtypes/pingone_region_code_test.go +++ b/internal/customtypes/pingone_region_code_test.go @@ -9,7 +9,7 @@ import ( // Test PingOneRegion Set function func Test_PingOneRegion_Set(t *testing.T) { - prc := new(customtypes.PingoneRegionCode) + prc := new(customtypes.PingOneRegionCode) err := prc.Set(customtypes.ENUM_PINGONE_REGION_CODE_AP) if err != nil { @@ -19,29 +19,29 @@ func Test_PingOneRegion_Set(t *testing.T) { // Test Set function fails with invalid value func Test_PingOneRegion_Set_InvalidValue(t *testing.T) { - prc := new(customtypes.PingoneRegionCode) + prc := new(customtypes.PingOneRegionCode) invalidValue := "invalid" - expectedErrorPattern := `^unrecognized Pingone Region Code: '.*'\. Must be one of: .*$` + expectedErrorPattern := `^unrecognized PingOne Region Code: '.*'\. Must be one of: .*$` err := prc.Set(invalidValue) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test Set function fails with nil func Test_PingOneRegion_Set_Nil(t *testing.T) { - var prc *customtypes.PingoneRegionCode + var prc *customtypes.PingOneRegionCode val := customtypes.ENUM_PINGONE_REGION_CODE_AP - expectedErrorPattern := `^failed to set Pingone Region Code value: .* Pingone Region Code is nil$` + expectedErrorPattern := `^failed to set PingOne Region Code value: .* PingOne Region Code is nil$` err := prc.Set(val) testutils.CheckExpectedError(t, err, &expectedErrorPattern) } // Test String function func Test_PingOneRegion_String(t *testing.T) { - pingoneRegion := customtypes.PingoneRegionCode(customtypes.ENUM_PINGONE_REGION_CODE_CA) + pingoneRegion := customtypes.PingOneRegionCode(customtypes.ENUM_PINGONE_REGION_CODE_CA) expected := customtypes.ENUM_PINGONE_REGION_CODE_CA actual := pingoneRegion.String() diff --git a/internal/profiles/validate.go b/internal/profiles/validate.go index a712a13b..26dbec2a 100644 --- a/internal/profiles/validate.go +++ b/internal/profiles/validate.go @@ -124,15 +124,15 @@ func validateProfileValues(pName string, profileViper *viper.Viper) (err error) } case options.ENUM_PINGONE_REGION_CODE: switch typedValue := vValue.(type) { - case *customtypes.PingoneRegionCode: + case *customtypes.PingOneRegionCode: continue case string: - prc := new(customtypes.PingoneRegionCode) + prc := new(customtypes.PingOneRegionCode) if err = prc.Set(typedValue); err != nil { - return fmt.Errorf("profile '%s': variable type '%T' for key '%s' is not a Pingone Region Code value: %v", pName, typedValue, key, err) + return fmt.Errorf("profile '%s': variable type '%T' for key '%s' is not a PingOne Region Code value: %v", pName, typedValue, key, err) } default: - return fmt.Errorf("profile '%s': variable type %T for key '%s' is not a Pingone Region Code value", pName, typedValue, key) + return fmt.Errorf("profile '%s': variable type %T for key '%s' is not a PingOne Region Code value", pName, typedValue, key) } case options.ENUM_STRING: switch typedValue := vValue.(type) { @@ -249,10 +249,10 @@ func validateProfileValues(pName string, profileViper *viper.Viper) (err error) } case options.ENUM_PINGFEDERATE_AUTH_TYPE: switch typedValue := vValue.(type) { - case *customtypes.PingfederateAuthenticationType: + case *customtypes.PingFederateAuthenticationType: continue case string: - pfa := new(customtypes.PingfederateAuthenticationType) + pfa := new(customtypes.PingFederateAuthenticationType) if err = pfa.Set(typedValue); err != nil { return fmt.Errorf("profile '%s': variable type '%T' for key '%s' is not a PingFederate Authentication Type value: %v", pName, typedValue, key, err) } @@ -261,10 +261,10 @@ func validateProfileValues(pName string, profileViper *viper.Viper) (err error) } case options.ENUM_PINGONE_AUTH_TYPE: switch typedValue := vValue.(type) { - case *customtypes.PingoneAuthenticationType: + case *customtypes.PingOneAuthenticationType: continue case string: - pat := new(customtypes.PingoneAuthenticationType) + pat := new(customtypes.PingOneAuthenticationType) if err = pat.Set(typedValue); err != nil { return fmt.Errorf("profile '%s': variable type '%T' for key '%s' is not a PingOne Authentication Type value: %v", pName, typedValue, key, err) } diff --git a/internal/testing/testutils/utils.go b/internal/testing/testutils/utils.go index 013d5ed1..2b6f3bac 100644 --- a/internal/testing/testutils/utils.go +++ b/internal/testing/testutils/utils.go @@ -26,7 +26,7 @@ var ( func GetEnvironmentID() string { envIdOnce.Do(func() { - environmentId = os.Getenv(options.PlatformExportPingoneEnvironmentIDOption.EnvVar) + environmentId = os.Getenv(options.PlatformExportPingOneEnvironmentIDOption.EnvVar) }) return environmentId @@ -40,10 +40,10 @@ func GetPingOneClientInfo(t *testing.T) *connector.PingOneClientInfo { configuration.InitAllOptions() // Grab environment vars for initializing the API client. // These are set in GitHub Actions. - clientID := os.Getenv(options.PingoneAuthenticationWorkerClientIDOption.EnvVar) - clientSecret := os.Getenv(options.PingoneAuthenticationWorkerClientSecretOption.EnvVar) + clientID := os.Getenv(options.PingOneAuthenticationWorkerClientIDOption.EnvVar) + clientSecret := os.Getenv(options.PingOneAuthenticationWorkerClientSecretOption.EnvVar) environmentId := GetEnvironmentID() - regionCode := os.Getenv(options.PingoneRegionCodeOption.EnvVar) + regionCode := os.Getenv(options.PingOneRegionCodeOption.EnvVar) sdkRegionCode := management.EnumRegionCode(regionCode) if clientID == "" || clientSecret == "" || environmentId == "" || regionCode == "" { @@ -82,10 +82,10 @@ func GetPingFederateClientInfo(t *testing.T) *connector.PingFederateClientInfo { configuration.InitAllOptions() - httpsHost := os.Getenv(options.PingfederateHTTPSHostOption.EnvVar) - adminApiPath := os.Getenv(options.PingfederateAdminAPIPathOption.EnvVar) - pfUsername := os.Getenv(options.PingfederateBasicAuthUsernameOption.EnvVar) - pfPassword := os.Getenv(options.PingfederateBasicAuthPasswordOption.EnvVar) + httpsHost := os.Getenv(options.PingFederateHTTPSHostOption.EnvVar) + adminApiPath := os.Getenv(options.PingFederateAdminAPIPathOption.EnvVar) + pfUsername := os.Getenv(options.PingFederateBasicAuthUsernameOption.EnvVar) + pfPassword := os.Getenv(options.PingFederateBasicAuthPasswordOption.EnvVar) if httpsHost == "" || adminApiPath == "" || pfUsername == "" || pfPassword == "" { t.Fatalf("Unable to retrieve env var value for one or more of httpsHost, adminApiPath, pfUsername, pfPassword.") diff --git a/internal/testing/testutils_viper/viper_utils.go b/internal/testing/testutils_viper/viper_utils.go index 94878cb2..18922b9e 100644 --- a/internal/testing/testutils_viper/viper_utils.go +++ b/internal/testing/testutils_viper/viper_utils.go @@ -109,14 +109,14 @@ func InitVipersCustomFile(t *testing.T, fileContents string) { func getDefaultConfigFileContents() string { return fmt.Sprintf(defaultConfigFileContentsPattern, outputDirectoryReplacement, - os.Getenv(options.PingoneRegionCodeOption.EnvVar), - os.Getenv(options.PingoneAuthenticationWorkerClientIDOption.EnvVar), - os.Getenv(options.PingoneAuthenticationWorkerClientSecretOption.EnvVar), - os.Getenv(options.PingoneAuthenticationWorkerEnvironmentIDOption.EnvVar), - os.Getenv(options.PingfederateAdminAPIPathOption.EnvVar), - os.Getenv(options.PingfederateClientCredentialsAuthClientIDOption.EnvVar), - os.Getenv(options.PingfederateClientCredentialsAuthClientSecretOption.EnvVar), - os.Getenv(options.PingfederateClientCredentialsAuthScopesOption.EnvVar), - os.Getenv(options.PingfederateClientCredentialsAuthTokenURLOption.EnvVar), - os.Getenv(options.PingfederateHTTPSHostOption.EnvVar)) + os.Getenv(options.PingOneRegionCodeOption.EnvVar), + os.Getenv(options.PingOneAuthenticationWorkerClientIDOption.EnvVar), + os.Getenv(options.PingOneAuthenticationWorkerClientSecretOption.EnvVar), + os.Getenv(options.PingOneAuthenticationWorkerEnvironmentIDOption.EnvVar), + os.Getenv(options.PingFederateAdminAPIPathOption.EnvVar), + os.Getenv(options.PingFederateClientCredentialsAuthClientIDOption.EnvVar), + os.Getenv(options.PingFederateClientCredentialsAuthClientSecretOption.EnvVar), + os.Getenv(options.PingFederateClientCredentialsAuthScopesOption.EnvVar), + os.Getenv(options.PingFederateClientCredentialsAuthTokenURLOption.EnvVar), + os.Getenv(options.PingFederateHTTPSHostOption.EnvVar)) } From d866a3540b8821cf35992f9e61950ce96a11e4ee Mon Sep 17 00:00:00 2001 From: Patrick Cowland Date: Fri, 11 Oct 2024 18:47:49 +0100 Subject: [PATCH 12/16] update Pingcli to Ping CLI in printed messages --- README.md | 2 +- cmd/root.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6218633d..20cfd226 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Start by running the command to create a new profile and answering the prompts. ```text $ pingcli config add-profile -Pingcli configuration file '/Users//.pingcli/config.yaml' does not exist. - No Action (Warning) +Ping CLI configuration file '/Users//.pingcli/config.yaml' does not exist. - No Action (Warning) Creating new pingcli configuration file at: /Users//.pingcli/config.yaml New profile name: : dev New profile description: : configuration for development environment diff --git a/cmd/root.go b/cmd/root.go index 32cee4f5..e766f127 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -21,7 +21,7 @@ import ( func init() { l := logger.Get() - l.Debug().Msgf("Initializing Pingcli options...") + l.Debug().Msgf("Initializing Ping CLI options...") configuration.InitAllOptions() l.Debug().Msgf("Initializing Root command...") @@ -117,7 +117,7 @@ func checkCfgFileLocation(cfgFile string) { // Only create a new configuration file if it is the default configuration file location if cfgFile == options.RootConfigOption.DefaultValue.String() { output.Print(output.Opts{ - Message: fmt.Sprintf("Pingcli configuration file '%s' does not exist.", cfgFile), + Message: fmt.Sprintf("Ping CLI configuration file '%s' does not exist.", cfgFile), Result: output.ENUM_RESULT_NOACTION_WARN, }) From 96a99a45c19ad9ca9dc5ed4961f3aa845f74e615 Mon Sep 17 00:00:00 2001 From: Patrick Cowland Date: Fri, 11 Oct 2024 18:57:13 +0100 Subject: [PATCH 13/16] update pingcli to Ping CLI in printed messages --- README.md | 4 ++-- cmd/root.go | 8 ++++---- internal/profiles/validate.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 20cfd226..0093ae2a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# pingcli +# Ping CLI The Ping CLI is a unified command line interface for configuring and managing Ping Identity Services. @@ -15,7 +15,7 @@ Start by running the command to create a new profile and answering the prompts. ```text $ pingcli config add-profile Ping CLI configuration file '/Users//.pingcli/config.yaml' does not exist. - No Action (Warning) -Creating new pingcli configuration file at: /Users//.pingcli/config.yaml +Creating new Ping CLI configuration file at: /Users//.pingcli/config.yaml New profile name: : dev New profile description: : configuration for development environment Set new profile as active: : y diff --git a/cmd/root.go b/cmd/root.go index e766f127..3ddd9115 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -103,7 +103,7 @@ func initViperProfile() { // Validate the configuration if err := profiles.Validate(); err != nil { output.Print(output.Opts{ - Message: "Failed to validate pingcli configuration", + Message: "Failed to validate Ping CLI configuration", Result: output.ENUM_RESULT_FAILURE, FatalMessage: err.Error(), }) @@ -141,7 +141,7 @@ func checkCfgFileLocation(cfgFile string) { func createConfigFile(cfgFile string) { output.Print(output.Opts{ - Message: fmt.Sprintf("Creating new pingcli configuration file at: %s", cfgFile), + Message: fmt.Sprintf("Creating new Ping CLI configuration file at: %s", cfgFile), Result: output.ENUM_RESULT_NIL, }) @@ -149,7 +149,7 @@ func createConfigFile(cfgFile string) { err := os.MkdirAll(filepath.Dir(cfgFile), os.ModePerm) if err != nil { output.Print(output.Opts{ - Message: fmt.Sprintf("Failed to make directories needed for new pingcli configuration file: %s", cfgFile), + Message: fmt.Sprintf("Failed to make directories needed for new Ping CLI configuration file: %s", cfgFile), Result: output.ENUM_RESULT_FAILURE, FatalMessage: err.Error(), }) @@ -157,7 +157,7 @@ func createConfigFile(cfgFile string) { tempViper := viper.New() tempViper.Set(options.RootActiveProfileOption.ViperKey, options.RootActiveProfileOption.DefaultValue) - tempViper.Set(fmt.Sprintf("%s.%v", options.RootActiveProfileOption.DefaultValue.String(), options.ProfileDescriptionOption.ViperKey), "Default profile created by pingcli") + tempViper.Set(fmt.Sprintf("%s.%v", options.RootActiveProfileOption.DefaultValue.String(), options.ProfileDescriptionOption.ViperKey), "Default profile created by Ping CLI") err = tempViper.WriteConfigAs(cfgFile) if err != nil { diff --git a/internal/profiles/validate.go b/internal/profiles/validate.go index 26dbec2a..4d56bab7 100644 --- a/internal/profiles/validate.go +++ b/internal/profiles/validate.go @@ -23,7 +23,7 @@ func Validate() error { // Make sure selected active profile is in the configuration file activeProfile := GetMainConfig().ActiveProfile().Name() if !slices.Contains(profileNames, activeProfile) { - return fmt.Errorf("failed to validate pingcli configuration: active profile '%s' not found in configuration file %s", activeProfile, GetMainConfig().ViperInstance().ConfigFileUsed()) + return fmt.Errorf("failed to validate Ping CLI configuration: active profile '%s' not found in configuration file %s", activeProfile, GetMainConfig().ViperInstance().ConfigFileUsed()) } // for each profile key, set the profile based on mainViper.Sub() and validate the profile @@ -31,11 +31,11 @@ func Validate() error { subViper := GetMainConfig().ViperInstance().Sub(pName) if err := validateProfileKeys(pName, subViper); err != nil { - return fmt.Errorf("failed to validate pingcli configuration: %v", err) + return fmt.Errorf("failed to validate Ping CLI configuration: %v", err) } if err := validateProfileValues(pName, subViper); err != nil { - return fmt.Errorf("failed to validate pingcli configuration: %v", err) + return fmt.Errorf("failed to validate Ping CLI configuration: %v", err) } } From 03d7b69e55b774a55d65d49f581fc66ba793a237 Mon Sep 17 00:00:00 2001 From: Patrick Cowland Date: Mon, 14 Oct 2024 13:10:07 +0100 Subject: [PATCH 14/16] update command texts --- cmd/platform/export.go | 44 ++++++++++++----- cmd/platform/platform.go | 8 ++- cmd/request/request.go | 49 +++++++++---------- internal/configuration/config/config.go | 2 +- internal/configuration/platform/export.go | 2 +- .../configuration/services/pingfederate.go | 2 +- 6 files changed, 62 insertions(+), 45 deletions(-) diff --git a/cmd/platform/export.go b/cmd/platform/export.go index cbd75a6e..5d2a6811 100644 --- a/cmd/platform/export.go +++ b/cmd/platform/export.go @@ -9,15 +9,29 @@ import ( ) const ( - commandExamples = ` pingcli platform export - pingcli platform export --output-directory dir --overwrite - pingcli platform export --export-format HCL - pingcli platform export --services pingone-platform,pingone-sso - pingcli platform export --services pingone-platform --pingone-client-environment-id envID --pingone-worker-client-id clientID --pingone-worker-client-secret clientSecret --pingone-region-code regionCode - pingcli platform export --service pingfederate --pingfederate-username user --pingfederate-password password - pingcli platform export --service pingfederate --pingfederate-client-id clientID --pingfederate-client-secret clientSecret --pingfederate-token-url tokenURL - pingcli platform export --service pingfederate --pingfederate-access-token accessToken - pingcli platform export --service pingfederate --x-bypass-external-validation=false --ca-certificate-pem-files "/path/to/cert.pem,/path/to/cert2.pem" --insecure-trust-all-tls=false` + commandExamples = ` Export configuration-as-code for all products configured in the configuration file, applying default options. + pingcli platform export + + Export configuration-as-code packages for all configured products to a specific directory, overwriting any previous export. + pingcli platform export --output-directory /path/to/my/directory --overwrite + + Export configuration-as-code packages for all configured products, specifying the export format as Terraform HCL. + pingcli platform export --export-format HCL + + Export configuration-as-code packages for PingOne (core platform and SSO services). + pingcli platform export --services pingone-platform,pingone-sso + + Export configuration-as-code packages for PingOne (core platform), specifying the PingOne environment connection details. + pingcli platform export --services pingone-platform --pingone-client-environment-id 3cf2... --pingone-worker-client-id a719... --pingone-worker-client-secret ey..... --pingone-region-code EU + + Export configuration-as-code packages for PingFederate, specifying the PingFederate connection details using basic authentication. + pingcli platform export --service pingfederate --pingfederate-username administrator --pingfederate-password 2FederateM0re + + Export configuration-as-code packages for PingFederate, specifying the PingFederate connection details using OAuth 2.0 client credentials. + pingcli platform export --service pingfederate --pingfederate-client-id clientID --pingfederate-client-secret clientSecret --pingfederate-token-url https://pingfederate.example.com/as/token.oauth2 + + Export configuration-as-code packages for PingFederate, specifying optional connection properties + pingcli platform export --service pingfederate --x-bypass-external-validation=false --ca-certificate-pem-files "/path/to/cert.pem,/path/to/cert2.pem" --insecure-trust-all-tls=false` ) func NewExportCommand() *cobra.Command { @@ -25,10 +39,14 @@ func NewExportCommand() *cobra.Command { Args: common.ExactArgs(0), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute Example: commandExamples, - Long: `Export configuration-as-code packages for the Ping Platform.`, - Short: "Export configuration-as-code packages for the Ping Platform.", - RunE: exportRunE, - Use: "export [flags]", + Long: "Export configuration-as-code packages for the Ping Platform.\n\n" + + "The CLI can export Terraform HCL to use with released Terraform providers.\n" + + "The Terraform HCL option generates `import {}` block statements for resources in the target environment.\n" + + "Using Terraform `import {}` blocks, the platform's configuration can be generated and imported into state management.\n" + + "More information can be found at https://developer.hashicorp.com/terraform/language/import", + Short: "Export configuration-as-code packages for the Ping Platform.", + RunE: exportRunE, + Use: "export [flags]", } initGeneralExportFlags(cmd) diff --git a/cmd/platform/platform.go b/cmd/platform/platform.go index 26471555..a291a13a 100644 --- a/cmd/platform/platform.go +++ b/cmd/platform/platform.go @@ -6,8 +6,12 @@ import ( func NewPlatformCommand() *cobra.Command { cmd := &cobra.Command{ - Long: `Provides details and interactions with the connected Ping Platform.`, - Short: "Provides details and interactions with the connected Ping Platform.", + Long: `Administer and manage the Ping integrated platform. + +When multiple products are configured in the CLI, the platform command can be used to manage one or more products collectively. + +The --active-profile command switch can be used to specify the profile of Ping products to be managed.`, + Short: "Administer and manage the Ping integrated platform.", Use: "platform", } diff --git a/cmd/request/request.go b/cmd/request/request.go index d7e2d245..c131a71b 100644 --- a/cmd/request/request.go +++ b/cmd/request/request.go @@ -1,8 +1,6 @@ package request import ( - "fmt" - "github.com/pingidentity/pingcli/cmd/common" request_internal "github.com/pingidentity/pingcli/internal/commands/request" "github.com/pingidentity/pingcli/internal/configuration/options" @@ -11,37 +9,34 @@ import ( ) const ( - commandExamples = ` pingcli request --service pingone environments - pingcli request --service pingone --http-method GET environments/{{environmentID}} - pingcli request --service pingone --http-method POST --data {{raw-data}} environments - pingcli request --service pingone --http-method POST --data @{{filepath}} environments - pingcli request --service pingone --http-method DELETE environments/{{environmentID}}` - - profileConfigurationFormat = `Profile Configuration Format: -request: - data: @ OR - http-method: - service: -service: - pingone: - regionCode: - authentication: - type: - worker: - clientID: - clientSecret: - environmentID: ` + commandExamples = ` Send a custom API request to the configured PingOne tenant, making a GET request against the /environments endpoint. + pingcli request --service pingone environments + + Send a custom API request to the configured PingOne tenant, making a GET request to retrieve JSON configuration for a specific environment. + pingcli request --service pingone --http-method GET environments/$MY_ENVIRONMENT_ID + + Send a custom API request to the configured PingOne tenant, making a POST request to create a new environment with raw JSON data. + pingcli request --service pingone --http-method POST --data '{"name": "My environment"}' environments + + Send a custom API request to the configured PingOne tenant, making a POST request to create a new environment with JSON data sourced from a file. + pingcli request --service pingone --http-method POST --data @./my-environment.json environments + + Send a custom API request to the configured PingOne tenant, making a DELETE request to remove an application attribute mapping. + pingcli request --service pingone --http-method DELETE environments/$MY_ENVIRONMENT_ID/applications/$MY_APPLICATION_ID/attributes/$MY_ATTRIBUTE_MAPPING_ID` ) func NewRequestCommand() *cobra.Command { cmd := &cobra.Command{ Args: common.ExactArgs(1), DisableFlagsInUseLine: true, // We write our own flags in @Use attribute - Example: fmt.Sprintf("%s\n\n%s", commandExamples, profileConfigurationFormat), - Long: `Send a custom request to a Ping Service.`, - RunE: requestRunE, - Short: "Send a custom request to a Ping Service.", - Use: "request [flags] API_URI", + Example: commandExamples, + Long: `Send a custom REST API request to a Ping Service. + +The custom REST API request is most powerful when product connection details have been configured in the CLI configuration file. +The command offers a cURL-like experience to interact with the Ping platform services, with authentication and environment details dynamically filled by the CLI.`, + RunE: requestRunE, + Short: "Send a custom REST API request to a Ping platform service.", + Use: "request [flags] API_URI", } cmd.Flags().AddFlag(options.RequestHTTPMethodOption.Flag) diff --git a/internal/configuration/config/config.go b/internal/configuration/config/config.go index 8d485867..31dbb8dc 100644 --- a/internal/configuration/config/config.go +++ b/internal/configuration/config/config.go @@ -25,7 +25,7 @@ func initConfigProfileOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "p", - Usage: "The name of the profile to update.", + Usage: "The name of the profile to update. E.g. `myAwesomeProfile`", Value: cobraValue, DefValue: "The active profile", }, diff --git a/internal/configuration/platform/export.go b/internal/configuration/platform/export.go index ac28c82c..3ef72977 100644 --- a/internal/configuration/platform/export.go +++ b/internal/configuration/platform/export.go @@ -33,7 +33,7 @@ func initFormatOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "f", - Usage: fmt.Sprintf("Specifies the export format\nOptions are: [%s]. Also configurable via environment variable %s", strings.Join(customtypes.ExportFormatValidValues(), ", "), envVar), + Usage: fmt.Sprintf("Specifies the export format. E.g. `HCL`.\nOptions are: [%s]. Also configurable via environment variable %s", strings.Join(customtypes.ExportFormatValidValues(), ", "), envVar), Value: cobraValue, DefValue: customtypes.ENUM_EXPORT_FORMAT_HCL, }, diff --git a/internal/configuration/services/pingfederate.go b/internal/configuration/services/pingfederate.go index 20fa789c..130a06be 100644 --- a/internal/configuration/services/pingfederate.go +++ b/internal/configuration/services/pingfederate.go @@ -82,7 +82,7 @@ func initXBypassExternalValidationHeaderOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("Bypass connection tests when configuring PingFederate (the `X-BypassExternalValidation` header when using PingFederate's admin API). Also configurable via environment variable %s", envVar), + Usage: fmt.Sprintf("Bypass connection tests when configuring PingFederate (the X-BypassExternalValidation header when using PingFederate's admin API). Also configurable via environment variable %s", envVar), Value: cobraValue, DefValue: "false", }, From fc72f233f55e9cfbdfd7de4373de9791a8da43ab Mon Sep 17 00:00:00 2001 From: Patrick Cowland Date: Mon, 14 Oct 2024 14:08:14 +0100 Subject: [PATCH 15/16] Remove environment vars in flag descriptions for readability --- internal/configuration/platform/export.go | 8 +++--- .../configuration/services/pingfederate.go | 26 +++++++++---------- internal/configuration/services/pingone.go | 10 +++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/internal/configuration/platform/export.go b/internal/configuration/platform/export.go index 3ef72977..0e61907e 100644 --- a/internal/configuration/platform/export.go +++ b/internal/configuration/platform/export.go @@ -33,7 +33,7 @@ func initFormatOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "f", - Usage: fmt.Sprintf("Specifies the export format. E.g. `HCL`.\nOptions are: [%s]. Also configurable via environment variable %s", strings.Join(customtypes.ExportFormatValidValues(), ", "), envVar), + Usage: fmt.Sprintf("Specifies the export format. E.g. `HCL`.\nOptions are: [%s].", strings.Join(customtypes.ExportFormatValidValues(), ", ")), Value: cobraValue, DefValue: customtypes.ENUM_EXPORT_FORMAT_HCL, }, @@ -56,7 +56,7 @@ func initServicesOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "s", - Usage: fmt.Sprintf("Specifies the service(s) to export. Accepts a comma-separated string to delimit multiple services. Options are: [%s]. Also configurable via environment variable %s", strings.Join(customtypes.ExportServicesValidValues(), ", "), envVar), + Usage: fmt.Sprintf("Specifies the service(s) to export. Accepts a comma-separated string to delimit multiple services. Options are: [%s].", strings.Join(customtypes.ExportServicesValidValues(), ", ")), Value: cobraValue, DefValue: strings.Join(customtypes.ExportServicesValidValues(), ", "), }, @@ -79,7 +79,7 @@ func initOutputDirectoryOption() { Flag: &pflag.Flag{ Name: cobraParamName, Shorthand: "d", - Usage: fmt.Sprintf("Specifies the output directory for export. Also configurable via environment variable %s", envVar), + Usage: "Specifies the output directory for export.", Value: cobraValue, DefValue: "$(pwd)/export", }, @@ -142,7 +142,7 @@ func initPingOneEnvironmentIDOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The ID of the PingOne environment to export. Also configurable via environment variable %s", envVar), + Usage: "The ID of the PingOne environment to export.", Value: cobraValue, DefValue: "", }, diff --git a/internal/configuration/services/pingfederate.go b/internal/configuration/services/pingfederate.go index 130a06be..efe3500e 100644 --- a/internal/configuration/services/pingfederate.go +++ b/internal/configuration/services/pingfederate.go @@ -38,7 +38,7 @@ func initHTTPSHostOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate HTTPS host used to communicate with PingFederate's admin API. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate HTTPS host used to communicate with PingFederate's admin API.", Value: cobraValue, DefValue: "", }, @@ -60,7 +60,7 @@ func initAdminAPIPathOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate API URL path used to communicate with PingFederate's admin API. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate API URL path used to communicate with PingFederate's admin API.", Value: cobraValue, DefValue: "/pf-admin-api/v1", }, @@ -82,7 +82,7 @@ func initXBypassExternalValidationHeaderOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("Bypass connection tests when configuring PingFederate (the X-BypassExternalValidation header when using PingFederate's admin API). Also configurable via environment variable %s", envVar), + Usage: "Bypass connection tests when configuring PingFederate (the X-BypassExternalValidation header when using PingFederate's admin API).", Value: cobraValue, DefValue: "false", }, @@ -104,7 +104,7 @@ func initCACertificatePemFilesOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("Relative or full paths to PEM-encoded certificate files to be trusted as root CAs when connecting to the PingFederate server over HTTPS. Accepts a comma-separated string to delimit multiple PEM files. Also configurable via environment variable %s", envVar), + Usage: "Relative or full paths to PEM-encoded certificate files to be trusted as root CAs when connecting to the PingFederate server over HTTPS. Accepts a comma-separated string to delimit multiple PEM files.", Value: cobraValue, DefValue: "[]", }, @@ -126,7 +126,7 @@ func initInsecureTrustAllTLSOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("Trust any certificate when connecting to the PingFederate server admin API. This is insecure and should not be enabled outside of testing. Also configurable via environment variable %s", envVar), + Usage: "Trust any certificate when connecting to the PingFederate server admin API. This is insecure and should not be enabled outside of testing.", Value: cobraValue, DefValue: "false", }, @@ -148,7 +148,7 @@ func initUsernameOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate username used to authenticate to the PingFederate admin API when using basic authentication. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate username used to authenticate to the PingFederate admin API when using basic authentication.", Value: cobraValue, DefValue: "", }, @@ -170,7 +170,7 @@ func initPasswordOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate password used to authenticate to the PingFederate admin API when using basic authentication. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate password used to authenticate to the PingFederate admin API when using basic authentication.", Value: cobraValue, DefValue: "", }, @@ -192,7 +192,7 @@ func initAccessTokenOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate access token used to authenticate to the PingFederate admin API when using a custom OAuth 2.0 token method. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate access token used to authenticate to the PingFederate admin API when using a custom OAuth 2.0 token method.", Value: cobraValue, DefValue: "", }, @@ -214,7 +214,7 @@ func initClientIDOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate OAuth client ID used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate OAuth client ID used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type.", Value: cobraValue, DefValue: "", }, @@ -236,7 +236,7 @@ func initClientSecretOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate OAuth client secret used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate OAuth client secret used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type.", Value: cobraValue, DefValue: "", }, @@ -258,7 +258,7 @@ func initTokenURLOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate OAuth token URL used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate OAuth token URL used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type.", Value: cobraValue, DefValue: "", }, @@ -280,7 +280,7 @@ func initScopesOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The PingFederate OAuth scopes used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Accepts a comma-separated string to delimit multiple scopes. Also configurable via environment variable %s", envVar), + Usage: "The PingFederate OAuth scopes used to authenticate to the PingFederate admin API when using the OAuth 2.0 client credentials grant type. Accepts a comma-separated string to delimit multiple scopes.", Value: cobraValue, DefValue: "[]", }, @@ -302,7 +302,7 @@ func initPingFederateAuthenticationTypeOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The authentication type to use when connecting to the PingFederate admin API. Options are: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingFederateAuthenticationTypeValidValues(), ", "), envVar), + Usage: fmt.Sprintf("The authentication type to use when connecting to the PingFederate admin API. Options are: %s.", strings.Join(customtypes.PingFederateAuthenticationTypeValidValues(), ", ")), Value: cobraValue, DefValue: "", }, diff --git a/internal/configuration/services/pingone.go b/internal/configuration/services/pingone.go index acaebfae..e74bc16a 100644 --- a/internal/configuration/services/pingone.go +++ b/internal/configuration/services/pingone.go @@ -31,7 +31,7 @@ func initAuthenticationWorkerClientIDOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The worker client ID used to authenticate to the PingOne management API. Also configurable via environment variable %s", envVar), + Usage: "The worker client ID used to authenticate to the PingOne management API.", Value: cobraValue, DefValue: "", }, @@ -53,7 +53,7 @@ func initAuthenticationWorkerClientSecretOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The worker client secret used to authenticate to the PingOne management API. Also configurable via environment variable %s", envVar), + Usage: "The worker client secret used to authenticate to the PingOne management API.", Value: cobraValue, DefValue: "", }, @@ -75,7 +75,7 @@ func initAuthenticationWorkerEnvironmentIDOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The ID of the PingOne environment that contains the worker client used to authenticate to the PingOne management API. Also configurable via environment variable %s", envVar), + Usage: "The ID of the PingOne environment that contains the worker client used to authenticate to the PingOne management API.", Value: cobraValue, DefValue: "", }, @@ -97,7 +97,7 @@ func initPingOneAuthenticationTypeOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The authentication type to use to authenticate to the PingOne management API. Options are: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingOneAuthenticationTypeValidValues(), ", "), envVar), + Usage: fmt.Sprintf("The authentication type to use to authenticate to the PingOne management API. Options are: %s.", strings.Join(customtypes.PingOneAuthenticationTypeValidValues(), ", ")), Value: cobraValue, DefValue: customtypes.ENUM_PINGONE_AUTHENTICATION_TYPE_WORKER, }, @@ -119,7 +119,7 @@ func initRegionCodeOption() { EnvVar: envVar, Flag: &pflag.Flag{ Name: cobraParamName, - Usage: fmt.Sprintf("The region code of the PingOne tenant. Options are: %s. Also configurable via environment variable %s", strings.Join(customtypes.PingOneRegionCodeValidValues(), ", "), envVar), + Usage: fmt.Sprintf("The region code of the PingOne tenant. Options are: %s.", strings.Join(customtypes.PingOneRegionCodeValidValues(), ", ")), Value: cobraValue, DefValue: "", }, From d6677b0d38d444a755100550fa4240ce368c0b44 Mon Sep 17 00:00:00 2001 From: Patrick Cowland Date: Tue, 15 Oct 2024 09:21:42 +0100 Subject: [PATCH 16/16] minor updates --- README.md | 4 ++-- cmd/config/view_profile.go | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4aeaaa96..6df5ad7e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# pingcli +# Ping CLI The Ping CLI is a unified command line interface for configuring and managing Ping Identity Services. @@ -15,7 +15,7 @@ Start by running the command to create a new profile and answering the prompts. ```text $ pingcli config add-profile Pingcli configuration file '/Users//.pingcli/config.yaml' does not exist. - No Action (Warning) -Creating new pingcli configuration file at: /Users//.pingcli/config.yaml +Creating new Ping CLI configuration file at: /Users//.pingcli/config.yaml New profile name: : dev New profile description: : configuration for development environment Set new profile as active: : y diff --git a/cmd/config/view_profile.go b/cmd/config/view_profile.go index c520e6c2..a94d06a2 100644 --- a/cmd/config/view_profile.go +++ b/cmd/config/view_profile.go @@ -9,10 +9,11 @@ import ( ) const ( - viewProfileCommandExamples = ` pingcli config view-profile - pingcli config view-profile --profile myprofile` - viewProfileCommandExamples = ` pingcli config view-profile - pingcli config view-profile --profile myprofile` + viewProfileCommandExamples = ` View configuration for the currently active profile + pingcli config view-profile + + View configuration for a specific profile + pingcli config view-profile --profile myprofile` ) func NewConfigViewProfileCommand() *cobra.Command {