diff --git a/CHANGELOG.md b/CHANGELOG.md index 33fcf7a..b6ea2fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,13 @@ -## Version 1.11.5 +## Version 1.11.6 -### Добавлено +### Удалено -#### Общие изменения +#### Account | Идентификатор
задачи | Описание | | --- | --- | -| BGOS-532 | Метод `Check` для `DecortClient`, `BVSDecortClient` и `LegacyDecortClient` | \ No newline at end of file +| BGOS-553 | Метод `Create` в cloudapi/account | + +#### Image +| Идентификатор
задачи | Описание | +| --- | --- | +| BGOS-552 | Метод `UploadImageFile` в cloudbroker/image | \ No newline at end of file diff --git a/pkg/cloudapi/account/create.go b/pkg/cloudapi/account/create.go deleted file mode 100644 index 6885de4..0000000 --- a/pkg/cloudapi/account/create.go +++ /dev/null @@ -1,75 +0,0 @@ -package account - -import ( - "context" - "net/http" - "strconv" - - "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" -) - -// CreateRequest struct for creating account -type CreateRequest struct { - // Display name - // Required: true - Name string `url:"name" json:"name" validate:"required"` - - // Name of the account - // Required: true - Username string `url:"username" json:"username" validate:"required"` - - // Email - // Required: false - EmailAddress string `url:"emailaddress,omitempty" json:"emailaddress,omitempty" validate:"omitempty,email"` - - // Max size of memory in MB - // Required: false - MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"` - - // Max size of aggregated vdisks in GB - // Required: false - MaxVDiskCapacity int64 `url:"maxVDiskCapacity,omitempty" json:"maxVDiskCapacity,omitempty"` - - // Max number of CPU cores - // Required: false - MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"` - - // Max sent/received network transfer peering - // Required: false - MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"` - - // Max number of assigned public IPs - // Required: false - MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"` - - // If true send emails when a user is granted access to resources - // Required: false - SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"` - - // Limit (positive) or disable (0) GPU resources - // Required: false - GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"` -} - -// Create creates account -// Setting a cloud unit maximum to -1 or empty will not put any restrictions on the resource -func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error) { - err := validators.ValidateRequest(req) - if err != nil { - return 0, validators.ValidationErrors(validators.GetErrors(err)) - } - - url := "/cloudapi/account/create" - - res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req) - if err != nil { - return 0, err - } - - result, err := strconv.ParseUint(string(res), 10, 64) - if err != nil { - return 0, err - } - - return result, nil -} diff --git a/pkg/cloudbroker/image/upload_image_file.go b/pkg/cloudbroker/image/upload_image_file.go deleted file mode 100644 index 1268eae..0000000 --- a/pkg/cloudbroker/image/upload_image_file.go +++ /dev/null @@ -1,39 +0,0 @@ -package image - -import ( - "context" - "encoding/json" - "fmt" - "net/http" - "os" -) - -// UploadImageFileResponse struct to enable image -type UploadImageFileResponse struct { - // ImageFileUri - ImageFileUri string `json:"image_file_uri"` -} - -// UploadImageFile uploads file image to platform -func (i Image) UploadImageFile(ctx context.Context, filePath string) (string, error) { - file, err := os.ReadFile(filePath) - if err != nil { - return "", fmt.Errorf("can not read file %v", err) - } - - url := "/cloudbroker/image/uploadImageFile" - - res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, file) - if err != nil { - return "", err - } - - result := UploadImageFileResponse{} - - err = json.Unmarshal(res, &result) - if err != nil { - return "", err - } - - return result.ImageFileUri, nil -} diff --git a/tests/platform_upgrade/request_map.go b/tests/platform_upgrade/request_map.go index 223c341..aa29c73 100644 --- a/tests/platform_upgrade/request_map.go +++ b/tests/platform_upgrade/request_map.go @@ -709,7 +709,6 @@ func getRequestsMapCloudbroker() map[string]interface{} { "/restmachine/cloudbroker/image/share": image_cb.ShareRequest{}, "/restmachine/cloudbroker/image/syncCreateImage": image_cb.SyncCreateRequest{}, "/restmachine/cloudbroker/image/updateNodes": image_cb.UpdateNodesRequest{}, - "/restmachine/cloudbroker/image/uploadImageFile": image_cb.UploadImageFileResponse{}, // k8ci "/restmachine/cloudbroker/k8ci/accessAdd": k8ci_cb.AccessAddRequest{},