Update golanglint-ci version and fix deprecated rand functions (#1109)

Author: shifucun

build/Dockerfile

@@ -82,8 +82,8 @@ ENTRYPOINT ["/go/bin/mixer"]
 FROM base as test
 WORKDIR /mixer
 # Golint
-RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0
-RUN ./bin/golangci-lint run --timeout=600s
+RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.52.2
+RUN ./bin/golangci-lint run --timeout=600s --skip-dirs='internal/proto'
 # Test
 COPY test/ test
 COPY deploy/ deploy

build/ci/cloudbuild.test.yaml

@@ -1,4 +1,4 @@
-# Copyright 2019 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ steps:
           echo "bigquery.version should not have end of file newline"
           exit 1
         fi
-        wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0
-        ./bin/golangci-lint run --timeout=600s
+        wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.52.2
+        ./bin/golangci-lint run --timeout=600s --skip-dirs='internal/proto'
 
   - id: build-proto
     name: gcr.io/datcom-ci/go-protoc

internal/server/statvar/golden/search_statvar/poor.json

@@ -3292,66 +3292,34 @@
         }
       ]
     },
-    {
-      "dcid": "dc/g/SDG_1.3.1",
-      "name": "1.3.1: Proportion of population covered by social protection floors/systems, by sex, distinguishing children, unemployed persons, older persons, persons with disabilities, pregnant women, newborns, work-injury victims and the poor and the vulnerable"
-    },
     {
       "dcid": "sdg/g/SDG_1.3.1",
       "name": "1.3.1: Proportion of population covered by social protection floors/systems, by sex, distinguishing children, unemployed persons, older persons, persons with disabilities, pregnant women, newborns, work-injury victims and the poor and the vulnerable"
     },
-    {
-      "dcid": "dc/g/SDG_1.3",
-      "name": "1.3: Implement nationally appropriate social protection systems and measures for all, including floors, and by 2030 achieve substantial coverage of the poor and the vulnerable"
-    },
     {
       "dcid": "sdg/g/SDG_1.3",
       "name": "1.3: Implement nationally appropriate social protection systems and measures for all, including floors, and by 2030 achieve substantial coverage of the poor and the vulnerable"
     },
-    {
-      "dcid": "dc/g/SDG_1.4",
-      "name": "1.4: By 2030, ensure that all men and women, in particular the poor and the vulnerable, have equal rights to economic resources, as well as access to basic services, ownership and control over land and other forms of property, inheritance, natural resources, appropriate new technology and financial services, including microfinance"
-    },
     {
       "dcid": "sdg/g/SDG_1.4",
       "name": "1.4: By 2030, ensure that all men and women, in particular the poor and the vulnerable, have equal rights to economic resources, as well as access to basic services, ownership and control over land and other forms of property, inheritance, natural resources, appropriate new technology and financial services, including microfinance"
     },
-    {
-      "dcid": "dc/g/SDG_1.5",
-      "name": "1.5: By 2030, build the resilience of the poor and those in vulnerable situations and reduce their exposure and vulnerability to climate-related extreme events and other economic, social and environmental shocks and disasters"
-    },
     {
       "dcid": "sdg/g/SDG_1.5",
       "name": "1.5: By 2030, build the resilience of the poor and those in vulnerable situations and reduce their exposure and vulnerability to climate-related extreme events and other economic, social and environmental shocks and disasters"
     },
-    {
-      "dcid": "dc/g/SDG_11.5",
-      "name": "11.5: By 2030, significantly reduce the number of deaths and the number of people affected and substantially decrease the direct economic losses relative to global gross domestic product caused by disasters, including water-related disasters, with a focus on protecting the poor and people in vulnerable situations"
-    },
     {
       "dcid": "sdg/g/SDG_11.5",
       "name": "11.5: By 2030, significantly reduce the number of deaths and the number of people affected and substantially decrease the direct economic losses relative to global gross domestic product caused by disasters, including water-related disasters, with a focus on protecting the poor and people in vulnerable situations"
     },
-    {
-      "dcid": "dc/g/SDG_12.c",
-      "name": "12.c: Rationalize inefficient fossil-fuel subsidies that encourage wasteful consumption by removing market distortions, in accordance with national circumstances, including by restructuring taxation and phasing out those harmful subsidies, where they exist, to reflect their environmental impacts, taking fully into account the specific needs and conditions of developing countries and minimizing the possible adverse impacts on their development in a manner that protects the poor and the affected communities"
-    },
     {
       "dcid": "sdg/g/SDG_12.c",
       "name": "12.c: Rationalize inefficient fossil-fuel subsidies that encourage wasteful consumption by removing market distortions, in accordance with national circumstances, including by restructuring taxation and phasing out those harmful subsidies, where they exist, to reflect their environmental impacts, taking fully into account the specific needs and conditions of developing countries and minimizing the possible adverse impacts on their development in a manner that protects the poor and the affected communities"
     },
-    {
-      "dcid": "dc/g/SDG_17.4",
-      "name": "17.4: Assist developing countries in attaining long-term debt sustainability through coordinated policies aimed at fostering debt financing, debt relief and debt restructuring, as appropriate, and address the external debt of highly indebted poor countries to reduce debt distress"
-    },
     {
       "dcid": "sdg/g/SDG_17.4",
       "name": "17.4: Assist developing countries in attaining long-term debt sustainability through coordinated policies aimed at fostering debt financing, debt relief and debt restructuring, as appropriate, and address the external debt of highly indebted poor countries to reduce debt distress"
     },
-    {
-      "dcid": "dc/g/SDG_2.1",
-      "name": "2.1: By 2030, end hunger and ensure access by all people, in particular the poor and people in vulnerable situations, including infants, to safe, nutritious and sufficient food all year round"
-    },
     {
       "dcid": "sdg/g/SDG_2.1",
       "name": "2.1: By 2030, end hunger and ensure access by all people, in particular the poor and people in vulnerable situations, including infants, to safe, nutritious and sufficient food all year round"

internal/server/v1/page/place.go

@@ -542,8 +542,8 @@ func getSimilarPlaces(
 		}
 		seed = int64(time.Now().YearDay() + int(h.Sum32()))
 	}
-	rand.Seed(seed)
-	rand.Shuffle(len(places), func(i, j int) {
+	r := rand.New(rand.NewSource(seed))
+	r.Shuffle(len(places), func(i, j int) {
 		places[i], places[j] = places[j], places[i]
 	})
 	result := []*pbv1.Place{}

internal/util/util.go

@@ -237,14 +237,14 @@ func CheckValidDCIDs(dcids []string) error {
 
 // RandomString creates a random string with 16 runes.
 func RandomString() string {
-	rand.Seed(time.Now().UnixNano())
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 	chars := []rune("ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
 		"abcdefghijklmnopqrstuvwxyz" +
 		"0123456789")
 	length := 16
 	var b strings.Builder
 	for i := 0; i < length; i++ {
-		b.WriteRune(chars[rand.Intn(len(chars))])
+		b.WriteRune(chars[r.Intn(len(chars))])
 	}
 	return b.String()
 }