Skip to content

feat(registry): support projects #506

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.

Sign up for GitHub

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
kindermoumoute merged 2 commits into from
Aug 4, 2020
Merged

feat(registry): support projects #506

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dbd538
feat(registry): support projects
scaleway-bot Jul 30, 2020
1f6bf55
Merge branch 'master' into 1.1192.0
kindermoumoute Aug 4, 2020
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
29 changes: 23 additions & 6 deletions api/registry/v1/registry_sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ type Namespace struct {
Description string `json:"description"`
// OrganizationID: owner of the namespace
OrganizationID string `json:"organization_id"`
// ProjectID: project of the namespace
ProjectID string `json:"project_id"`
// Status: namespace status
//
// Default value: unknown
Expand Down Expand Up @@ -431,8 +433,10 @@ type ListNamespacesRequest struct {
//
// Default value: created_at_asc
OrderBy ListNamespacesRequestOrderBy `json:"-"`
// OrganizationID: filter by the namespace owner
// OrganizationID: filter by Organization ID
OrganizationID *string `json:"-"`
// ProjectID: filter by Project ID
ProjectID *string `json:"-"`
// Name: filter by the namespace name (exact match)
Name *string `json:"-"`
}
Expand All @@ -456,6 +460,7 @@ func (s *API) ListNamespaces(req *ListNamespacesRequest, opts ...scw.RequestOpti
parameter.AddToQuery(query, "page_size", req.PageSize)
parameter.AddToQuery(query, "order_by", req.OrderBy)
parameter.AddToQuery(query, "organization_id", req.OrganizationID)
parameter.AddToQuery(query, "project_id", req.ProjectID)
parameter.AddToQuery(query, "name", req.Name)

if fmt.Sprint(req.Region) == "" {
Expand Down Expand Up @@ -543,8 +548,12 @@ type CreateNamespaceRequest struct {
Name string `json:"name"`
// Description: define a description
Description string `json:"description"`
// OrganizationID: define the namespace owner
OrganizationID string `json:"organization_id"`
// OrganizationID: assign the namespace owner (deprecated)
// Precisely one of OrganizationID, ProjectID must be set.
OrganizationID *string `json:"organization_id,omitempty"`
// ProjectID: assign the namespace to a project ID
// Precisely one of OrganizationID, ProjectID must be set.
ProjectID *string `json:"project_id,omitempty"`
// IsPublic: define the default visibility policy
IsPublic bool `json:"is_public"`
}
Expand All @@ -553,9 +562,14 @@ type CreateNamespaceRequest struct {
func (s *API) CreateNamespace(req *CreateNamespaceRequest, opts ...scw.RequestOption) (*Namespace, error) {
var err error

if req.OrganizationID == "" {
defaultOrganizationID, _ := s.client.GetDefaultOrganizationID()
req.OrganizationID = defaultOrganizationID
defaultProjectID, exist := s.client.GetDefaultProjectID()
if exist && req.OrganizationID == nil && req.ProjectID == nil {
req.ProjectID = &defaultProjectID
}

defaultOrganizationID, exist := s.client.GetDefaultOrganizationID()
if exist && req.OrganizationID == nil && req.ProjectID == nil {
req.OrganizationID = &defaultOrganizationID
}

if req.Region == "" {
Expand Down Expand Up @@ -692,6 +706,8 @@ type ListImagesRequest struct {
Name *string `json:"-"`
// OrganizationID: filter by Organization ID
OrganizationID *string `json:"-"`
// ProjectID: filter by Project ID
ProjectID *string `json:"-"`
}

// ListImages: list all your images
Expand All @@ -715,6 +731,7 @@ func (s *API) ListImages(req *ListImagesRequest, opts ...scw.RequestOption) (*Li
parameter.AddToQuery(query, "namespace_id", req.NamespaceID)
parameter.AddToQuery(query, "name", req.Name)
parameter.AddToQuery(query, "organization_id", req.OrganizationID)
parameter.AddToQuery(query, "project_id", req.ProjectID)

if fmt.Sprint(req.Region) == "" {
return nil, errors.New("field Region cannot be empty in request")
Expand Down