Skip to content

Commit 40028a8

Browse files
tadeleshtadelesh
andauthored
Fix wrong release type constant (#25693)
* Fix wrong release type constant * fix vet problem --------- Co-authored-by: tadelesh <[email protected]>
1 parent 937c81b commit 40028a8

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

eng/tools/generator/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Release History
22

3+
## 0.4.1 (2025-12-02)
4+
5+
### Bugs Fixed
6+
7+
- Fix the wrong constant value for beta release type.
8+
39
## 0.4.0 (2025-12-01)
410

511
### Features Added

eng/tools/generator/cmd/v2/automation/automationCmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (ctx *automationContext) generate(input *pipeline.GenerateInput) (*pipeline
9191

9292
errorBuilder := generateErrorBuilder{}
9393
if input.RunMode == utils.AutomationRunModeLocal || input.RunMode == utils.AutomationRunModeRelease {
94-
if input.SdkReleaseType != "" && input.SdkReleaseType != utils.SDKReleaseTypeStable && input.SdkReleaseType != utils.SDKReleaseTypePreview {
94+
if input.SdkReleaseType != "" && input.SdkReleaseType != utils.SDKReleaseTypeStable && input.SdkReleaseType != utils.SDKReleaseTypeBeta {
9595
return nil, fmt.Errorf("invalid SDK release type:%s, only support 'stable' or 'beta'", input.SdkReleaseType)
9696
}
9797
if input.SdkReleaseType != "" && input.ApiVersion != "" {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func ExecuteGoimports(path string) error {
123123
}
124124

125125
func ExecuteGitPush(path, remoteName, branchName string) (string, error) {
126-
refName := fmt.Sprintf(branchName + ":" + branchName)
126+
refName := fmt.Sprintf("%s", branchName+":"+branchName)
127127
cmd := exec.Command("git", "push", remoteName, refName)
128128
cmd.Dir = path
129129
msg, err := cmd.CombinedOutput()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ func (t *TypeSpecUpdateGenerator) PreGenerate(generateParam *GenerateParam) erro
664664

665665
var override *bool
666666
switch generateParam.SdkReleaseType {
667-
case utils.SDKReleaseTypePreview:
667+
case utils.SDKReleaseTypeBeta:
668668
override = new(bool)
669669
*override = true
670670
case utils.SDKReleaseTypeStable:

eng/tools/generator/repo/workTree.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (r *repository) Add(path string) error {
9090
cmd.Dir = r.root
9191
output, err := cmd.CombinedOutput()
9292
if err != nil {
93-
return fmt.Errorf(string(output))
93+
return fmt.Errorf("%s", string(output))
9494
}
9595
return nil
9696
}
@@ -107,7 +107,7 @@ func (r *repository) Commit(message string) error {
107107
message: m,
108108
}
109109
}
110-
return fmt.Errorf(m)
110+
return fmt.Errorf("%s", m)
111111
}
112112
return nil
113113
}
@@ -133,7 +133,7 @@ func (r *repository) checkoutBranch(branch string, create bool) error {
133133
cmd.Dir = r.root
134134
output, err := cmd.CombinedOutput()
135135
if err != nil {
136-
return fmt.Errorf(string(output))
136+
return fmt.Errorf("%s", string(output))
137137
}
138138
return nil
139139
}
@@ -143,7 +143,7 @@ func (r *repository) checkoutHash(hash string) error {
143143
cmd.Dir = r.root
144144
output, err := cmd.CombinedOutput()
145145
if err != nil {
146-
return fmt.Errorf(string(output))
146+
return fmt.Errorf("%s", string(output))
147147
}
148148
return nil
149149
}
@@ -153,7 +153,7 @@ func (r *repository) CheckoutTag(tag string) error {
153153
cmd.Dir = r.root
154154
output, err := cmd.CombinedOutput()
155155
if err != nil {
156-
return fmt.Errorf(string(output))
156+
return fmt.Errorf("%s", string(output))
157157
}
158158
return nil
159159
}
@@ -163,7 +163,7 @@ func (r *repository) CreateBranch(branch *Branch) error {
163163
cmd.Dir = r.root
164164
output, err := cmd.CombinedOutput()
165165
if err != nil {
166-
return fmt.Errorf(string(output))
166+
return fmt.Errorf("%s", string(output))
167167
}
168168
return nil
169169
}
@@ -174,7 +174,7 @@ func (r *repository) DeleteBranch(name string) error {
174174
cmd.Dir = r.root
175175
output, err := cmd.CombinedOutput()
176176
if err != nil {
177-
return fmt.Errorf(string(output))
177+
return fmt.Errorf("%s", string(output))
178178
}
179179
return nil
180180
}
@@ -185,7 +185,7 @@ func (r *repository) CherryPick(commit string) error {
185185
cmd.Dir = r.root
186186
output, err := cmd.CombinedOutput()
187187
if err != nil {
188-
return fmt.Errorf(string(output))
188+
return fmt.Errorf("%s", string(output))
189189
}
190190
return nil
191191
}
@@ -196,7 +196,7 @@ func (r *repository) Stash() error {
196196
cmd.Dir = r.root
197197
output, err := cmd.CombinedOutput()
198198
if err != nil {
199-
return fmt.Errorf(string(output))
199+
return fmt.Errorf("%s", string(output))
200200
}
201201
return nil
202202
}
@@ -207,7 +207,7 @@ func (r *repository) StashPop() error {
207207
cmd.Dir = r.root
208208
output, err := cmd.CombinedOutput()
209209
if err != nil {
210-
return fmt.Errorf(string(output))
210+
return fmt.Errorf("%s", string(output))
211211
}
212212
return nil
213213
}

eng/tools/generator/utils/constants.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const (
1212
ReadmeFileName = "README.md"
1313
ClientFactoryFileName = "client_factory.go"
1414

15-
SDKReleaseTypeStable = "stable"
16-
SDKReleaseTypePreview = "preview"
15+
SDKReleaseTypeStable = "stable"
16+
SDKReleaseTypeBeta = "beta"
1717

1818
AutomationRunModeRelease = "release"
1919
AutomationRunModeLocal = "local"

eng/tools/generator/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ package main
55

66
const (
77
moduleName = "github.com/Azure/azure-sdk-for-go/eng/tools/generator"
8-
moduleVersion = "v0.4.0"
8+
moduleVersion = "v0.4.1"
99
)

0 commit comments

Comments
 (0)