Upgrade tooling to the latest generator with go generic support (Azure#17481)

tadelesh · web-flow · commit e899af6b4aa5 · 2022-04-08T14:39:06.000+08:00
* ci: update build and test script for mgmt

* feat: upgrade mgmt release tool to go 1.18
diff --git a/eng/scripts/Invoke-MgmtTestgen.ps1 b/eng/scripts/Invoke-MgmtTestgen.ps1
@@ -9,10 +9,10 @@ param(
     [switch]$cleanGenerated,
     [switch]$format,
     [switch]$tidy,
-    [string]$config = "autorest.md",
-    [string]$autorestVersion = "3.7.3",
-    [string]$goExtension = "@autorest/go@4.0.0-preview.36",
-    [string]$testExtension = "@autorest/gotest@1.3.0",
+    [string]$config,
+    [string]$autorestVersion,
+    [string]$goExtension,
+    [string]$testExtension,
     [string]$outputFolder
 )
 
diff --git a/eng/scripts/MgmtTestLib.ps1 b/eng/scripts/MgmtTestLib.ps1
@@ -18,9 +18,9 @@ function Invoke-MgmtTestgen ()
         [switch]$tidy,
         [string]$autorestPath = "",
         [string]$config = "autorest.md",
-        [string]$autorestVersion = "3.6.2",
-        [string]$goExtension = "@autorest/go@4.0.0-preview.36",
-        [string]$testExtension = "@autorest/gotest@1.3.0",
+        [string]$autorestVersion = "3.8.2",
+        [string]$goExtension = "@autorest/go@4.0.0-preview.38",
+        [string]$testExtension = "@autorest/gotest@3.0.0",
         [string]$outputFolder
     )
     if ($clean)
diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1
@@ -9,8 +9,8 @@ param(
     [switch]$format,
     [switch]$tidy,
     [string]$config = "autorest.md",
-    [string]$autorestVersion = "3.7.3",
-    [string]$goExtension = "@autorest/go@4.0.0-preview.36",
+    [string]$autorestVersion = "3.8.2",
+    [string]$goExtension = "@autorest/go@4.0.0-preview.38",
     [string]$outputFolder
 )
 
diff --git a/eng/tools/generator/cmd/template/templateCmd.go b/eng/tools/generator/cmd/template/templateCmd.go
@@ -60,7 +60,7 @@ func BindFlags(flagSet *pflag.FlagSet) {
 	flagSet.String("commit", "", "Specifies the commit hash of azure-rest-api-specs")
 	flagSet.String("release-date", "", "Specifies the release date in changelog")
 	flagSet.String("package-config", "", "Additional config for package")
-	flagSet.String("go-version", "1.16", "Go version")
+	flagSet.String("go-version", "1.18", "Go version")
 }
 
 // ParseFlags parses the flags to a Flags struct
diff --git a/eng/tools/generator/cmd/v2/automation/automationCmd.go b/eng/tools/generator/cmd/v2/automation/automationCmd.go
@@ -27,7 +27,7 @@ func Command() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			goVersion := "1.16"
+			goVersion := "1.18"
 			if len(args) == 3 {
 				goVersion = args[2]
 			}
diff --git a/eng/tools/generator/cmd/v2/refresh/refreshCmd.go b/eng/tools/generator/cmd/v2/refresh/refreshCmd.go
@@ -62,7 +62,7 @@ func BindFlags(flagSet *pflag.FlagSet) {
 	flagSet.String("release-date", "", "Specifies the release date in changelog")
 	flagSet.Bool("skip-create-branch", false, "Skip create release branch after generation")
 	flagSet.Bool("skip-generate-example", false, "Skip generate example for SDK in the same time")
-	flagSet.String("go-version", "1.16", "Go version")
+	flagSet.String("go-version", "1.18", "Go version")
 	flagSet.String("rps", "", "Specify RP list to refresh, seperated by ','")
 }
 
