diff --git a/cmd/browser_pools.go b/cmd/browser_pools.go index f826f07..08a31fe 100644 --- a/cmd/browser_pools.go +++ b/cmd/browser_pools.go @@ -98,27 +98,27 @@ type BrowserPoolsCreateInput struct { } func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) error { - req := kernel.BrowserPoolRequestParam{ + params := kernel.BrowserPoolNewParams{ Size: in.Size, } if in.Name != "" { - req.Name = kernel.String(in.Name) + params.Name = kernel.String(in.Name) } if in.FillRate > 0 { - req.FillRatePerMinute = kernel.Int(in.FillRate) + params.FillRatePerMinute = kernel.Int(in.FillRate) } if in.TimeoutSeconds > 0 { - req.TimeoutSeconds = kernel.Int(in.TimeoutSeconds) + params.TimeoutSeconds = kernel.Int(in.TimeoutSeconds) } if in.Stealth.Set { - req.Stealth = kernel.Bool(in.Stealth.Value) + params.Stealth = kernel.Bool(in.Stealth.Value) } if in.Headless.Set { - req.Headless = kernel.Bool(in.Headless.Value) + params.Headless = kernel.Bool(in.Headless.Value) } if in.Kiosk.Set { - req.KioskMode = kernel.Bool(in.Kiosk.Value) + params.KioskMode = kernel.Bool(in.Kiosk.Value) } profile, err := buildProfileParam(in.ProfileID, in.ProfileName, in.ProfileSaveChanges) @@ -127,14 +127,14 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) return nil } if profile != nil { - req.Profile = *profile + params.Profile = *profile } if in.ProxyID != "" { - req.ProxyID = kernel.String(in.ProxyID) + params.ProxyID = kernel.String(in.ProxyID) } - req.Extensions = buildExtensionsParam(in.Extensions) + params.Extensions = buildExtensionsParam(in.Extensions) viewport, err := buildViewportParam(in.Viewport) if err != nil { @@ -142,11 +142,7 @@ func (c BrowserPoolsCmd) Create(ctx context.Context, in BrowserPoolsCreateInput) return nil } if viewport != nil { - req.Viewport = *viewport - } - - params := kernel.BrowserPoolNewParams{ - BrowserPoolRequest: req, + params.Viewport = *viewport } pool, err := c.client.New(ctx, params) @@ -231,31 +227,31 @@ type BrowserPoolsUpdateInput struct { } func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) error { - req := kernel.BrowserPoolUpdateRequestParam{} + params := kernel.BrowserPoolUpdateParams{} if in.Name != "" { - req.Name = kernel.String(in.Name) + params.Name = kernel.String(in.Name) } if in.Size > 0 { - req.Size = in.Size + params.Size = in.Size } if in.FillRate > 0 { - req.FillRatePerMinute = kernel.Int(in.FillRate) + params.FillRatePerMinute = kernel.Int(in.FillRate) } if in.TimeoutSeconds > 0 { - req.TimeoutSeconds = kernel.Int(in.TimeoutSeconds) + params.TimeoutSeconds = kernel.Int(in.TimeoutSeconds) } if in.Stealth.Set { - req.Stealth = kernel.Bool(in.Stealth.Value) + params.Stealth = kernel.Bool(in.Stealth.Value) } if in.Headless.Set { - req.Headless = kernel.Bool(in.Headless.Value) + params.Headless = kernel.Bool(in.Headless.Value) } if in.Kiosk.Set { - req.KioskMode = kernel.Bool(in.Kiosk.Value) + params.KioskMode = kernel.Bool(in.Kiosk.Value) } if in.DiscardAllIdle.Set { - req.DiscardAllIdle = kernel.Bool(in.DiscardAllIdle.Value) + params.DiscardAllIdle = kernel.Bool(in.DiscardAllIdle.Value) } profile, err := buildProfileParam(in.ProfileID, in.ProfileName, in.ProfileSaveChanges) @@ -264,14 +260,14 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) return nil } if profile != nil { - req.Profile = *profile + params.Profile = *profile } if in.ProxyID != "" { - req.ProxyID = kernel.String(in.ProxyID) + params.ProxyID = kernel.String(in.ProxyID) } - req.Extensions = buildExtensionsParam(in.Extensions) + params.Extensions = buildExtensionsParam(in.Extensions) viewport, err := buildViewportParam(in.Viewport) if err != nil { @@ -279,11 +275,7 @@ func (c BrowserPoolsCmd) Update(ctx context.Context, in BrowserPoolsUpdateInput) return nil } if viewport != nil { - req.Viewport = *viewport - } - - params := kernel.BrowserPoolUpdateParams{ - BrowserPoolUpdateRequest: req, + params.Viewport = *viewport } pool, err := c.client.Update(ctx, in.IDOrName, params) @@ -322,12 +314,9 @@ type BrowserPoolsAcquireInput struct { } func (c BrowserPoolsCmd) Acquire(ctx context.Context, in BrowserPoolsAcquireInput) error { - req := kernel.BrowserPoolAcquireRequestParam{} + params := kernel.BrowserPoolAcquireParams{} if in.TimeoutSeconds > 0 { - req.AcquireTimeoutSeconds = kernel.Int(in.TimeoutSeconds) - } - params := kernel.BrowserPoolAcquireParams{ - BrowserPoolAcquireRequest: req, + params.AcquireTimeoutSeconds = kernel.Int(in.TimeoutSeconds) } resp, err := c.client.Acquire(ctx, in.IDOrName, params) if err != nil { @@ -355,14 +344,11 @@ type BrowserPoolsReleaseInput struct { } func (c BrowserPoolsCmd) Release(ctx context.Context, in BrowserPoolsReleaseInput) error { - req := kernel.BrowserPoolReleaseRequestParam{ + params := kernel.BrowserPoolReleaseParams{ SessionID: in.SessionID, } if in.Reuse.Set { - req.Reuse = kernel.Bool(in.Reuse.Value) - } - params := kernel.BrowserPoolReleaseParams{ - BrowserPoolReleaseRequest: req, + params.Reuse = kernel.Bool(in.Reuse.Value) } err := c.client.Release(ctx, in.IDOrName, params) if err != nil { diff --git a/cmd/browsers.go b/cmd/browsers.go index 36a91d4..eb4e27b 100644 --- a/cmd/browsers.go +++ b/cmd/browsers.go @@ -2062,12 +2062,9 @@ func runBrowsersCreate(cmd *cobra.Command, args []string) error { pterm.Info.Printf("Acquiring browser from pool %s...\n", pool) poolSvc := client.BrowserPools - req := kernel.BrowserPoolAcquireRequestParam{} + acquireParams := kernel.BrowserPoolAcquireParams{} if cmd.Flags().Changed("timeout") && timeout > 0 { - req.AcquireTimeoutSeconds = kernel.Int(int64(timeout)) - } - acquireParams := kernel.BrowserPoolAcquireParams{ - BrowserPoolAcquireRequest: req, + acquireParams.AcquireTimeoutSeconds = kernel.Int(int64(timeout)) } resp, err := (&poolSvc).Acquire(cmd.Context(), pool, acquireParams) diff --git a/go.mod b/go.mod index b17f5cc..cdfe589 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,10 @@ require ( github.com/Masterminds/semver/v3 v3.4.0 github.com/boyter/gocodewalker v1.4.0 github.com/charmbracelet/fang v0.2.0 + github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/joho/godotenv v1.5.1 - github.com/onkernel/kernel-go-sdk v0.21.0 + github.com/onkernel/kernel-go-sdk v0.24.0 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pterm/pterm v0.12.80 github.com/samber/lo v1.51.0 @@ -25,7 +26,6 @@ require ( atomicgo.dev/keyboard v0.2.9 // indirect atomicgo.dev/schedule v0.1.0 // indirect github.com/charmbracelet/colorprofile v0.3.0 // indirect - github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 // indirect github.com/charmbracelet/x/ansi v0.8.0 // indirect github.com/charmbracelet/x/cellbuf v0.0.13 // indirect github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444 // indirect diff --git a/go.sum b/go.sum index f5b74b9..3172668 100644 --- a/go.sum +++ b/go.sum @@ -91,8 +91,8 @@ github.com/muesli/mango-pflag v0.1.0 h1:UADqbYgpUyRoBja3g6LUL+3LErjpsOwaC9ywvBWe github.com/muesli/mango-pflag v0.1.0/go.mod h1:YEQomTxaCUp8PrbhFh10UfbhbQrM/xJ4i2PB8VTLLW0= github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8= github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig= -github.com/onkernel/kernel-go-sdk v0.21.0 h1:ah1uBl71pk5DJmge0Z8eyyk1dZw6ik9ETuyd+3tIrl4= -github.com/onkernel/kernel-go-sdk v0.21.0/go.mod h1:t80buN1uCA/hwvm4D2SpjTJzZWcV7bWOFo9d7qdXD8M= +github.com/onkernel/kernel-go-sdk v0.24.0 h1:M5GdjmdASnpet9UezVEadPpzWyjBfoyqnLwHf/tFoVE= +github.com/onkernel/kernel-go-sdk v0.24.0/go.mod h1:t80buN1uCA/hwvm4D2SpjTJzZWcV7bWOFo9d7qdXD8M= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=