Skip to content

Commit e7ca777

Browse files
scaleway-botscaleway-bot
authored
fix(secret_manager): change secret type names to avoid conflicts in sdk (#492)
1 parent 4b80993 commit e7ca777

File tree

4 files changed

+106
-106
lines changed

4 files changed

+106
-106
lines changed

‎scaleway-async/scaleway_async/secret/v1beta1/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
from .types import AccessSecretVersionRequest
1919
from .types import AccessSecretVersionResponse
2020
from .types import AddSecretOwnerRequest
21+
from .types import BasicCredentials
2122
from .types import BrowseSecretsRequest
2223
from .types import BrowseSecretsResponse
2324
from .types import CreateSecretRequest
2425
from .types import CreateSecretVersionRequest
26+
from .types import DatabaseCredentials
2527
from .types import DeleteSecretRequest
2628
from .types import DeleteSecretVersionRequest
2729
from .types import DisableSecretVersionRequest
@@ -35,9 +37,7 @@
3537
from .types import ListTagsRequest
3638
from .types import ListTagsResponse
3739
from .types import ProtectSecretRequest
38-
from .types import SecretTypeBasicCredentials
39-
from .types import SecretTypeDatabaseCredentials
40-
from .types import SecretTypeSSHKey
40+
from .types import SSHKey
4141
from .types import UnprotectSecretRequest
4242
from .types import UpdateSecretRequest
4343
from .types import UpdateSecretVersionRequest
@@ -62,10 +62,12 @@
6262
"AccessSecretVersionRequest",
6363
"AccessSecretVersionResponse",
6464
"AddSecretOwnerRequest",
65+
"BasicCredentials",
6566
"BrowseSecretsRequest",
6667
"BrowseSecretsResponse",
6768
"CreateSecretRequest",
6869
"CreateSecretVersionRequest",
70+
"DatabaseCredentials",
6971
"DeleteSecretRequest",
7072
"DeleteSecretVersionRequest",
7173
"DisableSecretVersionRequest",
@@ -79,9 +81,7 @@
7981
"ListTagsRequest",
8082
"ListTagsResponse",
8183
"ProtectSecretRequest",
82-
"SecretTypeBasicCredentials",
83-
"SecretTypeDatabaseCredentials",
84-
"SecretTypeSSHKey",
84+
"SSHKey",
8585
"UnprotectSecretRequest",
8686
"UpdateSecretRequest",
8787
"UpdateSecretVersionRequest",

‎scaleway-async/scaleway_async/secret/v1beta1/types.py‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,19 @@ class AddSecretOwnerRequest:
378378
"""
379379

380380

381+
@dataclass
382+
class BasicCredentials:
383+
username: str
384+
"""
385+
The username or identifier associated with the credentials.
386+
"""
387+
388+
password: str
389+
"""
390+
The password associated with the credentials.
391+
"""
392+
393+
381394
@dataclass
382395
class BrowseSecretsRequest:
383396
prefix: str
@@ -506,6 +519,39 @@ class CreateSecretVersionRequest:
506519
"""
507520

508521

522+
@dataclass
523+
class DatabaseCredentials:
524+
engine: str
525+
"""
526+
Supported database engines are: 'postgres', 'mysql', 'other'.
527+
"""
528+
529+
username: str
530+
"""
531+
The username used to authenticate to the database server.
532+
"""
533+
534+
password: str
535+
"""
536+
The password used to authenticate to the database server.
537+
"""
538+
539+
host: str
540+
"""
541+
The hostname or resolvable DNS name of the database server.
542+
"""
543+
544+
dbname: str
545+
"""
546+
The name of the database to connect to.
547+
"""
548+
549+
port: str
550+
"""
551+
The port must be an integer ranging from 0 to 65535.
552+
"""
553+
554+
509555
@dataclass
510556
class DeleteSecretRequest:
511557
secret_id: str
@@ -757,53 +803,7 @@ class ProtectSecretRequest:
757803

758804

759805
@dataclass
760-
class SecretTypeBasicCredentials:
761-
username: str
762-
"""
763-
The username or identifier associated with the credentials.
764-
"""
765-
766-
password: str
767-
"""
768-
The password associated with the credentials.
769-
"""
770-
771-
772-
@dataclass
773-
class SecretTypeDatabaseCredentials:
774-
engine: str
775-
"""
776-
Supported database engines are: 'postgres', 'mysql', 'other'.
777-
"""
778-
779-
username: str
780-
"""
781-
The username used to authenticate to the database server.
782-
"""
783-
784-
password: str
785-
"""
786-
The password used to authenticate to the database server.
787-
"""
788-
789-
host: str
790-
"""
791-
The hostname or resolvable DNS name of the database server.
792-
"""
793-
794-
dbname: str
795-
"""
796-
The name of the database to connect to.
797-
"""
798-
799-
port: str
800-
"""
801-
The port must be an integer ranging from 0 to 65535.
802-
"""
803-
804-
805-
@dataclass
806-
class SecretTypeSSHKey:
806+
class SSHKey:
807807
ssh_private_key: str
808808
"""
809809
The private SSH key.

‎scaleway/scaleway/secret/v1beta1/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
from .types import AccessSecretVersionRequest
1919
from .types import AccessSecretVersionResponse
2020
from .types import AddSecretOwnerRequest
21+
from .types import BasicCredentials
2122
from .types import BrowseSecretsRequest
2223
from .types import BrowseSecretsResponse
2324
from .types import CreateSecretRequest
2425
from .types import CreateSecretVersionRequest
26+
from .types import DatabaseCredentials
2527
from .types import DeleteSecretRequest
2628
from .types import DeleteSecretVersionRequest
2729
from .types import DisableSecretVersionRequest
@@ -35,9 +37,7 @@
3537
from .types import ListTagsRequest
3638
from .types import ListTagsResponse
3739
from .types import ProtectSecretRequest
38-
from .types import SecretTypeBasicCredentials
39-
from .types import SecretTypeDatabaseCredentials
40-
from .types import SecretTypeSSHKey
40+
from .types import SSHKey
4141
from .types import UnprotectSecretRequest
4242
from .types import UpdateSecretRequest
4343
from .types import UpdateSecretVersionRequest
@@ -62,10 +62,12 @@
6262
"AccessSecretVersionRequest",
6363
"AccessSecretVersionResponse",
6464
"AddSecretOwnerRequest",
65+
"BasicCredentials",
6566
"BrowseSecretsRequest",
6667
"BrowseSecretsResponse",
6768
"CreateSecretRequest",
6869
"CreateSecretVersionRequest",
70+
"DatabaseCredentials",
6971
"DeleteSecretRequest",
7072
"DeleteSecretVersionRequest",
7173
"DisableSecretVersionRequest",
@@ -79,9 +81,7 @@
7981
"ListTagsRequest",
8082
"ListTagsResponse",
8183
"ProtectSecretRequest",
82-
"SecretTypeBasicCredentials",
83-
"SecretTypeDatabaseCredentials",
84-
"SecretTypeSSHKey",
84+
"SSHKey",
8585
"UnprotectSecretRequest",
8686
"UpdateSecretRequest",
8787
"UpdateSecretVersionRequest",

‎scaleway/scaleway/secret/v1beta1/types.py‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,19 @@ class AddSecretOwnerRequest:
378378
"""
379379

380380

381+
@dataclass
382+
class BasicCredentials:
383+
username: str
384+
"""
385+
The username or identifier associated with the credentials.
386+
"""
387+
388+
password: str
389+
"""
390+
The password associated with the credentials.
391+
"""
392+
393+
381394
@dataclass
382395
class BrowseSecretsRequest:
383396
prefix: str
@@ -506,6 +519,39 @@ class CreateSecretVersionRequest:
506519
"""
507520

508521

522+
@dataclass
523+
class DatabaseCredentials:
524+
engine: str
525+
"""
526+
Supported database engines are: 'postgres', 'mysql', 'other'.
527+
"""
528+
529+
username: str
530+
"""
531+
The username used to authenticate to the database server.
532+
"""
533+
534+
password: str
535+
"""
536+
The password used to authenticate to the database server.
537+
"""
538+
539+
host: str
540+
"""
541+
The hostname or resolvable DNS name of the database server.
542+
"""
543+
544+
dbname: str
545+
"""
546+
The name of the database to connect to.
547+
"""
548+
549+
port: str
550+
"""
551+
The port must be an integer ranging from 0 to 65535.
552+
"""
553+
554+
509555
@dataclass
510556
class DeleteSecretRequest:
511557
secret_id: str
@@ -757,53 +803,7 @@ class ProtectSecretRequest:
757803

758804

759805
@dataclass
760-
class SecretTypeBasicCredentials:
761-
username: str
762-
"""
763-
The username or identifier associated with the credentials.
764-
"""
765-
766-
password: str
767-
"""
768-
The password associated with the credentials.
769-
"""
770-
771-
772-
@dataclass
773-
class SecretTypeDatabaseCredentials:
774-
engine: str
775-
"""
776-
Supported database engines are: 'postgres', 'mysql', 'other'.
777-
"""
778-
779-
username: str
780-
"""
781-
The username used to authenticate to the database server.
782-
"""
783-
784-
password: str
785-
"""
786-
The password used to authenticate to the database server.
787-
"""
788-
789-
host: str
790-
"""
791-
The hostname or resolvable DNS name of the database server.
792-
"""
793-
794-
dbname: str
795-
"""
796-
The name of the database to connect to.
797-
"""
798-
799-
port: str
800-
"""
801-
The port must be an integer ranging from 0 to 65535.
802-
"""
803-
804-
805-
@dataclass
806-
class SecretTypeSSHKey:
806+
class SSHKey:
807807
ssh_private_key: str
808808
"""
809809
The private SSH key.

0 commit comments

Comments
 (0)