diff --git a/eng/tools/generator/cmd/v2/release/releaseCmd.go b/eng/tools/generator/cmd/v2/release/releaseCmd.go
@@ -76,7 +76,7 @@ func BindFlags(flagSet *pflag.FlagSet) {
 	flagSet.Bool("skip-create-branch", false, "Skip create release branch after generation")
 	flagSet.Bool("skip-generate-example", false, "Skip generate example for SDK in the same time")
 	flagSet.String("package-config", "", "Additional config for package")
-	flagSet.String("go-version", "1.16", "Go version")
+	flagSet.String("go-version", "1.18", "Go version")
 }
 
 func ParseFlags(flagSet *pflag.FlagSet) Flags {
diff --git a/eng/tools/generator/doc.go b/eng/tools/generator/doc.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.18
+// +build go1.18
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
diff --git a/eng/tools/generator/go.mod b/eng/tools/generator/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/azure-sdk-for-go/eng/tools/generator
 
-go 1.13
+go 1.18
 
 require (
 	github.com/Azure/azure-sdk-for-go/eng/tools/internal v0.0.0-20210928100519-41af1bab440e
@@ -13,3 +13,27 @@ require (
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 )
+
+require (
+	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
+	github.com/acomagu/bufpipe v1.0.3 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.3.1 // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
+	golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
+	golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect
+	golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 // indirect
+	google.golang.org/appengine v1.6.1 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
+)
diff --git a/eng/tools/generator/go.sum b/eng/tools/generator/go.sum
@@ -11,7 +11,6 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/azure-sdk-for-go v54.2.1+incompatible h1:RiwBAqYP8Xz2yTPNzrwiHX5+lfPkRlHuk/x4BOAyAjA=
 github.com/Azure/azure-sdk-for-go v54.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go/eng/tools/internal v0.0.0-20210928100519-41af1bab440e h1:G4N2h9Gye3sIipThHng3wrXnctrMC/WR5Ne6lMCEyL8=
 github.com/Azure/azure-sdk-for-go/eng/tools/internal v0.0.0-20210928100519-41af1bab440e/go.mod h1:2vV9sTDQVI3Py0jyWZoEOYfkV5O692UaOWgPOhGS0H4=
@@ -66,7 +65,6 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
diff --git a/eng/tools/generator/template/rpName/packageName/README.md.tpl b/eng/tools/generator/template/rpName/packageName/README.md.tpl
@@ -38,16 +38,18 @@ For more information on authentication, please see the documentation for `aziden
 Azure {{PackageTitle}} modules consist of one or more clients.  A client groups a set of related APIs, providing access to its functionality within the specified subscription.  Create one or more clients to access the APIs you require using your credential.
 
 ```go
-client := {{packageName}}.{{NewClientName}}(<subscription ID>, cred, nil)
+client, err := {{packageName}}.{{NewClientName}}(<subscription ID>, cred, nil)
 ```
 
 You can use `ClientOptions` in package `github.com/Azure/azure-sdk-for-go/sdk/azcore/arm` to set endpoint to connect with public and sovereign clouds as well as Azure Stack. For more information, please see the documentation for `azcore` at [pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azcore](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azcore).
 
 ```go
-options = arm.ClientOptions{
-    Host: arm.AzureChina,
+options := arm.ClientOptions{
+    ClientOptions: azcore.ClientOptions {
+        Cloud: cloud.AzureChina,
+    },
 }
-client := {{packageName}}.{{NewClientName}}(<subscription ID>, cred, &options)
+client, err := {{packageName}}.{{NewClientName}}(<subscription ID>, cred, &options)
 ```
 
 ## Provide Feedback

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func BindFlags(flagSet *pflag.FlagSet) {`
`60`	`60`	`flagSet.String("commit", "", "Specifies the commit hash of azure-rest-api-specs")`
`61`	`61`	`flagSet.String("release-date", "", "Specifies the release date in changelog")`
`62`	`62`	`flagSet.String("package-config", "", "Additional config for package")`
`63`		`- flagSet.String("go-version", "1.16", "Go version")`
	`63`	`+ flagSet.String("go-version", "1.18", "Go version")`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// ParseFlags parses the flags to a Flags struct`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func Command() *cobra.Command {`
`27`	`27`	`return nil`
`28`	`28`	`},`
`29`	`29`	`RunE: func(cmd *cobra.Command, args []string) error {`
`30`		`- goVersion := "1.16"`
	`30`	`+ goVersion := "1.18"`
`31`	`31`	`if len(args) == 3 {`
`32`	`32`	`goVersion = args[2]`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func BindFlags(flagSet *pflag.FlagSet) {`
`62`	`62`	`flagSet.String("release-date", "", "Specifies the release date in changelog")`
`63`	`63`	`flagSet.Bool("skip-create-branch", false, "Skip create release branch after generation")`
`64`	`64`	`flagSet.Bool("skip-generate-example", false, "Skip generate example for SDK in the same time")`
`65`		`- flagSet.String("go-version", "1.16", "Go version")`
	`65`	`+ flagSet.String("go-version", "1.18", "Go version")`
`66`	`66`	`flagSet.String("rps", "", "Specify RP list to refresh, seperated by ','")`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func BindFlags(flagSet *pflag.FlagSet) {`
`76`	`76`	`flagSet.Bool("skip-create-branch", false, "Skip create release branch after generation")`
`77`	`77`	`flagSet.Bool("skip-generate-example", false, "Skip generate example for SDK in the same time")`
`78`	`78`	`flagSet.String("package-config", "", "Additional config for package")`
`79`		`- flagSet.String("go-version", "1.16", "Go version")`
	`79`	`+ flagSet.String("go-version", "1.18", "Go version")`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`func ParseFlags(flagSet *pflag.FlagSet) Flags {`