diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index a7b5a67f..c85c62d1 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -647,6 +647,7 @@ docs/UpdateAzureTarget.md docs/UpdateAzureTargetOutput.md docs/UpdateCertificateOutput.md docs/UpdateCertificateValue.md +docs/UpdateClassicKeyCertificate.md docs/UpdateDBTarget.md docs/UpdateDBTargetDetails.md docs/UpdateDBTargetOutput.md @@ -1400,6 +1401,7 @@ src/main/java/io/akeyless/client/model/UpdateAzureTarget.java src/main/java/io/akeyless/client/model/UpdateAzureTargetOutput.java src/main/java/io/akeyless/client/model/UpdateCertificateOutput.java src/main/java/io/akeyless/client/model/UpdateCertificateValue.java +src/main/java/io/akeyless/client/model/UpdateClassicKeyCertificate.java src/main/java/io/akeyless/client/model/UpdateDBTarget.java src/main/java/io/akeyless/client/model/UpdateDBTargetDetails.java src/main/java/io/akeyless/client/model/UpdateDBTargetOutput.java @@ -1482,7 +1484,4 @@ src/main/java/io/akeyless/client/model/WindowsService.java src/main/java/io/akeyless/client/model/WindowsServiceAttributes.java src/main/java/io/akeyless/client/model/WindowsTargetDetails.java src/main/java/io/akeyless/client/model/ZeroSSLTargetDetails.java -src/test/java/io/akeyless/client/model/TargetNameWithHostsTest.java -src/test/java/io/akeyless/client/model/UsageEventSettingTest.java -src/test/java/io/akeyless/client/model/WindowsServiceAttributesTest.java -src/test/java/io/akeyless/client/model/WindowsServiceTest.java +src/test/java/io/akeyless/client/model/UpdateClassicKeyCertificateTest.java diff --git a/README.md b/README.md index 6f9b37ab..8f0ec969 100644 --- a/README.md +++ b/README.md @@ -363,6 +363,7 @@ Class | Method | HTTP request | Description *V2Api* | [**updateAuthMethodUniversalIdentity**](docs/V2Api.md#updateAuthMethodUniversalIdentity) | **POST** /update-auth-method-universal-identity | *V2Api* | [**updateAzureTarget**](docs/V2Api.md#updateAzureTarget) | **POST** /update-azure-target | *V2Api* | [**updateCertificateValue**](docs/V2Api.md#updateCertificateValue) | **POST** /update-certificate-value | +*V2Api* | [**updateClassicKeyCertificate**](docs/V2Api.md#updateClassicKeyCertificate) | **POST** /update-classic-key-certificate | *V2Api* | [**updateDBTarget**](docs/V2Api.md#updateDBTarget) | **POST** /update-db-target | *V2Api* | [**updateDBTargetDetails**](docs/V2Api.md#updateDBTargetDetails) | **POST** /update-db-target-details | *V2Api* | [**updateDockerhubTarget**](docs/V2Api.md#updateDockerhubTarget) | **POST** /update-dockerhub-target | @@ -1055,6 +1056,7 @@ Class | Method | HTTP request | Description - [UpdateAzureTargetOutput](docs/UpdateAzureTargetOutput.md) - [UpdateCertificateOutput](docs/UpdateCertificateOutput.md) - [UpdateCertificateValue](docs/UpdateCertificateValue.md) + - [UpdateClassicKeyCertificate](docs/UpdateClassicKeyCertificate.md) - [UpdateDBTarget](docs/UpdateDBTarget.md) - [UpdateDBTargetDetails](docs/UpdateDBTargetDetails.md) - [UpdateDBTargetOutput](docs/UpdateDBTargetOutput.md) diff --git a/api/openapi.yaml b/api/openapi.yaml index bf6988e2..8edf5f8a 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -7465,6 +7465,35 @@ paths: x-codegen-request-body-name: body x-contentType: application/json x-accepts: application/json + /update-classic-key-certificate: + post: + operationId: UpdateClassicKeyCertificate + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/UpdateClassicKeyCertificate' + required: true + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/UpdateClassicKeyCertificateOutput' + description: UpdateClassicKeyCertificateResponse wraps response body. + default: + content: + application/json: + schema: + $ref: '#/components/schemas/JSONError' + description: |- + errorResponse wraps any error to return it as a JSON object with one "error" + field. + tags: + - v2 + x-codegen-request-body-name: body + x-contentType: application/json + x-accepts: application/json /update-db-target: post: operationId: updateDBTarget @@ -8843,6 +8872,12 @@ components: schema: $ref: '#/components/schemas/GatewayUpdateTlsCertOutput' description: GatewayUpdateTlsCertResponse wraps response body. + UpdateClassicKeyCertificateResponse: + content: + application/json: + schema: + $ref: '#/components/schemas/UpdateClassicKeyCertificateOutput' + description: UpdateClassicKeyCertificateResponse wraps response body. addGatewayAllowedAccessIdResponse: content: application/json: @@ -10984,6 +11019,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -11000,6 +11038,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -11015,6 +11054,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -11031,6 +11073,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -11054,11 +11097,17 @@ components: type: string x-go-name: ComputerBaseDN discover_local_users: + description: Deprecated type: boolean x-go-name: DiscoverLocalUsers discover_services: type: boolean x-go-name: DiscoverServices + discovery_types: + items: + $ref: '#/components/schemas/DiscoveryType' + type: array + x-go-package: akeyless.io/akeyless-main-repo/go/src/infra/types domain_name: type: string x-go-name: DomainName @@ -11079,6 +11128,9 @@ components: local_users_rotated_secrets_path_template: type: string x-go-name: LocalUsersRotatedSecretsPathTemplate + os_filter: + type: string + x-go-name: OsFilter ssh_port: type: string x-go-name: SshPort @@ -11497,6 +11549,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -11513,6 +11568,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -11529,6 +11585,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -11545,6 +11604,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -13699,6 +13759,7 @@ components: digest_algo: digest_algo organization: organization locality: locality + csr_cnf_base_64: csr_cnf_base_64 common_name: common_name ttl: 1 self_signed_enabled: true @@ -13709,6 +13770,9 @@ components: country: type: string x-go-name: Country + csr_cnf_base_64: + type: string + x-go-name: CsrCNFBase64 digest_algo: type: string x-go-name: DigestAlgo @@ -14214,6 +14278,7 @@ components: metadata: metadata certificate-digest-algo: certificate-digest-algo certificate-locality: certificate-locality + conf-file-data: conf-file-data generate-self-signed-certificate: true description: description certificate-ttl: 0 @@ -14278,6 +14343,10 @@ components: format: int64 type: integer x-go-name: CertificateTTL + conf-file-data: + description: The csr config data in base64 encoding + type: string + x-go-name: ConfFileData delete_protection: description: Protection from accidental deletion of this item [true/false] type: string @@ -14888,6 +14957,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -15359,6 +15429,9 @@ components: gcp_service_account_key_base64: type: string x-go-name: GCPServiceAccountKeyBase64 + gcp_service_account_key_id: + type: string + x-go-name: GCPServiceAccountKeyId gcp_service_account_type: type: string x-go-package: akeyless.io/akeyless-main-repo/go/src/producer/config @@ -16112,6 +16185,14 @@ components: operation. type: object x-go-package: akeyless.io/akeyless-main-repo/go/src/infra/types + DiscoveryType: + type: string + x-go-package: akeyless.io/akeyless-main-repo/go/src/infra/types + DiscoveryTypes: + items: + $ref: '#/components/schemas/DiscoveryType' + type: array + x-go-package: akeyless.io/akeyless-main-repo/go/src/infra/types DockerhubTargetDetails: description: DockerhubTargetDetails example: @@ -16964,12 +17045,12 @@ components: GcpTargetDetails: example: use_gw_cloud_identity: true + gcp_service_account_key_id: gcp_service_account_key_id gcp_service_account_key_base64: gcp_service_account_key_base64 gcp_service_account_email: gcp_service_account_email gcp_service_account_key: gcp_service_account_key properties: gcp_service_account_email: - description: deprecated type: string x-go-name: GCPServiceAccountEmail gcp_service_account_key: @@ -16978,6 +17059,9 @@ components: gcp_service_account_key_base64: type: string x-go-name: GCPServiceAccountKeyBase64 + gcp_service_account_key_id: + type: string + x-go-name: GCPServiceAccountKeyId use_gw_cloud_identity: type: boolean x-go-name: GCPUseDefaultIdentity @@ -17443,6 +17527,7 @@ components: username: username gcp_target_details: use_gw_cloud_identity: true + gcp_service_account_key_id: gcp_service_account_key_id gcp_service_account_key_base64: gcp_service_account_key_base64 gcp_service_account_email: gcp_service_account_email gcp_service_account_key: gcp_service_account_key @@ -18539,6 +18624,7 @@ components: digest_algo: digest_algo organization: organization locality: locality + csr_cnf_base_64: csr_cnf_base_64 common_name: common_name ttl: 1 self_signed_enabled: true @@ -19219,6 +19305,7 @@ components: digest_algo: digest_algo organization: organization locality: locality + csr_cnf_base_64: csr_cnf_base_64 common_name: common_name ttl: 1 self_signed_enabled: true @@ -21671,6 +21758,7 @@ components: digest_algo: digest_algo organization: organization locality: locality + csr_cnf_base_64: csr_cnf_base_64 common_name: common_name ttl: 1 self_signed_enabled: true @@ -22364,6 +22452,7 @@ components: digest_algo: digest_algo organization: organization locality: locality + csr_cnf_base_64: csr_cnf_base_64 common_name: common_name ttl: 1 self_signed_enabled: true @@ -23079,6 +23168,7 @@ components: digest_algo: digest_algo organization: organization locality: locality + csr_cnf_base_64: csr_cnf_base_64 common_name: common_name ttl: 1 self_signed_enabled: true @@ -23772,6 +23862,7 @@ components: digest_algo: digest_algo organization: organization locality: locality + csr_cnf_base_64: csr_cnf_base_64 common_name: common_name ttl: 1 self_signed_enabled: true @@ -24835,6 +24926,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -24851,6 +24945,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -24867,6 +24962,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -24883,6 +24981,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -27762,6 +27861,7 @@ components: username: username gcp_target_details: use_gw_cloud_identity: true + gcp_service_account_key_id: gcp_service_account_key_id gcp_service_account_key_base64: gcp_service_account_key_base64 gcp_service_account_email: gcp_service_account_email gcp_service_account_key: gcp_service_account_key @@ -28084,6 +28184,46 @@ components: title: UniversalIdentityDetails Universal identity type. type: object x-go-package: akeyless.io/akeyless-main-repo/go/src/infra/types + UpdateClassicKeyCertificate: + description: UpdateClassicKeyCertificate is a command that updates the certificate + for a classic key + example: + name: name + json: false + cert-file-data: cert-file-data + uid-token: uid-token + token: token + properties: + cert-file-data: + description: PEM Certificate in a Base64 format. Used for updating RSA keys' + certificates. + type: string + x-go-name: CertFileData + json: + default: false + description: Set output format to JSON + type: boolean + x-go-name: Json + name: + description: ClassicKey name + type: string + x-go-name: ClassicKeyName + token: + description: Authentication token (see `/auth` and `/configure`) + type: string + x-go-name: Profile + uid-token: + description: The universal identity token, Required only for universal_identity + authentication + type: string + x-go-name: UIDToken + required: + - name + type: object + x-go-package: akeyless.io/akeyless-main-repo/go/src/client/commands + UpdateClassicKeyCertificateOutput: + type: object + x-go-package: akeyless.io/akeyless-main-repo/go/src/client/commands UpdateGroupOutput: example: group_name: group_name @@ -30816,6 +30956,10 @@ components: format: int64 type: integer x-go-name: CertificateTTL + conf-file-data: + description: The csr config data in base64 encoding + type: string + x-go-name: ConfFileData customer-frg-id: description: The customer fragment ID that will be used to create the DFC key (if empty, the key will be created independently of a customer fragment) @@ -31648,6 +31792,10 @@ components: format: int64 type: integer x-go-name: CertificateTTL + conf-file-data: + description: The csr config data in base64 encoding + type: string + x-go-name: ConfFileData customer-frg-id: description: |- The customer fragment ID that will be used to create the key (if empty, @@ -32273,6 +32421,14 @@ components: description: Base64-encoded service account private key text type: string x-go-name: ServiceAccountKey + gcp-service-account-email: + description: The email of the gcp service account to rotate + type: string + x-go-name: GcpServiceAccountEmail + gcp-service-account-key-id: + description: The key id of the gcp service account to rotate + type: string + x-go-name: GcpServiceAccountKeyId json: default: false description: Set output format to JSON @@ -34981,6 +35137,18 @@ components: only for Active Directory migration) type: string x-go-name: AdDiscoverServices + ad-discovery-types: + description: Set migration discovery types (domain-users, computers, local-users). + (Relevant only for Active Directory migration) + items: + type: string + type: array + x-go-name: AdDiscoverTypes + ad-os-filter: + description: Filter by Operating System to run the migration, can be used + with wildcards, e.g. SRV20* (Relevant only for Active Directory migration) + type: string + x-go-name: AdOsFilter ad-ssh-port: default: "22" description: Set the SSH Port for further connection to the domain servers. @@ -35019,14 +35187,11 @@ components: type: string x-go-name: AdComputerBaseDN ad_discover_local_users: - description: 'Enable/Disable discovery of local users from each domain server - and migrate them as SSH/Windows Rotated Secrets. Default is false: only - domain users will be migrated. Discovery of local users might require - further installation of SSH on the servers, based on the supplied computer - base DN. This will be implemented automatically as part of the migration - process (Relevant only for Active Directory migration)' - type: string - x-go-name: AdDiscoverLocalUsers + description: |- + Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) + Deprecated: use AdDiscoverTypes + type: string + x-go-name: AdDiscoverLocalUsersDeprecated ad_domain_name: description: Active Directory Domain Name (Relevant only for Active Directory migration) @@ -35473,6 +35638,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -35904,6 +36070,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -36321,6 +36488,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -36693,6 +36861,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -37122,6 +37291,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -37584,6 +37754,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -37950,6 +38121,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -38350,6 +38522,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -38730,6 +38903,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -39100,6 +39274,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -39491,6 +39666,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -39895,6 +40071,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -40282,6 +40459,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -40686,6 +40864,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -41107,6 +41286,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -41524,6 +41704,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -41957,6 +42138,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -42363,6 +42545,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -42812,6 +42995,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -43222,6 +43406,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -43628,6 +43813,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -44042,6 +44228,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -44426,6 +44613,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -44819,6 +45007,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -45198,6 +45387,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -46334,6 +46524,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -46350,6 +46543,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -46366,6 +46560,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -46382,6 +46579,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -46671,6 +46869,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -46687,6 +46888,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -46703,6 +46905,9 @@ components: auto_rotate: true ssh_port: ssh_port discover_local_users: true + discovery_types: + - null + - null winrm_port: winrm_port auto_rotate_interval_in_days: 1 active_directory_target_id: 1 @@ -46719,6 +46924,7 @@ components: domain_users_rotated_secrets_path_template: domain_users_rotated_secrets_path_template local_users_ignore_list: key: true + os_filter: os_filter user_groups: - user_groups - user_groups @@ -47014,6 +47220,14 @@ components: description: Base64-encoded service account private key text type: string x-go-name: ServiceAccountKey + gcp-service-account-email: + description: The email of the gcp service account to rotate + type: string + x-go-name: GcpServiceAccountEmail + gcp-service-account-key-id: + description: The key id of the gcp service account to rotate + type: string + x-go-name: GcpServiceAccountKeyId json: default: false description: Set output format to JSON @@ -47321,6 +47535,18 @@ components: only for Active Directory migration) type: string x-go-name: AdDiscoverServices + ad-discovery-types: + description: Set migration discovery types (domain-users, computers, local-users). + (Relevant only for Active Directory migration) + items: + type: string + type: array + x-go-name: AdDiscoverTypes + ad-os-filter: + description: Filter by Operating System to run the migration, can be used + with wildcards, e.g. SRV20* (Relevant only for Active Directory migration) + type: string + x-go-name: AdOsFilter ad-ssh-port: default: "22" description: Set the SSH Port for further connection to the domain servers. @@ -47359,14 +47585,11 @@ components: type: string x-go-name: AdComputerBaseDN ad_discover_local_users: - description: 'Enable/Disable discovery of local users from each domain server - and migrate them as SSH/Windows Rotated Secrets. Default is false: only - domain users will be migrated. Discovery of local users might require - further installation of SSH on the servers, based on the supplied computer - base DN. This will be implemented automatically as part of the migration - process (Relevant only for Active Directory migration)' - type: string - x-go-name: AdDiscoverLocalUsers + description: |- + Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) + Deprecated: use AdDiscoverTypes + type: string + x-go-name: AdDiscoverLocalUsersDeprecated ad_domain_name: description: Active Directory Domain Name (Relevant only for Active Directory migration) @@ -47821,6 +48044,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -48256,6 +48480,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -48677,6 +48902,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -49053,6 +49279,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -49486,6 +49713,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -49956,6 +50184,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -50326,6 +50555,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -50730,6 +50960,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -51114,6 +51345,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -51488,6 +51720,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -51883,6 +52116,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -52291,6 +52525,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -52682,6 +52917,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -53090,6 +53326,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -53515,6 +53752,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -53936,6 +54174,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -54373,6 +54612,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -54783,6 +55023,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -55236,6 +55477,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -55650,6 +55892,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -56060,6 +56303,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -56478,6 +56722,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -56866,6 +57111,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -57263,6 +57509,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -57646,6 +57893,7 @@ components: user_principal_name: user_principal_name k8s_client_key_data: k8s_client_key_data azure_subscription_id: azure_subscription_id + gcp_service_account_key_id: gcp_service_account_key_id gcp_key_algo: gcp_key_algo venafi_zone: venafi_zone github_installation_token_repositories: @@ -57954,6 +58202,11 @@ components: description: Set output format to JSON type: boolean x-go-name: Json + key-type: + default: classic-key + description: The type of the key to generate (classic-key/dfc) + type: string + x-go-name: KeyType name: description: The classic key name type: string @@ -57962,6 +58215,14 @@ components: description: The organization to be included in the CSR certificate type: string x-go-name: Organization + split-level: + default: 3 + description: |- + The number of fragments that the item will be split into (not includes + customer fragment) + format: int64 + type: integer + x-go-name: SplitLevel state: description: The state to be included in the CSR certificate type: string @@ -57981,6 +58242,7 @@ components: x-go-name: URISANs required: - common-name + - key-type - name title: GenerateCsr is a command that generates CSR. type: object diff --git a/build.gradle b/build.gradle index caede926..014a126d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'java' apply plugin: 'com.diffplug.spotless' group = 'io.akeyless' -version = '3.5.1' +version = '3.5.2' buildscript { repositories { diff --git a/build.sbt b/build.sbt index 3e4aaad7..dbee0b63 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "io.akeyless", name := "akeyless-java", - version := "3.5.1", + version := "3.5.2", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), javacOptions in compile ++= Seq("-Xlint:deprecation"), diff --git a/docs/ActiveDirectoryPayload.md b/docs/ActiveDirectoryPayload.md index 4b8f4585..3badf300 100644 --- a/docs/ActiveDirectoryPayload.md +++ b/docs/ActiveDirectoryPayload.md @@ -12,14 +12,16 @@ Name | Type | Description | Notes **autoRotateIntervalInDays** | **Integer** | | [optional] **autoRotateRotationHour** | **Integer** | | [optional] **computerBaseDn** | **String** | | [optional] -**discoverLocalUsers** | **Boolean** | | [optional] +**discoverLocalUsers** | **Boolean** | Deprecated | [optional] **discoverServices** | **Boolean** | | [optional] +**discoveryTypes** | **List<String>** | | [optional] **domainName** | **String** | | [optional] **domainServerTargetsPathTemplate** | **String** | | [optional] **domainUsersRotatedSecretsPathTemplate** | **String** | | [optional] **enableRdpSra** | **Boolean** | | [optional] **localUsersIgnoreList** | **Map<String, Boolean>** | | [optional] **localUsersRotatedSecretsPathTemplate** | **String** | | [optional] +**osFilter** | **String** | | [optional] **sshPort** | **String** | | [optional] **targetsType** | **String** | | [optional] **userBaseDn** | **String** | | [optional] diff --git a/docs/CertificateTemplateInfo.md b/docs/CertificateTemplateInfo.md index c3cdff58..f72c3d31 100644 --- a/docs/CertificateTemplateInfo.md +++ b/docs/CertificateTemplateInfo.md @@ -9,6 +9,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **commonName** | **String** | | [optional] **country** | **String** | | [optional] +**csrCnfBase64** | **String** | | [optional] **digestAlgo** | **String** | | [optional] **locality** | **String** | | [optional] **organization** | **String** | | [optional] diff --git a/docs/CreateClassicKey.md b/docs/CreateClassicKey.md index faa9f6be..9122c012 100644 --- a/docs/CreateClassicKey.md +++ b/docs/CreateClassicKey.md @@ -17,6 +17,7 @@ Name | Type | Description | Notes **certificateOrganization** | **String** | Organization name for the generated certificate. Relevant only for generate-self-signed-certificate. | [optional] **certificateProvince** | **String** | Province name for the generated certificate. Relevant only for generate-self-signed-certificate. | [optional] **certificateTtl** | **Long** | TTL in days for the generated certificate. Required only for generate-self-signed-certificate. | [optional] +**confFileData** | **String** | The csr config data in base64 encoding | [optional] **deleteProtection** | **String** | Protection from accidental deletion of this item [true/false] | [optional] **description** | **String** | Description of the object | [optional] **generateSelfSignedCertificate** | **Boolean** | Whether to generate a self signed certificate with the key. If set, --certificate-ttl must be provided. | [optional] diff --git a/docs/CreateDFCKey.md b/docs/CreateDFCKey.md index 8dbe6500..c8846425 100644 --- a/docs/CreateDFCKey.md +++ b/docs/CreateDFCKey.md @@ -15,6 +15,7 @@ Name | Type | Description | Notes **certificateOrganization** | **String** | Organization name for the generated certificate. Relevant only for generate-self-signed-certificate. | [optional] **certificateProvince** | **String** | Province name for the generated certificate. Relevant only for generate-self-signed-certificate. | [optional] **certificateTtl** | **Long** | TTL in days for the generated certificate. Required only for generate-self-signed-certificate. | [optional] +**confFileData** | **String** | The csr config data in base64 encoding | [optional] **customerFrgId** | **String** | The customer fragment ID that will be used to create the DFC key (if empty, the key will be created independently of a customer fragment) | [optional] **deleteProtection** | **String** | Protection from accidental deletion of this item [true/false] | [optional] **description** | **String** | Description of the object | [optional] diff --git a/docs/CreateKey.md b/docs/CreateKey.md index 08ec126a..1f83c76d 100644 --- a/docs/CreateKey.md +++ b/docs/CreateKey.md @@ -16,6 +16,7 @@ Name | Type | Description | Notes **certificateOrganization** | **String** | Organization name for the generated certificate. Relevant only for generate-self-signed-certificate. | [optional] **certificateProvince** | **String** | Province name for the generated certificate. Relevant only for generate-self-signed-certificate. | [optional] **certificateTtl** | **Long** | TTL in days for the generated certificate. Required only for generate-self-signed-certificate. | [optional] +**confFileData** | **String** | The csr config data in base64 encoding | [optional] **customerFrgId** | **String** | The customer fragment ID that will be used to create the key (if empty, the key will be created independently of a customer fragment) | [optional] **deleteProtection** | **String** | Protection from accidental deletion of this item [true/false] | [optional] **description** | **String** | Description of the object | [optional] diff --git a/docs/CreateRotatedSecret.md b/docs/CreateRotatedSecret.md index c10b7507..6649e51b 100644 --- a/docs/CreateRotatedSecret.md +++ b/docs/CreateRotatedSecret.md @@ -17,6 +17,8 @@ Name | Type | Description | Notes **deleteProtection** | **String** | Protection from accidental deletion of this item [true/false] | [optional] **description** | **String** | Description of the object | [optional] **gcpKey** | **String** | Base64-encoded service account private key text | [optional] +**gcpServiceAccountEmail** | **String** | The email of the gcp service account to rotate | [optional] +**gcpServiceAccountKeyId** | **String** | The key id of the gcp service account to rotate | [optional] **json** | **Boolean** | Set output format to JSON | [optional] **key** | **String** | The name of a key that used to encrypt the secret value (if empty, the account default protectionKey key will be used) | [optional] **metadata** | **String** | Deprecated - use description | [optional] diff --git a/docs/DSProducerDetails.md b/docs/DSProducerDetails.md index de21c9ce..1a961d43 100644 --- a/docs/DSProducerDetails.md +++ b/docs/DSProducerDetails.md @@ -93,6 +93,7 @@ Name | Type | Description | Notes **gcpServiceAccountEmail** | **String** | GCPServiceAccountEmail overrides the deprecated field from the target | [optional] **gcpServiceAccountKey** | **String** | | [optional] **gcpServiceAccountKeyBase64** | **String** | | [optional] +**gcpServiceAccountKeyId** | **String** | | [optional] **gcpServiceAccountType** | **String** | | [optional] **gcpTmpServiceAccountName** | **String** | | [optional] **gcpTokenLifetime** | **String** | | [optional] diff --git a/docs/GatewayCreateMigration.md b/docs/GatewayCreateMigration.md index 6f219076..3497f347 100644 --- a/docs/GatewayCreateMigration.md +++ b/docs/GatewayCreateMigration.md @@ -14,13 +14,15 @@ Name | Type | Description | Notes **_1passwordUrl** | **String** | 1Password api container url | [optional] **_1passwordVaults** | **List<String>** | 1Password list of vault to get the items from | [optional] **adDiscoverServices** | **String** | Enable/Disable discovery of Windows services from each domain server as part of the SSH/Windows Rotated Secrets. Default is false. (Relevant only for Active Directory migration) | [optional] +**adDiscoveryTypes** | **List<String>** | Set migration discovery types (domain-users, computers, local-users). (Relevant only for Active Directory migration) | [optional] +**adOsFilter** | **String** | Filter by Operating System to run the migration, can be used with wildcards, e.g. SRV20* (Relevant only for Active Directory migration) | [optional] **adSshPort** | **String** | Set the SSH Port for further connection to the domain servers. Default is port 22 (Relevant only for Active Directory migration) | [optional] **adTargetsType** | **String** | Set the target type of the domain servers [ssh/windows](Relevant only for Active Directory migration) | [optional] **adWinrmOverHttp** | **String** | Use WinRM over HTTP, by default runs over HTTPS | [optional] **adWinrmPort** | **String** | Set the WinRM Port for further connection to the domain servers. Default is 5986 (Relevant only for Active Directory migration) | [optional] **adAutoRotate** | **String** | Enable/Disable automatic/recurrent rotation for migrated secrets. Default is false: only manual rotation is allowed for migrated secrets. If set to true, this command should be combined with --ad-rotation-interval and --ad-rotation-hour parameters (Relevant only for Active Directory migration) | [optional] **adComputerBaseDn** | **String** | Distinguished Name of Computer objects (servers) to search in Active Directory e.g.: CN=Computers,DC=example,DC=com (Relevant only for Active Directory migration) | [optional] -**adDiscoverLocalUsers** | **String** | Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) | [optional] +**adDiscoverLocalUsers** | **String** | Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) Deprecated: use AdDiscoverTypes | [optional] **adDomainName** | **String** | Active Directory Domain Name (Relevant only for Active Directory migration) | [optional] **adDomainUsersPathTemplate** | **String** | Path location template for migrating domain users as Rotated Secrets e.g.: .../DomainUsers/{{USERNAME}} (Relevant only for Active Directory migration) | [optional] **adLocalUsersIgnore** | **String** | Comma-separated list of Local Users which should not be migrated (Relevant only for Active Directory migration) | [optional] diff --git a/docs/GatewayUpdateItem.md b/docs/GatewayUpdateItem.md index 7b1358a3..6aea964c 100644 --- a/docs/GatewayUpdateItem.md +++ b/docs/GatewayUpdateItem.md @@ -16,6 +16,8 @@ Name | Type | Description | Notes **deleteProtection** | **String** | Protection from accidental deletion of this item [true/false] | [optional] **description** | **String** | Description of the object | [optional] **gcpKey** | **String** | Base64-encoded service account private key text | [optional] +**gcpServiceAccountEmail** | **String** | The email of the gcp service account to rotate | [optional] +**gcpServiceAccountKeyId** | **String** | The key id of the gcp service account to rotate | [optional] **json** | **Boolean** | Set output format to JSON | [optional] **keepPrevVersion** | **String** | Whether to keep previous version [true/false]. (relevant only for --type=rotated-secret). If not set, use default according to account settings | [optional] **key** | **String** | The name of a key that used to encrypt the secret value (if empty, the account default protectionKey key will be used) | [optional] diff --git a/docs/GatewayUpdateMigration.md b/docs/GatewayUpdateMigration.md index 46656287..60aec8f1 100644 --- a/docs/GatewayUpdateMigration.md +++ b/docs/GatewayUpdateMigration.md @@ -14,13 +14,15 @@ Name | Type | Description | Notes **_1passwordUrl** | **String** | 1Password api container url | [optional] **_1passwordVaults** | **List<String>** | 1Password list of vault to get the items from | [optional] **adDiscoverServices** | **String** | Enable/Disable discovery of Windows services from each domain server as part of the SSH/Windows Rotated Secrets. Default is false. (Relevant only for Active Directory migration) | [optional] +**adDiscoveryTypes** | **List<String>** | Set migration discovery types (domain-users, computers, local-users). (Relevant only for Active Directory migration) | [optional] +**adOsFilter** | **String** | Filter by Operating System to run the migration, can be used with wildcards, e.g. SRV20* (Relevant only for Active Directory migration) | [optional] **adSshPort** | **String** | Set the SSH Port for further connection to the domain servers. Default is port 22 (Relevant only for Active Directory migration) | [optional] **adTargetsType** | **String** | Set the target type of the domain servers [ssh/windows](Relevant only for Active Directory migration) | [optional] **adWinrmOverHttp** | **String** | Use WinRM over HTTP, by default runs over HTTPS | [optional] **adWinrmPort** | **String** | Set the WinRM Port for further connection to the domain servers. Default is 5986 (Relevant only for Active Directory migration) | [optional] **adAutoRotate** | **String** | Enable/Disable automatic/recurrent rotation for migrated secrets. Default is false: only manual rotation is allowed for migrated secrets. If set to true, this command should be combined with --ad-rotation-interval and --ad-rotation-hour parameters (Relevant only for Active Directory migration) | [optional] **adComputerBaseDn** | **String** | Distinguished Name of Computer objects (servers) to search in Active Directory e.g.: CN=Computers,DC=example,DC=com (Relevant only for Active Directory migration) | [optional] -**adDiscoverLocalUsers** | **String** | Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) | [optional] +**adDiscoverLocalUsers** | **String** | Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) Deprecated: use AdDiscoverTypes | [optional] **adDomainName** | **String** | Active Directory Domain Name (Relevant only for Active Directory migration) | [optional] **adDomainUsersPathTemplate** | **String** | Path location template for migrating domain users as Rotated Secrets e.g.: .../DomainUsers/{{USERNAME}} (Relevant only for Active Directory migration) | [optional] **adLocalUsersIgnore** | **String** | Comma-separated list of Local Users which should not be migrated (Relevant only for Active Directory migration) | [optional] diff --git a/docs/GcpTargetDetails.md b/docs/GcpTargetDetails.md index f9f8dba8..29d49e4b 100644 --- a/docs/GcpTargetDetails.md +++ b/docs/GcpTargetDetails.md @@ -7,9 +7,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**gcpServiceAccountEmail** | **String** | deprecated | [optional] +**gcpServiceAccountEmail** | **String** | | [optional] **gcpServiceAccountKey** | **String** | | [optional] **gcpServiceAccountKeyBase64** | **String** | | [optional] +**gcpServiceAccountKeyId** | **String** | | [optional] **useGwCloudIdentity** | **Boolean** | | [optional] diff --git a/docs/GenerateCsr.md b/docs/GenerateCsr.md index 941f18d6..96674a1f 100644 --- a/docs/GenerateCsr.md +++ b/docs/GenerateCsr.md @@ -19,8 +19,10 @@ Name | Type | Description | Notes **generateKey** | **Boolean** | Generate a new classic key for the csr | [optional] **ipAddresses** | **String** | A comma-separated list of ip addresses alternative names | [optional] **json** | **Boolean** | Set output format to JSON | [optional] +**keyType** | **String** | The type of the key to generate (classic-key/dfc) | **name** | **String** | The classic key name | **org** | **String** | The organization to be included in the CSR certificate | [optional] +**splitLevel** | **Long** | The number of fragments that the item will be split into (not includes customer fragment) | [optional] **state** | **String** | The state to be included in the CSR certificate | [optional] **token** | **String** | Authentication token (see `/auth` and `/configure`) | [optional] **uidToken** | **String** | The universal identity token, Required only for universal_identity authentication | [optional] diff --git a/docs/UpdateClassicKeyCertificate.md b/docs/UpdateClassicKeyCertificate.md new file mode 100644 index 00000000..bb1dbcc5 --- /dev/null +++ b/docs/UpdateClassicKeyCertificate.md @@ -0,0 +1,18 @@ + + +# UpdateClassicKeyCertificate + +UpdateClassicKeyCertificate is a command that updates the certificate for a classic key + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**certFileData** | **String** | PEM Certificate in a Base64 format. Used for updating RSA keys' certificates. | [optional] +**json** | **Boolean** | Set output format to JSON | [optional] +**name** | **String** | ClassicKey name | +**token** | **String** | Authentication token (see `/auth` and `/configure`) | [optional] +**uidToken** | **String** | The universal identity token, Required only for universal_identity authentication | [optional] + + + diff --git a/docs/V2Api.md b/docs/V2Api.md index 697ae5aa..e3d96e1a 100644 --- a/docs/V2Api.md +++ b/docs/V2Api.md @@ -262,6 +262,7 @@ Method | HTTP request | Description [**updateAuthMethodUniversalIdentity**](V2Api.md#updateAuthMethodUniversalIdentity) | **POST** /update-auth-method-universal-identity | [**updateAzureTarget**](V2Api.md#updateAzureTarget) | **POST** /update-azure-target | [**updateCertificateValue**](V2Api.md#updateCertificateValue) | **POST** /update-certificate-value | +[**updateClassicKeyCertificate**](V2Api.md#updateClassicKeyCertificate) | **POST** /update-classic-key-certificate | [**updateDBTarget**](V2Api.md#updateDBTarget) | **POST** /update-db-target | [**updateDBTargetDetails**](V2Api.md#updateDBTargetDetails) | **POST** /update-db-target-details | [**updateDockerhubTarget**](V2Api.md#updateDockerhubTarget) | **POST** /update-dockerhub-target | @@ -16037,6 +16038,67 @@ No authorization required **200** | updateCertificateValueResponse wraps response body. | - | **0** | errorResponse wraps any error to return it as a JSON object with one \"error\" field. | - | + +# **updateClassicKeyCertificate** +> Object updateClassicKeyCertificate(body) + + + +### Example +```java +// Import classes: +import io.akeyless.client.ApiClient; +import io.akeyless.client.ApiException; +import io.akeyless.client.Configuration; +import io.akeyless.client.models.*; +import io.akeyless.client.api.V2Api; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("https://api.akeyless.io"); + + V2Api apiInstance = new V2Api(defaultClient); + UpdateClassicKeyCertificate body = new UpdateClassicKeyCertificate(); // UpdateClassicKeyCertificate | + try { + Object result = apiInstance.updateClassicKeyCertificate(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling V2Api#updateClassicKeyCertificate"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **body** | [**UpdateClassicKeyCertificate**](UpdateClassicKeyCertificate.md)| | + +### Return type + +**Object** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | UpdateClassicKeyCertificateResponse wraps response body. | - | +**0** | errorResponse wraps any error to return it as a JSON object with one \"error\" field. | - | + # **updateDBTarget** > UpdateDBTargetOutput updateDBTarget(body) diff --git a/pom.xml b/pom.xml index a477e437..1fa6f76c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ akeyless-java jar akeyless-java - 3.5.1 + 3.5.2 https://github.com/akeylesslabs/akeyless-java Akeyless Java SDK diff --git a/src/main/java/io/akeyless/client/ApiClient.java b/src/main/java/io/akeyless/client/ApiClient.java index 1986d5d4..b82c0d45 100644 --- a/src/main/java/io/akeyless/client/ApiClient.java +++ b/src/main/java/io/akeyless/client/ApiClient.java @@ -129,7 +129,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/3.5.1/java"); + setUserAgent("OpenAPI-Generator/3.5.2/java"); authentications = new HashMap(); } diff --git a/src/main/java/io/akeyless/client/api/V2Api.java b/src/main/java/io/akeyless/client/api/V2Api.java index 3684023d..862b2d95 100644 --- a/src/main/java/io/akeyless/client/api/V2Api.java +++ b/src/main/java/io/akeyless/client/api/V2Api.java @@ -498,6 +498,7 @@ import io.akeyless.client.model.UpdateAzureTargetOutput; import io.akeyless.client.model.UpdateCertificateOutput; import io.akeyless.client.model.UpdateCertificateValue; +import io.akeyless.client.model.UpdateClassicKeyCertificate; import io.akeyless.client.model.UpdateDBTarget; import io.akeyless.client.model.UpdateDBTargetDetails; import io.akeyless.client.model.UpdateDBTargetOutput; @@ -34300,6 +34301,137 @@ public okhttp3.Call updateCertificateValueAsync(UpdateCertificateValue body, fin localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } + /** + * Build call for updateClassicKeyCertificate + * @param body (required) + * @param _callback Callback for upload/download progress + * @return Call to execute + * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 UpdateClassicKeyCertificateResponse wraps response body. -
0 errorResponse wraps any error to return it as a JSON object with one \"error\" field. -
+ */ + public okhttp3.Call updateClassicKeyCertificateCall(UpdateClassicKeyCertificate body, final ApiCallback _callback) throws ApiException { + String basePath = null; + + // Operation Servers + String[] localBasePaths = new String[] { }; + + // Determine Base Path to Use + if (localCustomBaseUrl != null){ + basePath = localCustomBaseUrl; + } else if ( localBasePaths.length > 0 ) { + basePath = localBasePaths[localHostIndex]; + } else { + basePath = null; + } + + Object localVarPostBody = body; + + // create path and map variables + String localVarPath = "/update-classic-key-certificate"; + + List localVarQueryParams = new ArrayList(); + List localVarCollectionQueryParams = new ArrayList(); + Map localVarHeaderParams = new HashMap(); + Map localVarCookieParams = new HashMap(); + Map localVarFormParams = new HashMap(); + + final String[] localVarAccepts = { + "application/json" + }; + final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); + if (localVarAccept != null) { + localVarHeaderParams.put("Accept", localVarAccept); + } + + final String[] localVarContentTypes = { + "application/json" + }; + final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes); + if (localVarContentType != null) { + localVarHeaderParams.put("Content-Type", localVarContentType); + } + + String[] localVarAuthNames = new String[] { }; + return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback); + } + + @SuppressWarnings("rawtypes") + private okhttp3.Call updateClassicKeyCertificateValidateBeforeCall(UpdateClassicKeyCertificate body, final ApiCallback _callback) throws ApiException { + + // verify the required parameter 'body' is set + if (body == null) { + throw new ApiException("Missing the required parameter 'body' when calling updateClassicKeyCertificate(Async)"); + } + + + okhttp3.Call localVarCall = updateClassicKeyCertificateCall(body, _callback); + return localVarCall; + + } + + /** + * + * + * @param body (required) + * @return Object + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 UpdateClassicKeyCertificateResponse wraps response body. -
0 errorResponse wraps any error to return it as a JSON object with one \"error\" field. -
+ */ + public Object updateClassicKeyCertificate(UpdateClassicKeyCertificate body) throws ApiException { + ApiResponse localVarResp = updateClassicKeyCertificateWithHttpInfo(body); + return localVarResp.getData(); + } + + /** + * + * + * @param body (required) + * @return ApiResponse<Object> + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 UpdateClassicKeyCertificateResponse wraps response body. -
0 errorResponse wraps any error to return it as a JSON object with one \"error\" field. -
+ */ + public ApiResponse updateClassicKeyCertificateWithHttpInfo(UpdateClassicKeyCertificate body) throws ApiException { + okhttp3.Call localVarCall = updateClassicKeyCertificateValidateBeforeCall(body, null); + Type localVarReturnType = new TypeToken(){}.getType(); + return localVarApiClient.execute(localVarCall, localVarReturnType); + } + + /** + * (asynchronously) + * + * @param body (required) + * @param _callback The callback to be executed when the API call finishes + * @return The request call + * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 UpdateClassicKeyCertificateResponse wraps response body. -
0 errorResponse wraps any error to return it as a JSON object with one \"error\" field. -
+ */ + public okhttp3.Call updateClassicKeyCertificateAsync(UpdateClassicKeyCertificate body, final ApiCallback _callback) throws ApiException { + + okhttp3.Call localVarCall = updateClassicKeyCertificateValidateBeforeCall(body, _callback); + Type localVarReturnType = new TypeToken(){}.getType(); + localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); + return localVarCall; + } /** * Build call for updateDBTarget * @param body (required) diff --git a/src/main/java/io/akeyless/client/model/ActiveDirectoryPayload.java b/src/main/java/io/akeyless/client/model/ActiveDirectoryPayload.java index 067d75c7..5cbe2121 100644 --- a/src/main/java/io/akeyless/client/model/ActiveDirectoryPayload.java +++ b/src/main/java/io/akeyless/client/model/ActiveDirectoryPayload.java @@ -61,6 +61,10 @@ public class ActiveDirectoryPayload { @SerializedName(SERIALIZED_NAME_DISCOVER_SERVICES) private Boolean discoverServices; + public static final String SERIALIZED_NAME_DISCOVERY_TYPES = "discovery_types"; + @SerializedName(SERIALIZED_NAME_DISCOVERY_TYPES) + private List discoveryTypes = null; + public static final String SERIALIZED_NAME_DOMAIN_NAME = "domain_name"; @SerializedName(SERIALIZED_NAME_DOMAIN_NAME) private String domainName; @@ -85,6 +89,10 @@ public class ActiveDirectoryPayload { @SerializedName(SERIALIZED_NAME_LOCAL_USERS_ROTATED_SECRETS_PATH_TEMPLATE) private String localUsersRotatedSecretsPathTemplate; + public static final String SERIALIZED_NAME_OS_FILTER = "os_filter"; + @SerializedName(SERIALIZED_NAME_OS_FILTER) + private String osFilter; + public static final String SERIALIZED_NAME_SSH_PORT = "ssh_port"; @SerializedName(SERIALIZED_NAME_SSH_PORT) private String sshPort; @@ -234,11 +242,11 @@ public ActiveDirectoryPayload discoverLocalUsers(Boolean discoverLocalUsers) { } /** - * Get discoverLocalUsers + * Deprecated * @return discoverLocalUsers **/ @javax.annotation.Nullable - @ApiModelProperty(value = "") + @ApiModelProperty(value = "Deprecated") public Boolean getDiscoverLocalUsers() { return discoverLocalUsers; @@ -273,6 +281,37 @@ public void setDiscoverServices(Boolean discoverServices) { } + public ActiveDirectoryPayload discoveryTypes(List discoveryTypes) { + + this.discoveryTypes = discoveryTypes; + return this; + } + + public ActiveDirectoryPayload addDiscoveryTypesItem(String discoveryTypesItem) { + if (this.discoveryTypes == null) { + this.discoveryTypes = new ArrayList(); + } + this.discoveryTypes.add(discoveryTypesItem); + return this; + } + + /** + * Get discoveryTypes + * @return discoveryTypes + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public List getDiscoveryTypes() { + return discoveryTypes; + } + + + public void setDiscoveryTypes(List discoveryTypes) { + this.discoveryTypes = discoveryTypes; + } + + public ActiveDirectoryPayload domainName(String domainName) { this.domainName = domainName; @@ -419,6 +458,29 @@ public void setLocalUsersRotatedSecretsPathTemplate(String localUsersRotatedSecr } + public ActiveDirectoryPayload osFilter(String osFilter) { + + this.osFilter = osFilter; + return this; + } + + /** + * Get osFilter + * @return osFilter + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public String getOsFilter() { + return osFilter; + } + + + public void setOsFilter(String osFilter) { + this.osFilter = osFilter; + } + + public ActiveDirectoryPayload sshPort(String sshPort) { this.sshPort = sshPort; @@ -581,12 +643,14 @@ public boolean equals(Object o) { Objects.equals(this.computerBaseDn, activeDirectoryPayload.computerBaseDn) && Objects.equals(this.discoverLocalUsers, activeDirectoryPayload.discoverLocalUsers) && Objects.equals(this.discoverServices, activeDirectoryPayload.discoverServices) && + Objects.equals(this.discoveryTypes, activeDirectoryPayload.discoveryTypes) && Objects.equals(this.domainName, activeDirectoryPayload.domainName) && Objects.equals(this.domainServerTargetsPathTemplate, activeDirectoryPayload.domainServerTargetsPathTemplate) && Objects.equals(this.domainUsersRotatedSecretsPathTemplate, activeDirectoryPayload.domainUsersRotatedSecretsPathTemplate) && Objects.equals(this.enableRdpSra, activeDirectoryPayload.enableRdpSra) && Objects.equals(this.localUsersIgnoreList, activeDirectoryPayload.localUsersIgnoreList) && Objects.equals(this.localUsersRotatedSecretsPathTemplate, activeDirectoryPayload.localUsersRotatedSecretsPathTemplate) && + Objects.equals(this.osFilter, activeDirectoryPayload.osFilter) && Objects.equals(this.sshPort, activeDirectoryPayload.sshPort) && Objects.equals(this.targetsType, activeDirectoryPayload.targetsType) && Objects.equals(this.userBaseDn, activeDirectoryPayload.userBaseDn) && @@ -597,7 +661,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(activeDirectoryTargetId, autoRotate, autoRotateIntervalInDays, autoRotateRotationHour, computerBaseDn, discoverLocalUsers, discoverServices, domainName, domainServerTargetsPathTemplate, domainUsersRotatedSecretsPathTemplate, enableRdpSra, localUsersIgnoreList, localUsersRotatedSecretsPathTemplate, sshPort, targetsType, userBaseDn, userGroups, winrmOverHttp, winrmPort); + return Objects.hash(activeDirectoryTargetId, autoRotate, autoRotateIntervalInDays, autoRotateRotationHour, computerBaseDn, discoverLocalUsers, discoverServices, discoveryTypes, domainName, domainServerTargetsPathTemplate, domainUsersRotatedSecretsPathTemplate, enableRdpSra, localUsersIgnoreList, localUsersRotatedSecretsPathTemplate, osFilter, sshPort, targetsType, userBaseDn, userGroups, winrmOverHttp, winrmPort); } @Override @@ -611,12 +675,14 @@ public String toString() { sb.append(" computerBaseDn: ").append(toIndentedString(computerBaseDn)).append("\n"); sb.append(" discoverLocalUsers: ").append(toIndentedString(discoverLocalUsers)).append("\n"); sb.append(" discoverServices: ").append(toIndentedString(discoverServices)).append("\n"); + sb.append(" discoveryTypes: ").append(toIndentedString(discoveryTypes)).append("\n"); sb.append(" domainName: ").append(toIndentedString(domainName)).append("\n"); sb.append(" domainServerTargetsPathTemplate: ").append(toIndentedString(domainServerTargetsPathTemplate)).append("\n"); sb.append(" domainUsersRotatedSecretsPathTemplate: ").append(toIndentedString(domainUsersRotatedSecretsPathTemplate)).append("\n"); sb.append(" enableRdpSra: ").append(toIndentedString(enableRdpSra)).append("\n"); sb.append(" localUsersIgnoreList: ").append(toIndentedString(localUsersIgnoreList)).append("\n"); sb.append(" localUsersRotatedSecretsPathTemplate: ").append(toIndentedString(localUsersRotatedSecretsPathTemplate)).append("\n"); + sb.append(" osFilter: ").append(toIndentedString(osFilter)).append("\n"); sb.append(" sshPort: ").append(toIndentedString(sshPort)).append("\n"); sb.append(" targetsType: ").append(toIndentedString(targetsType)).append("\n"); sb.append(" userBaseDn: ").append(toIndentedString(userBaseDn)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/CertificateTemplateInfo.java b/src/main/java/io/akeyless/client/model/CertificateTemplateInfo.java index 77e5a585..be82423d 100644 --- a/src/main/java/io/akeyless/client/model/CertificateTemplateInfo.java +++ b/src/main/java/io/akeyless/client/model/CertificateTemplateInfo.java @@ -37,6 +37,10 @@ public class CertificateTemplateInfo { @SerializedName(SERIALIZED_NAME_COUNTRY) private String country; + public static final String SERIALIZED_NAME_CSR_CNF_BASE64 = "csr_cnf_base_64"; + @SerializedName(SERIALIZED_NAME_CSR_CNF_BASE64) + private String csrCnfBase64; + public static final String SERIALIZED_NAME_DIGEST_ALGO = "digest_algo"; @SerializedName(SERIALIZED_NAME_DIGEST_ALGO) private String digestAlgo; @@ -110,6 +114,29 @@ public void setCountry(String country) { } + public CertificateTemplateInfo csrCnfBase64(String csrCnfBase64) { + + this.csrCnfBase64 = csrCnfBase64; + return this; + } + + /** + * Get csrCnfBase64 + * @return csrCnfBase64 + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public String getCsrCnfBase64() { + return csrCnfBase64; + } + + + public void setCsrCnfBase64(String csrCnfBase64) { + this.csrCnfBase64 = csrCnfBase64; + } + + public CertificateTemplateInfo digestAlgo(String digestAlgo) { this.digestAlgo = digestAlgo; @@ -259,6 +286,7 @@ public boolean equals(Object o) { CertificateTemplateInfo certificateTemplateInfo = (CertificateTemplateInfo) o; return Objects.equals(this.commonName, certificateTemplateInfo.commonName) && Objects.equals(this.country, certificateTemplateInfo.country) && + Objects.equals(this.csrCnfBase64, certificateTemplateInfo.csrCnfBase64) && Objects.equals(this.digestAlgo, certificateTemplateInfo.digestAlgo) && Objects.equals(this.locality, certificateTemplateInfo.locality) && Objects.equals(this.organization, certificateTemplateInfo.organization) && @@ -269,7 +297,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(commonName, country, digestAlgo, locality, organization, province, selfSignedEnabled, ttl); + return Objects.hash(commonName, country, csrCnfBase64, digestAlgo, locality, organization, province, selfSignedEnabled, ttl); } @Override @@ -278,6 +306,7 @@ public String toString() { sb.append("class CertificateTemplateInfo {\n"); sb.append(" commonName: ").append(toIndentedString(commonName)).append("\n"); sb.append(" country: ").append(toIndentedString(country)).append("\n"); + sb.append(" csrCnfBase64: ").append(toIndentedString(csrCnfBase64)).append("\n"); sb.append(" digestAlgo: ").append(toIndentedString(digestAlgo)).append("\n"); sb.append(" locality: ").append(toIndentedString(locality)).append("\n"); sb.append(" organization: ").append(toIndentedString(organization)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/CreateClassicKey.java b/src/main/java/io/akeyless/client/model/CreateClassicKey.java index 459b4403..3625bc28 100644 --- a/src/main/java/io/akeyless/client/model/CreateClassicKey.java +++ b/src/main/java/io/akeyless/client/model/CreateClassicKey.java @@ -68,6 +68,10 @@ public class CreateClassicKey { @SerializedName(SERIALIZED_NAME_CERTIFICATE_TTL) private Long certificateTtl; + public static final String SERIALIZED_NAME_CONF_FILE_DATA = "conf-file-data"; + @SerializedName(SERIALIZED_NAME_CONF_FILE_DATA) + private String confFileData; + public static final String SERIALIZED_NAME_DELETE_PROTECTION = "delete_protection"; @SerializedName(SERIALIZED_NAME_DELETE_PROTECTION) private String deleteProtection; @@ -326,6 +330,29 @@ public void setCertificateTtl(Long certificateTtl) { } + public CreateClassicKey confFileData(String confFileData) { + + this.confFileData = confFileData; + return this; + } + + /** + * The csr config data in base64 encoding + * @return confFileData + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The csr config data in base64 encoding") + + public String getConfFileData() { + return confFileData; + } + + + public void setConfFileData(String confFileData) { + this.confFileData = confFileData; + } + + public CreateClassicKey deleteProtection(String deleteProtection) { this.deleteProtection = deleteProtection; @@ -628,6 +655,7 @@ public boolean equals(Object o) { Objects.equals(this.certificateOrganization, createClassicKey.certificateOrganization) && Objects.equals(this.certificateProvince, createClassicKey.certificateProvince) && Objects.equals(this.certificateTtl, createClassicKey.certificateTtl) && + Objects.equals(this.confFileData, createClassicKey.confFileData) && Objects.equals(this.deleteProtection, createClassicKey.deleteProtection) && Objects.equals(this.description, createClassicKey.description) && Objects.equals(this.generateSelfSignedCertificate, createClassicKey.generateSelfSignedCertificate) && @@ -644,7 +672,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(alg, certFileData, certificateCommonName, certificateCountry, certificateDigestAlgo, certificateLocality, certificateOrganization, certificateProvince, certificateTtl, deleteProtection, description, generateSelfSignedCertificate, gpgAlg, json, keyData, metadata, name, protectionKeyName, tags, token, uidToken); + return Objects.hash(alg, certFileData, certificateCommonName, certificateCountry, certificateDigestAlgo, certificateLocality, certificateOrganization, certificateProvince, certificateTtl, confFileData, deleteProtection, description, generateSelfSignedCertificate, gpgAlg, json, keyData, metadata, name, protectionKeyName, tags, token, uidToken); } @Override @@ -660,6 +688,7 @@ public String toString() { sb.append(" certificateOrganization: ").append(toIndentedString(certificateOrganization)).append("\n"); sb.append(" certificateProvince: ").append(toIndentedString(certificateProvince)).append("\n"); sb.append(" certificateTtl: ").append(toIndentedString(certificateTtl)).append("\n"); + sb.append(" confFileData: ").append(toIndentedString(confFileData)).append("\n"); sb.append(" deleteProtection: ").append(toIndentedString(deleteProtection)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" generateSelfSignedCertificate: ").append(toIndentedString(generateSelfSignedCertificate)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/CreateDFCKey.java b/src/main/java/io/akeyless/client/model/CreateDFCKey.java index 7b80fc0a..a8e3c8bb 100644 --- a/src/main/java/io/akeyless/client/model/CreateDFCKey.java +++ b/src/main/java/io/akeyless/client/model/CreateDFCKey.java @@ -63,6 +63,10 @@ public class CreateDFCKey { @SerializedName(SERIALIZED_NAME_CERTIFICATE_TTL) private Long certificateTtl; + public static final String SERIALIZED_NAME_CONF_FILE_DATA = "conf-file-data"; + @SerializedName(SERIALIZED_NAME_CONF_FILE_DATA) + private String confFileData; + public static final String SERIALIZED_NAME_CUSTOMER_FRG_ID = "customer-frg-id"; @SerializedName(SERIALIZED_NAME_CUSTOMER_FRG_ID) private String customerFrgId; @@ -294,6 +298,29 @@ public void setCertificateTtl(Long certificateTtl) { } + public CreateDFCKey confFileData(String confFileData) { + + this.confFileData = confFileData; + return this; + } + + /** + * The csr config data in base64 encoding + * @return confFileData + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The csr config data in base64 encoding") + + public String getConfFileData() { + return confFileData; + } + + + public void setConfFileData(String confFileData) { + this.confFileData = confFileData; + } + + public CreateDFCKey customerFrgId(String customerFrgId) { this.customerFrgId = customerFrgId; @@ -572,6 +599,7 @@ public boolean equals(Object o) { Objects.equals(this.certificateOrganization, createDFCKey.certificateOrganization) && Objects.equals(this.certificateProvince, createDFCKey.certificateProvince) && Objects.equals(this.certificateTtl, createDFCKey.certificateTtl) && + Objects.equals(this.confFileData, createDFCKey.confFileData) && Objects.equals(this.customerFrgId, createDFCKey.customerFrgId) && Objects.equals(this.deleteProtection, createDFCKey.deleteProtection) && Objects.equals(this.description, createDFCKey.description) && @@ -587,7 +615,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(alg, certificateCommonName, certificateCountry, certificateDigestAlgo, certificateLocality, certificateOrganization, certificateProvince, certificateTtl, customerFrgId, deleteProtection, description, generateSelfSignedCertificate, json, metadata, name, splitLevel, tag, token, uidToken); + return Objects.hash(alg, certificateCommonName, certificateCountry, certificateDigestAlgo, certificateLocality, certificateOrganization, certificateProvince, certificateTtl, confFileData, customerFrgId, deleteProtection, description, generateSelfSignedCertificate, json, metadata, name, splitLevel, tag, token, uidToken); } @Override @@ -602,6 +630,7 @@ public String toString() { sb.append(" certificateOrganization: ").append(toIndentedString(certificateOrganization)).append("\n"); sb.append(" certificateProvince: ").append(toIndentedString(certificateProvince)).append("\n"); sb.append(" certificateTtl: ").append(toIndentedString(certificateTtl)).append("\n"); + sb.append(" confFileData: ").append(toIndentedString(confFileData)).append("\n"); sb.append(" customerFrgId: ").append(toIndentedString(customerFrgId)).append("\n"); sb.append(" deleteProtection: ").append(toIndentedString(deleteProtection)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/CreateKey.java b/src/main/java/io/akeyless/client/model/CreateKey.java index 13f3575e..7a0d67ef 100644 --- a/src/main/java/io/akeyless/client/model/CreateKey.java +++ b/src/main/java/io/akeyless/client/model/CreateKey.java @@ -64,6 +64,10 @@ public class CreateKey { @SerializedName(SERIALIZED_NAME_CERTIFICATE_TTL) private Long certificateTtl; + public static final String SERIALIZED_NAME_CONF_FILE_DATA = "conf-file-data"; + @SerializedName(SERIALIZED_NAME_CONF_FILE_DATA) + private String confFileData; + public static final String SERIALIZED_NAME_CUSTOMER_FRG_ID = "customer-frg-id"; @SerializedName(SERIALIZED_NAME_CUSTOMER_FRG_ID) private String customerFrgId; @@ -295,6 +299,29 @@ public void setCertificateTtl(Long certificateTtl) { } + public CreateKey confFileData(String confFileData) { + + this.confFileData = confFileData; + return this; + } + + /** + * The csr config data in base64 encoding + * @return confFileData + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The csr config data in base64 encoding") + + public String getConfFileData() { + return confFileData; + } + + + public void setConfFileData(String confFileData) { + this.confFileData = confFileData; + } + + public CreateKey customerFrgId(String customerFrgId) { this.customerFrgId = customerFrgId; @@ -573,6 +600,7 @@ public boolean equals(Object o) { Objects.equals(this.certificateOrganization, createKey.certificateOrganization) && Objects.equals(this.certificateProvince, createKey.certificateProvince) && Objects.equals(this.certificateTtl, createKey.certificateTtl) && + Objects.equals(this.confFileData, createKey.confFileData) && Objects.equals(this.customerFrgId, createKey.customerFrgId) && Objects.equals(this.deleteProtection, createKey.deleteProtection) && Objects.equals(this.description, createKey.description) && @@ -588,7 +616,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(alg, certificateCommonName, certificateCountry, certificateDigestAlgo, certificateLocality, certificateOrganization, certificateProvince, certificateTtl, customerFrgId, deleteProtection, description, generateSelfSignedCertificate, json, metadata, name, splitLevel, tag, token, uidToken); + return Objects.hash(alg, certificateCommonName, certificateCountry, certificateDigestAlgo, certificateLocality, certificateOrganization, certificateProvince, certificateTtl, confFileData, customerFrgId, deleteProtection, description, generateSelfSignedCertificate, json, metadata, name, splitLevel, tag, token, uidToken); } @Override @@ -603,6 +631,7 @@ public String toString() { sb.append(" certificateOrganization: ").append(toIndentedString(certificateOrganization)).append("\n"); sb.append(" certificateProvince: ").append(toIndentedString(certificateProvince)).append("\n"); sb.append(" certificateTtl: ").append(toIndentedString(certificateTtl)).append("\n"); + sb.append(" confFileData: ").append(toIndentedString(confFileData)).append("\n"); sb.append(" customerFrgId: ").append(toIndentedString(customerFrgId)).append("\n"); sb.append(" deleteProtection: ").append(toIndentedString(deleteProtection)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/CreateRotatedSecret.java b/src/main/java/io/akeyless/client/model/CreateRotatedSecret.java index e07a749b..e8d86faa 100644 --- a/src/main/java/io/akeyless/client/model/CreateRotatedSecret.java +++ b/src/main/java/io/akeyless/client/model/CreateRotatedSecret.java @@ -71,6 +71,14 @@ public class CreateRotatedSecret { @SerializedName(SERIALIZED_NAME_GCP_KEY) private String gcpKey; + public static final String SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_EMAIL = "gcp-service-account-email"; + @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_EMAIL) + private String gcpServiceAccountEmail; + + public static final String SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_ID = "gcp-service-account-key-id"; + @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_ID) + private String gcpServiceAccountKeyId; + public static final String SERIALIZED_NAME_JSON = "json"; @SerializedName(SERIALIZED_NAME_JSON) private Boolean json = false; @@ -444,6 +452,52 @@ public void setGcpKey(String gcpKey) { } + public CreateRotatedSecret gcpServiceAccountEmail(String gcpServiceAccountEmail) { + + this.gcpServiceAccountEmail = gcpServiceAccountEmail; + return this; + } + + /** + * The email of the gcp service account to rotate + * @return gcpServiceAccountEmail + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The email of the gcp service account to rotate") + + public String getGcpServiceAccountEmail() { + return gcpServiceAccountEmail; + } + + + public void setGcpServiceAccountEmail(String gcpServiceAccountEmail) { + this.gcpServiceAccountEmail = gcpServiceAccountEmail; + } + + + public CreateRotatedSecret gcpServiceAccountKeyId(String gcpServiceAccountKeyId) { + + this.gcpServiceAccountKeyId = gcpServiceAccountKeyId; + return this; + } + + /** + * The key id of the gcp service account to rotate + * @return gcpServiceAccountKeyId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The key id of the gcp service account to rotate") + + public String getGcpServiceAccountKeyId() { + return gcpServiceAccountKeyId; + } + + + public void setGcpServiceAccountKeyId(String gcpServiceAccountKeyId) { + this.gcpServiceAccountKeyId = gcpServiceAccountKeyId; + } + + public CreateRotatedSecret json(Boolean json) { this.json = json; @@ -1284,6 +1338,8 @@ public boolean equals(Object o) { Objects.equals(this.deleteProtection, createRotatedSecret.deleteProtection) && Objects.equals(this.description, createRotatedSecret.description) && Objects.equals(this.gcpKey, createRotatedSecret.gcpKey) && + Objects.equals(this.gcpServiceAccountEmail, createRotatedSecret.gcpServiceAccountEmail) && + Objects.equals(this.gcpServiceAccountKeyId, createRotatedSecret.gcpServiceAccountKeyId) && Objects.equals(this.json, createRotatedSecret.json) && Objects.equals(this.key, createRotatedSecret.key) && Objects.equals(this.metadata, createRotatedSecret.metadata) && @@ -1323,7 +1379,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(apiId, apiKey, applicationId, authenticationCredentials, autoRotate, awsRegion, customPayload, deleteProtection, description, gcpKey, json, key, metadata, name, rotateAfterDisconnect, rotatedPassword, rotatedUsername, rotationHour, rotationInterval, rotatorCredsType, rotatorCustomCmd, rotatorType, samePassword, secureAccessAllowExternalUser, secureAccessAwsAccountId, secureAccessAwsNativeCli, secureAccessBastionIssuer, secureAccessDbName, secureAccessDbSchema, secureAccessEnable, secureAccessHost, secureAccessRdpDomain, secureAccessRdpUser, secureAccessWeb, secureAccessWebBrowsing, secureAccessWebProxy, sshPassword, sshUsername, storageAccountKeyName, tags, targetName, token, uidToken, userAttribute, userDn); + return Objects.hash(apiId, apiKey, applicationId, authenticationCredentials, autoRotate, awsRegion, customPayload, deleteProtection, description, gcpKey, gcpServiceAccountEmail, gcpServiceAccountKeyId, json, key, metadata, name, rotateAfterDisconnect, rotatedPassword, rotatedUsername, rotationHour, rotationInterval, rotatorCredsType, rotatorCustomCmd, rotatorType, samePassword, secureAccessAllowExternalUser, secureAccessAwsAccountId, secureAccessAwsNativeCli, secureAccessBastionIssuer, secureAccessDbName, secureAccessDbSchema, secureAccessEnable, secureAccessHost, secureAccessRdpDomain, secureAccessRdpUser, secureAccessWeb, secureAccessWebBrowsing, secureAccessWebProxy, sshPassword, sshUsername, storageAccountKeyName, tags, targetName, token, uidToken, userAttribute, userDn); } @Override @@ -1340,6 +1396,8 @@ public String toString() { sb.append(" deleteProtection: ").append(toIndentedString(deleteProtection)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" gcpKey: ").append(toIndentedString(gcpKey)).append("\n"); + sb.append(" gcpServiceAccountEmail: ").append(toIndentedString(gcpServiceAccountEmail)).append("\n"); + sb.append(" gcpServiceAccountKeyId: ").append(toIndentedString(gcpServiceAccountKeyId)).append("\n"); sb.append(" json: ").append(toIndentedString(json)).append("\n"); sb.append(" key: ").append(toIndentedString(key)).append("\n"); sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/DSProducerDetails.java b/src/main/java/io/akeyless/client/model/DSProducerDetails.java index bcf315e2..40b532c4 100644 --- a/src/main/java/io/akeyless/client/model/DSProducerDetails.java +++ b/src/main/java/io/akeyless/client/model/DSProducerDetails.java @@ -379,6 +379,10 @@ public class DSProducerDetails { @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_BASE64) private String gcpServiceAccountKeyBase64; + public static final String SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_ID = "gcp_service_account_key_id"; + @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_ID) + private String gcpServiceAccountKeyId; + public static final String SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_TYPE = "gcp_service_account_type"; @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_TYPE) private String gcpServiceAccountType; @@ -2900,6 +2904,29 @@ public void setGcpServiceAccountKeyBase64(String gcpServiceAccountKeyBase64) { } + public DSProducerDetails gcpServiceAccountKeyId(String gcpServiceAccountKeyId) { + + this.gcpServiceAccountKeyId = gcpServiceAccountKeyId; + return this; + } + + /** + * Get gcpServiceAccountKeyId + * @return gcpServiceAccountKeyId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public String getGcpServiceAccountKeyId() { + return gcpServiceAccountKeyId; + } + + + public void setGcpServiceAccountKeyId(String gcpServiceAccountKeyId) { + this.gcpServiceAccountKeyId = gcpServiceAccountKeyId; + } + + public DSProducerDetails gcpServiceAccountType(String gcpServiceAccountType) { this.gcpServiceAccountType = gcpServiceAccountType; @@ -6096,6 +6123,7 @@ public boolean equals(Object o) { Objects.equals(this.gcpServiceAccountEmail, dsProducerDetails.gcpServiceAccountEmail) && Objects.equals(this.gcpServiceAccountKey, dsProducerDetails.gcpServiceAccountKey) && Objects.equals(this.gcpServiceAccountKeyBase64, dsProducerDetails.gcpServiceAccountKeyBase64) && + Objects.equals(this.gcpServiceAccountKeyId, dsProducerDetails.gcpServiceAccountKeyId) && Objects.equals(this.gcpServiceAccountType, dsProducerDetails.gcpServiceAccountType) && Objects.equals(this.gcpTmpServiceAccountName, dsProducerDetails.gcpTmpServiceAccountName) && Objects.equals(this.gcpTokenLifetime, dsProducerDetails.gcpTokenLifetime) && @@ -6231,7 +6259,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(accessTokenManagerId, aclRules, active, adminName, adminPwd, adminRotationIntervalDays, administrativePort, artifactoryAdminApikey, artifactoryAdminUsername, artifactoryBaseUrl, artifactoryTokenAudience, artifactoryTokenScope, authorizationPort, awsAccessKeyId, awsAccessMode, awsRegion, awsRoleArns, awsSecretAccessKey, awsSessionToken, awsUserConsoleAccess, awsUserGroups, awsUserPolicies, awsUserProgrammaticAccess, azureAppObjectId, azureClientId, azureClientSecret, azureFixedUserNameSubClaimKey, azureFixedUserOnly, azureResourceGroupName, azureResourceName, azureSubscriptionId, azureTenantId, azureUserGroupsObjId, azureUserPortalAccess, azureUserProgrammaticAccess, azureUserRolesTemplateId, cassandraCreationStatements, chefOrganizations, chefServerAccessMode, chefServerHostName, chefServerKey, chefServerPort, chefServerUrl, chefServerUsername, chefSkipSsl, clientAuthenticationType, cloudServiceProvider, connectionType, createSyncUrl, dbClientId, dbClientSecret, dbHostName, dbIsolationLevel, dbMaxIdleConns, dbMaxOpenConns, dbName, dbPort, dbPrivateKey, dbPrivateKeyPassphrase, dbPwd, dbServerCertificates, dbServerName, dbTenantId, dbUserName, deleteProtection, dynamicSecretId, dynamicSecretKey, dynamicSecretName, dynamicSecretType, eksAccessKeyId, eksAssumeRole, eksClusterCaCertificate, eksClusterEndpoint, eksClusterName, eksRegion, eksSecretAccessKey, enableAdminRotation, enforceReplayPrevention, externallyProvidedUser, failureMessage, fixedUserOnly, gcpKeyAlgo, gcpRoleBindings, gcpServiceAccountEmail, gcpServiceAccountKey, gcpServiceAccountKeyBase64, gcpServiceAccountType, gcpTmpServiceAccountName, gcpTokenLifetime, gcpTokenScope, gcpTokenType, githubAppId, githubAppPrivateKey, githubBaseUrl, githubInstallationId, githubInstallationTokenPermissions, githubInstallationTokenRepositories, githubInstallationTokenRepositoriesIds, githubRepositoryPath, gkeClusterCaCertificate, gkeClusterEndpoint, gkeClusterName, gkeServiceAccountKey, gkeServiceAccountName, grantTypes, groups, hanadbCreationStatements, hanadbRevocationStatements, hostName, hostPort, implementationType, isFixedUser, issuer, itemTargetsAssoc, jwks, jwksUrl, k8sAllowedNamespaces, k8sAuthType, k8sBearerToken, k8sClientCertData, k8sClientKeyData, k8sClusterCaCertificate, k8sClusterEndpoint, k8sDynamicMode, k8sMultipleDocYamlTempDefinition, k8sNamespace, k8sRoleName, k8sRoleType, k8sServiceAccount, lastAdminRotation, ldapAudience, ldapBindDn, ldapBindPassword, ldapCertificate, ldapGroupDn, ldapTokenExpiration, ldapUrl, ldapUserAttr, ldapUserDn, metadata, mongodbAtlasApiPrivateKey, mongodbAtlasApiPublicKey, mongodbAtlasProjectId, mongodbCustomData, mongodbDbName, mongodbDefaultAuthDb, mongodbHostPort, mongodbIsAtlas, mongodbPassword, mongodbRoles, mongodbUriConnection, mongodbUriOptions, mongodbUsername, mssqlCreationStatements, mssqlRevocationStatements, mysqlCreationStatements, mysqlRevocationStatements, oracleCreationStatements, password, passwordLength, passwordPolicy, payload, pingUrl, postgresCreationStatements, postgresRevocationStatements, privilegedUser, rabbitmqServerPassword, rabbitmqServerUri, rabbitmqServerUser, rabbitmqUserConfPermission, rabbitmqUserReadPermission, rabbitmqUserTags, rabbitmqUserVhost, rabbitmqUserWritePermission, redirectUris, redshiftCreationStatements, restrictedScopes, revokeSyncUrl, rotateSyncUrl, scopes, secureRemoteAccessDetails, sessionExtensionWarnIntervalMin, sfAccount, sfUserRole, sfWarehouseName, shouldStop, signingAlgorithm, sslConnectionCertificate, sslConnectionMode, subjectDn, tags, timeoutSeconds, useGwCloudIdentity, useGwServiceAccount, userName, userPassword, userPrincipalName, userTtl, usernameLength, usernamePolicy, venafiAllowSubdomains, venafiAllowedDomains, venafiApiKey, venafiAutoGeneratedFolder, venafiBaseUrl, venafiRootFirstInChain, venafiSignUsingAkeylessPki, venafiSignerKeyName, venafiStorePrivateKey, venafiTppAccessToken, venafiTppClientId, venafiTppPassword, venafiTppRefreshToken, venafiTppUsername, venafiUseTpp, venafiZone, warnBeforeUserExpirationMin); + return Objects.hash(accessTokenManagerId, aclRules, active, adminName, adminPwd, adminRotationIntervalDays, administrativePort, artifactoryAdminApikey, artifactoryAdminUsername, artifactoryBaseUrl, artifactoryTokenAudience, artifactoryTokenScope, authorizationPort, awsAccessKeyId, awsAccessMode, awsRegion, awsRoleArns, awsSecretAccessKey, awsSessionToken, awsUserConsoleAccess, awsUserGroups, awsUserPolicies, awsUserProgrammaticAccess, azureAppObjectId, azureClientId, azureClientSecret, azureFixedUserNameSubClaimKey, azureFixedUserOnly, azureResourceGroupName, azureResourceName, azureSubscriptionId, azureTenantId, azureUserGroupsObjId, azureUserPortalAccess, azureUserProgrammaticAccess, azureUserRolesTemplateId, cassandraCreationStatements, chefOrganizations, chefServerAccessMode, chefServerHostName, chefServerKey, chefServerPort, chefServerUrl, chefServerUsername, chefSkipSsl, clientAuthenticationType, cloudServiceProvider, connectionType, createSyncUrl, dbClientId, dbClientSecret, dbHostName, dbIsolationLevel, dbMaxIdleConns, dbMaxOpenConns, dbName, dbPort, dbPrivateKey, dbPrivateKeyPassphrase, dbPwd, dbServerCertificates, dbServerName, dbTenantId, dbUserName, deleteProtection, dynamicSecretId, dynamicSecretKey, dynamicSecretName, dynamicSecretType, eksAccessKeyId, eksAssumeRole, eksClusterCaCertificate, eksClusterEndpoint, eksClusterName, eksRegion, eksSecretAccessKey, enableAdminRotation, enforceReplayPrevention, externallyProvidedUser, failureMessage, fixedUserOnly, gcpKeyAlgo, gcpRoleBindings, gcpServiceAccountEmail, gcpServiceAccountKey, gcpServiceAccountKeyBase64, gcpServiceAccountKeyId, gcpServiceAccountType, gcpTmpServiceAccountName, gcpTokenLifetime, gcpTokenScope, gcpTokenType, githubAppId, githubAppPrivateKey, githubBaseUrl, githubInstallationId, githubInstallationTokenPermissions, githubInstallationTokenRepositories, githubInstallationTokenRepositoriesIds, githubRepositoryPath, gkeClusterCaCertificate, gkeClusterEndpoint, gkeClusterName, gkeServiceAccountKey, gkeServiceAccountName, grantTypes, groups, hanadbCreationStatements, hanadbRevocationStatements, hostName, hostPort, implementationType, isFixedUser, issuer, itemTargetsAssoc, jwks, jwksUrl, k8sAllowedNamespaces, k8sAuthType, k8sBearerToken, k8sClientCertData, k8sClientKeyData, k8sClusterCaCertificate, k8sClusterEndpoint, k8sDynamicMode, k8sMultipleDocYamlTempDefinition, k8sNamespace, k8sRoleName, k8sRoleType, k8sServiceAccount, lastAdminRotation, ldapAudience, ldapBindDn, ldapBindPassword, ldapCertificate, ldapGroupDn, ldapTokenExpiration, ldapUrl, ldapUserAttr, ldapUserDn, metadata, mongodbAtlasApiPrivateKey, mongodbAtlasApiPublicKey, mongodbAtlasProjectId, mongodbCustomData, mongodbDbName, mongodbDefaultAuthDb, mongodbHostPort, mongodbIsAtlas, mongodbPassword, mongodbRoles, mongodbUriConnection, mongodbUriOptions, mongodbUsername, mssqlCreationStatements, mssqlRevocationStatements, mysqlCreationStatements, mysqlRevocationStatements, oracleCreationStatements, password, passwordLength, passwordPolicy, payload, pingUrl, postgresCreationStatements, postgresRevocationStatements, privilegedUser, rabbitmqServerPassword, rabbitmqServerUri, rabbitmqServerUser, rabbitmqUserConfPermission, rabbitmqUserReadPermission, rabbitmqUserTags, rabbitmqUserVhost, rabbitmqUserWritePermission, redirectUris, redshiftCreationStatements, restrictedScopes, revokeSyncUrl, rotateSyncUrl, scopes, secureRemoteAccessDetails, sessionExtensionWarnIntervalMin, sfAccount, sfUserRole, sfWarehouseName, shouldStop, signingAlgorithm, sslConnectionCertificate, sslConnectionMode, subjectDn, tags, timeoutSeconds, useGwCloudIdentity, useGwServiceAccount, userName, userPassword, userPrincipalName, userTtl, usernameLength, usernamePolicy, venafiAllowSubdomains, venafiAllowedDomains, venafiApiKey, venafiAutoGeneratedFolder, venafiBaseUrl, venafiRootFirstInChain, venafiSignUsingAkeylessPki, venafiSignerKeyName, venafiStorePrivateKey, venafiTppAccessToken, venafiTppClientId, venafiTppPassword, venafiTppRefreshToken, venafiTppUsername, venafiUseTpp, venafiZone, warnBeforeUserExpirationMin); } @Override @@ -6324,6 +6352,7 @@ public String toString() { sb.append(" gcpServiceAccountEmail: ").append(toIndentedString(gcpServiceAccountEmail)).append("\n"); sb.append(" gcpServiceAccountKey: ").append(toIndentedString(gcpServiceAccountKey)).append("\n"); sb.append(" gcpServiceAccountKeyBase64: ").append(toIndentedString(gcpServiceAccountKeyBase64)).append("\n"); + sb.append(" gcpServiceAccountKeyId: ").append(toIndentedString(gcpServiceAccountKeyId)).append("\n"); sb.append(" gcpServiceAccountType: ").append(toIndentedString(gcpServiceAccountType)).append("\n"); sb.append(" gcpTmpServiceAccountName: ").append(toIndentedString(gcpTmpServiceAccountName)).append("\n"); sb.append(" gcpTokenLifetime: ").append(toIndentedString(gcpTokenLifetime)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/GatewayCreateMigration.java b/src/main/java/io/akeyless/client/model/GatewayCreateMigration.java index 5245715c..6fb1e4a4 100644 --- a/src/main/java/io/akeyless/client/model/GatewayCreateMigration.java +++ b/src/main/java/io/akeyless/client/model/GatewayCreateMigration.java @@ -56,6 +56,14 @@ public class GatewayCreateMigration { @SerializedName(SERIALIZED_NAME_AD_DISCOVER_SERVICES) private String adDiscoverServices = "false"; + public static final String SERIALIZED_NAME_AD_DISCOVERY_TYPES = "ad-discovery-types"; + @SerializedName(SERIALIZED_NAME_AD_DISCOVERY_TYPES) + private List adDiscoveryTypes = null; + + public static final String SERIALIZED_NAME_AD_OS_FILTER = "ad-os-filter"; + @SerializedName(SERIALIZED_NAME_AD_OS_FILTER) + private String adOsFilter; + public static final String SERIALIZED_NAME_AD_SSH_PORT = "ad-ssh-port"; @SerializedName(SERIALIZED_NAME_AD_SSH_PORT) private String adSshPort = "22"; @@ -417,6 +425,60 @@ public void setAdDiscoverServices(String adDiscoverServices) { } + public GatewayCreateMigration adDiscoveryTypes(List adDiscoveryTypes) { + + this.adDiscoveryTypes = adDiscoveryTypes; + return this; + } + + public GatewayCreateMigration addAdDiscoveryTypesItem(String adDiscoveryTypesItem) { + if (this.adDiscoveryTypes == null) { + this.adDiscoveryTypes = new ArrayList(); + } + this.adDiscoveryTypes.add(adDiscoveryTypesItem); + return this; + } + + /** + * Set migration discovery types (domain-users, computers, local-users). (Relevant only for Active Directory migration) + * @return adDiscoveryTypes + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Set migration discovery types (domain-users, computers, local-users). (Relevant only for Active Directory migration)") + + public List getAdDiscoveryTypes() { + return adDiscoveryTypes; + } + + + public void setAdDiscoveryTypes(List adDiscoveryTypes) { + this.adDiscoveryTypes = adDiscoveryTypes; + } + + + public GatewayCreateMigration adOsFilter(String adOsFilter) { + + this.adOsFilter = adOsFilter; + return this; + } + + /** + * Filter by Operating System to run the migration, can be used with wildcards, e.g. SRV20* (Relevant only for Active Directory migration) + * @return adOsFilter + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Filter by Operating System to run the migration, can be used with wildcards, e.g. SRV20* (Relevant only for Active Directory migration)") + + public String getAdOsFilter() { + return adOsFilter; + } + + + public void setAdOsFilter(String adOsFilter) { + this.adOsFilter = adOsFilter; + } + + public GatewayCreateMigration adSshPort(String adSshPort) { this.adSshPort = adSshPort; @@ -562,11 +624,11 @@ public GatewayCreateMigration adDiscoverLocalUsers(String adDiscoverLocalUsers) } /** - * Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) + * Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) Deprecated: use AdDiscoverTypes * @return adDiscoverLocalUsers **/ @javax.annotation.Nullable - @ApiModelProperty(value = "Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration)") + @ApiModelProperty(value = "Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) Deprecated: use AdDiscoverTypes") public String getAdDiscoverLocalUsers() { return adDiscoverLocalUsers; @@ -1683,6 +1745,8 @@ public boolean equals(Object o) { Objects.equals(this._1passwordUrl, gatewayCreateMigration._1passwordUrl) && Objects.equals(this._1passwordVaults, gatewayCreateMigration._1passwordVaults) && Objects.equals(this.adDiscoverServices, gatewayCreateMigration.adDiscoverServices) && + Objects.equals(this.adDiscoveryTypes, gatewayCreateMigration.adDiscoveryTypes) && + Objects.equals(this.adOsFilter, gatewayCreateMigration.adOsFilter) && Objects.equals(this.adSshPort, gatewayCreateMigration.adSshPort) && Objects.equals(this.adTargetsType, gatewayCreateMigration.adTargetsType) && Objects.equals(this.adWinrmOverHttp, gatewayCreateMigration.adWinrmOverHttp) && @@ -1740,7 +1804,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(_1passwordEmail, _1passwordPassword, _1passwordSecretKey, _1passwordUrl, _1passwordVaults, adDiscoverServices, adSshPort, adTargetsType, adWinrmOverHttp, adWinrmPort, adAutoRotate, adComputerBaseDn, adDiscoverLocalUsers, adDomainName, adDomainUsersPathTemplate, adLocalUsersIgnore, adLocalUsersPathTemplate, adRotationHour, adRotationInterval, adSraEnableRdp, adTargetName, adTargetsPathTemplate, adUserBaseDn, adUserGroups, awsKey, awsKeyId, awsRegion, azureClientId, azureKvName, azureSecret, azureTenantId, gcpKey, hashiJson, hashiNs, hashiToken, hashiUrl, json, k8sCaCertificate, k8sClientCertificate, k8sClientKey, k8sNamespace, k8sPassword, k8sSkipSystem, k8sToken, k8sUrl, k8sUsername, name, protectionKey, siAutoRotate, siRotationHour, siRotationInterval, siSraEnableRdp, siTargetName, siUsersIgnore, siUsersPathTemplate, targetLocation, token, type, uidToken); + return Objects.hash(_1passwordEmail, _1passwordPassword, _1passwordSecretKey, _1passwordUrl, _1passwordVaults, adDiscoverServices, adDiscoveryTypes, adOsFilter, adSshPort, adTargetsType, adWinrmOverHttp, adWinrmPort, adAutoRotate, adComputerBaseDn, adDiscoverLocalUsers, adDomainName, adDomainUsersPathTemplate, adLocalUsersIgnore, adLocalUsersPathTemplate, adRotationHour, adRotationInterval, adSraEnableRdp, adTargetName, adTargetsPathTemplate, adUserBaseDn, adUserGroups, awsKey, awsKeyId, awsRegion, azureClientId, azureKvName, azureSecret, azureTenantId, gcpKey, hashiJson, hashiNs, hashiToken, hashiUrl, json, k8sCaCertificate, k8sClientCertificate, k8sClientKey, k8sNamespace, k8sPassword, k8sSkipSystem, k8sToken, k8sUrl, k8sUsername, name, protectionKey, siAutoRotate, siRotationHour, siRotationInterval, siSraEnableRdp, siTargetName, siUsersIgnore, siUsersPathTemplate, targetLocation, token, type, uidToken); } @Override @@ -1753,6 +1817,8 @@ public String toString() { sb.append(" _1passwordUrl: ").append(toIndentedString(_1passwordUrl)).append("\n"); sb.append(" _1passwordVaults: ").append(toIndentedString(_1passwordVaults)).append("\n"); sb.append(" adDiscoverServices: ").append(toIndentedString(adDiscoverServices)).append("\n"); + sb.append(" adDiscoveryTypes: ").append(toIndentedString(adDiscoveryTypes)).append("\n"); + sb.append(" adOsFilter: ").append(toIndentedString(adOsFilter)).append("\n"); sb.append(" adSshPort: ").append(toIndentedString(adSshPort)).append("\n"); sb.append(" adTargetsType: ").append(toIndentedString(adTargetsType)).append("\n"); sb.append(" adWinrmOverHttp: ").append(toIndentedString(adWinrmOverHttp)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/GatewayUpdateItem.java b/src/main/java/io/akeyless/client/model/GatewayUpdateItem.java index 9928361e..9e6cce1c 100644 --- a/src/main/java/io/akeyless/client/model/GatewayUpdateItem.java +++ b/src/main/java/io/akeyless/client/model/GatewayUpdateItem.java @@ -64,6 +64,14 @@ public class GatewayUpdateItem { @SerializedName(SERIALIZED_NAME_GCP_KEY) private String gcpKey; + public static final String SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_EMAIL = "gcp-service-account-email"; + @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_EMAIL) + private String gcpServiceAccountEmail; + + public static final String SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_ID = "gcp-service-account-key-id"; + @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_ID) + private String gcpServiceAccountKeyId; + public static final String SERIALIZED_NAME_JSON = "json"; @SerializedName(SERIALIZED_NAME_JSON) private Boolean json = false; @@ -323,6 +331,52 @@ public void setGcpKey(String gcpKey) { } + public GatewayUpdateItem gcpServiceAccountEmail(String gcpServiceAccountEmail) { + + this.gcpServiceAccountEmail = gcpServiceAccountEmail; + return this; + } + + /** + * The email of the gcp service account to rotate + * @return gcpServiceAccountEmail + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The email of the gcp service account to rotate") + + public String getGcpServiceAccountEmail() { + return gcpServiceAccountEmail; + } + + + public void setGcpServiceAccountEmail(String gcpServiceAccountEmail) { + this.gcpServiceAccountEmail = gcpServiceAccountEmail; + } + + + public GatewayUpdateItem gcpServiceAccountKeyId(String gcpServiceAccountKeyId) { + + this.gcpServiceAccountKeyId = gcpServiceAccountKeyId; + return this; + } + + /** + * The key id of the gcp service account to rotate + * @return gcpServiceAccountKeyId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The key id of the gcp service account to rotate") + + public String getGcpServiceAccountKeyId() { + return gcpServiceAccountKeyId; + } + + + public void setGcpServiceAccountKeyId(String gcpServiceAccountKeyId) { + this.gcpServiceAccountKeyId = gcpServiceAccountKeyId; + } + + public GatewayUpdateItem json(Boolean json) { this.json = json; @@ -716,6 +770,8 @@ public boolean equals(Object o) { Objects.equals(this.deleteProtection, gatewayUpdateItem.deleteProtection) && Objects.equals(this.description, gatewayUpdateItem.description) && Objects.equals(this.gcpKey, gatewayUpdateItem.gcpKey) && + Objects.equals(this.gcpServiceAccountEmail, gatewayUpdateItem.gcpServiceAccountEmail) && + Objects.equals(this.gcpServiceAccountKeyId, gatewayUpdateItem.gcpServiceAccountKeyId) && Objects.equals(this.json, gatewayUpdateItem.json) && Objects.equals(this.keepPrevVersion, gatewayUpdateItem.keepPrevVersion) && Objects.equals(this.key, gatewayUpdateItem.key) && @@ -736,7 +792,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(addTag, apiId, apiKey, autoRotate, customPayload, deleteProtection, description, gcpKey, json, keepPrevVersion, key, name, newMetadata, newName, newVersion, rmTag, rotatedPassword, rotatedUsername, rotationHour, rotationInterval, rotatorCredsType, token, type, uidToken); + return Objects.hash(addTag, apiId, apiKey, autoRotate, customPayload, deleteProtection, description, gcpKey, gcpServiceAccountEmail, gcpServiceAccountKeyId, json, keepPrevVersion, key, name, newMetadata, newName, newVersion, rmTag, rotatedPassword, rotatedUsername, rotationHour, rotationInterval, rotatorCredsType, token, type, uidToken); } @Override @@ -751,6 +807,8 @@ public String toString() { sb.append(" deleteProtection: ").append(toIndentedString(deleteProtection)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" gcpKey: ").append(toIndentedString(gcpKey)).append("\n"); + sb.append(" gcpServiceAccountEmail: ").append(toIndentedString(gcpServiceAccountEmail)).append("\n"); + sb.append(" gcpServiceAccountKeyId: ").append(toIndentedString(gcpServiceAccountKeyId)).append("\n"); sb.append(" json: ").append(toIndentedString(json)).append("\n"); sb.append(" keepPrevVersion: ").append(toIndentedString(keepPrevVersion)).append("\n"); sb.append(" key: ").append(toIndentedString(key)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/GatewayUpdateMigration.java b/src/main/java/io/akeyless/client/model/GatewayUpdateMigration.java index 80a117be..eb933134 100644 --- a/src/main/java/io/akeyless/client/model/GatewayUpdateMigration.java +++ b/src/main/java/io/akeyless/client/model/GatewayUpdateMigration.java @@ -56,6 +56,14 @@ public class GatewayUpdateMigration { @SerializedName(SERIALIZED_NAME_AD_DISCOVER_SERVICES) private String adDiscoverServices = "false"; + public static final String SERIALIZED_NAME_AD_DISCOVERY_TYPES = "ad-discovery-types"; + @SerializedName(SERIALIZED_NAME_AD_DISCOVERY_TYPES) + private List adDiscoveryTypes = null; + + public static final String SERIALIZED_NAME_AD_OS_FILTER = "ad-os-filter"; + @SerializedName(SERIALIZED_NAME_AD_OS_FILTER) + private String adOsFilter; + public static final String SERIALIZED_NAME_AD_SSH_PORT = "ad-ssh-port"; @SerializedName(SERIALIZED_NAME_AD_SSH_PORT) private String adSshPort = "22"; @@ -421,6 +429,60 @@ public void setAdDiscoverServices(String adDiscoverServices) { } + public GatewayUpdateMigration adDiscoveryTypes(List adDiscoveryTypes) { + + this.adDiscoveryTypes = adDiscoveryTypes; + return this; + } + + public GatewayUpdateMigration addAdDiscoveryTypesItem(String adDiscoveryTypesItem) { + if (this.adDiscoveryTypes == null) { + this.adDiscoveryTypes = new ArrayList(); + } + this.adDiscoveryTypes.add(adDiscoveryTypesItem); + return this; + } + + /** + * Set migration discovery types (domain-users, computers, local-users). (Relevant only for Active Directory migration) + * @return adDiscoveryTypes + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Set migration discovery types (domain-users, computers, local-users). (Relevant only for Active Directory migration)") + + public List getAdDiscoveryTypes() { + return adDiscoveryTypes; + } + + + public void setAdDiscoveryTypes(List adDiscoveryTypes) { + this.adDiscoveryTypes = adDiscoveryTypes; + } + + + public GatewayUpdateMigration adOsFilter(String adOsFilter) { + + this.adOsFilter = adOsFilter; + return this; + } + + /** + * Filter by Operating System to run the migration, can be used with wildcards, e.g. SRV20* (Relevant only for Active Directory migration) + * @return adOsFilter + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Filter by Operating System to run the migration, can be used with wildcards, e.g. SRV20* (Relevant only for Active Directory migration)") + + public String getAdOsFilter() { + return adOsFilter; + } + + + public void setAdOsFilter(String adOsFilter) { + this.adOsFilter = adOsFilter; + } + + public GatewayUpdateMigration adSshPort(String adSshPort) { this.adSshPort = adSshPort; @@ -566,11 +628,11 @@ public GatewayUpdateMigration adDiscoverLocalUsers(String adDiscoverLocalUsers) } /** - * Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) + * Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) Deprecated: use AdDiscoverTypes * @return adDiscoverLocalUsers **/ @javax.annotation.Nullable - @ApiModelProperty(value = "Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration)") + @ApiModelProperty(value = "Enable/Disable discovery of local users from each domain server and migrate them as SSH/Windows Rotated Secrets. Default is false: only domain users will be migrated. Discovery of local users might require further installation of SSH on the servers, based on the supplied computer base DN. This will be implemented automatically as part of the migration process (Relevant only for Active Directory migration) Deprecated: use AdDiscoverTypes") public String getAdDiscoverLocalUsers() { return adDiscoverLocalUsers; @@ -1710,6 +1772,8 @@ public boolean equals(Object o) { Objects.equals(this._1passwordUrl, gatewayUpdateMigration._1passwordUrl) && Objects.equals(this._1passwordVaults, gatewayUpdateMigration._1passwordVaults) && Objects.equals(this.adDiscoverServices, gatewayUpdateMigration.adDiscoverServices) && + Objects.equals(this.adDiscoveryTypes, gatewayUpdateMigration.adDiscoveryTypes) && + Objects.equals(this.adOsFilter, gatewayUpdateMigration.adOsFilter) && Objects.equals(this.adSshPort, gatewayUpdateMigration.adSshPort) && Objects.equals(this.adTargetsType, gatewayUpdateMigration.adTargetsType) && Objects.equals(this.adWinrmOverHttp, gatewayUpdateMigration.adWinrmOverHttp) && @@ -1768,7 +1832,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(_1passwordEmail, _1passwordPassword, _1passwordSecretKey, _1passwordUrl, _1passwordVaults, adDiscoverServices, adSshPort, adTargetsType, adWinrmOverHttp, adWinrmPort, adAutoRotate, adComputerBaseDn, adDiscoverLocalUsers, adDomainName, adDomainUsersPathTemplate, adLocalUsersIgnore, adLocalUsersPathTemplate, adRotationHour, adRotationInterval, adSraEnableRdp, adTargetName, adTargetsPathTemplate, adUserBaseDn, adUserGroups, awsKey, awsKeyId, awsRegion, azureClientId, azureKvName, azureSecret, azureTenantId, gcpKey, hashiJson, hashiNs, hashiToken, hashiUrl, id, json, k8sCaCertificate, k8sClientCertificate, k8sClientKey, k8sNamespace, k8sPassword, k8sSkipSystem, k8sToken, k8sUrl, k8sUsername, name, newName, protectionKey, siAutoRotate, siRotationHour, siRotationInterval, siSraEnableRdp, siTargetName, siUsersIgnore, siUsersPathTemplate, targetLocation, token, uidToken); + return Objects.hash(_1passwordEmail, _1passwordPassword, _1passwordSecretKey, _1passwordUrl, _1passwordVaults, adDiscoverServices, adDiscoveryTypes, adOsFilter, adSshPort, adTargetsType, adWinrmOverHttp, adWinrmPort, adAutoRotate, adComputerBaseDn, adDiscoverLocalUsers, adDomainName, adDomainUsersPathTemplate, adLocalUsersIgnore, adLocalUsersPathTemplate, adRotationHour, adRotationInterval, adSraEnableRdp, adTargetName, adTargetsPathTemplate, adUserBaseDn, adUserGroups, awsKey, awsKeyId, awsRegion, azureClientId, azureKvName, azureSecret, azureTenantId, gcpKey, hashiJson, hashiNs, hashiToken, hashiUrl, id, json, k8sCaCertificate, k8sClientCertificate, k8sClientKey, k8sNamespace, k8sPassword, k8sSkipSystem, k8sToken, k8sUrl, k8sUsername, name, newName, protectionKey, siAutoRotate, siRotationHour, siRotationInterval, siSraEnableRdp, siTargetName, siUsersIgnore, siUsersPathTemplate, targetLocation, token, uidToken); } @Override @@ -1781,6 +1845,8 @@ public String toString() { sb.append(" _1passwordUrl: ").append(toIndentedString(_1passwordUrl)).append("\n"); sb.append(" _1passwordVaults: ").append(toIndentedString(_1passwordVaults)).append("\n"); sb.append(" adDiscoverServices: ").append(toIndentedString(adDiscoverServices)).append("\n"); + sb.append(" adDiscoveryTypes: ").append(toIndentedString(adDiscoveryTypes)).append("\n"); + sb.append(" adOsFilter: ").append(toIndentedString(adOsFilter)).append("\n"); sb.append(" adSshPort: ").append(toIndentedString(adSshPort)).append("\n"); sb.append(" adTargetsType: ").append(toIndentedString(adTargetsType)).append("\n"); sb.append(" adWinrmOverHttp: ").append(toIndentedString(adWinrmOverHttp)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/GcpTargetDetails.java b/src/main/java/io/akeyless/client/model/GcpTargetDetails.java index 631ad905..571ec68b 100644 --- a/src/main/java/io/akeyless/client/model/GcpTargetDetails.java +++ b/src/main/java/io/akeyless/client/model/GcpTargetDetails.java @@ -41,6 +41,10 @@ public class GcpTargetDetails { @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_BASE64) private String gcpServiceAccountKeyBase64; + public static final String SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_ID = "gcp_service_account_key_id"; + @SerializedName(SERIALIZED_NAME_GCP_SERVICE_ACCOUNT_KEY_ID) + private String gcpServiceAccountKeyId; + public static final String SERIALIZED_NAME_USE_GW_CLOUD_IDENTITY = "use_gw_cloud_identity"; @SerializedName(SERIALIZED_NAME_USE_GW_CLOUD_IDENTITY) private Boolean useGwCloudIdentity; @@ -55,11 +59,11 @@ public GcpTargetDetails gcpServiceAccountEmail(String gcpServiceAccountEmail) { } /** - * deprecated + * Get gcpServiceAccountEmail * @return gcpServiceAccountEmail **/ @javax.annotation.Nullable - @ApiModelProperty(value = "deprecated") + @ApiModelProperty(value = "") public String getGcpServiceAccountEmail() { return gcpServiceAccountEmail; @@ -117,6 +121,29 @@ public void setGcpServiceAccountKeyBase64(String gcpServiceAccountKeyBase64) { } + public GcpTargetDetails gcpServiceAccountKeyId(String gcpServiceAccountKeyId) { + + this.gcpServiceAccountKeyId = gcpServiceAccountKeyId; + return this; + } + + /** + * Get gcpServiceAccountKeyId + * @return gcpServiceAccountKeyId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public String getGcpServiceAccountKeyId() { + return gcpServiceAccountKeyId; + } + + + public void setGcpServiceAccountKeyId(String gcpServiceAccountKeyId) { + this.gcpServiceAccountKeyId = gcpServiceAccountKeyId; + } + + public GcpTargetDetails useGwCloudIdentity(Boolean useGwCloudIdentity) { this.useGwCloudIdentity = useGwCloudIdentity; @@ -152,12 +179,13 @@ public boolean equals(Object o) { return Objects.equals(this.gcpServiceAccountEmail, gcpTargetDetails.gcpServiceAccountEmail) && Objects.equals(this.gcpServiceAccountKey, gcpTargetDetails.gcpServiceAccountKey) && Objects.equals(this.gcpServiceAccountKeyBase64, gcpTargetDetails.gcpServiceAccountKeyBase64) && + Objects.equals(this.gcpServiceAccountKeyId, gcpTargetDetails.gcpServiceAccountKeyId) && Objects.equals(this.useGwCloudIdentity, gcpTargetDetails.useGwCloudIdentity); } @Override public int hashCode() { - return Objects.hash(gcpServiceAccountEmail, gcpServiceAccountKey, gcpServiceAccountKeyBase64, useGwCloudIdentity); + return Objects.hash(gcpServiceAccountEmail, gcpServiceAccountKey, gcpServiceAccountKeyBase64, gcpServiceAccountKeyId, useGwCloudIdentity); } @Override @@ -167,6 +195,7 @@ public String toString() { sb.append(" gcpServiceAccountEmail: ").append(toIndentedString(gcpServiceAccountEmail)).append("\n"); sb.append(" gcpServiceAccountKey: ").append(toIndentedString(gcpServiceAccountKey)).append("\n"); sb.append(" gcpServiceAccountKeyBase64: ").append(toIndentedString(gcpServiceAccountKeyBase64)).append("\n"); + sb.append(" gcpServiceAccountKeyId: ").append(toIndentedString(gcpServiceAccountKeyId)).append("\n"); sb.append(" useGwCloudIdentity: ").append(toIndentedString(useGwCloudIdentity)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/io/akeyless/client/model/GenerateCsr.java b/src/main/java/io/akeyless/client/model/GenerateCsr.java index 1397e2c5..21ca4ba5 100644 --- a/src/main/java/io/akeyless/client/model/GenerateCsr.java +++ b/src/main/java/io/akeyless/client/model/GenerateCsr.java @@ -77,6 +77,10 @@ public class GenerateCsr { @SerializedName(SERIALIZED_NAME_JSON) private Boolean json = false; + public static final String SERIALIZED_NAME_KEY_TYPE = "key-type"; + @SerializedName(SERIALIZED_NAME_KEY_TYPE) + private String keyType = "classic-key"; + public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) private String name; @@ -85,6 +89,10 @@ public class GenerateCsr { @SerializedName(SERIALIZED_NAME_ORG) private String org; + public static final String SERIALIZED_NAME_SPLIT_LEVEL = "split-level"; + @SerializedName(SERIALIZED_NAME_SPLIT_LEVEL) + private Long splitLevel = 3l; + public static final String SERIALIZED_NAME_STATE = "state"; @SerializedName(SERIALIZED_NAME_STATE) private String state; @@ -380,6 +388,29 @@ public void setJson(Boolean json) { } + public GenerateCsr keyType(String keyType) { + + this.keyType = keyType; + return this; + } + + /** + * The type of the key to generate (classic-key/dfc) + * @return keyType + **/ + @javax.annotation.Nonnull + @ApiModelProperty(required = true, value = "The type of the key to generate (classic-key/dfc)") + + public String getKeyType() { + return keyType; + } + + + public void setKeyType(String keyType) { + this.keyType = keyType; + } + + public GenerateCsr name(String name) { this.name = name; @@ -426,6 +457,29 @@ public void setOrg(String org) { } + public GenerateCsr splitLevel(Long splitLevel) { + + this.splitLevel = splitLevel; + return this; + } + + /** + * The number of fragments that the item will be split into (not includes customer fragment) + * @return splitLevel + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The number of fragments that the item will be split into (not includes customer fragment)") + + public Long getSplitLevel() { + return splitLevel; + } + + + public void setSplitLevel(Long splitLevel) { + this.splitLevel = splitLevel; + } + + public GenerateCsr state(String state) { this.state = state; @@ -539,8 +593,10 @@ public boolean equals(Object o) { Objects.equals(this.generateKey, generateCsr.generateKey) && Objects.equals(this.ipAddresses, generateCsr.ipAddresses) && Objects.equals(this.json, generateCsr.json) && + Objects.equals(this.keyType, generateCsr.keyType) && Objects.equals(this.name, generateCsr.name) && Objects.equals(this.org, generateCsr.org) && + Objects.equals(this.splitLevel, generateCsr.splitLevel) && Objects.equals(this.state, generateCsr.state) && Objects.equals(this.token, generateCsr.token) && Objects.equals(this.uidToken, generateCsr.uidToken) && @@ -549,7 +605,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(alg, altNames, certificateType, city, commonName, country, critical, dep, emailAddresses, generateKey, ipAddresses, json, name, org, state, token, uidToken, uriSans); + return Objects.hash(alg, altNames, certificateType, city, commonName, country, critical, dep, emailAddresses, generateKey, ipAddresses, json, keyType, name, org, splitLevel, state, token, uidToken, uriSans); } @Override @@ -568,8 +624,10 @@ public String toString() { sb.append(" generateKey: ").append(toIndentedString(generateKey)).append("\n"); sb.append(" ipAddresses: ").append(toIndentedString(ipAddresses)).append("\n"); sb.append(" json: ").append(toIndentedString(json)).append("\n"); + sb.append(" keyType: ").append(toIndentedString(keyType)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" org: ").append(toIndentedString(org)).append("\n"); + sb.append(" splitLevel: ").append(toIndentedString(splitLevel)).append("\n"); sb.append(" state: ").append(toIndentedString(state)).append("\n"); sb.append(" token: ").append(toIndentedString(token)).append("\n"); sb.append(" uidToken: ").append(toIndentedString(uidToken)).append("\n"); diff --git a/src/main/java/io/akeyless/client/model/UpdateClassicKeyCertificate.java b/src/main/java/io/akeyless/client/model/UpdateClassicKeyCertificate.java new file mode 100644 index 00000000..2a6f2b30 --- /dev/null +++ b/src/main/java/io/akeyless/client/model/UpdateClassicKeyCertificate.java @@ -0,0 +1,217 @@ +/* + * Akeyless API + * The purpose of this application is to provide access to Akeyless API. + * + * The version of the OpenAPI document: 2.0 + * Contact: support@akeyless.io + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package io.akeyless.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.IOException; + +/** + * UpdateClassicKeyCertificate is a command that updates the certificate for a classic key + */ +@ApiModel(description = "UpdateClassicKeyCertificate is a command that updates the certificate for a classic key") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class UpdateClassicKeyCertificate { + public static final String SERIALIZED_NAME_CERT_FILE_DATA = "cert-file-data"; + @SerializedName(SERIALIZED_NAME_CERT_FILE_DATA) + private String certFileData; + + public static final String SERIALIZED_NAME_JSON = "json"; + @SerializedName(SERIALIZED_NAME_JSON) + private Boolean json = false; + + public static final String SERIALIZED_NAME_NAME = "name"; + @SerializedName(SERIALIZED_NAME_NAME) + private String name; + + public static final String SERIALIZED_NAME_TOKEN = "token"; + @SerializedName(SERIALIZED_NAME_TOKEN) + private String token; + + public static final String SERIALIZED_NAME_UID_TOKEN = "uid-token"; + @SerializedName(SERIALIZED_NAME_UID_TOKEN) + private String uidToken; + + public UpdateClassicKeyCertificate() { + } + + public UpdateClassicKeyCertificate certFileData(String certFileData) { + + this.certFileData = certFileData; + return this; + } + + /** + * PEM Certificate in a Base64 format. Used for updating RSA keys' certificates. + * @return certFileData + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "PEM Certificate in a Base64 format. Used for updating RSA keys' certificates.") + + public String getCertFileData() { + return certFileData; + } + + + public void setCertFileData(String certFileData) { + this.certFileData = certFileData; + } + + + public UpdateClassicKeyCertificate json(Boolean json) { + + this.json = json; + return this; + } + + /** + * Set output format to JSON + * @return json + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Set output format to JSON") + + public Boolean getJson() { + return json; + } + + + public void setJson(Boolean json) { + this.json = json; + } + + + public UpdateClassicKeyCertificate name(String name) { + + this.name = name; + return this; + } + + /** + * ClassicKey name + * @return name + **/ + @javax.annotation.Nonnull + @ApiModelProperty(required = true, value = "ClassicKey name") + + public String getName() { + return name; + } + + + public void setName(String name) { + this.name = name; + } + + + public UpdateClassicKeyCertificate token(String token) { + + this.token = token; + return this; + } + + /** + * Authentication token (see `/auth` and `/configure`) + * @return token + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Authentication token (see `/auth` and `/configure`)") + + public String getToken() { + return token; + } + + + public void setToken(String token) { + this.token = token; + } + + + public UpdateClassicKeyCertificate uidToken(String uidToken) { + + this.uidToken = uidToken; + return this; + } + + /** + * The universal identity token, Required only for universal_identity authentication + * @return uidToken + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "The universal identity token, Required only for universal_identity authentication") + + public String getUidToken() { + return uidToken; + } + + + public void setUidToken(String uidToken) { + this.uidToken = uidToken; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + UpdateClassicKeyCertificate updateClassicKeyCertificate = (UpdateClassicKeyCertificate) o; + return Objects.equals(this.certFileData, updateClassicKeyCertificate.certFileData) && + Objects.equals(this.json, updateClassicKeyCertificate.json) && + Objects.equals(this.name, updateClassicKeyCertificate.name) && + Objects.equals(this.token, updateClassicKeyCertificate.token) && + Objects.equals(this.uidToken, updateClassicKeyCertificate.uidToken); + } + + @Override + public int hashCode() { + return Objects.hash(certFileData, json, name, token, uidToken); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class UpdateClassicKeyCertificate {\n"); + sb.append(" certFileData: ").append(toIndentedString(certFileData)).append("\n"); + sb.append(" json: ").append(toIndentedString(json)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" token: ").append(toIndentedString(token)).append("\n"); + sb.append(" uidToken: ").append(toIndentedString(uidToken)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/src/test/java/io/akeyless/client/model/UpdateClassicKeyCertificateTest.java b/src/test/java/io/akeyless/client/model/UpdateClassicKeyCertificateTest.java new file mode 100644 index 00000000..93b4cca9 --- /dev/null +++ b/src/test/java/io/akeyless/client/model/UpdateClassicKeyCertificateTest.java @@ -0,0 +1,83 @@ +/* + * Akeyless API + * The purpose of this application is to provide access to Akeyless API. + * + * The version of the OpenAPI document: 2.0 + * Contact: support@akeyless.io + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package io.akeyless.client.model; + +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.IOException; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Model tests for UpdateClassicKeyCertificate + */ +public class UpdateClassicKeyCertificateTest { + private final UpdateClassicKeyCertificate model = new UpdateClassicKeyCertificate(); + + /** + * Model tests for UpdateClassicKeyCertificate + */ + @Test + public void testUpdateClassicKeyCertificate() { + // TODO: test UpdateClassicKeyCertificate + } + + /** + * Test the property 'certFileData' + */ + @Test + public void certFileDataTest() { + // TODO: test certFileData + } + + /** + * Test the property 'json' + */ + @Test + public void jsonTest() { + // TODO: test json + } + + /** + * Test the property 'name' + */ + @Test + public void nameTest() { + // TODO: test name + } + + /** + * Test the property 'token' + */ + @Test + public void tokenTest() { + // TODO: test token + } + + /** + * Test the property 'uidToken' + */ + @Test + public void uidTokenTest() { + // TODO: test uidToken + } + +}