Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix generator tool #22205

Merged
merged 4 commits into from
Jan 10, 2024
Merged

fix generator tool #22205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a475a0
fix generator tool
Alancere Jan 4, 2024
ba98334
gofmt
Alancere Jan 4, 2024
4726cf7
fix
Alancere Jan 4, 2024
2e90301
goimports
Alancere Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions eng/tools/generator/cmd/v2/common/fileProcessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package common

import (
"bytes"
"errors"
"fmt"
"io/fs"
"io/ioutil"
Expand Down Expand Up @@ -543,11 +544,9 @@ func replaceModuleImport(path, rpName, namespaceName, previousVersion, currentVe
if err != nil {
return err
}

if info.IsDir() {
return nil
}

suffix := false
for i := 0; i < len(suffixes) && !suffix; i++ {
suffix = strings.HasSuffix(info.Name(), suffixes[i])
Expand All @@ -566,11 +565,25 @@ func replaceModuleImport(path, rpName, namespaceName, previousVersion, currentVe
}
}
}

return nil
})
}

func getModuleVersion(autorestPath string) (*semver.Version, error) {
data, err := os.ReadFile(autorestPath)
if err != nil {
return nil, err
}

for _, line := range strings.Split(string(data), "\n") {
if strings.HasPrefix(line, autorest_md_module_version_prefix) {
return semver.NewVersion(strings.TrimSpace(line[len(autorest_md_module_version_prefix):]))
Alancere marked this conversation as resolved.
Show resolved Hide resolved
}
}

return nil, errors.New("module-version does not exist in autorest.md")
}

func existSuffixFile(path, suffix string) bool {

existed := false
Expand Down
13 changes: 9 additions & 4 deletions eng/tools/generator/cmd/v2/common/generation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,23 +306,28 @@ func (ctx *GenerateContext) GenerateForSingleRPNamespace(generateParam *Generate
return nil, err
}

oldModuleVersion, err := getModuleVersion(filepath.Join(packagePath, "autorest.md"))
if err != nil {
return nil, err
}

log.Printf("Replace version in autorest.md and constants...")
if err = ReplaceVersion(packagePath, version.String()); err != nil {
return nil, err
}

if _, err := os.Stat(filepath.Join(packagePath, "fake")); !os.IsNotExist(err) && changelog.HasBreakingChanges() {
if _, err := os.Stat(filepath.Join(packagePath, "fake")); !os.IsNotExist(err) && oldModuleVersion.Major() != version.Major() {
log.Printf("Replace fake module v2+...")
if err = replaceModuleImport(packagePath, generateParam.RPName, generateParam.NamespaceName, previousVersion, version.String(),
if err = replaceModuleImport(packagePath, generateParam.RPName, generateParam.NamespaceName, oldModuleVersion.String(), version.String(),
"fake", ".go"); err != nil {
return nil, err
}
}

// When sdk has major version bump, the live test needs to update the module referenced in the code.
if changelog.HasBreakingChanges() && existSuffixFile(packagePath, "_live_test.go") {
if oldModuleVersion.Major() != version.Major() && existSuffixFile(packagePath, "_live_test.go") {
log.Printf("Replace live test module v2+...")
if err = replaceModuleImport(packagePath, generateParam.RPName, generateParam.NamespaceName, previousVersion, version.String(),
if err = replaceModuleImport(packagePath, generateParam.RPName, generateParam.NamespaceName, oldModuleVersion.String(), version.String(),
"", "_live_test.go"); err != nil {
return nil, err
}
Expand Down