Merge branch 'master' into dbaas-sql-mode

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [v1.25.0] - 2019-11-13
+
+- #275 registry/docker-credentials: add support for the read/write parameter - @kamaln7
+- #273 implement the registry/docker-credentials endpoint - @kamaln7
+- #271 Add registry resource - @snormore
+
 ## [v1.24.1] - 2019-11-04
 
 - #264 Update isLast to check p.Next - @aqche

godo.go

@@ -17,7 +17,7 @@ import (
 )
 
 const (
-	libraryVersion = "1.24.1"
+	libraryVersion = "1.25.0"
 	defaultBaseURL = "https://api.digitalocean.com/"
 	userAgent      = "godo/" + libraryVersion
 	mediaType      = "application/json"

registry.go

@@ -1,7 +1,9 @@
 package godo
 
 import (
+	"bytes"
 	"context"
+	"fmt"
 	"net/http"
 )
 
@@ -16,6 +18,7 @@ type RegistryService interface {
 	Create(context.Context, *RegistryCreateRequest) (*Registry, *Response, error)
 	Get(context.Context) (*Registry, *Response, error)
 	Delete(context.Context) (*Response, error)
+	DockerCredentials(context.Context, *RegistryDockerCredentialsRequest) (*DockerCredentials, *Response, error)
 }
 
 var _ RegistryService = &RegistryServiceOp{}
@@ -30,6 +33,12 @@ type RegistryCreateRequest struct {
 	Name string `json:"name,omitempty"`
 }
 
+// RegistryDockerCredentialsRequest represents a request to retrieve docker
+// credentials for a registry.
+type RegistryDockerCredentialsRequest struct {
+	ReadWrite bool `json:"read_write"`
+}
+
 // Registry represents a registry.
 type Registry struct {
 	Name string `json:"name,omitempty"`
@@ -80,3 +89,31 @@ func (svc *RegistryServiceOp) Delete(ctx context.Context) (*Response, error) {
 	}
 	return resp, nil
 }
+
+// DockerCredentials is the content of a Docker config file
+// that is used by the docker CLI
+// See: https://docs.docker.com/engine/reference/commandline/cli/#configjson-properties
+type DockerCredentials struct {
+	DockerConfigJSON []byte
+}
+
+// DockerCredentials retrieves a Docker config file containing the registry's credentials.
+func (svc *RegistryServiceOp) DockerCredentials(ctx context.Context, request *RegistryDockerCredentialsRequest) (*DockerCredentials, *Response, error) {
+	path := fmt.Sprintf("%s/%s?read_write=%t", registryPath, "docker-credentials", request.ReadWrite)
+
+	req, err := svc.client.NewRequest(ctx, http.MethodGet, path, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	var buf bytes.Buffer
+	resp, err := svc.client.Do(ctx, req, &buf)
+	if err != nil {
+		return nil, resp, err
+	}
+
+	dc := &DockerCredentials{
+		DockerConfigJSON: buf.Bytes(),
+	}
+	return dc, resp, nil
+}

registry_test.go

@@ -80,3 +80,40 @@ func TestRegistry_Delete(t *testing.T) {
 	_, err := client.Registry.Delete(ctx)
 	require.NoError(t, err)
 }
+
+func TestRegistry_DockerCredentials(t *testing.T) {
+	returnedConfig := "this could be a docker config"
+	tests := []struct {
+		name              string
+		params            *RegistryDockerCredentialsRequest
+		expectedReadWrite string
+	}{
+		{
+			name:              "read-only (default)",
+			params:            &RegistryDockerCredentialsRequest{},
+			expectedReadWrite: "false",
+		},
+		{
+			name:              "read/write",
+			params:            &RegistryDockerCredentialsRequest{ReadWrite: true},
+			expectedReadWrite: "true",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			setup()
+			defer teardown()
+
+			mux.HandleFunc("/v2/registry/docker-credentials", func(w http.ResponseWriter, r *http.Request) {
+				require.Equal(t, test.expectedReadWrite, r.URL.Query().Get("read_write"))
+				testMethod(t, r, http.MethodGet)
+				fmt.Fprint(w, returnedConfig)
+			})
+
+			got, _, err := client.Registry.DockerCredentials(ctx, test.params)
+			require.NoError(t, err)
+			require.Equal(t, []byte(returnedConfig), got.DockerConfigJSON)
+		})
+	}
+}