From c414863f48dc2d55e1aff16b129a69dbc74c4500 Mon Sep 17 00:00:00 2001 From: Shnayder Anton <41984158+TruePack@users.noreply.github.com> Date: Wed, 25 Jan 2023 19:03:29 +0400 Subject: [PATCH] Revert quotas schemas for resell API (#160) --- selvpcclient/resell/v2/projects/schemas.go | 37 ++++- selvpcclient/resell/v2/quotas/schemas.go | 170 +++++++++++++++++++++ 2 files changed, 200 insertions(+), 7 deletions(-) create mode 100644 selvpcclient/resell/v2/quotas/schemas.go diff --git a/selvpcclient/resell/v2/projects/schemas.go b/selvpcclient/resell/v2/projects/schemas.go index 7be174a..337f3d4 100644 --- a/selvpcclient/resell/v2/projects/schemas.go +++ b/selvpcclient/resell/v2/projects/schemas.go @@ -2,6 +2,8 @@ package projects import ( "encoding/json" + + "github.com/selectel/go-selvpcclient/v2/selvpcclient/resell/v2/quotas" ) // Project represents a single Identity service project. @@ -23,20 +25,23 @@ type Project struct { // Theme represents project theme settings. Theme Theme `json:"-"` + + // Quotas contains information about project quotas. + Quotas []quotas.Quota `json:"-"` } // UnmarshalJSON implements custom unmarshalling method for the Project type. func (result *Project) UnmarshalJSON(b []byte) error { // Populate temporary structure with resource quotas represented as maps. var s struct { - ID string `json:"id"` - Name string `json:"name"` - URL string `json:"url"` - Enabled bool `json:"enabled"` - CustomURL string `json:"custom_url"` - Theme Theme `json:"theme"` + ID string `json:"id"` + Name string `json:"name"` + URL string `json:"url"` + Enabled bool `json:"enabled"` + CustomURL string `json:"custom_url"` + Theme Theme `json:"theme"` + Quotas map[string][]quotas.ResourceQuotaEntity `json:"quotas"` } - err := json.Unmarshal(b, &s) if err != nil { return err @@ -52,6 +57,24 @@ func (result *Project) UnmarshalJSON(b []byte) error { Theme: s.Theme, } + if len(s.Quotas) != 0 { + // Convert resource quota maps to the slice of Quota types. + // Here we're allocating memory in advance because we already know the length + // of a result slice from the JSON bytearray. + resourceQuotasSlice := make([]quotas.Quota, len(s.Quotas)) + i := 0 + for resourceName, resourceQuotas := range s.Quotas { + resourceQuotasSlice[i] = quotas.Quota{ + Name: resourceName, + ResourceQuotasEntities: resourceQuotas, + } + i++ + } + + // Add the unmarshalled quotas slice to the result. + result.Quotas = resourceQuotasSlice + } + return nil } diff --git a/selvpcclient/resell/v2/quotas/schemas.go b/selvpcclient/resell/v2/quotas/schemas.go new file mode 100644 index 0000000..9d2cc89 --- /dev/null +++ b/selvpcclient/resell/v2/quotas/schemas.go @@ -0,0 +1,170 @@ +// Package quotas is deprecated. Use quota manager instead. +package quotas + +import ( + "encoding/json" +) + +// Quota represents a quota information for a single billing resource. +type Quota struct { + // Name is a resource human-readable name. + Name string `json:"-"` + + // ResourceQuotasEntities contains information about quotas of a single billing resource in different locations. + ResourceQuotasEntities []ResourceQuotaEntity `json:"-"` +} + +// ResourceQuotaEntity represents a single entity of the resource quota data in the specific region and zone. +type ResourceQuotaEntity struct { + // Region contains the quota region data. + Region string `json:"region"` + + // Zone contains the quota zone data. + Zone string `json:"zone"` + + // Value contans value of resource quota in the specific region and zone. + // It represents a free quota value if used with the GetFree request. + Value int `json:"value"` + + // Used contains quantity of a used quota in the specific region and zone. + Used int `json:"used"` +} + +// ResourcesQuotas represents quotas for different resources. +type ResourcesQuotas struct { + // Quotas represents slice of Quotas. + Quotas []*Quota `json:"-"` +} + +/* +UnmarshalJSON implements custom unmarshalling method for the ResourcesQuotas type. + +We need it to work with a JSON structure that the Resell v2 API responses with: + + "quotas": { + "compute_cores": [ + { + "region": "ru-2", + "value": 200, + "zone": "ru-2a" + }, + ... + ], + ... + } +*/ +func (result *ResourcesQuotas) UnmarshalJSON(b []byte) error { + // Populate temporary structure with resource quotas represented as maps. + var s struct { + ResourcesQuotas map[string][]ResourceQuotaEntity `json:"quotas"` + } + err := json.Unmarshal(b, &s) + if err != nil { + return err + } + + // Populate the result with an empty slice in case of empty quota list. + *result = ResourcesQuotas{ + Quotas: []*Quota{}, + } + + if len(s.ResourcesQuotas) != 0 { + // Convert resource quota maps to the slice of Quota types. + // Here we're allocating memory in advance because we already know the length + // of a result slice from the JSON bytearray. + resourceQuotasSlice := make([]*Quota, len(s.ResourcesQuotas)) + i := 0 + for resourceName, resourceQuotas := range s.ResourcesQuotas { + resourceQuotasSlice[i] = &Quota{ + Name: resourceName, + ResourceQuotasEntities: resourceQuotas, + } + i++ + } + + // Add the unmarshalled quotas slice to the result. + result.Quotas = resourceQuotasSlice + } + + return nil +} + +// ProjectQuota represents quota information of a single project. +type ProjectQuota struct { + // ID is a project unique id. + ID string `json:"-"` + + // ProjectQuotas contains project's quota information. + ProjectQuotas []Quota `json:"-"` +} + +// ProjectsQuotas represents quotas for different projects. +type ProjectsQuotas struct { + // ProjectQuotas represents slice of ProjectQuotas. + ProjectQuotas []*ProjectQuota `json:"-"` +} + +/* +UnmarshalJSON implements custom unmarshalling method for the ProjectsQuotas type. + +We need it to work with a JSON structure that the Resell v2 API responses with: + + "quotas": { + "6d23928357bb4e0eb302794bc57fb8fd": { + "compute_cores": [ + { + "region": "ru-1", + "used": 2, + "value": 10, + "zone": "ru-1b" + }, + ... + ] + }, + ... + } +*/ +func (result *ProjectsQuotas) UnmarshalJSON(b []byte) error { + // Populate temporary structure with projects quotas represented as maps. + var s struct { + ProjectsQuotas map[string]map[string][]ResourceQuotaEntity `json:"quotas"` + } + err := json.Unmarshal(b, &s) + if err != nil { + return err + } + + // Populate the result with an empty slice in case of empty quota list. + *result = ProjectsQuotas{ + ProjectQuotas: []*ProjectQuota{}, + } + + if len(s.ProjectsQuotas) != 0 { + // Convert projects quota maps to the slice of ProjectQuota types. + // Here we're allocating memory in advance for both of project and resource quotas + // because we already know the length of each slices from the JSON bytearray. + projectQuotasSlice := make([]*ProjectQuota, len(s.ProjectsQuotas)) + i := 0 + for projectName, projectQuotas := range s.ProjectsQuotas { + resourceQuotasSlice := make([]Quota, len(projectQuotas)) + j := 0 + for resourceName, resourceQuotas := range projectQuotas { + resourceQuotasSlice[j] = Quota{ + Name: resourceName, + ResourceQuotasEntities: resourceQuotas, + } + j++ + } + projectQuotasSlice[i] = &ProjectQuota{ + ID: projectName, + ProjectQuotas: resourceQuotasSlice, + } + i++ + } + + // Add the unmarshalled project quotas slice to the result. + result.ProjectQuotas = projectQuotasSlice + } + + return nil +}