Skip to content

fix(edge_services): review billing wording #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,7 @@ async def get_billing(
project_id: Optional[str] = None,
) -> GetBillingResponse:
"""
Gives information on current edge-services subscription plan and used resources with associated price.
Gives information on the currently selected Edge Services subscription plan, resource usage and associated billing information for this calendar month (including whether consumption falls within or exceeds the currently selected subscription plan.).
:param project_id:
:return: :class:`GetBillingResponse <GetBillingResponse>`

Expand Down
16 changes: 8 additions & 8 deletions scaleway-async/scaleway_async/edge_services/v1alpha1/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ class PlanDetails:

pipeline_limit: int
"""
Number of pipeline included in subscription plan.
Number of pipelines included in subscription plan.
"""


Expand Down Expand Up @@ -732,22 +732,22 @@ class GetBillingRequest:
class GetBillingResponse:
pipeline_number: int
"""
Total number of pipeline currently configured.
Total number of pipelines currently configured.
"""

current_plan_cache_usage: int
"""
Total amount of data egressed from cache in current subscription plan.
Total amount of data egressed from the cache (this month), included in the active subscription plan.
"""

extra_cache_usage: int
"""
Total amount of data egressed from cache not included in the plans.
Total amount of data egressed from cache (this month), not included in the active subscription plan.
"""

current_plan: Optional[PlanDetails]
"""
Information on the current edge-service subscription plan.
Information on the currently-selected, active Edge Services subscription plan.
"""

plan_cost: Optional[Money]
Expand All @@ -757,17 +757,17 @@ class GetBillingResponse:

extra_pipelines_cost: Optional[Money]
"""
Cost to date of the pipelines not included in the plans.
Cost to date (this month) of pipelines not included in the subscription plan.
"""

extra_cache_cost: Optional[Money]
"""
Cost to date of the data egressed from cache not included in the plans.
Cost to date (this month) of the data egressed from the cache that is not included in the active subscription plan.
"""

total_cost: Optional[Money]
"""
Total cost to date of edge-service product for the month including current plan, previous plans, extra pipelines and extra egress cache data.
Total cost to date (this month) of all Edge Services resources including active subscription plan, previously active plans, extra pipelines and extra egress cache data.
"""


Expand Down
2 changes: 1 addition & 1 deletion scaleway/scaleway/edge_services/v1alpha1/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1715,7 +1715,7 @@ def get_billing(
project_id: Optional[str] = None,
) -> GetBillingResponse:
"""
Gives information on current edge-services subscription plan and used resources with associated price.
Gives information on the currently selected Edge Services subscription plan, resource usage and associated billing information for this calendar month (including whether consumption falls within or exceeds the currently selected subscription plan.).
:param project_id:
:return: :class:`GetBillingResponse <GetBillingResponse>`

Expand Down
16 changes: 8 additions & 8 deletions scaleway/scaleway/edge_services/v1alpha1/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ class PlanDetails:

pipeline_limit: int
"""
Number of pipeline included in subscription plan.
Number of pipelines included in subscription plan.
"""


Expand Down Expand Up @@ -732,22 +732,22 @@ class GetBillingRequest:
class GetBillingResponse:
pipeline_number: int
"""
Total number of pipeline currently configured.
Total number of pipelines currently configured.
"""

current_plan_cache_usage: int
"""
Total amount of data egressed from cache in current subscription plan.
Total amount of data egressed from the cache (this month), included in the active subscription plan.
"""

extra_cache_usage: int
"""
Total amount of data egressed from cache not included in the plans.
Total amount of data egressed from cache (this month), not included in the active subscription plan.
"""

current_plan: Optional[PlanDetails]
"""
Information on the current edge-service subscription plan.
Information on the currently-selected, active Edge Services subscription plan.
"""

plan_cost: Optional[Money]
Expand All @@ -757,17 +757,17 @@ class GetBillingResponse:

extra_pipelines_cost: Optional[Money]
"""
Cost to date of the pipelines not included in the plans.
Cost to date (this month) of pipelines not included in the subscription plan.
"""

extra_cache_cost: Optional[Money]
"""
Cost to date of the data egressed from cache not included in the plans.
Cost to date (this month) of the data egressed from the cache that is not included in the active subscription plan.
"""

total_cost: Optional[Money]
"""
Total cost to date of edge-service product for the month including current plan, previous plans, extra pipelines and extra egress cache data.
Total cost to date (this month) of all Edge Services resources including active subscription plan, previously active plans, extra pipelines and extra egress cache data.
"""


Expand Down