Skip to content

Commit 74e1315

Browse files
scaleway-botscaleway-bot
authored
revert(cockpit): set back external enum (#761)
1 parent c858e72 commit 74e1315

File tree

8 files changed

+2
-164
lines changed

8 files changed

+2
-164
lines changed

‎scaleway-async/scaleway_async/cockpit/v1/__init__.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from .types import Token
2323
from .types import Usage
2424
from .types import AlertManager
25-
from .types import CockpitMetrics
2625
from .types import GetConfigResponse
2726
from .types import GlobalApiCreateGrafanaUserRequest
2827
from .types import GlobalApiDeleteGrafanaUserRequest
@@ -54,7 +53,6 @@
5453
from .types import RegionalApiEnableAlertManagerRequest
5554
from .types import RegionalApiEnableManagedAlertsRequest
5655
from .types import RegionalApiGetAlertManagerRequest
57-
from .types import RegionalApiGetCockpitMetricsRequest
5856
from .types import RegionalApiGetConfigRequest
5957
from .types import RegionalApiGetDataSourceRequest
6058
from .types import RegionalApiGetTokenRequest
@@ -92,7 +90,6 @@
9290
"Token",
9391
"Usage",
9492
"AlertManager",
95-
"CockpitMetrics",
9693
"GetConfigResponse",
9794
"GlobalApiCreateGrafanaUserRequest",
9895
"GlobalApiDeleteGrafanaUserRequest",
@@ -124,7 +121,6 @@
124121
"RegionalApiEnableAlertManagerRequest",
125122
"RegionalApiEnableManagedAlertsRequest",
126123
"RegionalApiGetAlertManagerRequest",
127-
"RegionalApiGetCockpitMetricsRequest",
128124
"RegionalApiGetConfigRequest",
129125
"RegionalApiGetDataSourceRequest",
130126
"RegionalApiGetTokenRequest",

‎scaleway-async/scaleway_async/cockpit/v1/api.py‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# This file was automatically generated. DO NOT EDIT.
22
# If you have any remark or suggestion do not hesitate to open an issue.
33

4-
from datetime import datetime
54
from typing import List, Optional
65

76
from scaleway_core.api import API
@@ -25,7 +24,6 @@
2524
TokenScope,
2625
Alert,
2726
AlertManager,
28-
CockpitMetrics,
2927
ContactPoint,
3028
ContactPointEmail,
3129
DataSource,
@@ -66,7 +64,6 @@
6664
unmarshal_Plan,
6765
unmarshal_Token,
6866
unmarshal_AlertManager,
69-
unmarshal_CockpitMetrics,
7067
unmarshal_GetConfigResponse,
7168
unmarshal_Grafana,
7269
unmarshal_ListContactPointsResponse,
@@ -1578,40 +1575,3 @@ async def trigger_test_alert(
15781575
)
15791576

15801577
self._throw_on_error(res)
1581-
1582-
async def get_cockpit_metrics(
1583-
self,
1584-
*,
1585-
query: str,
1586-
project_id: Optional[str] = None,
1587-
start_date: Optional[datetime] = None,
1588-
end_date: Optional[datetime] = None,
1589-
) -> CockpitMetrics:
1590-
"""
1591-
:param query:
1592-
:param project_id:
1593-
:param start_date:
1594-
:param end_date:
1595-
:return: :class:`CockpitMetrics <CockpitMetrics>`
1596-
1597-
Usage:
1598-
::
1599-
1600-
result = await api.get_cockpit_metrics(
1601-
query="example",
1602-
)
1603-
"""
1604-
1605-
res = self._request(
1606-
"GET",
1607-
"/cockpit/v1beta1/cockpit/metrics",
1608-
params={
1609-
"end_date": end_date,
1610-
"project_id": project_id or self.client.default_project_id,
1611-
"query": query,
1612-
"start_date": start_date,
1613-
},
1614-
)
1615-
1616-
self._throw_on_error(res)
1617-
return unmarshal_CockpitMetrics(res.json())

‎scaleway-async/scaleway_async/cockpit/v1/marshalling.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
from dateutil import parser
66

77
from scaleway_core.profile import ProfileDefaults
8-
from scaleway_core.bridge import (
9-
unmarshal_TimeSeries,
10-
)
118
from scaleway_core.utils import (
129
OneOfPossibility,
1310
resolve_one_of,
@@ -22,7 +19,6 @@
2219
Plan,
2320
Token,
2421
AlertManager,
25-
CockpitMetrics,
2622
GetConfigResponseRetention,
2723
GetConfigResponse,
2824
Grafana,
@@ -335,23 +331,6 @@ def unmarshal_AlertManager(data: Any) -> AlertManager:
335331
return AlertManager(**args)
336332

337333

338-
def unmarshal_CockpitMetrics(data: Any) -> CockpitMetrics:
339-
if not isinstance(data, dict):
340-
raise TypeError(
341-
"Unmarshalling the type 'CockpitMetrics' failed as data isn't a dictionary."
342-
)
343-
344-
args: Dict[str, Any] = {}
345-
346-
field = data.get("timeseries", None)
347-
if field is not None:
348-
args["timeseries"] = (
349-
[unmarshal_TimeSeries(v) for v in field] if field is not None else None
350-
)
351-
352-
return CockpitMetrics(**args)
353-
354-
355334
def unmarshal_GetConfigResponseRetention(data: Any) -> GetConfigResponseRetention:
356335
if not isinstance(data, dict):
357336
raise TypeError(

‎scaleway-async/scaleway_async/cockpit/v1/types.py‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from scaleway_core.bridge import (
1111
Region,
12-
TimeSeries,
1312
)
1413
from scaleway_core.utils import (
1514
StrEnumMeta,
@@ -19,6 +18,7 @@
1918
class DataSourceOrigin(str, Enum, metaclass=StrEnumMeta):
2019
UNKNOWN_ORIGIN = "unknown_origin"
2120
SCALEWAY = "scaleway"
21+
EXTERNAL = "external"
2222
CUSTOM = "custom"
2323

2424
def __str__(self) -> str:
@@ -459,11 +459,6 @@ class AlertManager:
459459
"""
460460

461461

462-
@dataclass
463-
class CockpitMetrics:
464-
timeseries: List[TimeSeries]
465-
466-
467462
@dataclass
468463
class GetConfigResponse:
469464
"""
@@ -1052,17 +1047,6 @@ class RegionalApiGetAlertManagerRequest:
10521047
"""
10531048

10541049

1055-
@dataclass
1056-
class RegionalApiGetCockpitMetricsRequest:
1057-
query: str
1058-
1059-
project_id: Optional[str]
1060-
1061-
start_date: Optional[datetime]
1062-
1063-
end_date: Optional[datetime]
1064-
1065-
10661050
@dataclass
10671051
class RegionalApiGetConfigRequest:
10681052
"""

‎scaleway/scaleway/cockpit/v1/__init__.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from .types import Token
2323
from .types import Usage
2424
from .types import AlertManager
25-
from .types import CockpitMetrics
2625
from .types import GetConfigResponse
2726
from .types import GlobalApiCreateGrafanaUserRequest
2827
from .types import GlobalApiDeleteGrafanaUserRequest
@@ -54,7 +53,6 @@
5453
from .types import RegionalApiEnableAlertManagerRequest
5554
from .types import RegionalApiEnableManagedAlertsRequest
5655
from .types import RegionalApiGetAlertManagerRequest
57-
from .types import RegionalApiGetCockpitMetricsRequest
5856
from .types import RegionalApiGetConfigRequest
5957
from .types import RegionalApiGetDataSourceRequest
6058
from .types import RegionalApiGetTokenRequest
@@ -92,7 +90,6 @@
9290
"Token",
9391
"Usage",
9492
"AlertManager",
95-
"CockpitMetrics",
9693
"GetConfigResponse",
9794
"GlobalApiCreateGrafanaUserRequest",
9895
"GlobalApiDeleteGrafanaUserRequest",
@@ -124,7 +121,6 @@
124121
"RegionalApiEnableAlertManagerRequest",
125122
"RegionalApiEnableManagedAlertsRequest",
126123
"RegionalApiGetAlertManagerRequest",
127-
"RegionalApiGetCockpitMetricsRequest",
128124
"RegionalApiGetConfigRequest",
129125
"RegionalApiGetDataSourceRequest",
130126
"RegionalApiGetTokenRequest",

‎scaleway/scaleway/cockpit/v1/api.py‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# This file was automatically generated. DO NOT EDIT.
22
# If you have any remark or suggestion do not hesitate to open an issue.
33

4-
from datetime import datetime
54
from typing import List, Optional
65

76
from scaleway_core.api import API
@@ -25,7 +24,6 @@
2524
TokenScope,
2625
Alert,
2726
AlertManager,
28-
CockpitMetrics,
2927
ContactPoint,
3028
ContactPointEmail,
3129
DataSource,
@@ -66,7 +64,6 @@
6664
unmarshal_Plan,
6765
unmarshal_Token,
6866
unmarshal_AlertManager,
69-
unmarshal_CockpitMetrics,
7067
unmarshal_GetConfigResponse,
7168
unmarshal_Grafana,
7269
unmarshal_ListContactPointsResponse,
@@ -1578,40 +1575,3 @@ def trigger_test_alert(
15781575
)
15791576

15801577
self._throw_on_error(res)
1581-
1582-
def get_cockpit_metrics(
1583-
self,
1584-
*,
1585-
query: str,
1586-
project_id: Optional[str] = None,
1587-
start_date: Optional[datetime] = None,
1588-
end_date: Optional[datetime] = None,
1589-
) -> CockpitMetrics:
1590-
"""
1591-
:param query:
1592-
:param project_id:
1593-
:param start_date:
1594-
:param end_date:
1595-
:return: :class:`CockpitMetrics <CockpitMetrics>`
1596-
1597-
Usage:
1598-
::
1599-
1600-
result = api.get_cockpit_metrics(
1601-
query="example",
1602-
)
1603-
"""
1604-
1605-
res = self._request(
1606-
"GET",
1607-
"/cockpit/v1beta1/cockpit/metrics",
1608-
params={
1609-
"end_date": end_date,
1610-
"project_id": project_id or self.client.default_project_id,
1611-
"query": query,
1612-
"start_date": start_date,
1613-
},
1614-
)
1615-
1616-
self._throw_on_error(res)
1617-
return unmarshal_CockpitMetrics(res.json())

‎scaleway/scaleway/cockpit/v1/marshalling.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
from dateutil import parser
66

77
from scaleway_core.profile import ProfileDefaults
8-
from scaleway_core.bridge import (
9-
unmarshal_TimeSeries,
10-
)
118
from scaleway_core.utils import (
129
OneOfPossibility,
1310
resolve_one_of,
@@ -22,7 +19,6 @@
2219
Plan,
2320
Token,
2421
AlertManager,
25-
CockpitMetrics,
2622
GetConfigResponseRetention,
2723
GetConfigResponse,
2824
Grafana,
@@ -335,23 +331,6 @@ def unmarshal_AlertManager(data: Any) -> AlertManager:
335331
return AlertManager(**args)
336332

337333

338-
def unmarshal_CockpitMetrics(data: Any) -> CockpitMetrics:
339-
if not isinstance(data, dict):
340-
raise TypeError(
341-
"Unmarshalling the type 'CockpitMetrics' failed as data isn't a dictionary."
342-
)
343-
344-
args: Dict[str, Any] = {}
345-
346-
field = data.get("timeseries", None)
347-
if field is not None:
348-
args["timeseries"] = (
349-
[unmarshal_TimeSeries(v) for v in field] if field is not None else None
350-
)
351-
352-
return CockpitMetrics(**args)
353-
354-
355334
def unmarshal_GetConfigResponseRetention(data: Any) -> GetConfigResponseRetention:
356335
if not isinstance(data, dict):
357336
raise TypeError(

‎scaleway/scaleway/cockpit/v1/types.py‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from scaleway_core.bridge import (
1111
Region,
12-
TimeSeries,
1312
)
1413
from scaleway_core.utils import (
1514
StrEnumMeta,
@@ -19,6 +18,7 @@
1918
class DataSourceOrigin(str, Enum, metaclass=StrEnumMeta):
2019
UNKNOWN_ORIGIN = "unknown_origin"
2120
SCALEWAY = "scaleway"
21+
EXTERNAL = "external"
2222
CUSTOM = "custom"
2323

2424
def __str__(self) -> str:
@@ -459,11 +459,6 @@ class AlertManager:
459459
"""
460460

461461

462-
@dataclass
463-
class CockpitMetrics:
464-
timeseries: List[TimeSeries]
465-
466-
467462
@dataclass
468463
class GetConfigResponse:
469464
"""
@@ -1052,17 +1047,6 @@ class RegionalApiGetAlertManagerRequest:
10521047
"""
10531048

10541049

1055-
@dataclass
1056-
class RegionalApiGetCockpitMetricsRequest:
1057-
query: str
1058-
1059-
project_id: Optional[str]
1060-
1061-
start_date: Optional[datetime]
1062-
1063-
end_date: Optional[datetime]
1064-
1065-
10661050
@dataclass
10671051
class RegionalApiGetConfigRequest:
10681052
"""

0 commit comments

Comments
 (0)