Merge 5e29ffc into ab0f33f

Author: kzys

go.mod

@@ -74,7 +74,7 @@ require (
 	github.com/spf13/pflag v1.0.9
 	github.com/spf13/viper v1.20.1
 	github.com/stretchr/testify v1.11.1
-	github.com/superfly/fly-go v0.1.54
+	github.com/superfly/fly-go v0.1.55-0.20250930234843-3142f94c5f3e
 	github.com/superfly/graphql v0.2.6
 	github.com/superfly/lfsc-go v0.1.1
 	github.com/superfly/macaroon v0.3.0

go.sum

@@ -635,8 +635,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/superfly/fly-go v0.1.54 h1:O6SUkihongJJeGF2nr+LuN426LnMPxewRdQArv/xGOM=
-github.com/superfly/fly-go v0.1.54/go.mod h1:YcVyr0bQm6cdydoMsqIHDPZDQqbmErwCSIuJI4pNwZM=
+github.com/superfly/fly-go v0.1.55-0.20250930234843-3142f94c5f3e h1:+0VfB8XizK+8yw6U9gzOa+n2As/E8TKy1fNB/rB8Wm4=
+github.com/superfly/fly-go v0.1.55-0.20250930234843-3142f94c5f3e/go.mod h1:OEtmZnkQLEUNGyW+vzq52VnB8mMnTgsiHGdNfYd7IkM=
 github.com/superfly/graphql v0.2.6 h1:zppbodNerWecoXEdjkhrqaNaSjGqobhXNlViHFuZzb4=
 github.com/superfly/graphql v0.2.6/go.mod h1:CVfDl31srm8HnJ9udwLu6hFNUW/P6GUM2dKcG1YQ8jc=
 github.com/superfly/lfsc-go v0.1.1 h1:dGjLgt81D09cG+aR9lJZIdmonjZSR5zYCi7s54+ZU2Q=

internal/command/deploy/machines_deploymachinesapp.go

@@ -60,7 +60,7 @@ func (md *machineDeployment) DeployMachinesApp(ctx context.Context) error {
 		}
 		fullOrg, err := md.apiClient.GetOrganizationBySlug(ctx, md.app.Organization.Slug)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to ger org for deployment: %w", err)
 		}
 
 		md.tigrisStatics = statics.Deployer(md.appConfig, fullApp, fullOrg, md.releaseVersion)

internal/command/launch/cmd.go

@@ -459,7 +459,7 @@ func run(ctx context.Context) (err error) {
 
 	err = state.Launch(ctx)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to launch %+v: %w", state.Plan, err)
 	}
 
 	if flag.GetBool(ctx, "attach") && parentConfig != nil && !flag.GetBool(ctx, "no-create") {

internal/command/launch/launch.go

@@ -42,7 +42,7 @@ func (state *launchState) Launch(ctx context.Context) error {
 
 	org, err := state.Org(ctx)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to get org for launch: %w", err)
 	}
 	if !planValidateHighAvailability(ctx, state.Plan, org, !state.warnedNoCcHa) {
 		state.Plan.HighAvailability = false
@@ -334,7 +334,8 @@ func (state *launchState) createApp(ctx context.Context) (flapsutil.FlapsClient,
 	apiClient := flyutil.ClientFromContext(ctx)
 	org, err := state.Org(ctx)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("failed to get org for app: %w", err)
+
 	}
 	app, err := apiClient.CreateApp(ctx, fly.CreateAppInput{
 		OrganizationID:  org.ID,

internal/command/launch/state.go

@@ -59,7 +59,11 @@ func cacheGrab[T any](cache map[string]interface{}, key string, cb func() (T, er
 func (state *launchState) Org(ctx context.Context) (*fly.Organization, error) {
 	apiClient := flyutil.ClientFromContext(ctx)
 	return cacheGrab(state.cache, "org,"+state.Plan.OrgSlug, func() (*fly.Organization, error) {
-		return apiClient.GetOrganizationBySlug(ctx, state.Plan.OrgSlug)
+		org, err := apiClient.GetOrganizationBySlug(ctx, state.Plan.OrgSlug)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get org %q for state: %w", state.Plan.OrgSlug, err)
+		}
+		return org, nil
 	})
 }