From 2ef2250ed15a1a0f3a9e6a397258c22ecebc38ef Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Mon, 6 Feb 2023 10:09:27 -0800 Subject: [PATCH 01/11] Add 1.20 to the matrix --- .../jobs/archetype-sdk-client-samples.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml b/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml index 5233f298d52b..a49c20f8b345 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml @@ -18,19 +18,27 @@ stages: Linux_Go118: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 - go.version: '1.18.5' + go.version: '1.18.10' Windows_Go118: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 - go.version: '1.18.5' + go.version: '1.18.10' Linux_Go119: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 - go.version: '1.19' + go.version: '1.19.5' Windows_Go119: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 - go.version: '1.19' + go.version: '1.19.5' + Linux_Go120: + pool.name: azsdk-pool-mms-ubuntu-2004-general + image.name: MMSUbuntu20.04 + go.version: '1.20' + Windows_Go120: + pool.name: azsdk-pool-mms-win-2022-general + image.name: MMS2022 + go.version: '1.20' pool: name: $(pool.name) vmImage: $(image.name) @@ -63,7 +71,7 @@ stages: steps: - task: GoTool@0 inputs: - version: '1.19' + version: '1.20' displayName: "Select Go Version" - template: ../steps/create-go-workspace.yml From df96655276514febf558337bafbd8fbd8656ae00 Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Mon, 6 Feb 2023 10:11:00 -0800 Subject: [PATCH 02/11] Add 1.20 to the matrix --- eng/pipelines/mgmt-auto-release.yml | 2 +- .../templates/jobs/archetype-sdk-client.yml | 16 ++++++++++++---- .../jobs/archetype-sdk-eng-client.yml | 18 +++++++++++++----- .../templates/jobs/mgmt-mock-test.yml | 2 +- .../templates/stages/platform-matrix.json | 4 +++- eng/scripts/automation_init.sh | 14 +++++++++++--- 6 files changed, 41 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/mgmt-auto-release.yml b/eng/pipelines/mgmt-auto-release.yml index 0d3d2e294e2c..dfd10d30b63e 100644 --- a/eng/pipelines/mgmt-auto-release.yml +++ b/eng/pipelines/mgmt-auto-release.yml @@ -23,7 +23,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19' + version: '1.20' - task: ShellScript@2 inputs: diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index a8ada194cf36..b7d86177b8e6 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -85,11 +85,11 @@ stages: Linux_Go118: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 - go.version: '1.18.5' + go.version: '1.18.10' Windows_Go118: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 - go.version: '1.18.5' + go.version: '1.18.10' Linux_Go119: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 @@ -97,7 +97,15 @@ stages: Windows_Go119: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 - go.version: '1.19' + go.version: '1.19' + Linux_Go120: + pool.name: azsdk-pool-mms-ubuntu-2004-general + image.name: MMSUbuntu20.04 + go.version: '1.20' + Windows_Go120: + pool.name: azsdk-pool-mms-win-2022-general + image.name: MMS2022 + go.version: '1.20' generate.bom: true pool: name: $(pool.name) @@ -141,7 +149,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19' + version: '1.20' displayName: "Select Go Version" - template: ../steps/create-go-workspace.yml diff --git a/eng/pipelines/templates/jobs/archetype-sdk-eng-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-eng-client.yml index 4bba57e892a0..8d1d50d1700e 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-eng-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-eng-client.yml @@ -28,19 +28,27 @@ stages: Linux_Go118: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 - go.version: '1.18.5' + go.version: '1.18.10' Windows_Go118: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 - go.version: '1.18.5' + go.version: '1.18.10' Linux_Go119: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 - go.version: '1.19' + go.version: '1.19.5' Windows_Go119: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 - go.version: '1.19' + go.version: '1.19.5' + Linux_Go120: + pool.name: azsdk-pool-mms-ubuntu-2004-general + image.name: MMSUbuntu20.04 + go.version: '1.20' + Windows_Go120: + pool.name: azsdk-pool-mms-win-2022-general + image.name: MMS2022 + go.version: '1.20' generate.bom: true pool: name: $(pool.name) @@ -79,7 +87,7 @@ stages: - task: GoTool@0 inputs: - version: '1.19' + version: '1.20' displayName: "Select Go Version" - template: ../steps/create-go-workspace.yml diff --git a/eng/pipelines/templates/jobs/mgmt-mock-test.yml b/eng/pipelines/templates/jobs/mgmt-mock-test.yml index d0eda1553772..6ac45250fd55 100644 --- a/eng/pipelines/templates/jobs/mgmt-mock-test.yml +++ b/eng/pipelines/templates/jobs/mgmt-mock-test.yml @@ -14,7 +14,7 @@ jobs: displayName: 'Install autorest' - task: GoTool@0 inputs: - version: '1.19' + version: '1.20' displayName: "Select Go Version" - template: /eng/pipelines/templates/steps/create-go-workspace.yml diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index fb9df86651f8..c1f1c63729e9 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -11,7 +11,9 @@ } }, "GoVersion": [ - "1.18.2" + "1.18.10", + "1.19.5", + "1.20" ] } } diff --git a/eng/scripts/automation_init.sh b/eng/scripts/automation_init.sh index ca6c73ca6917..ba9583ec1230 100644 --- a/eng/scripts/automation_init.sh +++ b/eng/scripts/automation_init.sh @@ -17,10 +17,18 @@ outputFile="$(realpath $outputFile)" echo "output json file: $outputFile" TMPDIR="/tmp" -if [ ! "$(go version | awk '{print $3}' | cut -c 3-6)" = "1.19" ] +if [ ! "$(go version | awk '{print $3}' | cut -c 3-6)" = "1.19.5" ] then - wget https://golang.org/dl/go1.19.linux-amd64.tar.gz - tar -C $TMPDIR -xzf go1.19.linux-amd64.tar.gz + wget https://golang.org/dl/go1.19.5.linux-amd64.tar.gz + tar -C $TMPDIR -xzf go1.19.5.linux-amd64.tar.gz + export GOROOT=$TMPDIR/go + export PATH=$GOROOT/bin:$PATH +fi + +if [ ! "$(go version | awk '{print $3}' | cut -c 3-6)" = "1.20" ] +then + wget https://golang.org/dl/go1.20.linux-amd64.tar.gz + tar -C $TMPDIR -xzf go1.20.linux-amd64.tar.gz export GOROOT=$TMPDIR/go export PATH=$GOROOT/bin:$PATH fi From 4987019051196f0b2f4cd15499159830f331c8ed Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Mon, 6 Feb 2023 11:31:58 -0800 Subject: [PATCH 03/11] Update GoLint version --- eng/pipelines/templates/variables/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml index 1010bf70cd16..071313330e97 100644 --- a/eng/pipelines/templates/variables/globals.yml +++ b/eng/pipelines/templates/variables/globals.yml @@ -1,5 +1,5 @@ variables: - GoLintCLIVersion: 'v1.48.0' + GoLintCLIVersion: 'v1.51.1' Package.EnableSBOMSigning: true # Enable go native component governance detection # https://docs.opensource.microsoft.com/tools/cg/index.html From b8485e3d2f5523c6f6538679dcbee92bd1851c9c Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Mon, 6 Feb 2023 12:01:12 -0800 Subject: [PATCH 04/11] Update two used of rand.Seed to rand.NewSource --- sdk/resourcemanager/internal/testutil/helper.go | 2 +- sdk/resourcemanager/internal/testutil/recording.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/resourcemanager/internal/testutil/helper.go b/sdk/resourcemanager/internal/testutil/helper.go index 68c17844baa1..23b7053388dd 100644 --- a/sdk/resourcemanager/internal/testutil/helper.go +++ b/sdk/resourcemanager/internal/testutil/helper.go @@ -34,7 +34,7 @@ func GetEnv(key, fallback string) string { // a delegate function to delete the created resource group which can be used for clean up // and any error during the creation. func CreateResourceGroup(ctx context.Context, subscriptionId string, cred azcore.TokenCredential, options *arm.ClientOptions, location string) (*armresources.ResourceGroup, func() (*runtime.Poller[armresources.ResourceGroupsClientDeleteResponse], error), error) { - rand.Seed(time.Now().UnixNano()) + rand.NewSource(time.Now().UnixNano()) resourceGroupName := fmt.Sprintf("go-sdk-test-%d", rand.Intn(1000)) rgClient, err := armresources.NewResourceGroupsClient(subscriptionId, cred, options) if err != nil { diff --git a/sdk/resourcemanager/internal/testutil/recording.go b/sdk/resourcemanager/internal/testutil/recording.go index 9ba00fd0e15c..79df0510fa59 100644 --- a/sdk/resourcemanager/internal/testutil/recording.go +++ b/sdk/resourcemanager/internal/testutil/recording.go @@ -131,9 +131,9 @@ func GenerateAlphaNumericID(t *testing.T, prefix string, length int) string { recordingRandomSeed = time.Now().Unix() } } - rand.Seed(recordingRandomSeed) + rand.NewSource(recordingRandomSeed) } else { - rand.Seed(time.Now().Unix()) + rand.NewSource(time.Now().Unix()) } b := make([]rune, length) for i := range b { From 2f6ee56adf79610dcea609ac4b67743ba89f3a6a Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Mon, 6 Feb 2023 12:38:56 -0800 Subject: [PATCH 05/11] Update test --- sdk/resourcemanager/internal/testutil/recording_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/resourcemanager/internal/testutil/recording_test.go b/sdk/resourcemanager/internal/testutil/recording_test.go index 4e07ca4add5a..6f8885af243b 100644 --- a/sdk/resourcemanager/internal/testutil/recording_test.go +++ b/sdk/resourcemanager/internal/testutil/recording_test.go @@ -39,6 +39,6 @@ func TestStartStopRecording(t *testing.T) { func TestGenerateAlphaNumericID(t *testing.T) { stop := StartRecording(t, pathToPackage) rnd := GenerateAlphaNumericID(t, "test", 6) - require.Equal(t, rnd, "testsUJVGl") + require.Equal(t, rnd, "testLnfgDs") defer stop() } From a72479f640774964c63640ed8c76aaf56088cd78 Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Mon, 6 Feb 2023 15:06:17 -0800 Subject: [PATCH 06/11] Update baseline value --- sdk/resourcemanager/internal/testutil/recording_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/resourcemanager/internal/testutil/recording_test.go b/sdk/resourcemanager/internal/testutil/recording_test.go index 6f8885af243b..7a787509874a 100644 --- a/sdk/resourcemanager/internal/testutil/recording_test.go +++ b/sdk/resourcemanager/internal/testutil/recording_test.go @@ -39,6 +39,6 @@ func TestStartStopRecording(t *testing.T) { func TestGenerateAlphaNumericID(t *testing.T) { stop := StartRecording(t, pathToPackage) rnd := GenerateAlphaNumericID(t, "test", 6) - require.Equal(t, rnd, "testLnfgDs") + require.Equal(t, rnd, "testI4SuG5") defer stop() } From e6aef54f00397add26e6ce653bb404ff23f1c8ce Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Tue, 7 Feb 2023 09:59:57 -0800 Subject: [PATCH 07/11] Fix order of arguments --- sdk/resourcemanager/internal/testutil/recording_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/resourcemanager/internal/testutil/recording_test.go b/sdk/resourcemanager/internal/testutil/recording_test.go index 7a787509874a..4947c1b16c65 100644 --- a/sdk/resourcemanager/internal/testutil/recording_test.go +++ b/sdk/resourcemanager/internal/testutil/recording_test.go @@ -27,8 +27,8 @@ func TestRecordingPolicy(t *testing.T) { require.NoError(t, err) resp, err := pl.Do(req) require.NoError(t, err) - require.Equal(t, resp.StatusCode, http.StatusBadRequest) - require.Equal(t, resp.Request.URL.String(), testEndpoint) + require.Equal(t, http.StatusBadRequest, resp.StatusCode) + require.Equal(t, testEndpoint, resp.Request.URL.String()) } func TestStartStopRecording(t *testing.T) { @@ -39,6 +39,6 @@ func TestStartStopRecording(t *testing.T) { func TestGenerateAlphaNumericID(t *testing.T) { stop := StartRecording(t, pathToPackage) rnd := GenerateAlphaNumericID(t, "test", 6) - require.Equal(t, rnd, "testI4SuG5") + require.Equal(t, "testLnfgDs", rnd) defer stop() } From 48d7907e6ee06dd9aad017759f86826a0a9eca54 Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Tue, 7 Feb 2023 10:36:19 -0800 Subject: [PATCH 08/11] Update reference to latest version of internal --- sdk/resourcemanager/internal/go.mod | 2 +- sdk/resourcemanager/internal/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/resourcemanager/internal/go.mod b/sdk/resourcemanager/internal/go.mod index 3eb23e49e6fa..cc6d02a5dc22 100644 --- a/sdk/resourcemanager/internal/go.mod +++ b/sdk/resourcemanager/internal/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0 - github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 + github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0 github.com/stretchr/testify v1.7.0 ) diff --git a/sdk/resourcemanager/internal/go.sum b/sdk/resourcemanager/internal/go.sum index 9a8fa60437af..fe0b24340f87 100644 --- a/sdk/resourcemanager/internal/go.sum +++ b/sdk/resourcemanager/internal/go.sum @@ -4,6 +4,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0 h1:Yoicul8bnVdQrhDMTHxdE github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0/go.mod h1:+6sju8gk8FRmSajX3Oz4G5Gm7P+mbqE9FVaXXFYTkCM= github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 h1:jp0dGvZ7ZK0mgqnTSClMxa5xuRL7NZgHameVYF6BurY= github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 h1:+5VZ72z0Qan5Bog5C+ZkgSqUbeVUd9wgtHOrIKuc5b8= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0 h1:ECsQtyERDVz3NP3kvDOTLvbQhqWp/x9EsGKtb4ogUr8= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0/go.mod h1:s1tW/At+xHqjNFvWU4G0c0Qv33KOhvbGNj0RCTQDV8s= github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 h1:WVsrXCnHlDDX8ls+tootqRE87/hL9S/g4ewig9RsD/c= From a843404085525b2b90262cbc3710c53143570f23 Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Tue, 7 Feb 2023 14:57:22 -0800 Subject: [PATCH 09/11] Add stable method of caching the randomSource --- sdk/resourcemanager/internal/go.sum | 2 - .../internal/testutil/recording.go | 94 ++++++++++++++----- .../internal/testutil/recording_test.go | 4 +- 3 files changed, 75 insertions(+), 25 deletions(-) diff --git a/sdk/resourcemanager/internal/go.sum b/sdk/resourcemanager/internal/go.sum index fe0b24340f87..87790b562164 100644 --- a/sdk/resourcemanager/internal/go.sum +++ b/sdk/resourcemanager/internal/go.sum @@ -2,8 +2,6 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0 h1:Ut0ZGdOwJDw0npYEg+TLlPls3 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0 h1:Yoicul8bnVdQrhDMTHxdEckRGX01XvwXDHUT9zYZ3k0= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0/go.mod h1:+6sju8gk8FRmSajX3Oz4G5Gm7P+mbqE9FVaXXFYTkCM= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 h1:jp0dGvZ7ZK0mgqnTSClMxa5xuRL7NZgHameVYF6BurY= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 h1:+5VZ72z0Qan5Bog5C+ZkgSqUbeVUd9wgtHOrIKuc5b8= github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0 h1:ECsQtyERDVz3NP3kvDOTLvbQhqWp/x9EsGKtb4ogUr8= diff --git a/sdk/resourcemanager/internal/testutil/recording.go b/sdk/resourcemanager/internal/testutil/recording.go index 79df0510fa59..043603488a49 100644 --- a/sdk/resourcemanager/internal/testutil/recording.go +++ b/sdk/resourcemanager/internal/testutil/recording.go @@ -11,6 +11,7 @@ import ( "math/rand" "net/http" "strconv" + "strings" "testing" "time" @@ -21,8 +22,25 @@ import ( const recordingRandomSeedVariableName = "recordingRandomSeed" var ( - recordingRandomSeed int64 - letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") + recordingSeed int64 + recordingRandomSource rand.Source + letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") +) + +const ( + alphanumericBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" + alphanumericLowercaseBytes = "abcdefghijklmnopqrstuvwxyz1234567890" + randomSeedVariableName = "randomSeed" + nowVariableName = "now" + ModeEnvironmentVariableName = "AZURE_TEST_MODE" + recordingAssetConfigName = "assets.json" +) + +// Inspired by https://stackoverflow.com/questions/22892120/how-to-generate-a-random-string-of-a-fixed-length-in-go +const ( + letterIdxBits = 6 // 6 bits to represent a letter index + letterIdxMask = 1<= 0; { + if remain == 0 { + cache, remain = recordingRandomSource.Int63(), letterIdxMax + } + if lowercaseOnly { + if idx := int(cache & letterIdxMask); idx < len(alphanumericLowercaseBytes) { + sb.WriteByte(alphanumericLowercaseBytes[idx]) + i-- } - if recordingRandomSeed == 0 { - recordingRandomSeed = time.Now().Unix() + } else { + if idx := int(cache & letterIdxMask); idx < len(alphanumericBytes) { + sb.WriteByte(alphanumericBytes[idx]) + i-- } } - rand.NewSource(recordingRandomSeed) - } else { - rand.NewSource(time.Now().Unix()) - } - b := make([]rune, length) - for i := range b { - b[i] = letterRunes[rand.Intn(len(letterRunes))] + cache >>= letterIdxBits + remain-- } - return prefix + string(b) + str := sb.String() + return str } diff --git a/sdk/resourcemanager/internal/testutil/recording_test.go b/sdk/resourcemanager/internal/testutil/recording_test.go index 4947c1b16c65..f5834ef479bc 100644 --- a/sdk/resourcemanager/internal/testutil/recording_test.go +++ b/sdk/resourcemanager/internal/testutil/recording_test.go @@ -38,7 +38,7 @@ func TestStartStopRecording(t *testing.T) { func TestGenerateAlphaNumericID(t *testing.T) { stop := StartRecording(t, pathToPackage) - rnd := GenerateAlphaNumericID(t, "test", 6) - require.Equal(t, "testLnfgDs", rnd) + rnd := GenerateAlphaNumericID(t, "test", 8) + require.Equal(t, "testNlDA", rnd) defer stop() } From 4fda541fa09c7e4a982d4ad9108d97edd6d30686 Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Tue, 7 Feb 2023 15:24:44 -0800 Subject: [PATCH 10/11] Remove unused variable --- sdk/resourcemanager/internal/testutil/recording.go | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/resourcemanager/internal/testutil/recording.go b/sdk/resourcemanager/internal/testutil/recording.go index 043603488a49..1df34d541e18 100644 --- a/sdk/resourcemanager/internal/testutil/recording.go +++ b/sdk/resourcemanager/internal/testutil/recording.go @@ -24,7 +24,6 @@ const recordingRandomSeedVariableName = "recordingRandomSeed" var ( recordingSeed int64 recordingRandomSource rand.Source - letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") ) const ( From 9b68597e528d4a51b7fbcc007ce41aaac69f01ad Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Wed, 8 Feb 2023 10:17:12 -0800 Subject: [PATCH 11/11] Code review feedback --- eng/scripts/automation_init.sh | 8 -------- sdk/resourcemanager/internal/testutil/helper.go | 4 ++-- sdk/resourcemanager/internal/testutil/recording.go | 2 +- sdk/resourcemanager/internal/testutil/recording_test.go | 4 ++-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/eng/scripts/automation_init.sh b/eng/scripts/automation_init.sh index ba9583ec1230..c5bb546012c0 100644 --- a/eng/scripts/automation_init.sh +++ b/eng/scripts/automation_init.sh @@ -17,14 +17,6 @@ outputFile="$(realpath $outputFile)" echo "output json file: $outputFile" TMPDIR="/tmp" -if [ ! "$(go version | awk '{print $3}' | cut -c 3-6)" = "1.19.5" ] -then - wget https://golang.org/dl/go1.19.5.linux-amd64.tar.gz - tar -C $TMPDIR -xzf go1.19.5.linux-amd64.tar.gz - export GOROOT=$TMPDIR/go - export PATH=$GOROOT/bin:$PATH -fi - if [ ! "$(go version | awk '{print $3}' | cut -c 3-6)" = "1.20" ] then wget https://golang.org/dl/go1.20.linux-amd64.tar.gz diff --git a/sdk/resourcemanager/internal/testutil/helper.go b/sdk/resourcemanager/internal/testutil/helper.go index 23b7053388dd..35b8f188cd29 100644 --- a/sdk/resourcemanager/internal/testutil/helper.go +++ b/sdk/resourcemanager/internal/testutil/helper.go @@ -34,8 +34,8 @@ func GetEnv(key, fallback string) string { // a delegate function to delete the created resource group which can be used for clean up // and any error during the creation. func CreateResourceGroup(ctx context.Context, subscriptionId string, cred azcore.TokenCredential, options *arm.ClientOptions, location string) (*armresources.ResourceGroup, func() (*runtime.Poller[armresources.ResourceGroupsClientDeleteResponse], error), error) { - rand.NewSource(time.Now().UnixNano()) - resourceGroupName := fmt.Sprintf("go-sdk-test-%d", rand.Intn(1000)) + r := rand.New(rand.NewSource(time.Now().UnixNano())) + resourceGroupName := fmt.Sprintf("go-sdk-test-%d", r.Intn(1000)) rgClient, err := armresources.NewResourceGroupsClient(subscriptionId, cred, options) if err != nil { return nil, nil, err diff --git a/sdk/resourcemanager/internal/testutil/recording.go b/sdk/resourcemanager/internal/testutil/recording.go index 1df34d541e18..0b49b309ba9e 100644 --- a/sdk/resourcemanager/internal/testutil/recording.go +++ b/sdk/resourcemanager/internal/testutil/recording.go @@ -169,7 +169,7 @@ func GenerateAlphaNumericID(t *testing.T, prefix string, length int) string { sb := strings.Builder{} sb.Grow(length) sb.WriteString(prefix) - i := length - len(prefix) - 1 + i := length - 1 // A src.Int63() generates 63 random bits, enough for letterIdxMax characters! for cache, remain := recordingRandomSource.Int63(), letterIdxMax; i >= 0; { if remain == 0 { diff --git a/sdk/resourcemanager/internal/testutil/recording_test.go b/sdk/resourcemanager/internal/testutil/recording_test.go index f5834ef479bc..cd5b65b6c8fe 100644 --- a/sdk/resourcemanager/internal/testutil/recording_test.go +++ b/sdk/resourcemanager/internal/testutil/recording_test.go @@ -38,7 +38,7 @@ func TestStartStopRecording(t *testing.T) { func TestGenerateAlphaNumericID(t *testing.T) { stop := StartRecording(t, pathToPackage) - rnd := GenerateAlphaNumericID(t, "test", 8) - require.Equal(t, "testNlDA", rnd) + rnd := GenerateAlphaNumericID(t, "test", 6) + require.Equal(t, "testNlDAa8", rnd) defer stop() }