bump version of go to 1.19 (#4972)

steeling · keithmattix · commit 8ed34f8ba62e · 2022-12-13T16:45:08.000-06:00
bump version of go to 1.19

Signed-off-by: Sean Teeling &lt;seanteeling@microsoft.com&gt;
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,7 +54,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.47.0
+          version: v1.48.0
           skip-pkg-cache: true
 
   codegen:
diff --git a/Dockerfile b/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
diff --git a/Makefile b/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
diff --git a/cmd/cli/env.go b/cmd/cli/env.go
@@ -5,15 +5,15 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-Copyright 2020 The OSM contributors
+# Copyright 2020 The OSM contributors
 
 Licensed under the MIT License
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/cmd/cli/install.go b/cmd/cli/install.go
@@ -57,6 +57,7 @@ const (
 
 // chartTGZSource is the `helm package`d representation of the default Helm chart.
 // Its value is embedded at build time.
+//
 //go:embed chart.tgz
 var chartTGZSource []byte
 
diff --git a/cmd/osm-bootstrap/osm-bootstrap.go b/cmd/osm-bootstrap/osm-bootstrap.go
@@ -330,8 +330,9 @@ func (b *bootstrap) ensureMeshConfig() error {
 }
 
 // initiatilizeKubernetesEventsRecorder initializes the generic Kubernetes event recorder and associates it with
+//
 //	the osm-bootstrap pod resource. The events recorder allows the osm-bootstap to publish Kubernets events to
-// 	report fatal errors with initializing this application. These events will show up in the output of `kubectl get events`
+//	report fatal errors with initializing this application. These events will show up in the output of `kubectl get events`
 func (b *bootstrap) initiatilizeKubernetesEventsRecorder() error {
 	bootstrapPod, err := b.getBootstrapPod()
 	if err != nil {
diff --git a/demo/README.md b/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`
diff --git a/docs/development_guide/README.md b/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
 
diff --git a/go.mod b/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
diff --git a/pkg/bugreport/run_test.go b/pkg/bugreport/run_test.go
@@ -1,3 +1,4 @@
+//go:build withEnvPathSet
 // +build withEnvPathSet
 
 package bugreport
diff --git a/pkg/catalog/inbound_traffic_policies.go b/pkg/catalog/inbound_traffic_policies.go
@@ -197,6 +197,7 @@ func (mc *MeshCatalog) getRoutingRulesFromTrafficTarget(trafficTarget access.Tra
 }
 
 // routesFromRules takes a set of traffic target rules and the namespace of the traffic target and returns a list of
+//
 //	http route matches (trafficpolicy.HTTPRouteMatch)
 func (mc *MeshCatalog) routesFromRules(rules []access.TrafficTargetRule, trafficTargetNamespace string) ([]trafficpolicy.HTTPRouteMatch, error) {
 	var routes []trafficpolicy.HTTPRouteMatch
diff --git a/pkg/catalog/outbound_traffic_policies.go b/pkg/catalog/outbound_traffic_policies.go
@@ -17,12 +17,12 @@ import (
 // GetOutboundMeshTrafficPolicy returns the outbound mesh traffic policy for the given downstream identity
 //
 // The function works as follows:
-// 1. If permissive mode is enabled, builds outbound mesh traffic policies to reach every upstream service
-//    discovered using service discovery, using wildcard routes.
-// 2. In SMI mode, builds outbound mesh traffic policies to reach every upstream service corresponding
-//    to every upstream service account that this downstream is authorized to access using SMI TrafficTarget
-//    policies.
-// 3. Process TraficSplit policies and update the weights for the upstream services based on the policies.
+//  1. If permissive mode is enabled, builds outbound mesh traffic policies to reach every upstream service
+//     discovered using service discovery, using wildcard routes.
+//  2. In SMI mode, builds outbound mesh traffic policies to reach every upstream service corresponding
+//     to every upstream service account that this downstream is authorized to access using SMI TrafficTarget
+//     policies.
+//  3. Process TraficSplit policies and update the weights for the upstream services based on the policies.
 //
 // The route configurations are consolidated per port, such that upstream services using the same port are a part
 // of the same route configuration. This is required to avoid route conflicts that can occur when the same hostname
diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
@@ -8,15 +8,15 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-Copyright 2020 The OSM contributors
+# Copyright 2020 The OSM contributors
 
 Licensed under the MIT License
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/pkg/envoy/rds/route/route_config.go b/pkg/envoy/rds/route/route_config.go
@@ -247,7 +247,7 @@ func BuildEgressRouteConfiguration(portSpecificRouteConfigs map[int][]*trafficpo
 	return routeConfigs
 }
 
-//NewRouteConfigurationStub creates the route configuration placeholder
+// NewRouteConfigurationStub creates the route configuration placeholder
 func NewRouteConfigurationStub(routeConfigName string) *xds_route.RouteConfiguration {
 	routeConfiguration := xds_route.RouteConfiguration{
 		Name: routeConfigName,
diff --git a/pkg/ingress/gateway.go b/pkg/ingress/gateway.go
@@ -18,10 +18,10 @@ import (
 )
 
 // provisionIngressGatewayCert does the following:
-// 1. If an ingress gateway certificate spec is specified in the MeshConfig resource, issues a certificate
-//    for it and stores it in the referenced secret.
-// 2. Starts a goroutine to watch for changes to the MeshConfig resource and certificate rotation, and
-//    updates/removes the certificate and secret as necessary.
+//  1. If an ingress gateway certificate spec is specified in the MeshConfig resource, issues a certificate
+//     for it and stores it in the referenced secret.
+//  2. Starts a goroutine to watch for changes to the MeshConfig resource and certificate rotation, and
+//     updates/removes the certificate and secret as necessary.
 func (c *client) provisionIngressGatewayCert(stop <-chan struct{}) error {
 	defaultCertSpec := c.cfg.GetMeshConfig().Spec.Certificate.IngressGateway
 	if defaultCertSpec != nil {
diff --git a/pkg/tests/stream.go b/pkg/tests/stream.go
@@ -53,9 +53,9 @@ func (s *XDSServer) Recv() (*xds_discovery.DiscoveryRequest, error) {
 // SetHeader sets the header metadata. It may be called multiple times.
 // When call multiple times, all the provided metadata will be merged.
 // All the metadata will be sent out when one of the following happens:
-//  - ServerStream.SendHeader() is called;
-//  - The first response is sent out;
-//  - An RPC status is sent out (error or success).
+//   - ServerStream.SendHeader() is called;
+//   - The first response is sent out;
+//   - An RPC status is sent out (error or success).
 func (s *XDSServer) SetHeader(metadata.MD) error {
 	return nil
 }
diff --git a/pkg/trafficpolicy/trafficpolicy.go b/pkg/trafficpolicy/trafficpolicy.go
@@ -84,6 +84,7 @@ func (rwc *RouteWeightedClusters) TotalClustersWeight() int {
 }
 
 // AddRoute adds a route to an OutboundTrafficPolicy given an HTTP route match and weighted cluster. If a Route with the given HTTP route match
+//
 //	already exists, an error will be returned. If a Route with the given HTTP route match does not exist,
 //	a Route with the given HTTP route match and weighted clusters will be added to the Routes on the OutboundTrafficPolicy
 func (out *OutboundTrafficPolicy) AddRoute(httpRouteMatch HTTPRouteMatch, retryPolicy *policyv1alpha1.RetryPolicySpec, weightedClusters ...service.WeightedCluster) error {
@@ -137,6 +138,7 @@ func MergeInboundPolicies(original []*InboundTrafficPolicy, latest ...*InboundTr
 }
 
 // MergeRules merges the give slices of rules such that there is one Rule for a Route with all allowed service accounts listed in the
+//
 //	returned slice of rules
 func MergeRules(originalRules, latestRules []*Rule) []*Rule {
 	for _, latest := range latestRules {
@@ -156,8 +158,9 @@ func MergeRules(originalRules, latestRules []*Rule) []*Rule {
 }
 
 // mergeRoutesWeightedClusters merges two slices of RouteWeightedClusters and returns a slice where there is one RouteWeightedCluster
-//	for any HTTPRouteMatch. Where there is an overlap in HTTPRouteMatch between the originalRoutes and latestRoutes, the WeightedClusters
-//  will be unioned as there can only be one set of WeightedClusters per HTTPRouteMatch.
+//
+//		for any HTTPRouteMatch. Where there is an overlap in HTTPRouteMatch between the originalRoutes and latestRoutes, the WeightedClusters
+//	 will be unioned as there can only be one set of WeightedClusters per HTTPRouteMatch.
 func mergeRoutesWeightedClusters(originalRoutes, latestRoutes []*RouteWeightedClusters) []*RouteWeightedClusters {
 	for _, latest := range latestRoutes {
 		foundRoute := false
diff --git a/tests/framework/common_apps.go b/tests/framework/common_apps.go
@@ -851,7 +851,8 @@ func (td *OsmTestData) InstallNginxIngress() (string, error) {
 }
 
 // RandomNameWithPrefix generates a random string with the given prefix.
-// 	If the prefix is empty, the default prefix "test" will be used
+//
+//	If the prefix is empty, the default prefix "test" will be used
 func RandomNameWithPrefix(prefix string) string {
 	if prefix == "" || len(prefix) > 100 {
 		prefix = "test"
diff --git a/tests/framework/types.go b/tests/framework/types.go
@@ -140,7 +140,7 @@ type InstallOsmOpt func(*InstallOSMOpts)
 // CleanupType identifies what triggered the cleanup
 type CleanupType string
 
-//DockerConfig and other configs are docker-specific container registry secret structures.
+// DockerConfig and other configs are docker-specific container registry secret structures.
 // Most of it is taken or referenced from kubectl source itself
 type DockerConfig map[string]DockerConfigEntry
 
diff --git a/tools.go b/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package tools

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build withEnvPathSet`
`1`	`2`	`// +build withEnvPathSet`
`2`	`3`
`3`	`4`	`package bugreport`