Merge pull request #117 from w3c/dep_cleanup

remove deprecated ioutil lib for os and io
w3c · Feb 26, 2024 · 769a62d · 769a62d
2 parents 43f4d99 + aa72e75
commit 769a62d
Show file tree

Hide file tree

Showing 21 changed files with 248 additions and 253 deletions.
diff --git a/client/client-1.0/compress_client/compress_client.go b/client/client-1.0/compress_client/compress_client.go
@@ -13,7 +13,7 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"flag"
-	"io/ioutil"
+	//"io/ioutil"
 	//	"net/http"
 	"net/url"
 	"os"
@@ -82,7 +82,7 @@ func retrieveRequest(jsonRequest map[string]interface{}) string {
 }
 
 func createListFromFile(fname string) int {
-	data, err := ioutil.ReadFile(fname)
+	data, err := os.ReadFile(fname)
 	if err != nil {
 		fmt.Printf("Error reading file=%s", fname)
 		return 0

diff --git a/client/client-1.0/compress_client/transportSec.go b/client/client-1.0/compress_client/transportSec.go
@@ -13,7 +13,6 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 )
 
@@ -34,7 +33,7 @@ type SecConfig struct {
 var secConfig SecConfig
 
 func readTransportSecConfig() {
-	data, err := ioutil.ReadFile(trSecConfigPath + "transportSec.json")
+	data, err := os.ReadFile(trSecConfigPath + "transportSec.json")
 	if err != nil {
 		fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
 		secConfig.TransportSec = "no"
@@ -59,7 +58,7 @@ func prepareTransportSecConfig() *x509.CertPool {
 		fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
 		os.Exit(1)
 	}
-	caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
+	caCert, err := os.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
 	if err != nil {
 		fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath+secConfig.CaSecPath+"Root.CA.crt", err)
 		os.Exit(1)

diff --git a/client/client-1.0/csv_client/csv_client.go b/client/client-1.0/csv_client/csv_client.go
@@ -13,19 +13,15 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"flag"
-	"io/ioutil"
-	//	"net/http"
+	"fmt"
+	"github.com/akamensky/argparse"
+	"github.com/gorilla/websocket"
+	"github.com/w3c/automotive-viss2/utils"
 	"net/url"
 	"os"
 	"strconv"
 	"strings"
-
-	"fmt"
 	"time"
-
-	"github.com/akamensky/argparse"
-	"github.com/gorilla/websocket"
-	"github.com/w3c/automotive-viss2/utils"
 )
 
 var commandNumber string
@@ -82,7 +78,7 @@ func retrieveRequest(jsonRequest map[string]interface{}) string {
 }
 
 func createListFromFile(fname string) int {
-	data, err := ioutil.ReadFile(fname)
+	data, err := os.ReadFile(fname)
 	if err != nil {
 		fmt.Printf("Error reading file=%s", fname)
 		return 0

diff --git a/client/client-1.0/csv_client/transportSec.go b/client/client-1.0/csv_client/transportSec.go
@@ -13,7 +13,6 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 )
 
@@ -34,7 +33,7 @@ type SecConfig struct {
 var secConfig SecConfig
 
 func readTransportSecConfig() {
-	data, err := ioutil.ReadFile(trSecConfigPath + "transportSec.json")
+	data, err := os.ReadFile(trSecConfigPath + "transportSec.json")
 	if err != nil {
 		fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
 		secConfig.TransportSec = "no"
@@ -59,7 +58,7 @@ func prepareTransportSecConfig() *x509.CertPool {
 		fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
 		os.Exit(1)
 	}
-	caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
+	caCert, err := os.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
 	if err != nil {
 		fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath+secConfig.CaSecPath+"Root.CA.crt", err)
 		os.Exit(1)

diff --git a/client/client-1.0/grpc_client/grpc_map_client/transportSec.go b/client/client-1.0/grpc_client/grpc_map_client/transportSec.go
@@ -13,7 +13,6 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 )
 
@@ -37,7 +36,7 @@ var secConfig SecConfig
 func readTransportSecConfig() {
 	path, err := os.Getwd()
 
-	data, err := ioutil.ReadFile(path + "/" + trSecConfigPath + "transportSec.json")
+	data, err := os.ReadFile(path + "/" + trSecConfigPath + "transportSec.json")
 	if err != nil {
 		fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
 		secConfig.TransportSec = "no"
@@ -62,7 +61,7 @@ func prepareTransportSecConfig() *x509.CertPool {
 		fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
 		os.Exit(1)
 	}
-	caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
+	caCert, err := os.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
 	if err != nil {
 		fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath+secConfig.CaSecPath+"Root.CA.crt", err)
 		os.Exit(1)

diff --git a/client/client-1.0/grpc_client/transportSec.go b/client/client-1.0/grpc_client/transportSec.go
@@ -13,7 +13,7 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	//"io/ioutil"
 	"os"
 )
 
@@ -37,7 +37,7 @@ var secConfig SecConfig
 func readTransportSecConfig() {
 	path, err := os.Getwd()
 
-	data, err := ioutil.ReadFile(path + "/" + trSecConfigPath + "transportSec.json")
+	data, err := os.ReadFile(path + "/" + trSecConfigPath + "transportSec.json")
 	if err != nil {
 		fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
 		secConfig.TransportSec = "no"
@@ -62,7 +62,7 @@ func prepareTransportSecConfig() *x509.CertPool {
 		fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
 		os.Exit(1)
 	}
-	caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
+	caCert, err := os.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
 	if err != nil {
 		fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath+secConfig.CaSecPath+"Root.CA.crt", err)
 		os.Exit(1)

diff --git a/client/client-1.0/simple_client.go b/client/client-1.0/simple_client.go
@@ -14,7 +14,7 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"flag"
-	"io/ioutil"
+	//"io/ioutil"
 	//	"net/http"
 	"net/url"
 	"os"
@@ -82,7 +82,7 @@ func retrieveRequest(jsonRequest map[string]interface{}) string {
 }
 
 func createListFromFile(fname string) int {
-	data, err := ioutil.ReadFile(fname)
+	data, err := os.ReadFile(fname)
 	if err != nil {
 		fmt.Printf("Error reading file=%s", fname)
 		return 0

diff --git a/client/client-1.0/transportSec.go b/client/client-1.0/transportSec.go
@@ -13,7 +13,7 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	//"io/ioutil"
 	"os"
 )
 
@@ -34,7 +34,7 @@ type SecConfig struct {
 var secConfig SecConfig
 
 func readTransportSecConfig() {
-	data, err := ioutil.ReadFile(trSecConfigPath + "transportSec.json")
+	data, err := os.ReadFile(trSecConfigPath + "transportSec.json")
 	if err != nil {
 		fmt.Printf("ReadTransportSecConfig():%stransportSec.json error=%s", trSecConfigPath, err)
 		secConfig.TransportSec = "no"
@@ -59,7 +59,7 @@ func prepareTransportSecConfig() *x509.CertPool {
 		fmt.Printf("Error creating x509 keypair from client cert file %s and client key file %s\n", clientCertFile, clientKeyFile)
 		os.Exit(1)
 	}
-	caCert, err := ioutil.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
+	caCert, err := os.ReadFile(trSecConfigPath + secConfig.CaSecPath + "Root.CA.crt")
 	if err != nil {
 		fmt.Printf("Error opening cert file %s, Error: %s", trSecConfigPath+secConfig.CaSecPath+"Root.CA.crt", err)
 		os.Exit(1)

diff --git a/docker/README.md b/docker/README.md
@@ -22,7 +22,10 @@ Placing the dockerfile which is used to build the image in the root is done for
 practical reasons. See: https://www.baeldung.com/ops/docker-include-files-outside-build-context
 
 
-To build and run the docker example see below:
+To build and run the docker example see below, please note that the docker-compose-rl.yml file is located in 
+the: _viss-docker-rl_ folder
+
+
 
 ```bash
 $ docker compose -f docker-compose-rl.yml build