fix: some compatible issue in build.ps1 after unify module discovery (#…

…15623) * fix: some compatible issue in build.ps1 after unify module discovery * chore: remove deprecated converting script for _meta.json * fix: add NonShipping flag for non-rp package release
Azure · Sep 24, 2021 · 6ff9912 · 6ff9912
1 parent 4f444f0
commit 6ff9912
Show file tree

Hide file tree

Showing 28 changed files with 41 additions and 62 deletions.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -1,12 +1,15 @@
 parameters:
-  - name:  ServiceDirectory
+  - name: ServiceDirectory
     type: string
     default: ''
-  - name:  RunTests
-    type: string
+  - name: RunTests
+    type: boolean
     default: false
-  - name:  RunLiveTests
-    type: string
+  - name: RunLiveTests
+    type: boolean
+    default: false
+  - name: NonShipping
+    type: boolean
     default: false
   - name: Clouds
     type: string
@@ -131,6 +134,7 @@ stages:
           ServiceDirectory: ${{ parameters.ServiceDirectory }}
           GoWorkspace: $(GO_WORKSPACE_PATH)
           LintVersion: $(GoLintCLIVersion)
+          NonShipping: ${{ parameters.NonShipping }}
 
   # Run live tests for internal only, not public CI builds. This can be triggered manually for via an `/azp run` comment.
   - ${{if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.RunLiveTests, 'true'))}}:

diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
@@ -3,6 +3,8 @@ parameters:
   ServiceDirectory: ''
   GoWorkspace: ''
   LintVersion: ''
+  NonShipping: false
+
 
 steps:
 
@@ -56,7 +58,8 @@ steps:
 
   - template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml
 
