Skip to content

Commit b8ac65c

Browse files
yjp20yjp20
committed
fix: fix go client version bump issues
1 parent 006ada1 commit b8ac65c

File tree

6 files changed

+47
-47
lines changed

6 files changed

+47
-47
lines changed

‎pkg/cmd/build.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func processSingleTarget(target string) (string, string) {
105105
}
106106

107107
// getBuildTargetInfo extracts completed targets from a build response
108-
func getBuildTargetInfo(buildRes stainless.BuildObject) []BuildTargetInfo {
108+
func getBuildTargetInfo(buildRes stainless.Build) []BuildTargetInfo {
109109
targets := []BuildTargetInfo{}
110110

111111
// Check each target and add it to the list if it's completed or in postgen
@@ -173,7 +173,7 @@ func isTargetCompleted(status stainless.BuildTargetStatus) bool {
173173
}
174174

175175
// waitForBuildCompletion polls a build until completion and shows progress updates
176-
func waitForBuildCompletion(ctx context.Context, client stainless.Client, build *stainless.BuildObject, waitGroup *Group) (*stainless.BuildObject, error) {
176+
func waitForBuildCompletion(ctx context.Context, client stainless.Client, build *stainless.Build, waitGroup *Group) (*stainless.Build, error) {
177177
ticker := time.NewTicker(3 * time.Second)
178178
defer ticker.Stop()
179179

@@ -451,12 +451,10 @@ func handleBuildsCreate(ctx context.Context, cmd *cli.Command) error {
451451
targetPaths := parseTargetPaths(cc.workspaceConfig)
452452
buildGroup := Info("Creating build...")
453453
params := stainless.BuildNewParams{}
454-
var res []byte
455-
_, err := cc.client.Builds.New(
454+
res, err := cc.client.Builds.New(
456455
context.TODO(),
457456
params,
458457
option.WithMiddleware(cc.AsMiddleware()),
459-
option.WithResponseBodyInto(&res),
460458
)
461459
if err != nil {
462460
return err
@@ -486,7 +484,7 @@ func handleBuildsCreate(ctx context.Context, cmd *cli.Command) error {
486484
}
487485

488486
format := cmd.Root().String("format")
489-
return ShowJSON("builds create", string(res), format)
487+
return ShowJSON("builds create", res.RawJSON(), format)
490488
}
491489

492490
func handleBuildsRetrieve(ctx context.Context, cmd *cli.Command) error {
@@ -507,7 +505,7 @@ func handleBuildsRetrieve(ctx context.Context, cmd *cli.Command) error {
507505
}
508506

509507
// pullBuildOutputs pulls the outputs for a completed build
510-
func pullBuildOutputs(ctx context.Context, client stainless.Client, res stainless.BuildObject, targetPaths map[string]string, pullGroup *Group) error {
508+
func pullBuildOutputs(ctx context.Context, client stainless.Client, res stainless.Build, targetPaths map[string]string, pullGroup *Group) error {
511509
// Get all targets
512510
allTargets := getBuildTargetInfo(res)
513511

@@ -576,8 +574,8 @@ func pullBuildOutputs(ctx context.Context, client stainless.Client, res stainles
576574
}
577575

578576
// hasFailedCommitStep checks if a target has a fatal commit conclusion
579-
func hasFailedCommitStep(build stainless.BuildObject, target stainless.Target) bool {
580-
buildObj := NewBuildObject(&build)
577+
func hasFailedCommitStep(build stainless.Build, target stainless.Target) bool {
578+
buildObj := NewBuild(&build)
581579
buildTarget := buildObj.BuildTarget(target)
582580
if buildTarget == nil {
583581
return false

‎pkg/cmd/buildtargetoutput.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func handleBuildsTargetOutputsRetrieve(ctx context.Context, cmd *cli.Command) er
9797
return nil
9898
}
9999

100-
func getLatestBuild(ctx context.Context, client stainless.Client, project, branch string) (*stainless.BuildObject, error) {
100+
func getLatestBuild(ctx context.Context, client stainless.Client, project, branch string) (*stainless.Build, error) {
101101
if project == "" {
102102
return nil, fmt.Errorf("project is required when build-id is not provided")
103103
}

‎pkg/cmd/dev.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ var ErrUserCancelled = errors.New("user cancelled")
2121

2222
// BuildModel represents the bubbletea model for build monitoring
2323
type BuildModel struct {
24-
start func() (*stainless.BuildObject, error)
24+
start func() (*stainless.Build, error)
2525
started time.Time
2626
ended *time.Time
27-
build *stainless.BuildObject
27+
build *stainless.Build
2828
branch string
29-
diagnostics []stainless.BuildDiagnosticListResponse
29+
diagnostics []stainless.BuildDiagnostic
3030
downloads map[stainless.Target]struct {
3131
status string
3232
path string
@@ -40,13 +40,13 @@ type BuildModel struct {
4040
}
4141

4242
type tickMsg time.Time
43-
type fetchBuildMsg *stainless.BuildObject
44-
type fetchDiagnosticsMsg []stainless.BuildDiagnosticListResponse
43+
type fetchBuildMsg *stainless.Build
44+
type fetchDiagnosticsMsg []stainless.BuildDiagnostic
4545
type errorMsg error
4646
type downloadMsg stainless.Target
4747
type triggerNewBuildMsg struct{}
4848

49-
func NewBuildModel(cc *apiCommandContext, ctx context.Context, branch string, fn func() (*stainless.BuildObject, error)) BuildModel {
49+
func NewBuildModel(cc *apiCommandContext, ctx context.Context, branch string, fn func() (*stainless.Build, error)) BuildModel {
5050
return BuildModel{
5151
start: fn,
5252
started: time.Now(),
@@ -117,7 +117,7 @@ func (m BuildModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
117117
}
118118

119119
m.build = msg
120-
buildObj := NewBuildObject(m.build)
120+
buildObj := NewBuild(m.build)
121121
if !m.isCompleted {
122122
// Check if all commit steps are completed
123123
allCommitsCompleted := true
@@ -206,7 +206,7 @@ func (m BuildModel) fetchDiagnostics() tea.Cmd {
206206
if m.build == nil {
207207
return errorMsg(fmt.Errorf("no current build to fetch diagnostics for"))
208208
}
209-
diags := []stainless.BuildDiagnosticListResponse{}
209+
diags := []stainless.BuildDiagnostic{}
210210
diagnostics := m.cc.client.Builds.Diagnostics.ListAutoPaging(m.ctx, m.build.ID, stainless.BuildDiagnosticListParams{
211211
Limit: stainless.Float(100),
212212
})
@@ -225,7 +225,7 @@ func (m *BuildModel) getBuildDuration() time.Duration {
225225
return time.Since(m.started)
226226
}
227227

228-
buildObj := NewBuildObject(m.build)
228+
buildObj := NewBuild(m.build)
229229
if buildObj.IsCompleted() {
230230
if m.ended == nil {
231231
now := time.Now()
@@ -370,7 +370,7 @@ func runDevBuild(ctx context.Context, cc *apiCommandContext, cmd *cli.Command, b
370370
AllowEmpty: stainless.Bool(true),
371371
}
372372

373-
model := NewBuildModel(cc, ctx, branch, func() (*stainless.BuildObject, error) {
373+
model := NewBuildModel(cc, ctx, branch, func() (*stainless.Build, error) {
374374
build, err := cc.client.Builds.New(ctx, buildReq, option.WithMiddleware(cc.AsMiddleware()))
375375
if err != nil {
376376
return nil, fmt.Errorf("failed to create build: %v", err)

‎pkg/cmd/dev_view.go‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ var parts = []struct {
133133
view: func(m BuildModel, s *strings.Builder) {
134134
s.WriteString("\n")
135135
if m.build != nil {
136-
buildObj := NewBuildObject(m.build)
136+
buildObj := NewBuild(m.build)
137137
languages := buildObj.Languages()
138138
// Target rows with colors
139139
for _, target := range languages {
@@ -173,11 +173,11 @@ var parts = []struct {
173173
},
174174
}
175175

176-
func ViewBuildPipeline(build *stainless.BuildObject, target stainless.Target, downloads map[stainless.Target]struct {
176+
func ViewBuildPipeline(build *stainless.Build, target stainless.Target, downloads map[stainless.Target]struct {
177177
status string
178178
path string
179179
}) string {
180-
buildObj := NewBuildObject(build)
180+
buildObj := NewBuild(build)
181181
buildTarget := buildObj.BuildTarget(target)
182182
if buildTarget == nil {
183183
return ""
@@ -240,15 +240,15 @@ func ViewStepSymbol(status, conclusion string) string {
240240
}
241241
}
242242

243-
func ViewDiagnosticIcon(level stainless.BuildDiagnosticListResponseLevel) string {
243+
func ViewDiagnosticIcon(level stainless.BuildDiagnosticLevel) string {
244244
switch level {
245-
case stainless.BuildDiagnosticListResponseLevelFatal:
245+
case stainless.BuildDiagnosticLevelFatal:
246246
return lipgloss.NewStyle().Foreground(lipgloss.Color("1")).Bold(true).Render("💀")
247-
case stainless.BuildDiagnosticListResponseLevelError:
247+
case stainless.BuildDiagnosticLevelError:
248248
return lipgloss.NewStyle().Foreground(lipgloss.Color("1")).Render("❌")
249-
case stainless.BuildDiagnosticListResponseLevelWarning:
249+
case stainless.BuildDiagnosticLevelWarning:
250250
return lipgloss.NewStyle().Foreground(lipgloss.Color("3")).Render("⚠️")
251-
case stainless.BuildDiagnosticListResponseLevelNote:
251+
case stainless.BuildDiagnosticLevelNote:
252252
return lipgloss.NewStyle().Foreground(lipgloss.Color("6")).Render("ℹ️")
253253
default:
254254
return lipgloss.NewStyle().Foreground(lipgloss.Color("8")).Render("•")
@@ -309,23 +309,23 @@ func renderMarkdown(content string) string {
309309
return strings.Trim(rendered, "\n ")
310310
}
311311

312-
func countDiagnosticsBySeverity(diagnostics []stainless.BuildDiagnosticListResponse) (fatal, errors, warnings, notes int) {
312+
func countDiagnosticsBySeverity(diagnostics []stainless.BuildDiagnostic) (fatal, errors, warnings, notes int) {
313313
for _, diag := range diagnostics {
314314
switch diag.Level {
315-
case stainless.BuildDiagnosticListResponseLevelFatal:
315+
case stainless.BuildDiagnosticLevelFatal:
316316
fatal++
317-
case stainless.BuildDiagnosticListResponseLevelError:
317+
case stainless.BuildDiagnosticLevelError:
318318
errors++
319-
case stainless.BuildDiagnosticListResponseLevelWarning:
319+
case stainless.BuildDiagnosticLevelWarning:
320320
warnings++
321-
case stainless.BuildDiagnosticListResponseLevelNote:
321+
case stainless.BuildDiagnosticLevelNote:
322322
notes++
323323
}
324324
}
325325
return
326326
}
327327

328-
func ViewDiagnosticsPrint(diagnostics []stainless.BuildDiagnosticListResponse) string {
328+
func ViewDiagnosticsPrint(diagnostics []stainless.BuildDiagnostic) string {
329329
var s strings.Builder
330330

331331
if len(diagnostics) > 0 {
@@ -373,6 +373,8 @@ func ViewDiagnosticsPrint(diagnostics []stainless.BuildDiagnosticListResponse) s
373373
sub.WriteString(fmt.Sprintf("%s %s\n", levelIcon, codeStyle.Render(diag.Code)))
374374
sub.WriteString(fmt.Sprintf("%s\n", renderMarkdown(diag.Message)))
375375

376+
sub.WriteString(fmt.Sprintf("%s\n", renderMarkdown(diag.Message)))
377+
376378
// Show source references if available
377379
if diag.OasRef != "" {
378380
refStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("8"))

‎pkg/cmd/init.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ func configureTargets(slug string, selectedTargets []string, config *WorkspaceCo
459459
}
460460

461461
// waitForLatestBuild waits for the latest build to complete
462-
func waitForLatestBuild(ctx context.Context, client stainless.Client, slug string) (*stainless.BuildObject, error) {
462+
func waitForLatestBuild(ctx context.Context, client stainless.Client, slug string) (*stainless.Build, error) {
463463
waitGroup := Info("Waiting for build to complete...")
464464

465465
// Try to get the latest build for this project (which should have been created automatically)
@@ -478,7 +478,7 @@ func waitForLatestBuild(ctx context.Context, client stainless.Client, slug strin
478478
}
479479

480480
// pullConfiguredTargets pulls build outputs for configured targets
481-
func pullConfiguredTargets(ctx context.Context, client stainless.Client, build stainless.BuildObject, config WorkspaceConfig) error {
481+
func pullConfiguredTargets(ctx context.Context, client stainless.Client, build stainless.Build, config WorkspaceConfig) error {
482482
if config.Targets == nil || len(config.Targets) == 0 {
483483
return nil
484484
}

‎pkg/cmd/stainlessutils.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ import (
77
"github.com/tidwall/gjson"
88
)
99

10-
// BuildObject wraps stainless.BuildObject to provide convenience methods
11-
type BuildObject struct {
12-
*stainless.BuildObject
10+
// Build wraps stainless.Build to provide convenience methods
11+
type Build struct {
12+
*stainless.Build
1313
}
1414

15-
// NewBuildObject creates a new BuildObject wrapper
16-
func NewBuildObject(build *stainless.BuildObject) *BuildObject {
15+
// NewBuild creates a new Build wrapper
16+
func NewBuild(build *stainless.Build) *Build {
1717
if build == nil {
1818
return nil
1919
}
20-
return &BuildObject{BuildObject: build}
20+
return &Build{Build: build}
2121
}
2222

2323
// BuildTarget returns the build target wrapper for a given target type, replacing getBuildTarget
24-
func (b *BuildObject) BuildTarget(target stainless.Target) *BuildTarget {
25-
if b.BuildObject == nil {
24+
func (b *Build) BuildTarget(target stainless.Target) *BuildTarget {
25+
if b.Build == nil {
2626
return nil
2727
}
2828

@@ -76,8 +76,8 @@ func (b *BuildObject) BuildTarget(target stainless.Target) *BuildTarget {
7676
}
7777

7878
// Languages returns all available build languages/targets for this build
79-
func (b *BuildObject) Languages() []stainless.Target {
80-
if b.BuildObject == nil {
79+
func (b *Build) Languages() []stainless.Target {
80+
if b.Build == nil {
8181
return []stainless.Target{}
8282
}
8383

@@ -122,7 +122,7 @@ func (b *BuildObject) Languages() []stainless.Target {
122122
}
123123

124124
// IsCompleted checks if the entire build is completed (all targets)
125-
func (b *BuildObject) IsCompleted() bool {
125+
func (b *Build) IsCompleted() bool {
126126
languages := b.Languages()
127127
for _, target := range languages {
128128
buildTarget := b.BuildTarget(target)

0 commit comments

Comments
 (0)