Merge pull request #138 from thaJeztah/update_gha

Remove deprecated graphdriver-plugins, assorted cleanups, and update to go1.21

Author: thaJeztah

.github/workflows/ci.yaml

@@ -16,6 +16,6 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: test
       run: make test

Makefile

@@ -3,7 +3,7 @@
 REPO_NAME = go-plugins-helpers
 REPO_OWNER = docker
 PKG_NAME = github.com/${REPO_OWNER}/${REPO_NAME}
-IMAGE = golang:1.16
+IMAGE = golang:1.21
 
 all: test
 

README.md

@@ -2,12 +2,11 @@
 
 A collection of helper packages to extend Docker Engine in Go
 
- Plugin type   | Documentation | Description
- --------------|---------------|--------------------------------------------------
- Authorization | [Link](https://docs.docker.com/engine/extend/authorization/)   | Extend API authorization mechanism
- Network       | [Link](https://docs.docker.com/engine/extend/plugins_network/) | Extend network management
- Volume        | [Link](https://docs.docker.com/engine/extend/plugins_volume/)  | Extend persistent storage
- IPAM          | [Link](https://github.com/docker/libnetwork/blob/master/docs/ipam.md) | Extend IP address management
- Graph (experimental) | [Link](https://github.com/docker/cli/blob/master/docs/extend/plugins_graphdriver.md)| Extend image and container fs storage
+| Plugin type   | Documentation                                                         | Description                        |
+|---------------|-----------------------------------------------------------------------|------------------------------------|
+| Authorization | [Link](https://docs.docker.com/engine/extend/authorization/)          | Extend API authorization mechanism |
+| Network       | [Link](https://docs.docker.com/engine/extend/plugins_network/)        | Extend network management          |
+| Volume        | [Link](https://docs.docker.com/engine/extend/plugins_volume/)         | Extend persistent storage          |
+| IPAM          | [Link](https://github.com/docker/libnetwork/blob/master/docs/ipam.md) | Extend IP address management       |
 
-See the [understand Docker plugins documentation section](https://docs.docker.com/engine/extend/plugins/).
+See the [understand Docker plugins documentation section](https://docs.docker.com/engine/extend/).

authorization/api_test.go

@@ -8,7 +8,7 @@ import (
 	"crypto/x509/pkix"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math/big"
 	"net/http"
 	"os"
@@ -42,15 +42,13 @@ func (p *TestPlugin) AuthZRes(r Request) Response {
 
 func TestActivate(t *testing.T) {
 	response, err := http.Get("http://localhost:32456/Plugin.Activate")
-
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	defer response.Body.Close()
 
-	body, err := ioutil.ReadAll(response.Body)
-
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -68,15 +66,13 @@ func TestAuthZReq(t *testing.T) {
 		sdk.DefaultContentTypeV1_1,
 		strings.NewReader(request),
 	)
-
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	defer response.Body.Close()
 
-	body, err := ioutil.ReadAll(response.Body)
-
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -107,15 +103,13 @@ func TestAuthZRes(t *testing.T) {
 		sdk.DefaultContentTypeV1_1,
 		strings.NewReader(request),
 	)
-
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	defer response.Body.Close()
 
-	body, err := ioutil.ReadAll(response.Body)
-
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -160,14 +154,14 @@ func TestPeerCertificateMarshalJSON(t *testing.T) {
 	publickey := &privatekey.PublicKey
 
 	// create a self-signed certificate. template = parent
-	var parent = template
+	parent := template
 	raw, err := x509.CreateCertificate(rand.Reader, template, parent, publickey, privatekey)
 	require.NoError(t, err)
 
 	cert, err := x509.ParseCertificate(raw)
 	require.NoError(t, err)
 
-	var certs = []*x509.Certificate{cert}
+	certs := []*x509.Certificate{cert}
 	addr := "www.authz.com/auth"
 	req, err := http.NewRequest("GET", addr, nil)
 	require.NoError(t, err)
@@ -191,11 +185,9 @@ func TestPeerCertificateMarshalJSON(t *testing.T) {
 			require.Nil(t, err)
 			require.Equal(t, "Earth", pcObj.Subject.Country[0])
 			require.Equal(t, true, pcObj.IsCA)
-
 		})
 
 	}
-
 }
 
 func callURL(url string) {