-  - template: /eng/common/pipelines/templates/steps/verify-changelog.yml
-    parameters:
-      PackageName: 'sdk/${{parameters.ServiceDirectory}}'
-      ForRelease: false
+  - ${{if eq(parameters.NonShipping, 'false')}}:
+    - template: /eng/common/pipelines/templates/steps/verify-changelog.yml
+      parameters:
+        PackageName: 'sdk/${{parameters.ServiceDirectory}}'
+        ForRelease: false
diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1
@@ -20,23 +20,15 @@ function Process-Sdk () {
         Write-Host "##[command]Executing autorest.go in " $currentDirectory
         $autorestPath = "./" + $config
 
-        if (ShouldGenerate-AutorestConfig $autorestPath) {
-            Generate-AutorestConfig $autorestPath
-            $removeAutorestFile = $true
-        }
-
         $autorestVersion = "@autorest/go@4.0.0-preview.27"
         if ($outputFolder -eq '') {
             $outputFolder = $currentDirectory
         }
-        autorest --use=$autorestVersion --go --track2 --go-sdk-folder=$root --output-folder=$outputFolder --file-prefix="zz_generated_" --clear-output-folder=false $autorestPath
+        autorest --use=$autorestVersion --go --track2 --output-folder=$outputFolder --file-prefix="zz_generated_" --clear-output-folder=false $autorestPath
         if ($LASTEXITCODE) {
             Write-Host "##[error]Error running autorest.go"
             exit $LASTEXITCODE
         }
-        if ($removeAutorestFile) {
-            Remove-Item $autorestPath
-        }
     }
 
     if ($format) {

diff --git a/eng/scripts/meta_generation.ps1 b/eng/scripts/meta_generation.ps1
diff --git a/sdk/agrifood/armagrifood/build.go b/sdk/agrifood/armagrifood/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armagrifood
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate agrifood/armagrifood
 
 package armagrifood
diff --git a/sdk/apimanagement/armapimanagement/build.go b/sdk/apimanagement/armapimanagement/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armapimanagement
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate apimanagement/armapimanagement
 
 package armapimanagement
diff --git a/sdk/authorization/armauthorization/build.go b/sdk/authorization/armauthorization/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armauthorization
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate authorization/armauthorization
 
 package armauthorization
diff --git a/sdk/compute/armcompute/build.go b/sdk/compute/armcompute/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armcompute
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate compute/armcompute
 
 package armcompute
diff --git a/sdk/containerregistry/armcontainerregistry/build.go b/sdk/containerregistry/armcontainerregistry/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armcontainerregistry
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate containerregistry/armcontainerregistry
 
 package armcontainerregistry
diff --git a/sdk/containerservice/armcontainerservice/build.go b/sdk/containerservice/armcontainerservice/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armcontainerservice
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate containerservice/armcontainerservice
 
 package armcontainerservice
diff --git a/sdk/cosmos/armcosmos/build.go b/sdk/cosmos/armcosmos/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armcosmos
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate cosmos/armcosmos
 
 package armcosmos
diff --git a/sdk/eventgrid/armeventgrid/build.go b/sdk/eventgrid/armeventgrid/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armeventgrid
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate eventgrid/armeventgrid
 
 package armeventgrid
diff --git a/sdk/eventhub/armeventhub/build.go b/sdk/eventhub/armeventhub/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armeventhub
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate eventhub/armeventhub
 
 package armeventhub
diff --git a/sdk/keyvault/armkeyvault/build.go b/sdk/keyvault/armkeyvault/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armkeyvault
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate keyvault/armkeyvault
 
 package armkeyvault
diff --git a/sdk/monitor/armmonitor/build.go b/sdk/monitor/armmonitor/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armmonitor
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate monitor/armmonitor
 
 package armmonitor
diff --git a/sdk/network/armnetwork/build.go b/sdk/network/armnetwork/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armnetwork
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate network/armnetwork
 
 package armnetwork
diff --git a/sdk/operationalinsights/armoperationalinsights/build.go b/sdk/operationalinsights/armoperationalinsights/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armoperationalinsights
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate operationalinsights/armoperationalinsights
 
 package armoperationalinsights
diff --git a/sdk/postgresql/armpostgresql/build.go b/sdk/postgresql/armpostgresql/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armpostgresql
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate postgresql/armpostgresql
 
 package armpostgresql
diff --git a/sdk/postgresql/armpostgresqlflexibleservers/build.go b/sdk/postgresql/armpostgresqlflexibleservers/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armpostgresqlflexibleservers
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate postgresqlflexibleservers/armpostgresqlflexibleservers
 
 package armpostgresqlflexibleservers
diff --git a/sdk/privatedns/armprivatedns/build.go b/sdk/privatedns/armprivatedns/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armprivatedns
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate privatedns/armprivatedns
 
 package armprivatedns
diff --git a/sdk/redis/armredis/build.go b/sdk/redis/armredis/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armredis
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate redis/armredis
 
 package armredis
diff --git a/sdk/resources/armresources/build.go b/sdk/resources/armresources/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armresources
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate resources/armresources
 
 package armresources
diff --git a/sdk/servicebus/armservicebus/build.go b/sdk/servicebus/armservicebus/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armservicebus
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate servicebus/armservicebus
 
 package armservicebus
diff --git a/sdk/sql/armsql/build.go b/sdk/sql/armsql/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armsql
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate sql/armsql
 
 package armsql
diff --git a/sdk/storage/armstorage/build.go b/sdk/storage/armstorage/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armstorage
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate storage/armstorage
 
 package armstorage
diff --git a/sdk/web/armweb/build.go b/sdk/web/armweb/build.go
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate armweb
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate web/armweb
 
 package armweb
diff --git a/tools/generator/ci.yml b/tools/generator/ci.yml
@@ -25,3 +25,4 @@ stages:
   - template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
     parameters:
       ServiceDirectory: '../tools/generator'
+      NonShipping: true
diff --git a/tools/generator/template/rpName/packageName/build.go.tpl b/tools/generator/template/rpName/packageName/build.go.tpl
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate {{packageName}}
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate {{rpName}}/{{packageName}}
 
 package {{packageName}}