adopt sub package

Author: JiaqiZhang-Dev

eng/tools/generator/cmd/v2/common/fileProcessor.go

@@ -189,7 +189,7 @@ func ChangeConfigWithLocalPath(path, readmeFile, readmeGoFile string) error {
 }
 
 // replace repo URL and commit id in autorest.md file
-func ChangeConfigWithCommitID(path, repoURL, commitID, specRPName string) error {
+func ChangeConfigWithCommitID(path, repoURL, commitID, specRPName, specSubRPName string) error {
 	log.Printf("Replacing repo URL and commit id in autorest.md ...")
 	b, err := os.ReadFile(path)
 	if err != nil {
@@ -203,7 +203,9 @@ func ChangeConfigWithCommitID(path, repoURL, commitID, specRPName string) error
 			indexReadme := strings.Index(line, autorest_md_file_suffix)
 			resourceManagerPath := []byte(line)
 			resourceManagerPath = resourceManagerPath[indexResourceManager : indexReadme-1]
-
+			if specSubRPName != "" {
+				resourceManagerPath = append(resourceManagerPath, []byte("/"+specSubRPName)...)
+			}
 			lines[i] = fmt.Sprintf("- %s/blob/%s/specification/%s/%s/readme.md", repoURL, commitID, specRPName, resourceManagerPath)
 			lines[i+1] = fmt.Sprintf("- %s/blob/%s/specification/%s/%s/readme.go.md", repoURL, commitID, specRPName, resourceManagerPath)
 			break

eng/tools/generator/cmd/v2/common/generation.go

@@ -49,6 +49,7 @@ type GenerateParam struct {
 	SpecificVersion      string
 	SpecificPackageTitle string
 	SpecRPName           string
+	SpecSubRPName        string
 	ReleaseDate          string
 	SkipGenerateExample  bool
 	GoVersion            string
@@ -232,7 +233,7 @@ func (t *SwaggerCommonGenerator) PreGenerate(generateParam *GenerateParam) error
 	} else {
 		log.Printf("Change swagger config in `autorest.md` according to repo URL and commit ID...")
 		autorestMdPath := filepath.Join(packagePath, "autorest.md")
-		if err := ChangeConfigWithCommitID(autorestMdPath, t.SpecRepoURL, t.SpecCommitHash, generateParam.SpecRPName); err != nil {
+		if err := ChangeConfigWithCommitID(autorestMdPath, t.SpecRepoURL, t.SpecCommitHash, generateParam.SpecRPName, generateParam.SpecSubRPName); err != nil {
 			return err
 		}
 	}

eng/tools/generator/cmd/v2/release/releaseCmd.go

@@ -68,6 +68,7 @@ type Flags struct {
 	PackageTitle        string
 	SDKRepo             string
 	SpecRPName          string
+	SpecSubRPName       string
 	ReleaseDate         string
 	SkipCreateBranch    bool
 	SkipGenerateExample bool
@@ -85,6 +86,7 @@ func BindFlags(flagSet *pflag.FlagSet) {
 	flagSet.String("sdk-repo", "https://github.com/Azure/azure-sdk-for-go", "Specifies the sdk repo URL for generation")
 	flagSet.String("spec-repo", "https://github.com/Azure/azure-rest-api-specs", "Specifies the swagger repo URL for generation")
 	flagSet.String("spec-rp-name", "", "Specifies the swagger spec RP name, default is RP name")
+	flagSet.String("spec-sub-rp-name", "", "Specifies the swagger spec sub RP name")
 	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")
@@ -103,6 +105,7 @@ func ParseFlags(flagSet *pflag.FlagSet) Flags {
 		SDKRepo:             flags.GetString(flagSet, "sdk-repo"),
 		SwaggerRepo:         flags.GetString(flagSet, "spec-repo"),
 		SpecRPName:          flags.GetString(flagSet, "spec-rp-name"),
+		SpecSubRPName:       flags.GetString(flagSet, "spec-sub-rp-name"),
 		ReleaseDate:         flags.GetString(flagSet, "release-date"),
 		SkipCreateBranch:    flags.GetBool(flagSet, "skip-create-branch"),
 		SkipGenerateExample: flags.GetBool(flagSet, "skip-generate-example"),
@@ -195,6 +198,10 @@ func (c *commandContext) generate(sdkRepo repo.SDKRepository, specCommitHash str
 			ReleaseDate:          c.flags.ReleaseDate,
 			SkipGenerateExample:  c.flags.SkipGenerateExample,
 			GoVersion:            c.flags.GoVersion,
+			ForceStableVersion:   c.flags.ForceStableVersion,
+			SpecSubRPName:        c.flags.SpecSubRPName,
+		})
+	}
 		})
 		if len(errs) > 0 {
 			// GenerateFromSwagger is a batch run function, one error means one package is failed.