Skip to content

Commit dde73b7

Browse files
author
Flexify
committed
v2.12.18-SNAPSHOT build 1249
1 parent 8fa4c26 commit dde73b7

File tree

6 files changed

+183
-59
lines changed

6 files changed

+183
-59
lines changed

‎docs/EndpointDetails.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Name | Type | Description | Notes
55
------------ | ------------- | ------------- | -------------
66
**accounts** | [**list[EndpointStorageAccount]**](EndpointStorageAccount.md) | | [optional]
77
**id** | **int** | Id | [optional]
8+
**key_vault_secret_id** | **str** | Key Vault secret ID where this credential secret is stored (only for admins) | [optional]
9+
**secret_in_key_vault** | **bool** | If secret credential is stored in Key Vault | [optional]
810
**settings** | [**EndpointSettingsRes**](EndpointSettingsRes.md) | Settings of endpoint |
911
**stat** | [**EndpointStat**](EndpointStat.md) | | [optional]
1012
**virtual_buckets** | [**list[VirtualBucket]**](VirtualBucket.md) | | [optional]

‎docs/StorageAccount.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
## Properties
44
Name | Type | Description | Notes
55
------------ | ------------- | ------------- | -------------
6-
**azure_key_vault_secret_id** | **str** | | [optional]
76
**id** | **int** | Id of the storage account | [optional]
8-
**is_sas** | **bool** | | [optional]
7+
**is_sas** | **bool** | For Azure - if credential is SAS signature (not included if storing in key vault) | [optional]
8+
**key_vault_secret_id** | **str** | Key Vault secret ID where this credential secret is stored (only for admins) | [optional]
99
**private_url** | **str** | URL used by engines to access the cloud | [optional]
1010
**provider** | [**StorageProvider**](StorageProvider.md) | Link to the storage provider (Amazon, Azure, etc) | [optional]
11+
**secret_in_key_vault** | **bool** | If secret credential is stored in Key Vault | [optional]
1112
**settings** | [**StorageAccountSettingsRes**](StorageAccountSettingsRes.md) | Configuration of this storage account | [optional]
1213
**stat** | [**StorageAccountStat**](StorageAccountStat.md) | Storage account state and statistics | [optional]
1314
**url** | **str** | URL to the cloud | [optional]

‎docs/StorageAccountWithBuckets.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
## Properties
44
Name | Type | Description | Notes
55
------------ | ------------- | ------------- | -------------
6-
**azure_key_vault_secret_id** | **str** | | [optional]
76
**buckets** | [**list[Bucket]**](Bucket.md) | Buckets that we have cached for this storage account | [optional]
87
**id** | **int** | Id of the storage account | [optional]
9-
**is_sas** | **bool** | | [optional]
8+
**is_sas** | **bool** | For Azure - if credential is SAS signature (not included if storing in key vault) | [optional]
9+
**key_vault_secret_id** | **str** | Key Vault secret ID where this credential secret is stored (only for admins) | [optional]
1010
**private_url** | **str** | URL used by engines to access the cloud | [optional]
1111
**provider** | [**StorageProvider**](StorageProvider.md) | Link to the storage provider (Amazon, Azure, etc) | [optional]
12+
**secret_in_key_vault** | **bool** | If secret credential is stored in Key Vault | [optional]
1213
**settings** | [**StorageAccountSettingsRes**](StorageAccountSettingsRes.md) | Configuration of this storage account | [optional]
1314
**stat** | [**StorageAccountStat**](StorageAccountStat.md) | Storage account state and statistics | [optional]
1415
**url** | **str** | URL to the cloud | [optional]

