|
5 | 5 | from typing import Optional, Union |
6 | 6 |
|
7 | 7 | from gvm._enum import Enum |
8 | | -from gvm.errors import RequiredArgument |
| 8 | +from gvm.errors import InvalidArgument, RequiredArgument |
9 | 9 | from gvm.protocols.core import Request |
10 | 10 | from gvm.utils import to_bool |
11 | 11 | from gvm.xml import XmlCommand |
@@ -103,33 +103,39 @@ def create_credential_store_credential( |
103 | 103 | cmd.add_element("allow_insecure", to_bool(allow_insecure)) |
104 | 104 |
|
105 | 105 | if ( |
106 | | - credential_type == CredentialStoreCredentialType.CLIENT_CERTIFICATE |
107 | | - or credential_type == CredentialStoreCredentialType.SNMP |
108 | | - or credential_type |
109 | | - == CredentialStoreCredentialType.USERNAME_PASSWORD |
110 | | - or credential_type == CredentialStoreCredentialType.USERNAME_SSH_KEY |
111 | | - or credential_type |
112 | | - == CredentialStoreCredentialType.SMIME_CERTIFICATE |
113 | | - or credential_type |
114 | | - == CredentialStoreCredentialType.PGP_ENCRYPTION_KEY |
115 | | - or credential_type == CredentialStoreCredentialType.PASSWORD_ONLY |
| 106 | + credential_type != CredentialStoreCredentialType.CLIENT_CERTIFICATE |
| 107 | + and credential_type != CredentialStoreCredentialType.SNMP |
| 108 | + and credential_type |
| 109 | + != CredentialStoreCredentialType.USERNAME_PASSWORD |
| 110 | + and credential_type |
| 111 | + != CredentialStoreCredentialType.USERNAME_SSH_KEY |
| 112 | + and credential_type |
| 113 | + != CredentialStoreCredentialType.SMIME_CERTIFICATE |
| 114 | + and credential_type |
| 115 | + != CredentialStoreCredentialType.PGP_ENCRYPTION_KEY |
| 116 | + and credential_type != CredentialStoreCredentialType.PASSWORD_ONLY |
116 | 117 | ): |
117 | | - if not vault_id: |
118 | | - raise RequiredArgument( |
119 | | - function=cls.create_credential.__name__, |
120 | | - argument="vault_id", |
121 | | - ) |
122 | | - if not host_identifier: |
123 | | - raise RequiredArgument( |
124 | | - function=cls.create_credential.__name__, |
125 | | - argument="host_identifier", |
126 | | - ) |
| 118 | + raise InvalidArgument( |
| 119 | + function=cls.create_credential.__name__, |
| 120 | + argument="credential_type", |
| 121 | + ) |
| 122 | + |
| 123 | + if not vault_id: |
| 124 | + raise RequiredArgument( |
| 125 | + function=cls.create_credential.__name__, |
| 126 | + argument="vault_id", |
| 127 | + ) |
| 128 | + if not host_identifier: |
| 129 | + raise RequiredArgument( |
| 130 | + function=cls.create_credential.__name__, |
| 131 | + argument="host_identifier", |
| 132 | + ) |
127 | 133 |
|
128 | | - if credential_store_id: |
129 | | - cmd.add_element("credential_store_id", str(credential_store_id)) |
| 134 | + if credential_store_id: |
| 135 | + cmd.add_element("credential_store_id", str(credential_store_id)) |
130 | 136 |
|
131 | | - cmd.add_element("vault_id", vault_id) |
132 | | - cmd.add_element("host_identifier", host_identifier) |
| 137 | + cmd.add_element("vault_id", vault_id) |
| 138 | + cmd.add_element("host_identifier", host_identifier) |
133 | 139 |
|
134 | 140 | return cmd |
135 | 141 |
|
|
0 commit comments