new: drop gobindata for native embedding (#127)

* deps: realign to latest release of wsc and regolithe

* new: drop gobindata for native embed

* fix deprecated use of ioutil

* fix additional depreciation warnings

Makefile

@@ -16,10 +16,8 @@ lint:
 		--enable=ineffassign \
 		--enable=revive \
 		--enable=unused \
-		--enable=structcheck \
 		--enable=staticcheck \
-		--enable=varcheck \
-		--enable=deadcode \
+		--enable=unused \
 		--enable=unconvert \
 		--enable=misspell \
 		--enable=prealloc \

cmd/elegen/main.go

@@ -11,8 +11,6 @@
 
 package main
 
-//go:generate go-bindata -pkg static -o static/bindata.go templates
-
 import (
 	"fmt"
 	"os"

cmd/elegen/utils.go

@@ -12,6 +12,7 @@
 package main
 
 import (
+	"embed"
 	"fmt"
 	"os"
 	"path"
@@ -20,12 +21,14 @@ import (
 	"strings"
 	"text/template"
 
-	"go.aporeto.io/elemental/cmd/elegen/static"
 	"go.aporeto.io/regolithe/spec"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )
 
+//go:embed templates
+var f embed.FS
+
 // An Enum represents an enum.
 type Enum struct {
 	Type          string
@@ -35,7 +38,7 @@ type Enum struct {
 
 func makeTemplate(p string) (*template.Template, error) {
 
-	data, err := static.Asset(p)
+	data, err := f.ReadFile(p)
 	if err != nil {
 		return nil, err
 	}

cmd/internal/genopenapi3/converter_errors_test.go

@@ -3,7 +3,6 @@ package genopenapi3
 import (
 	"errors"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -14,7 +13,7 @@ import (
 func TestConverter_Do__error_bad_externalType_mapping(t *testing.T) {
 	t.Parallel()
 
-	specDir, err := ioutil.TempDir("", t.Name()+"_*")
+	specDir, err := os.MkdirTemp("", t.Name()+"_*")
 	if err != nil {
 		t.Fatalf("error creating temporary directory for test function: %v", err)
 	}
@@ -55,7 +54,7 @@ func TestConverter_Do__error_bad_externalType_mapping(t *testing.T) {
 		"test.spec":     rawSpec,
 	} {
 		filename = filepath.Join(specDir, filename)
-		if err := ioutil.WriteFile(filename, []byte(content), os.ModePerm); err != nil {
+		if err := os.WriteFile(filename, []byte(content), os.ModePerm); err != nil {
 			t.Fatalf("error writing temporary file '%s': %v", filename, err)
 		}
 	}
@@ -73,7 +72,7 @@ func TestConverter_Do__error_bad_externalType_mapping(t *testing.T) {
 
 func TestConverter_Do__error_writer(t *testing.T) {
 
-	specDir, err := ioutil.TempDir("", t.Name()+"_*")
+	specDir, err := os.MkdirTemp("", t.Name()+"_*")
 	if err != nil {
 		t.Fatalf("error creating temporary directory for test function: %v", err)
 	}
@@ -101,7 +100,7 @@ func TestConverter_Do__error_writer(t *testing.T) {
 		"test.spec":     rawSpec,
 	} {
 		filename = filepath.Join(specDir, filename)
-		if err := ioutil.WriteFile(filename, []byte(content), os.ModePerm); err != nil {
+		if err := os.WriteFile(filename, []byte(content), os.ModePerm); err != nil {
 			t.Fatalf("error writing temporary file '%s': %v", filename, err)
 		}
 	}

cmd/internal/genopenapi3/converter_helpers_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -31,7 +30,7 @@ type testCaseRunner struct {
 func runAllTestCases(t *testing.T, cases map[string]testCase) {
 	t.Helper()
 
-	rootTmpDir, err := ioutil.TempDir("", t.Name()+"_*")
+	rootTmpDir, err := os.MkdirTemp("", t.Name()+"_*")
 	if err != nil {
 		t.Fatalf("error creating temporary directory for test function: %v", err)
 	}
@@ -82,14 +81,14 @@ func (r *testCaseRunner) run(name string, tc testCase) {
 		}
 
 		// this is to ensure that each test case executed within this runner is isolated
-		specDir, err := ioutil.TempDir(r.rootTmpDir, name)
+		specDir, err := os.MkdirTemp(r.rootTmpDir, name)
 		if err != nil {
 			t.Fatalf("error creating temporary directory for test case: %v", err)
 		}
 
 		for filename, content := range testDataFiles {
 			filename = filepath.Join(specDir, filename)
-			if err := ioutil.WriteFile(filename, []byte(content), os.ModePerm); err != nil {
+			if err := os.WriteFile(filename, []byte(content), os.ModePerm); err != nil {
 				t.Fatalf("error writing temporary file '%s': %v", filename, err)
 			}
 		}

go.mod

@@ -1,6 +1,6 @@
 module go.aporeto.io/elemental
 
-go 1.13
+go 1.16
 
 require go.aporeto.io/regolithe v1.70.0
 

request.go

@@ -14,7 +14,7 @@ package elemental
 import (
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strconv"
 	"strings"
@@ -155,7 +155,7 @@ func NewRequestFromHTTPRequest(req *http.Request, manager ModelManager) (*Reques
 	case http.MethodPatch:
 		operation = OperationPatch
 		if _, ok := externalSupportedContentType[string(contentType)]; !ok {
-			data, err = ioutil.ReadAll(req.Body)
+			data, err = io.ReadAll(req.Body)
 			if err != nil {
 				return nil, NewError("Bad Request", fmt.Sprintf("Unable to read body of request: %s", err), "elemental", http.StatusBadRequest)
 			}
@@ -165,7 +165,7 @@ func NewRequestFromHTTPRequest(req *http.Request, manager ModelManager) (*Reques
 	case http.MethodPost:
 		operation = OperationCreate
 		if _, ok := externalSupportedContentType[string(contentType)]; !ok {
-			data, err = ioutil.ReadAll(req.Body)
+			data, err = io.ReadAll(req.Body)
 			if err != nil {
 				return nil, NewError("Bad Request", fmt.Sprintf("Unable to read body of request: %s", err), "elemental", http.StatusBadRequest)
 			}
@@ -175,7 +175,7 @@ func NewRequestFromHTTPRequest(req *http.Request, manager ModelManager) (*Reques
 	case http.MethodPut:
 		operation = OperationUpdate
 		if _, ok := externalSupportedContentType[string(contentType)]; !ok {
-			data, err = ioutil.ReadAll(req.Body)
+			data, err = io.ReadAll(req.Body)
 			if err != nil {
 				return nil, NewError("Bad Request", fmt.Sprintf("Unable to read body of request: %s", err), "elemental", http.StatusBadRequest)
 			}