‎flexify_api/models/endpoint_details.py

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ class EndpointDetails(object):
3535
swagger_types = {
3636
'accounts': 'list[EndpointStorageAccount]',
3737
'id': 'int',
38+
'key_vault_secret_id': 'str',
39+
'secret_in_key_vault': 'bool',
3840
'settings': 'EndpointSettingsRes',
3941
'stat': 'EndpointStat',
4042
'virtual_buckets': 'list[VirtualBucket]'
@@ -43,19 +45,23 @@ class EndpointDetails(object):
4345
attribute_map = {
4446
'accounts': 'accounts',
4547
'id': 'id',
48+
'key_vault_secret_id': 'keyVaultSecretId',
49+
'secret_in_key_vault': 'secretInKeyVault',
4650
'settings': 'settings',
4751
'stat': 'stat',
4852
'virtual_buckets': 'virtualBuckets'
4953
}
5054

51-
def __init__(self, accounts=None, id=None, settings=None, stat=None, virtual_buckets=None, _configuration=None): # noqa: E501
55+
def __init__(self, accounts=None, id=None, key_vault_secret_id=None, secret_in_key_vault=None, settings=None, stat=None, virtual_buckets=None, _configuration=None): # noqa: E501
5256
"""EndpointDetails - a model defined in Swagger""" # noqa: E501
5357
if _configuration is None:
5458
_configuration = Configuration()
5559
self._configuration = _configuration
5660

5761
self._accounts = None
5862
self._id = None
63+
self._key_vault_secret_id = None
64+
self._secret_in_key_vault = None
5965
self._settings = None
6066
self._stat = None
6167
self._virtual_buckets = None
@@ -65,6 +71,10 @@ def __init__(self, accounts=None, id=None, settings=None, stat=None, virtual_buc
6571
self.accounts = accounts
6672
if id is not None:
6773
self.id = id
74+
if key_vault_secret_id is not None:
75+
self.key_vault_secret_id = key_vault_secret_id
76+
if secret_in_key_vault is not None:
77+
self.secret_in_key_vault = secret_in_key_vault
6878
self.settings = settings
6979
if stat is not None:
7080
self.stat = stat
@@ -115,6 +125,52 @@ def id(self, id):
115125

116126
self._id = id
117127

128+
@property
129+
def key_vault_secret_id(self):
130+
"""Gets the key_vault_secret_id of this EndpointDetails. # noqa: E501
131+
132+
Key Vault secret ID where this credential secret is stored (only for admins) # noqa: E501
133+
134+
:return: The key_vault_secret_id of this EndpointDetails. # noqa: E501
135+
:rtype: str
136+
"""
137+
return self._key_vault_secret_id
138+
139+
@key_vault_secret_id.setter
140+
def key_vault_secret_id(self, key_vault_secret_id):
141+
"""Sets the key_vault_secret_id of this EndpointDetails.
142+
143+
Key Vault secret ID where this credential secret is stored (only for admins) # noqa: E501
144+
145+
:param key_vault_secret_id: The key_vault_secret_id of this EndpointDetails. # noqa: E501
146+
:type: str
147+
"""
148+
149+
self._key_vault_secret_id = key_vault_secret_id
150+
151+
@property
152+
def secret_in_key_vault(self):
153+
"""Gets the secret_in_key_vault of this EndpointDetails. # noqa: E501
154+
155+
If secret credential is stored in Key Vault # noqa: E501
156+
157+
:return: The secret_in_key_vault of this EndpointDetails. # noqa: E501
158+
:rtype: bool
159+
"""
160+
return self._secret_in_key_vault
161+
162+
@secret_in_key_vault.setter
163+
def secret_in_key_vault(self, secret_in_key_vault):
164+
"""Sets the secret_in_key_vault of this EndpointDetails.
165+
166+
If secret credential is stored in Key Vault # noqa: E501
167+
168+
:param secret_in_key_vault: The secret_in_key_vault of this EndpointDetails. # noqa: E501
169+
:type: bool
170+
"""
171+
172+
self._secret_in_key_vault = secret_in_key_vault
173+
118174
@property
119175
def settings(self):
120176
"""Gets the settings of this EndpointDetails. # noqa: E501

‎flexify_api/models/storage_account.py

Lines changed: 59 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,81 +33,65 @@ class StorageAccount(object):
3333
and the value is json key in definition.
3434
"""
3535
swagger_types = {
36-
'azure_key_vault_secret_id': 'str',
3736
'id': 'int',
3837
'is_sas': 'bool',
38+
'key_vault_secret_id': 'str',
3939
'private_url': 'str',
4040
'provider': 'StorageProvider',
41+
'secret_in_key_vault': 'bool',
4142
'settings': 'StorageAccountSettingsRes',
4243
'stat': 'StorageAccountStat',
4344
'url': 'str'
4445
}
4546

4647
attribute_map = {
47-
'azure_key_vault_secret_id': 'azureKeyVaultSecretId',
4848
'id': 'id',
4949
'is_sas': 'isSas',
50+
'key_vault_secret_id': 'keyVaultSecretId',
5051
'private_url': 'privateUrl',
5152
'provider': 'provider',
53+
'secret_in_key_vault': 'secretInKeyVault',
5254
'settings': 'settings',
5355
'stat': 'stat',
5456
'url': 'url'
5557
}
5658

57-
def __init__(self, azure_key_vault_secret_id=None, id=None, is_sas=None, private_url=None, provider=None, settings=None, stat=None, url=None, _configuration=None): # noqa: E501
59+
def __init__(self, id=None, is_sas=None, key_vault_secret_id=None, private_url=None, provider=None, secret_in_key_vault=None, settings=None, stat=None, url=None, _configuration=None): # noqa: E501
5860
"""StorageAccount - a model defined in Swagger""" # noqa: E501
5961
if _configuration is None:
6062
_configuration = Configuration()
6163
self._configuration = _configuration
6264

63-
self._azure_key_vault_secret_id = None
6465
self._id = None
6566
self._is_sas = None
67+
self._key_vault_secret_id = None
6668
self._private_url = None
6769
self._provider = None
70+
self._secret_in_key_vault = None
6871
self._settings = None
6972
self._stat = None
7073
self._url = None
7174
self.discriminator = None
7275

73-
if azure_key_vault_secret_id is not None:
74-
self.azure_key_vault_secret_id = azure_key_vault_secret_id
7576
if id is not None:
7677
self.id = id
7778
if is_sas is not None:
7879
self.is_sas = is_sas
80+
if key_vault_secret_id is not None:
81+
self.key_vault_secret_id = key_vault_secret_id
7982
if private_url is not None:
8083
self.private_url = private_url
8184
if provider is not None:
8285
self.provider = provider
86+
if secret_in_key_vault is not None:
87+
self.secret_in_key_vault = secret_in_key_vault
8388
if settings is not None:
8489
self.settings = settings
8590
if stat is not None:
8691
self.stat = stat
8792
if url is not None:
8893
self.url = url
8994

90-
@property
91-
def azure_key_vault_secret_id(self):
92-
"""Gets the azure_key_vault_secret_id of this StorageAccount. # noqa: E501
93-
94-
95-
:return: The azure_key_vault_secret_id of this StorageAccount. # noqa: E501
96-
:rtype: str
97-
"""
98-
return self._azure_key_vault_secret_id
99-
100-
@azure_key_vault_secret_id.setter
101-
def azure_key_vault_secret_id(self, azure_key_vault_secret_id):
102-
"""Sets the azure_key_vault_secret_id of this StorageAccount.
103-
104-
105-
:param azure_key_vault_secret_id: The azure_key_vault_secret_id of this StorageAccount. # noqa: E501
106-
:type: str
107-
"""
108-
109-
self._azure_key_vault_secret_id = azure_key_vault_secret_id
110-
11195
@property
11296
def id(self):
11397
"""Gets the id of this StorageAccount. # noqa: E501
@@ -135,6 +119,7 @@ def id(self, id):
135119
def is_sas(self):
136120
"""Gets the is_sas of this StorageAccount. # noqa: E501
137121
122+
For Azure - if credential is SAS signature (not included if storing in key vault) # noqa: E501
138123
139124
:return: The is_sas of this StorageAccount. # noqa: E501
140125
:rtype: bool
@@ -145,13 +130,37 @@ def is_sas(self):
145130
def is_sas(self, is_sas):
146131
"""Sets the is_sas of this StorageAccount.
147132
133+
For Azure - if credential is SAS signature (not included if storing in key vault) # noqa: E501
148134
149135
:param is_sas: The is_sas of this StorageAccount. # noqa: E501
150136
:type: bool
151137
"""
152138

153139
self._is_sas = is_sas
154140

141+
@property
142+
def key_vault_secret_id(self):
143+
"""Gets the key_vault_secret_id of this StorageAccount. # noqa: E501
144+
145+
Key Vault secret ID where this credential secret is stored (only for admins) # noqa: E501
146+
147+
:return: The key_vault_secret_id of this StorageAccount. # noqa: E501
148+
:rtype: str
149+
"""
150+
return self._key_vault_secret_id
151+
152+
@key_vault_secret_id.setter
153+
def key_vault_secret_id(self, key_vault_secret_id):
154+
"""Sets the key_vault_secret_id of this StorageAccount.
155+
156+
Key Vault secret ID where this credential secret is stored (only for admins) # noqa: E501
157+
158+
:param key_vault_secret_id: The key_vault_secret_id of this StorageAccount. # noqa: E501
159+
:type: str
160+
"""
161+
162+
self._key_vault_secret_id = key_vault_secret_id
163+
155164
@property
156165
def private_url(self):
157166
"""Gets the private_url of this StorageAccount. # noqa: E501
@@ -198,6 +207,29 @@ def provider(self, provider):
198207

199208
self._provider = provider
200209

210+
@property
211+
def secret_in_key_vault(self):
212+
"""Gets the secret_in_key_vault of this StorageAccount. # noqa: E501
213+
214+
If secret credential is stored in Key Vault # noqa: E501
215+
216+
:return: The secret_in_key_vault of this StorageAccount. # noqa: E501
217+
:rtype: bool
218+
"""
219+
return self._secret_in_key_vault
220+
221+
@secret_in_key_vault.setter
222+
def secret_in_key_vault(self, secret_in_key_vault):
223+
"""Sets the secret_in_key_vault of this StorageAccount.
224+
225+
If secret credential is stored in Key Vault # noqa: E501
226+
227+
:param secret_in_key_vault: The secret_in_key_vault of this StorageAccount. # noqa: E501
228+
:type: bool
229+
"""
230+
231+
self._secret_in_key_vault = secret_in_key_vault
232+
201233
@property
202234
def settings(self):
203235
"""Gets the settings of this StorageAccount. # noqa: E501

0 commit comments

Comments
 (0)