docr: Create new Registries service for multiple-registry endpoints

Author: rak16

godo.go

@@ -80,6 +80,7 @@ type Client struct {
 	Projects          ProjectsService
 	Regions           RegionsService
 	Registry          RegistryService
+	Registries        RegistriesService
 	ReservedIPs       ReservedIPsService
 	ReservedIPActions ReservedIPActionsService
 	Sizes             SizesService
@@ -290,6 +291,7 @@ func NewClient(httpClient *http.Client) *Client {
 	c.Projects = &ProjectsServiceOp{client: c}
 	c.Regions = &RegionsServiceOp{client: c}
 	c.Registry = &RegistryServiceOp{client: c}
+	c.Registries = &RegistriesServiceOp{client: c}
 	c.ReservedIPs = &ReservedIPsServiceOp{client: c}
 	c.ReservedIPActions = &ReservedIPActionsServiceOp{client: c}
 	c.Sizes = &SizesServiceOp{client: c}

registry.go

@@ -41,13 +41,6 @@ type RegistryService interface {
 	GetSubscription(context.Context) (*RegistrySubscription, *Response, error)
 	UpdateSubscription(context.Context, *RegistrySubscriptionUpdateRequest) (*RegistrySubscription, *Response, error)
 	ValidateName(context.Context, *RegistryValidateNameRequest) (*Response, error)
-
-	// Multi-registry Open Beta API methods
-	GetBeta(context.Context, string) (*Registry, *Response, error)
-	ListBeta(context.Context) ([]*Registry, *Response, error)
-	CreateBeta(context.Context, *RegistriesCreateRequest) (*Registry, *Response, error)
-	DeleteBeta(context.Context, string) (*Response, error)
-	DockerCredentialsBeta(context.Context, string, *RegistryDockerCredentialsRequest) (*DockerCredentials, *Response, error)
 }
 
 var _ RegistryService = &RegistryServiceOp{}
@@ -634,10 +627,27 @@ func (svc *RegistryServiceOp) ValidateName(ctx context.Context, request *Registr
 	return resp, nil
 }
 
-// Multi-registry Open Beta API endpoints
+// RegistriesService is an interface for interfacing with the new multiple-registry beta endpoints
+// of the DigitalOcean API.
+//
+// We are creating a separate Service in alignment with the new /v2/registries endpoints.
+type RegistriesService interface {
+	Get(context.Context, string) (*Registry, *Response, error)
+	List(context.Context) ([]*Registry, *Response, error)
+	Create(context.Context, *RegistriesCreateRequest) (*Registry, *Response, error)
+	Delete(context.Context, string) (*Response, error)
+	DockerCredentials(context.Context, string, *RegistryDockerCredentialsRequest) (*DockerCredentials, *Response, error)
+}
+
+var _ RegistriesService = &RegistriesServiceOp{}
+
+// RegistriesServiceOp handles communication with the multiple-registry beta methods.
+type RegistriesServiceOp struct {
+	client *Client
+}
 
-// GetBeta returns the details of a named Registry.
-func (svc *RegistryServiceOp) GetBeta(ctx context.Context, registry string) (*Registry, *Response, error) {
+// Get returns the details of a named Registry.
+func (svc *RegistriesServiceOp) Get(ctx context.Context, registry string) (*Registry, *Response, error) {
 	path := fmt.Sprintf("%s/%s", registriesPath, registry)
 	req, err := svc.client.NewRequest(ctx, http.MethodGet, path, nil)
 	if err != nil {
@@ -651,8 +661,8 @@ func (svc *RegistryServiceOp) GetBeta(ctx context.Context, registry string) (*Re
 	return root.Registry, resp, nil
 }
 
-// ListBeta returns a list of the named Registries.
-func (svc *RegistryServiceOp) ListBeta(ctx context.Context) ([]*Registry, *Response, error) {
+// List returns a list of the named Registries.
+func (svc *RegistriesServiceOp) List(ctx context.Context) ([]*Registry, *Response, error) {
 	req, err := svc.client.NewRequest(ctx, http.MethodGet, registriesPath, nil)
 	if err != nil {
 		return nil, nil, err
@@ -665,8 +675,8 @@ func (svc *RegistryServiceOp) ListBeta(ctx context.Context) ([]*Registry, *Respo
 	return root.Registries, resp, nil
 }
 
-// CreateBeta creates a named Registry.
-func (svc *RegistryServiceOp) CreateBeta(ctx context.Context, create *RegistriesCreateRequest) (*Registry, *Response, error) {
+// Create creates a named Registry.
+func (svc *RegistriesServiceOp) Create(ctx context.Context, create *RegistriesCreateRequest) (*Registry, *Response, error) {
 	req, err := svc.client.NewRequest(ctx, http.MethodPost, registriesPath, create)
 	if err != nil {
 		return nil, nil, err
@@ -681,7 +691,7 @@ func (svc *RegistryServiceOp) CreateBeta(ctx context.Context, create *Registries
 
 // Delete deletes a named Registry. There is no way to recover a Registry once it has
 // been destroyed.
-func (svc *RegistryServiceOp) DeleteBeta(ctx context.Context, registry string) (*Response, error) {
+func (svc *RegistriesServiceOp) Delete(ctx context.Context, registry string) (*Response, error) {
 	path := fmt.Sprintf("%s/%s", registriesPath, registry)
 	req, err := svc.client.NewRequest(ctx, http.MethodDelete, path, nil)
 	if err != nil {
@@ -695,7 +705,7 @@ func (svc *RegistryServiceOp) DeleteBeta(ctx context.Context, registry string) (
 }
 
 // DockerCredentials retrieves a Docker config file containing named Registry's credentials.
-func (svc *RegistryServiceOp) DockerCredentialsBeta(ctx context.Context, registry string, request *RegistryDockerCredentialsRequest) (*DockerCredentials, *Response, error) {
+func (svc *RegistriesServiceOp) DockerCredentials(ctx context.Context, registry string, request *RegistryDockerCredentialsRequest) (*DockerCredentials, *Response, error) {
 	path := fmt.Sprintf("%s/%s/%s", registriesPath, registry, "docker-credentials")
 	req, err := svc.client.NewRequest(ctx, http.MethodGet, path, nil)
 	if err != nil {

registry_test.go

@@ -966,7 +966,8 @@ func TestRegistry_ValidateName(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestRegistries_GetBeta(t *testing.T) {
+// Tests for Registries service methods
+func TestRegistries_Get(t *testing.T) {
 	setup()
 	defer teardown()
 
@@ -994,13 +995,12 @@ func TestRegistries_GetBeta(t *testing.T) {
 		testMethod(t, r, http.MethodGet)
 		fmt.Fprint(w, getResponseJSON)
 	})
-	got, _, err := client.Registry.GetBeta(ctx, testRegistry)
+	got, _, err := client.Registries.Get(ctx, testRegistry)
 	require.NoError(t, err)
 	require.Equal(t, want, got)
 }
 
-// TODO: Fix following test
-func TestRegistries_ListBeta(t *testing.T) {
+func TestRegistries_List(t *testing.T) {
 	setup()
 	defer teardown()
 
@@ -1031,14 +1031,14 @@ func TestRegistries_ListBeta(t *testing.T) {
 		fmt.Printf("Returning: %v", getResponseJSON)
 		fmt.Fprint(w, getResponseJSON)
 	})
-	got, _, err := client.Registry.ListBeta(ctx)
+	got, _, err := client.Registries.List(ctx)
 	require.NoError(t, err)
 	fmt.Printf("Expected: %+v\n", wantRegistries)
 	fmt.Printf("Got: %+v\n", got)
 	require.Equal(t, wantRegistries, got)
 }
 
-func TestRegistries_CreateBeta(t *testing.T) {
+func TestRegistries_Create(t *testing.T) {
 	setup()
 	defer teardown()
 
@@ -1078,24 +1078,24 @@ func TestRegistries_CreateBeta(t *testing.T) {
 		fmt.Fprint(w, createResponseJSON)
 	})
 
-	got, _, err := client.Registry.CreateBeta(ctx, createRequest)
+	got, _, err := client.Registries.Create(ctx, createRequest)
 	require.NoError(t, err)
 	require.Equal(t, want, got)
 }
 
-func TestRegistries_DeleteBeta(t *testing.T) {
+func TestRegistries_Delete(t *testing.T) {
 	setup()
 	defer teardown()
 
 	mux.HandleFunc(fmt.Sprintf("/v2/registries/%s", testRegistry), func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodDelete)
 	})
 
-	_, err := client.Registry.DeleteBeta(ctx, testRegistry)
+	_, err := client.Registries.Delete(ctx, testRegistry)
 	require.NoError(t, err)
 }
 
-func TestRegistries_DockerCredentialsBeta(t *testing.T) {
+func TestRegistries_DockerCredentials(t *testing.T) {
 	returnedConfig := "this could be a docker config"
 	tests := []struct {
 		name                  string
@@ -1139,7 +1139,7 @@ func TestRegistries_DockerCredentialsBeta(t *testing.T) {
 				fmt.Fprint(w, returnedConfig)
 			})
 
-			got, _, err := client.Registry.DockerCredentialsBeta(ctx, testRegistry, test.params)
+			got, _, err := client.Registries.DockerCredentials(ctx, testRegistry, test.params)
 			fmt.Println(returnedConfig)
 			require.NoError(t, err)
 			require.Equal(t, []byte(returnedConfig), got.DockerConfigJSON)