[backport] cherry-pick 15e46da to release-v1.2

Fix ingress backend broken SAN (openservicemesh#4914)

Fix ingress backend SAN's, which were getting the trust domain appended to the provided SAN.
This adds an e2e test to catch that going forward.
This also switches the internal builders to use the principal (trust domain appended) vs the identity (no trust domain)

Signed-off-by: nshankar13 <[email protected]>

[backport] cherry-pick 961c865 to release-v1.2

fix golints G114 and package-comments (openservicemesh#5037)

golints addressed:
1. G114: Use of net/http serve function that has no support for setting timeouts
2. package-comments
3. removes pkg mesh and moves isValidUUID() to pkg/cli/proxy_get.go

Signed-off-by: Shalier Xia <[email protected]>

[backport] cherry-pick df502a7 to release-v1.2

bump version of go to 1.19 (openservicemesh#4972)

Signed-off-by: Sean Teeling <[email protected]>

Author: steeling

.golangci.yml

@@ -1,6 +1,6 @@
 run:
   tests: true
-  timeout: 10m
+  timeout: 20m
   skip-dirs:
     - pkg/gen
   skip-files:
@@ -35,6 +35,10 @@ issues:
         - revive
       source: ". \"github.com/openservicemesh/osm/tests/framework\""
       text: "dot imports"
+    # Ignore error for package comments
+    - linters:
+        - revive
+      text: "package-comments: should have a package comment"
     # Exclude staticcheck messages for deprecated function, variable or constant
     # This causes issues with package github.com/golang/protobuf/proto
     - linters:

Dockerfile

@@ -1,6 +1,6 @@
 
 #build stage
-FROM golang:1.17-alpine AS builder
+FROM golang:1.19-alpine AS builder
 
 RUN apk update
 RUN apk add --no-cache make

Makefile

@@ -21,8 +21,8 @@ GIT_SHA=$$(git rev-parse HEAD)
 BUILD_DATE_VAR := github.com/openservicemesh/osm/pkg/version.BuildDate
 BUILD_VERSION_VAR := github.com/openservicemesh/osm/pkg/version.Version
 BUILD_GITCOMMIT_VAR := github.com/openservicemesh/osm/pkg/version.GitCommit
-DOCKER_GO_VERSION = 1.17
-DOCKER_BUILDX_PLATFORM ?= linux/amd64
+DOCKER_GO_VERSION = 1.19
+DOCKER_BUILDX_PLATFORM ?= linux/$(shell go env GOARCH)
 # Value for the --output flag on docker buildx build.
 # https://docs.docker.com/engine/reference/commandline/buildx_build/#output
 DOCKER_BUILDX_OUTPUT ?= type=registry

demo/README.md

@@ -3,7 +3,7 @@
 ## System Requirements
 - MacOS, Linux or WSL2 on Windows
 - GCC
-- Go version [1.17.0 or higher](https://github.com/openservicemesh/osm/issues/2363)
+- Go version [1.19.0 or higher](https://github.com/openservicemesh/osm/issues/2363)
 - Kubectl version 1.15 or higher
 - Docker CLI
    - on a Debian based GNU/Linux system: `sudo apt-get install docker`

demo/cmd/bookbuyer/bookbuyer.go

@@ -1,3 +1,4 @@
+// Package main implements the bookbuyer application
 package main
 
 import (
@@ -77,6 +78,7 @@ func debugServer() {
 	}
 	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {})
 	log.Info().Msgf("Web server running on port %d", *port)
+	//#nosec G114: Use of net/http serve function that has no support for setting timeouts
 	err = http.ListenAndServe(fmt.Sprintf(":%d", *port), router)
 	log.Fatal().Err(err).Msgf("Failed to start HTTP server on port %d", *port)
 }

demo/cmd/bookstore/bookstore.go

@@ -1,3 +1,4 @@
+// Package main implements the bookstore application
 package main
 
 import (
@@ -164,8 +165,8 @@ func main() {
 		router.HandleFunc(h.path, h.fn).Methods(h.method)
 	}
 	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {})
-
 	log.Info().Msgf("Bookstore running on port %d", *port)
+	//#nosec G114: Use of net/http serve function that has no support for setting timeouts
 	err = http.ListenAndServe(fmt.Sprintf(":%d", *port), router)
 	log.Fatal().Err(err).Msgf("Failed to start HTTP server on port %d", *port)
 }

demo/cmd/bookthief/bookthief.go

@@ -1,3 +1,4 @@
+// Package main implements the bookthief application
 package main
 
 import (
@@ -86,6 +87,7 @@ func debugServer() {
 	}
 	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {})
 	log.Info().Msgf("Bookthief running on port %d", *port)
+	//#nosec G114: Use of net/http serve function that has no support for setting timeouts
 	err = http.ListenAndServe(fmt.Sprintf(":%d", *port), router)
 	log.Fatal().Err(err).Msgf("Failed to start HTTP server on port %d", *port)
 }

demo/cmd/bookwarehouse/bookwarehouse.go

@@ -1,3 +1,6 @@
+// Package main implements the bookwarehouse application
+// This create a service which has both inbound as well as outbound service policies
+// i.e. bookbuyer makes a GET call to bookstore, bookstore makes a POST call to bookwarehouse
 package main
 
 import (
@@ -129,6 +132,7 @@ func main() {
 	router.HandleFunc("/", restockBooks).Methods("POST")
 	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {})
 	log.Info().Msgf("Starting BookWarehouse HTTP server on port %d", *port)
+	//#nosec G114: Use of net/http serve function that has no support for setting timeouts
 	err := http.ListenAndServe(fmt.Sprintf(":%d", *port), router)
 	log.Fatal().Err(err).Msgf("Failed to start BookWarehouse HTTP server on port %d", *port)
 }

demo/cmd/bookwatcher/bookwatcher.go

@@ -1,3 +1,4 @@
+// Package main implements the bookwatcher for terminal and JSON output from demo applications
 package main
 
 import (

demo/cmd/common/books.go

@@ -1,3 +1,4 @@
+// Package common implements shared functions and structs between various book* applications
 package common
 
 import (

demo/cmd/database/mysql.go

@@ -1,3 +1,5 @@
+// Package database allows the bookwarehouse service to store
+// total books data into MySQL persistent storage
 package database
 
 import (

docs/development_guide/README.md

@@ -63,7 +63,7 @@ OSM leverages [Envoy proxy](https://github.com/envoyproxy/envoy) as a data plane
 
 ## Get Go-ing
 
-This Open Service Mesh project uses [Go v1.17.0+](https://golang.org/). If you are not familiar with Go, spend some time with the excellent [Tour of Go](https://tour.golang.org/).
+This Open Service Mesh project uses [Go v1.19.0+](https://golang.org/). If you are not familiar with Go, spend some time with the excellent [Tour of Go](https://tour.golang.org/).
 
 ## Get the dependencies
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/openservicemesh/osm
 
-go 1.17
+go 1.19
 
 require (
 	github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737