diff --git a/apps/cli-go/api/overlay.yaml b/apps/cli-go/api/overlay.yaml index c8222c4aa8..c4e1961ff4 100644 --- a/apps/cli-go/api/overlay.yaml +++ b/apps/cli-go/api/overlay.yaml @@ -14,13 +14,13 @@ actions: - abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:0123456789 - abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:0123456789:!@#$%^&*()_+-=[]{};'\\\\:\"|<>?,./`~ - '' -- target: $.components.schemas.*.properties.attribute_mapping.properties.keys.additionalProperties.properties.default.oneOf +- target: $.components.schemas.*.properties.attribute_mapping.properties.keys.additionalProperties.properties.default.anyOf description: Replaces request union type with interface for easier casting remove: true -- target: $.components.schemas.*.properties.saml.properties.attribute_mapping.properties.keys.additionalProperties.properties.default.oneOf +- target: $.components.schemas.*.properties.saml.properties.attribute_mapping.properties.keys.additionalProperties.properties.default.anyOf description: Replaces response union type with interface for easier casting remove: true -- target: $.components.schemas.*.properties.items.items.properties.saml.properties.attribute_mapping.properties.keys.additionalProperties.properties.default.oneOf +- target: $.components.schemas.*.properties.items.items.properties.saml.properties.attribute_mapping.properties.keys.additionalProperties.properties.default.anyOf description: Replaces list union type with interface for easier casting remove: true - target: $.components.schemas.*.properties.saml.properties.name_id_format.enum @@ -32,39 +32,48 @@ actions: - target: $.components.schemas.*.properties.connectionString description: Removes deprecated field that conflicts with naming convention remove: true -- target: $.components.schemas.*.properties.region_selection.discriminator - description: Replaces discriminated union with concrete type +- target: $.components.schemas.V1CreateProjectBody.properties.release_channel + description: Removes deprecated null-only field that oapi-codegen cannot map remove: true -- target: $.components.schemas.*.properties.private_jwk.discriminator - description: Replaces discriminated union with concrete type +- target: $.components.schemas.V1CreateProjectBody.properties.postgres_engine + description: Removes deprecated null-only field that oapi-codegen cannot map remove: true -- target: $.components.schemas.DiskRequestBody.properties.attributes.discriminator - description: Replaces discriminated union with concrete type - remove: true -- target: $.components.schemas.JitStateResponse.discriminator - description: Replaces discriminated union with concrete type - remove: true -- target: $.components.schemas.JitListAccessResponse.properties.items.items.oneOf[0].properties.invite_id +- target: $.components.schemas.JitListAccessResponse.properties.items.items.anyOf[0].properties.invite_id description: Replaces null-only project user invite id with nullable UUID for oapi-codegen update: type: string format: uuid nullable: true -- target: $.components.schemas.JitListAccessResponse.properties.items.items.oneOf[0].properties.expires_at +- target: $.components.schemas.JitListAccessResponse.properties.items.items.anyOf[0].properties.expires_at description: Replaces null-only project user invite expiry with nullable string for oapi-codegen update: type: string nullable: true -- target: $.components.schemas.JitListAccessResponse.properties.items.items.oneOf[1].properties.user_id +- target: $.components.schemas.JitListAccessResponse.properties.items.items.anyOf[1].properties.user_id description: Replaces null-only invited user id with nullable UUID for oapi-codegen update: type: string format: uuid nullable: true -- target: $.components.schemas.ProjectUpgradeEligibilityResponse.properties.warnings.items.discriminator - description: Removes inline warning discriminator that oapi-codegen cannot map - remove: true - target: $.paths.*.*.parameters[?(@.name=='branch_id_or_ref')] update: schema: type: string +- target: $.paths.*.*.parameters[?(@.name=='services')].schema.anyOf + description: Removes comma-string-or-array union so the array-of-enum shape can be set directly + remove: true +- target: $.paths.*.*.parameters[?(@.name=='services')].schema + description: Replaces comma-string-or-array union with a plain array of enums for oapi-codegen + update: + type: array + items: + type: string + enum: + - auth + - db + - db_postgres_user + - pooler + - realtime + - rest + - storage + - pg_bouncer diff --git a/apps/cli-go/go.mod b/apps/cli-go/go.mod index 25a5818bf1..778b1a731a 100644 --- a/apps/cli-go/go.mod +++ b/apps/cli-go/go.mod @@ -1,6 +1,6 @@ module github.com/supabase/cli -go 1.25.11 +go 1.26 require ( github.com/BurntSushi/toml v1.6.0 @@ -189,7 +189,7 @@ require ( github.com/fxamacker/cbor/v2 v2.9.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect github.com/gabriel-vasile/mimetype v1.4.13 // indirect - github.com/getkin/kin-openapi v0.135.0 // indirect + github.com/getkin/kin-openapi v0.136.0 // indirect github.com/ghostiam/protogetter v0.3.20 // indirect github.com/go-critic/go-critic v0.14.3 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect @@ -353,7 +353,7 @@ require ( github.com/oapi-codegen/oapi-codegen/v2 v2.7.1 // indirect github.com/oapi-codegen/runtime v1.6.0 // indirect github.com/oasdiff/yaml v0.0.9 // indirect - github.com/oasdiff/yaml3 v0.0.9 // indirect + github.com/oasdiff/yaml3 v0.0.12 // indirect github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect github.com/olekukonko/errors v1.2.0 // indirect github.com/olekukonko/ll v0.1.6 // indirect diff --git a/apps/cli-go/go.sum b/apps/cli-go/go.sum index d7fb2d5bee..43e9aaee08 100644 --- a/apps/cli-go/go.sum +++ b/apps/cli-go/go.sum @@ -371,8 +371,8 @@ github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= -github.com/getkin/kin-openapi v0.135.0 h1:751SjYfbiwqukYuVjwYEIKNfrSwS5YpA7DZnKSwQgtg= -github.com/getkin/kin-openapi v0.135.0/go.mod h1:6dd5FJl6RdX4usBtFBaQhk9q62Yb2J0Mk5IhUO/QqFI= +github.com/getkin/kin-openapi v0.136.0 h1:mJC/W0ZFnwGYkUUwujw+LmWGFuKcqHklJjpl8JAH5eE= +github.com/getkin/kin-openapi v0.136.0/go.mod h1:f97ss9nLJZRi9fm0vSwKZa4KrPMltWnZf9peal6MBrs= github.com/getsentry/sentry-go v0.48.0 h1:FRZNr7Uk1C86ev1bSJmYlUkL9oyivQA6YOcdYfaaMmY= github.com/getsentry/sentry-go v0.48.0/go.mod h1:E5UkA5wp1qR2+MDydNYlVeUiNN2xEdjYMidkgf0Qoss= github.com/ghostiam/protogetter v0.3.20 h1:oW7OPFit2FxZOpmMRPP9FffU4uUpfeE/rEdE1f+MzD0= @@ -900,8 +900,8 @@ github.com/oapi-codegen/runtime v1.6.0 h1:7Xx+GlueD6nRuyKoCPzL434Jfi3BetbiJOrzCH github.com/oapi-codegen/runtime v1.6.0/go.mod h1:GwV7hC2hviaMzj+ITfHVRESK5J2W/GefVwIND/bMGvU= github.com/oasdiff/yaml v0.0.9 h1:zQOvd2UKoozsSsAknnWoDJlSK4lC0mpmjfDsfqNwX48= github.com/oasdiff/yaml v0.0.9/go.mod h1:8lvhgJG4xiKPj3HN5lDow4jZHPlx1i7dIwzkdAo6oAM= -github.com/oasdiff/yaml3 v0.0.9 h1:rWPrKccrdUm8J0F3sGuU+fuh9+1K/RdJlWF7O/9yw2g= -github.com/oasdiff/yaml3 v0.0.9/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= +github.com/oasdiff/yaml3 v0.0.12 h1:75urAtPeDg2/iDEWwzNrLOWxI9N/dCh81nTTJtokt2M= +github.com/oasdiff/yaml3 v0.0.12/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o= github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj4EljqMiZsIcE09mmF8XsD5AYOJc= github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0= github.com/olekukonko/errors v1.2.0 h1:10Zcn4GeV59t/EGqJc8fUjtFT/FuUh5bTMzZ1XwmCRo= diff --git a/apps/cli-go/internal/branches/delete/delete.go b/apps/cli-go/internal/branches/delete/delete.go index d73762cedf..8bd4fbd1a7 100644 --- a/apps/cli-go/internal/branches/delete/delete.go +++ b/apps/cli-go/internal/branches/delete/delete.go @@ -10,6 +10,7 @@ import ( "github.com/supabase/cli/internal/branches/pause" "github.com/supabase/cli/internal/utils" "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" ) func Run(ctx context.Context, branchId string, force *bool) error { @@ -18,7 +19,7 @@ func Run(ctx context.Context, branchId string, force *bool) error { return err } resp, err := utils.GetSupabase().V1DeleteABranchWithResponse(ctx, projectRef, &api.V1DeleteABranchParams{ - Force: force, + Force: cast.BoolToStringPtr(force), }) if err != nil { return errors.Errorf("failed to delete preview branch: %w", err) diff --git a/apps/cli-go/internal/gen/bearerjwt/bearerjwt_test.go b/apps/cli-go/internal/gen/bearerjwt/bearerjwt_test.go index fe329b6498..df30fc9a04 100644 --- a/apps/cli-go/internal/gen/bearerjwt/bearerjwt_test.go +++ b/apps/cli-go/internal/gen/bearerjwt/bearerjwt_test.go @@ -7,6 +7,7 @@ import ( "crypto/elliptic" "crypto/rsa" _ "embed" + "encoding/base64" "encoding/json" "io" "testing" @@ -26,11 +27,17 @@ func TestGenerateToken(t *testing.T) { privateKeyECDSA, err := signingkeys.GeneratePrivateKey(config.AlgES256) require.NoError(t, err) // Setup public key for validation - publicKeyECDSA := ecdsa.PublicKey{Curve: elliptic.P256()} - publicKeyECDSA.X, err = config.NewBigIntFromBase64(privateKeyECDSA.X) + xBytes, err := base64.RawURLEncoding.DecodeString(privateKeyECDSA.X) require.NoError(t, err) - publicKeyECDSA.Y, err = config.NewBigIntFromBase64(privateKeyECDSA.Y) + yBytes, err := base64.RawURLEncoding.DecodeString(privateKeyECDSA.Y) require.NoError(t, err) + uncompressedPoint := make([]byte, 0, 1+len(xBytes)+len(yBytes)) + uncompressedPoint = append(uncompressedPoint, 0x04) + uncompressedPoint = append(uncompressedPoint, xBytes...) + uncompressedPoint = append(uncompressedPoint, yBytes...) + publicKeyECDSAPtr, err := ecdsa.ParseUncompressedPublicKey(elliptic.P256(), uncompressedPoint) + require.NoError(t, err) + publicKeyECDSA := *publicKeyECDSAPtr // Setup private key - RSA privateKeyRSA, err := signingkeys.GeneratePrivateKey(config.AlgRS256) diff --git a/apps/cli-go/internal/gen/signingkeys/signingkeys.go b/apps/cli-go/internal/gen/signingkeys/signingkeys.go index d8fdb43e77..cd5328c216 100644 --- a/apps/cli-go/internal/gen/signingkeys/signingkeys.go +++ b/apps/cli-go/internal/gen/signingkeys/signingkeys.go @@ -78,6 +78,17 @@ func generateECDSAKeyPair(keyID uuid.UUID) (*config.JWK, error) { publicKey := &privateKey.PublicKey + // SEC1 uncompressed point: 0x04 || X || Y, each coordinate fixed-length for the curve. + pubBytes, err := publicKey.Bytes() + if err != nil { + return nil, errors.Errorf("failed to encode ECDSA public key: %w", err) + } + privBytes, err := privateKey.Bytes() + if err != nil { + return nil, errors.Errorf("failed to encode ECDSA private key: %w", err) + } + coordLen := (len(pubBytes) - 1) / 2 + // Convert to JWK format privateJWK := config.JWK{ KeyType: "EC", @@ -87,9 +98,9 @@ func generateECDSAKeyPair(keyID uuid.UUID) (*config.JWK, error) { Algorithm: "ES256", Extractable: cast.Ptr(true), Curve: "P-256", - X: base64.RawURLEncoding.EncodeToString(publicKey.X.Bytes()), - Y: base64.RawURLEncoding.EncodeToString(publicKey.Y.Bytes()), - PrivateExponent: base64.RawURLEncoding.EncodeToString(privateKey.D.Bytes()), + X: base64.RawURLEncoding.EncodeToString(pubBytes[1 : 1+coordLen]), + Y: base64.RawURLEncoding.EncodeToString(pubBytes[1+coordLen:]), + PrivateExponent: base64.RawURLEncoding.EncodeToString(privBytes), } return &privateJWK, nil diff --git a/apps/cli-go/internal/utils/tenant/client.go b/apps/cli-go/internal/utils/tenant/client.go index 3d6d039fa8..e94e6e0f21 100644 --- a/apps/cli-go/internal/utils/tenant/client.go +++ b/apps/cli-go/internal/utils/tenant/client.go @@ -69,7 +69,7 @@ func isServiceRole(key api.ApiKeyResponse) bool { func GetApiKeys(ctx context.Context, projectRef string) (ApiKey, error) { resp, err := utils.GetSupabase().V1GetProjectApiKeysWithResponse(ctx, projectRef, &api.V1GetProjectApiKeysParams{ - Reveal: cast.Ptr(true), + Reveal: cast.Ptr("true"), }) if err != nil { return ApiKey{}, errors.Errorf("failed to get api keys: %w", err) diff --git a/apps/cli-go/pkg/api/client.gen.go b/apps/cli-go/pkg/api/client.gen.go index b8684b994f..5c6a3948ac 100644 --- a/apps/cli-go/pkg/api/client.gen.go +++ b/apps/cli-go/pkg/api/client.gen.go @@ -3508,7 +3508,7 @@ func NewV1DeleteABranchRequest(server string, branchIdOrRef string, params *V1De if params.Force != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "force", *params.Force, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "force", *params.Force, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -3662,7 +3662,7 @@ func NewV1DiffABranchRequest(server string, branchIdOrRef string, params *V1Diff if params.Pgdelta != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "pgdelta", *params.Pgdelta, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "pgdelta", *params.Pgdelta, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -5607,7 +5607,7 @@ func NewV1GetProjectApiKeysRequest(server string, ref string, params *V1GetProje if params.Reveal != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -5679,7 +5679,7 @@ func NewV1CreateProjectApiKeyRequestWithBody(server string, ref string, params * if params.Reveal != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -5774,7 +5774,7 @@ func NewV1UpdateProjectLegacyApiKeysRequest(server string, ref string, params *V // per the OpenAPI spec (e.g. "color=blue,black,brown"). var rawQueryFragments []string - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "enabled", params.Enabled, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "enabled", params.Enabled, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -5840,7 +5840,7 @@ func NewV1DeleteProjectApiKeyRequest(server string, ref string, id openapi_types if params.Reveal != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -5852,7 +5852,7 @@ func NewV1DeleteProjectApiKeyRequest(server string, ref string, id openapi_types if params.WasCompromised != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "was_compromised", *params.WasCompromised, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "was_compromised", *params.WasCompromised, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -5932,7 +5932,7 @@ func NewV1GetProjectApiKeyRequest(server string, ref string, id openapi_types.UU if params.Reveal != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -6011,7 +6011,7 @@ func NewV1UpdateProjectApiKeyRequestWithBody(server string, ref string, id opena if params.Reveal != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "reveal", *params.Reveal, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -7824,7 +7824,7 @@ func NewV1DeleteHostnameConfigRequest(server string, ref string, params *V1Delet if params.RemoveAddon != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "remove_addon", *params.RemoveAddon, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "remove_addon", *params.RemoveAddon, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -9385,7 +9385,7 @@ func NewV1CreateAFunctionRequestWithBody(server string, ref string, params *V1Cr if params.VerifyJwt != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "verify_jwt", *params.VerifyJwt, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "verify_jwt", *params.VerifyJwt, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -9397,7 +9397,7 @@ func NewV1CreateAFunctionRequestWithBody(server string, ref string, params *V1Cr if params.ImportMap != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "import_map", *params.ImportMap, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "import_map", *params.ImportMap, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -9555,7 +9555,7 @@ func NewV1DeployAFunctionRequestWithBody(server string, ref string, params *V1De if params.BundleOnly != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "bundleOnly", *params.BundleOnly, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "bundleOnly", *params.BundleOnly, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -9742,7 +9742,7 @@ func NewV1UpdateAFunctionRequestWithBody(server string, ref string, functionSlug if params.VerifyJwt != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "verify_jwt", *params.VerifyJwt, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "verify_jwt", *params.VerifyJwt, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -9754,7 +9754,7 @@ func NewV1UpdateAFunctionRequestWithBody(server string, ref string, functionSlug if params.ImportMap != nil { - if queryFrag, err := runtime.StyleParamWithOptions("form", true, "import_map", *params.ImportMap, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "boolean", Format: ""}); err != nil { + if queryFrag, err := runtime.StyleParamWithOptions("form", true, "import_map", *params.ImportMap, runtime.StyleParamOptions{ParamLocation: runtime.ParamLocationQuery, Type: "string", Format: ""}); err != nil { return nil, err } else { for _, qp := range strings.Split(queryFrag, "&") { @@ -16131,7 +16131,7 @@ func (r V1GetServicesHealthResponse) ContentType() string { type V1GetJitAccessConfigResponse struct { Body []byte HTTPResponse *http.Response - JSON200 *JitStateResponse + JSON200 *V1GetJitAccessConfig200JSONResponseBody } // Status returns HTTPResponse.Status @@ -16161,7 +16161,7 @@ func (r V1GetJitAccessConfigResponse) ContentType() string { type V1UpdateJitAccessConfigResponse struct { Body []byte HTTPResponse *http.Response - JSON200 *JitStateResponse + JSON200 *V1UpdateJitAccessConfig200JSONResponseBody } // Status returns HTTPResponse.Status @@ -22422,7 +22422,7 @@ func ParseV1GetJitAccessConfigResponse(rsp *http.Response) (*V1GetJitAccessConfi switch { case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200: - var dest JitStateResponse + var dest V1GetJitAccessConfig200JSONResponseBody if err := json.Unmarshal(bodyBytes, &dest); err != nil { return nil, err } @@ -22448,7 +22448,7 @@ func ParseV1UpdateJitAccessConfigResponse(rsp *http.Response) (*V1UpdateJitAcces switch { case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200: - var dest JitStateResponse + var dest V1UpdateJitAccessConfig200JSONResponseBody if err := json.Unmarshal(bodyBytes, &dest); err != nil { return nil, err } diff --git a/apps/cli-go/pkg/api/types.gen.go b/apps/cli-go/pkg/api/types.gen.go index 315c1560c9..1941afee0b 100644 --- a/apps/cli-go/pkg/api/types.gen.go +++ b/apps/cli-go/pkg/api/types.gen.go @@ -86,6 +86,7 @@ func (e ActionRunResponseRunStepsStatus) Valid() bool { // Defines values for ApiKeyResponseType. const ( ApiKeyResponseTypeLegacy ApiKeyResponseType = "legacy" + ApiKeyResponseTypeLessThannil ApiKeyResponseType = "" ApiKeyResponseTypePublishable ApiKeyResponseType = "publishable" ApiKeyResponseTypeSecret ApiKeyResponseType = "secret" ) @@ -95,6 +96,8 @@ func (e ApiKeyResponseType) Valid() bool { switch e { case ApiKeyResponseTypeLegacy: return true + case ApiKeyResponseTypeLessThannil: + return true case ApiKeyResponseTypePublishable: return true case ApiKeyResponseTypeSecret: @@ -260,6 +263,7 @@ func (e ApplyProjectAddonBodyAddonVariant3) Valid() bool { // Defines values for AuthConfigResponseDbMaxPoolSizeUnit. const ( AuthConfigResponseDbMaxPoolSizeUnitConnections AuthConfigResponseDbMaxPoolSizeUnit = "connections" + AuthConfigResponseDbMaxPoolSizeUnitLessThannil AuthConfigResponseDbMaxPoolSizeUnit = "" AuthConfigResponseDbMaxPoolSizeUnitPercent AuthConfigResponseDbMaxPoolSizeUnit = "percent" ) @@ -268,6 +272,8 @@ func (e AuthConfigResponseDbMaxPoolSizeUnit) Valid() bool { switch e { case AuthConfigResponseDbMaxPoolSizeUnitConnections: return true + case AuthConfigResponseDbMaxPoolSizeUnitLessThannil: + return true case AuthConfigResponseDbMaxPoolSizeUnitPercent: return true default: @@ -301,8 +307,9 @@ func (e AuthConfigResponsePasswordRequiredCharacters) Valid() bool { // Defines values for AuthConfigResponseSecurityCaptchaProvider. const ( - AuthConfigResponseSecurityCaptchaProviderHcaptcha AuthConfigResponseSecurityCaptchaProvider = "hcaptcha" - AuthConfigResponseSecurityCaptchaProviderTurnstile AuthConfigResponseSecurityCaptchaProvider = "turnstile" + AuthConfigResponseSecurityCaptchaProviderHcaptcha AuthConfigResponseSecurityCaptchaProvider = "hcaptcha" + AuthConfigResponseSecurityCaptchaProviderLessThannil AuthConfigResponseSecurityCaptchaProvider = "" + AuthConfigResponseSecurityCaptchaProviderTurnstile AuthConfigResponseSecurityCaptchaProvider = "turnstile" ) // Valid indicates whether the value is a known member of the AuthConfigResponseSecurityCaptchaProvider enum. @@ -310,6 +317,8 @@ func (e AuthConfigResponseSecurityCaptchaProvider) Valid() bool { switch e { case AuthConfigResponseSecurityCaptchaProviderHcaptcha: return true + case AuthConfigResponseSecurityCaptchaProviderLessThannil: + return true case AuthConfigResponseSecurityCaptchaProviderTurnstile: return true default: @@ -319,6 +328,7 @@ func (e AuthConfigResponseSecurityCaptchaProvider) Valid() bool { // Defines values for AuthConfigResponseSmsProvider. const ( + AuthConfigResponseSmsProviderLessThannil AuthConfigResponseSmsProvider = "" AuthConfigResponseSmsProviderMessagebird AuthConfigResponseSmsProvider = "messagebird" AuthConfigResponseSmsProviderTextlocal AuthConfigResponseSmsProvider = "textlocal" AuthConfigResponseSmsProviderTwilio AuthConfigResponseSmsProvider = "twilio" @@ -329,6 +339,8 @@ const ( // Valid indicates whether the value is a known member of the AuthConfigResponseSmsProvider enum. func (e AuthConfigResponseSmsProvider) Valid() bool { switch e { + case AuthConfigResponseSmsProviderLessThannil: + return true case AuthConfigResponseSmsProviderMessagebird: return true case AuthConfigResponseSmsProviderTextlocal: @@ -577,16 +589,16 @@ func (e BulkUpdateFunctionResponseFunctionsStatus) Valid() bool { // Defines values for CreateApiKeyBodyType. const ( - CreateApiKeyBodyTypePublishable CreateApiKeyBodyType = "publishable" - CreateApiKeyBodyTypeSecret CreateApiKeyBodyType = "secret" + Publishable CreateApiKeyBodyType = "publishable" + Secret CreateApiKeyBodyType = "secret" ) // Valid indicates whether the value is a known member of the CreateApiKeyBodyType enum. func (e CreateApiKeyBodyType) Valid() bool { switch e { - case CreateApiKeyBodyTypePublishable: + case Publishable: return true - case CreateApiKeyBodyTypeSecret: + case Secret: return true default: return false @@ -1451,60 +1463,6 @@ func (e JitAccessRequestRequestState) Valid() bool { } } -// Defines values for JitStateResponse0State. -const ( - JitStateResponse0StateDisabled JitStateResponse0State = "disabled" - JitStateResponse0StateEnabled JitStateResponse0State = "enabled" -) - -// Valid indicates whether the value is a known member of the JitStateResponse0State enum. -func (e JitStateResponse0State) Valid() bool { - switch e { - case JitStateResponse0StateDisabled: - return true - case JitStateResponse0StateEnabled: - return true - default: - return false - } -} - -// Defines values for JitStateResponse1State. -const ( - Unavailable JitStateResponse1State = "unavailable" -) - -// Valid indicates whether the value is a known member of the JitStateResponse1State enum. -func (e JitStateResponse1State) Valid() bool { - switch e { - case Unavailable: - return true - default: - return false - } -} - -// Defines values for JitStateResponse1UnavailableReason. -const ( - PostgresUpgradeRequired JitStateResponse1UnavailableReason = "postgres_upgrade_required" - SslEnforcementRequired JitStateResponse1UnavailableReason = "ssl_enforcement_required" - TemporarilyUnavailable JitStateResponse1UnavailableReason = "temporarily_unavailable" -) - -// Valid indicates whether the value is a known member of the JitStateResponse1UnavailableReason enum. -func (e JitStateResponse1UnavailableReason) Valid() bool { - switch e { - case PostgresUpgradeRequired: - return true - case SslEnforcementRequired: - return true - case TemporarilyUnavailable: - return true - default: - return false - } -} - // Defines values for ListActionRunResponseRunStepsName. const ( ListActionRunResponseRunStepsNameClone ListActionRunResponseRunStepsName = "clone" @@ -2242,11 +2200,12 @@ func (e OrganizationProjectClaimResponsePreviewSourceSubscriptionPlan) Valid() b // Defines values for OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan. const ( - OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanEnterprise OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "enterprise" - OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanFree OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "free" - OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanPlatform OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "platform" - OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanPro OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "pro" - OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanTeam OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "team" + OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanEnterprise OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "enterprise" + OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanFree OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "free" + OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanLessThannil OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "" + OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanPlatform OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "platform" + OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanPro OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "pro" + OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanTeam OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan = "team" ) // Valid indicates whether the value is a known member of the OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan enum. @@ -2256,6 +2215,8 @@ func (e OrganizationProjectClaimResponsePreviewTargetSubscriptionPlan) Valid() b return true case OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanFree: return true + case OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanLessThannil: + return true case OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanPlatform: return true case OrganizationProjectClaimResponsePreviewTargetSubscriptionPlanPro: @@ -2693,18 +2654,30 @@ func (e ProjectUpgradeEligibilityResponseValidationErrors5Type) Valid() bool { } } -// Defines values for ProjectUpgradeEligibilityResponseValidationErrors6ObjType. +// Defines values for ProjectUpgradeEligibilityResponseValidationErrors6ObjType0. const ( - ProjectUpgradeEligibilityResponseValidationErrors6ObjTypeFunction ProjectUpgradeEligibilityResponseValidationErrors6ObjType = "function" - ProjectUpgradeEligibilityResponseValidationErrors6ObjTypeTable ProjectUpgradeEligibilityResponseValidationErrors6ObjType = "table" + ProjectUpgradeEligibilityResponseValidationErrors6ObjType0Table ProjectUpgradeEligibilityResponseValidationErrors6ObjType0 = "table" ) -// Valid indicates whether the value is a known member of the ProjectUpgradeEligibilityResponseValidationErrors6ObjType enum. -func (e ProjectUpgradeEligibilityResponseValidationErrors6ObjType) Valid() bool { +// Valid indicates whether the value is a known member of the ProjectUpgradeEligibilityResponseValidationErrors6ObjType0 enum. +func (e ProjectUpgradeEligibilityResponseValidationErrors6ObjType0) Valid() bool { switch e { - case ProjectUpgradeEligibilityResponseValidationErrors6ObjTypeFunction: + case ProjectUpgradeEligibilityResponseValidationErrors6ObjType0Table: return true - case ProjectUpgradeEligibilityResponseValidationErrors6ObjTypeTable: + default: + return false + } +} + +// Defines values for ProjectUpgradeEligibilityResponseValidationErrors6ObjType1. +const ( + Function ProjectUpgradeEligibilityResponseValidationErrors6ObjType1 = "function" +) + +// Valid indicates whether the value is a known member of the ProjectUpgradeEligibilityResponseValidationErrors6ObjType1 enum. +func (e ProjectUpgradeEligibilityResponseValidationErrors6ObjType1) Valid() bool { + switch e { + case Function: return true default: return false @@ -3431,6 +3404,7 @@ func (e SupavisorConfigResponsePoolMode) Valid() bool { // Defines values for UpdateAuthConfigBodyDbMaxPoolSizeUnit. const ( UpdateAuthConfigBodyDbMaxPoolSizeUnitConnections UpdateAuthConfigBodyDbMaxPoolSizeUnit = "connections" + UpdateAuthConfigBodyDbMaxPoolSizeUnitLessThannil UpdateAuthConfigBodyDbMaxPoolSizeUnit = "" UpdateAuthConfigBodyDbMaxPoolSizeUnitPercent UpdateAuthConfigBodyDbMaxPoolSizeUnit = "percent" ) @@ -3439,6 +3413,8 @@ func (e UpdateAuthConfigBodyDbMaxPoolSizeUnit) Valid() bool { switch e { case UpdateAuthConfigBodyDbMaxPoolSizeUnitConnections: return true + case UpdateAuthConfigBodyDbMaxPoolSizeUnitLessThannil: + return true case UpdateAuthConfigBodyDbMaxPoolSizeUnitPercent: return true default: @@ -3472,8 +3448,9 @@ func (e UpdateAuthConfigBodyPasswordRequiredCharacters) Valid() bool { // Defines values for UpdateAuthConfigBodySecurityCaptchaProvider. const ( - UpdateAuthConfigBodySecurityCaptchaProviderHcaptcha UpdateAuthConfigBodySecurityCaptchaProvider = "hcaptcha" - UpdateAuthConfigBodySecurityCaptchaProviderTurnstile UpdateAuthConfigBodySecurityCaptchaProvider = "turnstile" + UpdateAuthConfigBodySecurityCaptchaProviderHcaptcha UpdateAuthConfigBodySecurityCaptchaProvider = "hcaptcha" + UpdateAuthConfigBodySecurityCaptchaProviderLessThannil UpdateAuthConfigBodySecurityCaptchaProvider = "" + UpdateAuthConfigBodySecurityCaptchaProviderTurnstile UpdateAuthConfigBodySecurityCaptchaProvider = "turnstile" ) // Valid indicates whether the value is a known member of the UpdateAuthConfigBodySecurityCaptchaProvider enum. @@ -3481,6 +3458,8 @@ func (e UpdateAuthConfigBodySecurityCaptchaProvider) Valid() bool { switch e { case UpdateAuthConfigBodySecurityCaptchaProviderHcaptcha: return true + case UpdateAuthConfigBodySecurityCaptchaProviderLessThannil: + return true case UpdateAuthConfigBodySecurityCaptchaProviderTurnstile: return true default: @@ -3490,25 +3469,28 @@ func (e UpdateAuthConfigBodySecurityCaptchaProvider) Valid() bool { // Defines values for UpdateAuthConfigBodySmsProvider. const ( - UpdateAuthConfigBodySmsProviderMessagebird UpdateAuthConfigBodySmsProvider = "messagebird" - UpdateAuthConfigBodySmsProviderTextlocal UpdateAuthConfigBodySmsProvider = "textlocal" - UpdateAuthConfigBodySmsProviderTwilio UpdateAuthConfigBodySmsProvider = "twilio" - UpdateAuthConfigBodySmsProviderTwilioVerify UpdateAuthConfigBodySmsProvider = "twilio_verify" - UpdateAuthConfigBodySmsProviderVonage UpdateAuthConfigBodySmsProvider = "vonage" + LessThannil UpdateAuthConfigBodySmsProvider = "" + Messagebird UpdateAuthConfigBodySmsProvider = "messagebird" + Textlocal UpdateAuthConfigBodySmsProvider = "textlocal" + Twilio UpdateAuthConfigBodySmsProvider = "twilio" + TwilioVerify UpdateAuthConfigBodySmsProvider = "twilio_verify" + Vonage UpdateAuthConfigBodySmsProvider = "vonage" ) // Valid indicates whether the value is a known member of the UpdateAuthConfigBodySmsProvider enum. func (e UpdateAuthConfigBodySmsProvider) Valid() bool { switch e { - case UpdateAuthConfigBodySmsProviderMessagebird: + case LessThannil: + return true + case Messagebird: return true - case UpdateAuthConfigBodySmsProviderTextlocal: + case Textlocal: return true - case UpdateAuthConfigBodySmsProviderTwilio: + case Twilio: return true - case UpdateAuthConfigBodySmsProviderTwilioVerify: + case TwilioVerify: return true - case UpdateAuthConfigBodySmsProviderVonage: + case Vonage: return true default: return false @@ -4526,27 +4508,6 @@ func (e V1OrganizationSlugResponseAllowedReleaseChannels) Valid() bool { } } -// Defines values for V1OrganizationSlugResponseOptInTags. -const ( - AIDATAGENERATOROPTIN V1OrganizationSlugResponseOptInTags = "AI_DATA_GENERATOR_OPT_IN" - AILOGGENERATOROPTIN V1OrganizationSlugResponseOptInTags = "AI_LOG_GENERATOR_OPT_IN" - AISQLGENERATOROPTIN V1OrganizationSlugResponseOptInTags = "AI_SQL_GENERATOR_OPT_IN" -) - -// Valid indicates whether the value is a known member of the V1OrganizationSlugResponseOptInTags enum. -func (e V1OrganizationSlugResponseOptInTags) Valid() bool { - switch e { - case AIDATAGENERATOROPTIN: - return true - case AILOGGENERATOROPTIN: - return true - case AISQLGENERATOROPTIN: - return true - default: - return false - } -} - // Defines values for V1OrganizationSlugResponsePlan. const ( V1OrganizationSlugResponsePlanEnterprise V1OrganizationSlugResponsePlan = "enterprise" @@ -5444,6 +5405,84 @@ func (e V1GetServicesHealthParamsServices) Valid() bool { } } +// Defines values for V1GetJitAccessConfig200JSONResponseBody0State. +const ( + V1GetJitAccessConfig200JSONResponseBody0StateDisabled V1GetJitAccessConfig200JSONResponseBody0State = "disabled" + V1GetJitAccessConfig200JSONResponseBody0StateEnabled V1GetJitAccessConfig200JSONResponseBody0State = "enabled" +) + +// Valid indicates whether the value is a known member of the V1GetJitAccessConfig200JSONResponseBody0State enum. +func (e V1GetJitAccessConfig200JSONResponseBody0State) Valid() bool { + switch e { + case V1GetJitAccessConfig200JSONResponseBody0StateDisabled: + return true + case V1GetJitAccessConfig200JSONResponseBody0StateEnabled: + return true + default: + return false + } +} + +// Defines values for V1GetJitAccessConfig200JSONResponseBody1UnavailableReason. +const ( + V1GetJitAccessConfig200JSONResponseBody1UnavailableReasonPostgresUpgradeRequired V1GetJitAccessConfig200JSONResponseBody1UnavailableReason = "postgres_upgrade_required" + V1GetJitAccessConfig200JSONResponseBody1UnavailableReasonSslEnforcementRequired V1GetJitAccessConfig200JSONResponseBody1UnavailableReason = "ssl_enforcement_required" + V1GetJitAccessConfig200JSONResponseBody1UnavailableReasonTemporarilyUnavailable V1GetJitAccessConfig200JSONResponseBody1UnavailableReason = "temporarily_unavailable" +) + +// Valid indicates whether the value is a known member of the V1GetJitAccessConfig200JSONResponseBody1UnavailableReason enum. +func (e V1GetJitAccessConfig200JSONResponseBody1UnavailableReason) Valid() bool { + switch e { + case V1GetJitAccessConfig200JSONResponseBody1UnavailableReasonPostgresUpgradeRequired: + return true + case V1GetJitAccessConfig200JSONResponseBody1UnavailableReasonSslEnforcementRequired: + return true + case V1GetJitAccessConfig200JSONResponseBody1UnavailableReasonTemporarilyUnavailable: + return true + default: + return false + } +} + +// Defines values for V1UpdateJitAccessConfig200JSONResponseBody0State. +const ( + Disabled V1UpdateJitAccessConfig200JSONResponseBody0State = "disabled" + Enabled V1UpdateJitAccessConfig200JSONResponseBody0State = "enabled" +) + +// Valid indicates whether the value is a known member of the V1UpdateJitAccessConfig200JSONResponseBody0State enum. +func (e V1UpdateJitAccessConfig200JSONResponseBody0State) Valid() bool { + switch e { + case Disabled: + return true + case Enabled: + return true + default: + return false + } +} + +// Defines values for V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason. +const ( + V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReasonPostgresUpgradeRequired V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason = "postgres_upgrade_required" + V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReasonSslEnforcementRequired V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason = "ssl_enforcement_required" + V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReasonTemporarilyUnavailable V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason = "temporarily_unavailable" +) + +// Valid indicates whether the value is a known member of the V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason enum. +func (e V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason) Valid() bool { + switch e { + case V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReasonPostgresUpgradeRequired: + return true + case V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReasonSslEnforcementRequired: + return true + case V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReasonTemporarilyUnavailable: + return true + default: + return false + } +} + // Defines values for V1ListAllSnippetsParamsSortBy. const ( InsertedAt V1ListAllSnippetsParamsSortBy = "inserted_at" @@ -5840,8 +5879,19 @@ type AuthConfigResponseSmsProvider string // AuthorizeJitAccessBody defines model for AuthorizeJitAccessBody. type AuthorizeJitAccessBody struct { - Rhost string `json:"rhost"` - Role string `json:"role"` + Rhost AuthorizeJitAccessBody_Rhost `json:"rhost"` + Role string `json:"role"` +} + +// AuthorizeJitAccessBodyRhost0 defines model for . +type AuthorizeJitAccessBodyRhost0 = string + +// AuthorizeJitAccessBodyRhost1 defines model for . +type AuthorizeJitAccessBodyRhost1 = string + +// AuthorizeJitAccessBody_Rhost defines model for AuthorizeJitAccessBody.Rhost. +type AuthorizeJitAccessBody_Rhost struct { + union json.RawMessage } // BranchActionBody defines model for BranchActionBody. @@ -6399,7 +6449,7 @@ type DiskUtilMetricsResponse struct { // FunctionDeployBody defines model for FunctionDeployBody. type FunctionDeployBody struct { - File *[]openapi_types.File `json:"file,omitempty"` + File []openapi_types.File `json:"file"` Metadata struct { EntrypointPath string `json:"entrypoint_path"` ImportMapPath *string `json:"import_map_path,omitempty"` @@ -6639,32 +6689,6 @@ type JitListAccessResponse_Items_Item struct { union json.RawMessage } -// JitStateResponse defines model for JitStateResponse. -type JitStateResponse struct { - union json.RawMessage -} - -// JitStateResponse0 defines model for . -type JitStateResponse0 struct { - AppliedSuccessfully *bool `json:"appliedSuccessfully,omitempty"` - State JitStateResponse0State `json:"state"` -} - -// JitStateResponse0State defines model for JitStateResponse.0.State. -type JitStateResponse0State string - -// JitStateResponse1 defines model for . -type JitStateResponse1 struct { - State JitStateResponse1State `json:"state"` - UnavailableReason JitStateResponse1UnavailableReason `json:"unavailableReason"` -} - -// JitStateResponse1State defines model for JitStateResponse.1.State. -type JitStateResponse1State string - -// JitStateResponse1UnavailableReason defines model for JitStateResponse.1.UnavailableReason. -type JitStateResponse1UnavailableReason string - // LegacyApiKeysResponse defines model for LegacyApiKeysResponse. type LegacyApiKeysResponse struct { Enabled bool `json:"enabled"` @@ -6702,8 +6726,8 @@ type ListProjectAddonsResponse struct { Id ListProjectAddonsResponse_AvailableAddons_Variants_Id `json:"id"` // Meta Any JSON-serializable value - Meta interface{} `json:"meta,omitempty"` - Name string `json:"name"` + Meta *ListProjectAddonsResponseJsonValue `json:"meta,omitempty"` + Name string `json:"name"` Price struct { Amount float32 `json:"amount"` Description string `json:"description"` @@ -6718,8 +6742,8 @@ type ListProjectAddonsResponse struct { Id ListProjectAddonsResponse_SelectedAddons_Variant_Id `json:"id"` // Meta Any JSON-serializable value - Meta interface{} `json:"meta,omitempty"` - Name string `json:"name"` + Meta *ListProjectAddonsResponseJsonValue `json:"meta,omitempty"` + Name string `json:"name"` Price struct { Amount float32 `json:"amount"` Description string `json:"description"` @@ -6806,6 +6830,31 @@ type ListProjectAddonsResponseSelectedAddonsVariantPriceInterval string // ListProjectAddonsResponseSelectedAddonsVariantPriceType defines model for ListProjectAddonsResponse.SelectedAddons.Variant.Price.Type. type ListProjectAddonsResponseSelectedAddonsVariantPriceType string +// ListProjectAddonsResponseJsonValue Any JSON-serializable value +type ListProjectAddonsResponseJsonValue struct { + union json.RawMessage +} + +// ListProjectAddonsResponseJsonValue0 defines model for . +type ListProjectAddonsResponseJsonValue0 struct { + union json.RawMessage +} + +// ListProjectAddonsResponseJsonValue00 defines model for . +type ListProjectAddonsResponseJsonValue00 = string + +// ListProjectAddonsResponseJsonValue01 defines model for . +type ListProjectAddonsResponseJsonValue01 = float32 + +// ListProjectAddonsResponseJsonValue02 defines model for . +type ListProjectAddonsResponseJsonValue02 = bool + +// ListProjectAddonsResponseJsonValue1 defines model for . +type ListProjectAddonsResponseJsonValue1 = []ListProjectAddonsResponseJsonValue + +// ListProjectAddonsResponseJsonValue2 defines model for . +type ListProjectAddonsResponseJsonValue2 map[string]ListProjectAddonsResponseJsonValue + // ListProvidersResponse defines model for ListProvidersResponse. type ListProvidersResponse struct { Items []struct { @@ -7271,14 +7320,22 @@ type ProjectUpgradeEligibilityResponseValidationErrors5Type string // ProjectUpgradeEligibilityResponseValidationErrors6 defines model for . type ProjectUpgradeEligibilityResponseValidationErrors6 struct { - ObjName string `json:"obj_name"` - ObjType ProjectUpgradeEligibilityResponseValidationErrors6ObjType `json:"obj_type"` - SchemaName string `json:"schema_name"` - Type ProjectUpgradeEligibilityResponseValidationErrors6Type `json:"type"` + ObjName string `json:"obj_name"` + ObjType ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType `json:"obj_type"` + SchemaName string `json:"schema_name"` + Type ProjectUpgradeEligibilityResponseValidationErrors6Type `json:"type"` } -// ProjectUpgradeEligibilityResponseValidationErrors6ObjType defines model for ProjectUpgradeEligibilityResponse.ValidationErrors.6.ObjType. -type ProjectUpgradeEligibilityResponseValidationErrors6ObjType string +// ProjectUpgradeEligibilityResponseValidationErrors6ObjType0 defines model for ProjectUpgradeEligibilityResponse.ValidationErrors.6.ObjType.0. +type ProjectUpgradeEligibilityResponseValidationErrors6ObjType0 string + +// ProjectUpgradeEligibilityResponseValidationErrors6ObjType1 defines model for ProjectUpgradeEligibilityResponse.ValidationErrors.6.ObjType.1. +type ProjectUpgradeEligibilityResponseValidationErrors6ObjType1 string + +// ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType defines model for ProjectUpgradeEligibilityResponse.ValidationErrors.6.ObjType. +type ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType struct { + union json.RawMessage +} // ProjectUpgradeEligibilityResponseValidationErrors6Type defines model for ProjectUpgradeEligibilityResponse.ValidationErrors.6.Type. type ProjectUpgradeEligibilityResponseValidationErrors6Type string @@ -7495,7 +7552,7 @@ type SigningKeyResponse struct { Algorithm SigningKeyResponseAlgorithm `json:"algorithm"` CreatedAt time.Time `json:"created_at"` Id openapi_types.UUID `json:"id"` - PublicJwk nullable.Nullable[interface{}] `json:"public_jwk,omitempty"` + PublicJwk nullable.Nullable[interface{}] `json:"public_jwk"` Status SigningKeyResponseStatus `json:"status"` UpdatedAt time.Time `json:"updated_at"` } @@ -7512,7 +7569,7 @@ type SigningKeysResponse struct { Algorithm SigningKeysResponseKeysAlgorithm `json:"algorithm"` CreatedAt time.Time `json:"created_at"` Id openapi_types.UUID `json:"id"` - PublicJwk nullable.Nullable[interface{}] `json:"public_jwk,omitempty"` + PublicJwk nullable.Nullable[interface{}] `json:"public_jwk"` Status SigningKeysResponseKeysStatus `json:"status"` UpdatedAt time.Time `json:"updated_at"` } `json:"keys"` @@ -7980,8 +8037,8 @@ type UpdateCustomHostnameBody struct { type UpdateCustomHostnameResponse struct { CustomHostname string `json:"custom_hostname"` Data struct { - Errors []interface{} `json:"errors"` - Messages []interface{} `json:"messages"` + Errors []UpdateCustomHostnameResponseJsonValue `json:"errors"` + Messages []UpdateCustomHostnameResponseJsonValue `json:"messages"` Result struct { CustomOriginServer string `json:"custom_origin_server"` Hostname string `json:"hostname"` @@ -8012,6 +8069,31 @@ type UpdateCustomHostnameResponse struct { // UpdateCustomHostnameResponseStatus defines model for UpdateCustomHostnameResponse.Status. type UpdateCustomHostnameResponseStatus string +// UpdateCustomHostnameResponseJsonValue Any JSON-serializable value +type UpdateCustomHostnameResponseJsonValue struct { + union json.RawMessage +} + +// UpdateCustomHostnameResponseJsonValue0 defines model for . +type UpdateCustomHostnameResponseJsonValue0 struct { + union json.RawMessage +} + +// UpdateCustomHostnameResponseJsonValue00 defines model for . +type UpdateCustomHostnameResponseJsonValue00 = string + +// UpdateCustomHostnameResponseJsonValue01 defines model for . +type UpdateCustomHostnameResponseJsonValue01 = float32 + +// UpdateCustomHostnameResponseJsonValue02 defines model for . +type UpdateCustomHostnameResponseJsonValue02 = bool + +// UpdateCustomHostnameResponseJsonValue1 defines model for . +type UpdateCustomHostnameResponseJsonValue1 = []UpdateCustomHostnameResponseJsonValue + +// UpdateCustomHostnameResponseJsonValue2 defines model for . +type UpdateCustomHostnameResponseJsonValue2 map[string]UpdateCustomHostnameResponseJsonValue + // UpdateJitAccessBody defines model for UpdateJitAccessBody. type UpdateJitAccessBody struct { Roles []struct { @@ -8544,16 +8626,13 @@ type V1OrganizationSlugResponse struct { AllowedReleaseChannels []V1OrganizationSlugResponseAllowedReleaseChannels `json:"allowed_release_channels"` Id string `json:"id"` Name string `json:"name"` - OptInTags []V1OrganizationSlugResponseOptInTags `json:"opt_in_tags"` + OptInTags []interface{} `json:"opt_in_tags"` Plan *V1OrganizationSlugResponsePlan `json:"plan,omitempty"` } // V1OrganizationSlugResponseAllowedReleaseChannels defines model for V1OrganizationSlugResponse.AllowedReleaseChannels. type V1OrganizationSlugResponseAllowedReleaseChannels string -// V1OrganizationSlugResponseOptInTags defines model for V1OrganizationSlugResponse.OptInTags. -type V1OrganizationSlugResponseOptInTags string - // V1OrganizationSlugResponsePlan defines model for V1OrganizationSlugResponse.Plan. type V1OrganizationSlugResponsePlan string @@ -8883,15 +8962,20 @@ type bearerContextKey string // V1DeleteABranchParams defines parameters for V1DeleteABranch. type V1DeleteABranchParams struct { // Force If set to false, schedule deletion with 1-hour grace period (only when soft deletion is enabled). - Force *bool `form:"force,omitempty" json:"force,omitempty"` + Force *string `form:"force,omitempty" json:"force,omitempty"` } // V1DiffABranchParams defines parameters for V1DiffABranch. type V1DiffABranchParams struct { IncludedSchemas *string `form:"included_schemas,omitempty" json:"included_schemas,omitempty"` - // Pgdelta Use pg-delta instead of Migra for diffing when true - Pgdelta *bool `form:"pgdelta,omitempty" json:"pgdelta,omitempty"` + // Pgdelta Use pg-delta instead of Migra for diffing when true. + // Boolean string. + // + // Truthy values: `true`, `1`, `yes`, `on`, `y`, `enabled` + // + // Falsy values: `false`, `0`, `no`, `off`, `n`, `disabled` + Pgdelta *string `form:"pgdelta,omitempty" json:"pgdelta,omitempty"` } // V1AuthorizeUserParams defines parameters for V1AuthorizeUser. @@ -9028,42 +9112,62 @@ type V1GetProjectUsageApiCountParamsInterval string // V1GetProjectApiKeysParams defines parameters for V1GetProjectApiKeys. type V1GetProjectApiKeysParams struct { - // Reveal Boolean string, true or false - Reveal *bool `form:"reveal,omitempty" json:"reveal,omitempty"` + // Reveal Boolean string. + // + // Truthy values: `true`, `1`, `yes`, `on`, `y`, `enabled` + // + // Falsy values: `false`, `0`, `no`, `off`, `n`, `disabled` + Reveal *string `form:"reveal,omitempty" json:"reveal,omitempty"` } // V1CreateProjectApiKeyParams defines parameters for V1CreateProjectApiKey. type V1CreateProjectApiKeyParams struct { - // Reveal Boolean string, true or false - Reveal *bool `form:"reveal,omitempty" json:"reveal,omitempty"` + // Reveal Boolean string. + // + // Truthy values: `true`, `1`, `yes`, `on`, `y`, `enabled` + // + // Falsy values: `false`, `0`, `no`, `off`, `n`, `disabled` + Reveal *string `form:"reveal,omitempty" json:"reveal,omitempty"` } // V1UpdateProjectLegacyApiKeysParams defines parameters for V1UpdateProjectLegacyApiKeys. type V1UpdateProjectLegacyApiKeysParams struct { - // Enabled Boolean string, true or false - Enabled bool `form:"enabled" json:"enabled"` + // Enabled Boolean string. + // + // Truthy values: `true`, `1`, `yes`, `on`, `y`, `enabled` + // + // Falsy values: `false`, `0`, `no`, `off`, `n`, `disabled` + Enabled string `form:"enabled" json:"enabled"` } // V1DeleteProjectApiKeyParams defines parameters for V1DeleteProjectApiKey. type V1DeleteProjectApiKeyParams struct { // Reveal Boolean string, true or false - Reveal *bool `form:"reveal,omitempty" json:"reveal,omitempty"` + Reveal *string `form:"reveal,omitempty" json:"reveal,omitempty"` // WasCompromised Boolean string, true or false - WasCompromised *bool `form:"was_compromised,omitempty" json:"was_compromised,omitempty"` + WasCompromised *string `form:"was_compromised,omitempty" json:"was_compromised,omitempty"` Reason *string `form:"reason,omitempty" json:"reason,omitempty"` } // V1GetProjectApiKeyParams defines parameters for V1GetProjectApiKey. type V1GetProjectApiKeyParams struct { - // Reveal Boolean string, true or false - Reveal *bool `form:"reveal,omitempty" json:"reveal,omitempty"` + // Reveal Boolean string. + // + // Truthy values: `true`, `1`, `yes`, `on`, `y`, `enabled` + // + // Falsy values: `false`, `0`, `no`, `off`, `n`, `disabled` + Reveal *string `form:"reveal,omitempty" json:"reveal,omitempty"` } // V1UpdateProjectApiKeyParams defines parameters for V1UpdateProjectApiKey. type V1UpdateProjectApiKeyParams struct { - // Reveal Boolean string, true or false - Reveal *bool `form:"reveal,omitempty" json:"reveal,omitempty"` + // Reveal Boolean string. + // + // Truthy values: `true`, `1`, `yes`, `on`, `y`, `enabled` + // + // Falsy values: `false`, `0`, `no`, `off`, `n`, `disabled` + Reveal *string `form:"reveal,omitempty" json:"reveal,omitempty"` } // V1RemoveProjectAddonParamsAddonVariant0 defines parameters for V1RemoveProjectAddon. @@ -9081,7 +9185,7 @@ type V1RemoveProjectAddonParamsAddonVariant3 string // V1DeleteHostnameConfigParams defines parameters for V1DeleteHostnameConfig. type V1DeleteHostnameConfigParams struct { // RemoveAddon If true, also removes the custom domain add-on from the project subscription. - RemoveAddon *bool `form:"remove_addon,omitempty" json:"remove_addon,omitempty"` + RemoveAddon *string `form:"remove_addon,omitempty" json:"remove_addon,omitempty"` } // V1GetRestorePointParams defines parameters for V1GetRestorePoint. @@ -9115,14 +9219,10 @@ type V1GetDatabaseOpenapiParams struct { // V1CreateAFunctionParams defines parameters for V1CreateAFunction. type V1CreateAFunctionParams struct { - Slug *string `form:"slug,omitempty" json:"slug,omitempty"` - Name *string `form:"name,omitempty" json:"name,omitempty"` - - // VerifyJwt Boolean string, true or false - VerifyJwt *bool `form:"verify_jwt,omitempty" json:"verify_jwt,omitempty"` - - // ImportMap Boolean string, true or false - ImportMap *bool `form:"import_map,omitempty" json:"import_map,omitempty"` + Slug *string `form:"slug,omitempty" json:"slug,omitempty"` + Name *string `form:"name,omitempty" json:"name,omitempty"` + VerifyJwt *string `form:"verify_jwt,omitempty" json:"verify_jwt,omitempty"` + ImportMap *string `form:"import_map,omitempty" json:"import_map,omitempty"` EntrypointPath *string `form:"entrypoint_path,omitempty" json:"entrypoint_path,omitempty"` ImportMapPath *string `form:"import_map_path,omitempty" json:"import_map_path,omitempty"` EzbrSha256 *string `form:"ezbr_sha256,omitempty" json:"ezbr_sha256,omitempty"` @@ -9130,22 +9230,16 @@ type V1CreateAFunctionParams struct { // V1DeployAFunctionParams defines parameters for V1DeployAFunction. type V1DeployAFunctionParams struct { - Slug *string `form:"slug,omitempty" json:"slug,omitempty"` - - // BundleOnly Boolean string, true or false - BundleOnly *bool `form:"bundleOnly,omitempty" json:"bundleOnly,omitempty"` + Slug *string `form:"slug,omitempty" json:"slug,omitempty"` + BundleOnly *string `form:"bundleOnly,omitempty" json:"bundleOnly,omitempty"` } // V1UpdateAFunctionParams defines parameters for V1UpdateAFunction. type V1UpdateAFunctionParams struct { - Slug *string `form:"slug,omitempty" json:"slug,omitempty"` - Name *string `form:"name,omitempty" json:"name,omitempty"` - - // VerifyJwt Boolean string, true or false - VerifyJwt *bool `form:"verify_jwt,omitempty" json:"verify_jwt,omitempty"` - - // ImportMap Boolean string, true or false - ImportMap *bool `form:"import_map,omitempty" json:"import_map,omitempty"` + Slug *string `form:"slug,omitempty" json:"slug,omitempty"` + Name *string `form:"name,omitempty" json:"name,omitempty"` + VerifyJwt *string `form:"verify_jwt,omitempty" json:"verify_jwt,omitempty"` + ImportMap *string `form:"import_map,omitempty" json:"import_map,omitempty"` EntrypointPath *string `form:"entrypoint_path,omitempty" json:"entrypoint_path,omitempty"` ImportMapPath *string `form:"import_map_path,omitempty" json:"import_map_path,omitempty"` EzbrSha256 *string `form:"ezbr_sha256,omitempty" json:"ezbr_sha256,omitempty"` @@ -9153,6 +9247,7 @@ type V1UpdateAFunctionParams struct { // V1GetServicesHealthParams defines parameters for V1GetServicesHealth. type V1GetServicesHealthParams struct { + // Services Comma-separated list of enums or array of enums. Services []V1GetServicesHealthParamsServices `form:"services" json:"services"` TimeoutMs *int `form:"timeout_ms,omitempty" json:"timeout_ms,omitempty"` } @@ -9160,6 +9255,52 @@ type V1GetServicesHealthParams struct { // V1GetServicesHealthParamsServices defines parameters for V1GetServicesHealth. type V1GetServicesHealthParamsServices string +// V1GetJitAccessConfig200JSONResponseBody0 defines parameters for V1GetJitAccessConfig. +type V1GetJitAccessConfig200JSONResponseBody0 struct { + AppliedSuccessfully *bool `json:"appliedSuccessfully,omitempty"` + State V1GetJitAccessConfig200JSONResponseBody0State `json:"state"` +} + +// V1GetJitAccessConfig200JSONResponseBody0State defines parameters for V1GetJitAccessConfig. +type V1GetJitAccessConfig200JSONResponseBody0State string + +// V1GetJitAccessConfig200JSONResponseBody1 defines parameters for V1GetJitAccessConfig. +type V1GetJitAccessConfig200JSONResponseBody1 struct { + State string `json:"state"` + UnavailableReason V1GetJitAccessConfig200JSONResponseBody1UnavailableReason `json:"unavailableReason"` +} + +// V1GetJitAccessConfig200JSONResponseBody1UnavailableReason defines parameters for V1GetJitAccessConfig. +type V1GetJitAccessConfig200JSONResponseBody1UnavailableReason string + +// V1GetJitAccessConfig200JSONResponseBody defines parameters for V1GetJitAccessConfig. +type V1GetJitAccessConfig200JSONResponseBody struct { + union json.RawMessage +} + +// V1UpdateJitAccessConfig200JSONResponseBody0 defines parameters for V1UpdateJitAccessConfig. +type V1UpdateJitAccessConfig200JSONResponseBody0 struct { + AppliedSuccessfully *bool `json:"appliedSuccessfully,omitempty"` + State V1UpdateJitAccessConfig200JSONResponseBody0State `json:"state"` +} + +// V1UpdateJitAccessConfig200JSONResponseBody0State defines parameters for V1UpdateJitAccessConfig. +type V1UpdateJitAccessConfig200JSONResponseBody0State string + +// V1UpdateJitAccessConfig200JSONResponseBody1 defines parameters for V1UpdateJitAccessConfig. +type V1UpdateJitAccessConfig200JSONResponseBody1 struct { + State string `json:"state"` + UnavailableReason V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason `json:"unavailableReason"` +} + +// V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason defines parameters for V1UpdateJitAccessConfig. +type V1UpdateJitAccessConfig200JSONResponseBody1UnavailableReason string + +// V1UpdateJitAccessConfig200JSONResponseBody defines parameters for V1UpdateJitAccessConfig. +type V1UpdateJitAccessConfig200JSONResponseBody struct { + union json.RawMessage +} + // V1GenerateTypescriptTypesParams defines parameters for V1GenerateTypescriptTypes. type V1GenerateTypescriptTypesParams struct { IncludedSchemas *string `form:"included_schemas,omitempty" json:"included_schemas,omitempty"` @@ -9689,6 +9830,68 @@ func (t *ApplyProjectAddonBody_AddonVariant) UnmarshalJSON(b []byte) error { return err } +// AsAuthorizeJitAccessBodyRhost0 returns the union data inside the AuthorizeJitAccessBody_Rhost as a AuthorizeJitAccessBodyRhost0 +func (t AuthorizeJitAccessBody_Rhost) AsAuthorizeJitAccessBodyRhost0() (AuthorizeJitAccessBodyRhost0, error) { + var body AuthorizeJitAccessBodyRhost0 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromAuthorizeJitAccessBodyRhost0 overwrites any union data inside the AuthorizeJitAccessBody_Rhost as the provided AuthorizeJitAccessBodyRhost0 +func (t *AuthorizeJitAccessBody_Rhost) FromAuthorizeJitAccessBodyRhost0(v AuthorizeJitAccessBodyRhost0) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeAuthorizeJitAccessBodyRhost0 performs a merge with any union data inside the AuthorizeJitAccessBody_Rhost, using the provided AuthorizeJitAccessBodyRhost0 +func (t *AuthorizeJitAccessBody_Rhost) MergeAuthorizeJitAccessBodyRhost0(v AuthorizeJitAccessBodyRhost0) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsAuthorizeJitAccessBodyRhost1 returns the union data inside the AuthorizeJitAccessBody_Rhost as a AuthorizeJitAccessBodyRhost1 +func (t AuthorizeJitAccessBody_Rhost) AsAuthorizeJitAccessBodyRhost1() (AuthorizeJitAccessBodyRhost1, error) { + var body AuthorizeJitAccessBodyRhost1 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromAuthorizeJitAccessBodyRhost1 overwrites any union data inside the AuthorizeJitAccessBody_Rhost as the provided AuthorizeJitAccessBodyRhost1 +func (t *AuthorizeJitAccessBody_Rhost) FromAuthorizeJitAccessBodyRhost1(v AuthorizeJitAccessBodyRhost1) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeAuthorizeJitAccessBodyRhost1 performs a merge with any union data inside the AuthorizeJitAccessBody_Rhost, using the provided AuthorizeJitAccessBodyRhost1 +func (t *AuthorizeJitAccessBody_Rhost) MergeAuthorizeJitAccessBodyRhost1(v AuthorizeJitAccessBodyRhost1) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t AuthorizeJitAccessBody_Rhost) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *AuthorizeJitAccessBody_Rhost) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + // AsCreateSigningKeyBodyPrivateJwk0 returns the union data inside the CreateSigningKeyBody_PrivateJwk as a CreateSigningKeyBodyPrivateJwk0 func (t CreateSigningKeyBody_PrivateJwk) AsCreateSigningKeyBodyPrivateJwk0() (CreateSigningKeyBodyPrivateJwk0, error) { var body CreateSigningKeyBodyPrivateJwk0 @@ -9989,22 +10192,22 @@ func (t *JitListAccessResponse_Items_Item) UnmarshalJSON(b []byte) error { return err } -// AsJitStateResponse0 returns the union data inside the JitStateResponse as a JitStateResponse0 -func (t JitStateResponse) AsJitStateResponse0() (JitStateResponse0, error) { - var body JitStateResponse0 +// AsListProjectAddonsResponseAvailableAddonsVariantsId0 returns the union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as a ListProjectAddonsResponseAvailableAddonsVariantsId0 +func (t ListProjectAddonsResponse_AvailableAddons_Variants_Id) AsListProjectAddonsResponseAvailableAddonsVariantsId0() (ListProjectAddonsResponseAvailableAddonsVariantsId0, error) { + var body ListProjectAddonsResponseAvailableAddonsVariantsId0 err := json.Unmarshal(t.union, &body) return body, err } -// FromJitStateResponse0 overwrites any union data inside the JitStateResponse as the provided JitStateResponse0 -func (t *JitStateResponse) FromJitStateResponse0(v JitStateResponse0) error { +// FromListProjectAddonsResponseAvailableAddonsVariantsId0 overwrites any union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as the provided ListProjectAddonsResponseAvailableAddonsVariantsId0 +func (t *ListProjectAddonsResponse_AvailableAddons_Variants_Id) FromListProjectAddonsResponseAvailableAddonsVariantsId0(v ListProjectAddonsResponseAvailableAddonsVariantsId0) error { b, err := json.Marshal(v) t.union = b return err } -// MergeJitStateResponse0 performs a merge with any union data inside the JitStateResponse, using the provided JitStateResponse0 -func (t *JitStateResponse) MergeJitStateResponse0(v JitStateResponse0) error { +// MergeListProjectAddonsResponseAvailableAddonsVariantsId0 performs a merge with any union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id, using the provided ListProjectAddonsResponseAvailableAddonsVariantsId0 +func (t *ListProjectAddonsResponse_AvailableAddons_Variants_Id) MergeListProjectAddonsResponseAvailableAddonsVariantsId0(v ListProjectAddonsResponseAvailableAddonsVariantsId0) error { b, err := json.Marshal(v) if err != nil { return err @@ -10015,84 +10218,22 @@ func (t *JitStateResponse) MergeJitStateResponse0(v JitStateResponse0) error { return err } -// AsJitStateResponse1 returns the union data inside the JitStateResponse as a JitStateResponse1 -func (t JitStateResponse) AsJitStateResponse1() (JitStateResponse1, error) { - var body JitStateResponse1 +// AsListProjectAddonsResponseAvailableAddonsVariantsId1 returns the union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as a ListProjectAddonsResponseAvailableAddonsVariantsId1 +func (t ListProjectAddonsResponse_AvailableAddons_Variants_Id) AsListProjectAddonsResponseAvailableAddonsVariantsId1() (ListProjectAddonsResponseAvailableAddonsVariantsId1, error) { + var body ListProjectAddonsResponseAvailableAddonsVariantsId1 err := json.Unmarshal(t.union, &body) return body, err } -// FromJitStateResponse1 overwrites any union data inside the JitStateResponse as the provided JitStateResponse1 -func (t *JitStateResponse) FromJitStateResponse1(v JitStateResponse1) error { +// FromListProjectAddonsResponseAvailableAddonsVariantsId1 overwrites any union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as the provided ListProjectAddonsResponseAvailableAddonsVariantsId1 +func (t *ListProjectAddonsResponse_AvailableAddons_Variants_Id) FromListProjectAddonsResponseAvailableAddonsVariantsId1(v ListProjectAddonsResponseAvailableAddonsVariantsId1) error { b, err := json.Marshal(v) t.union = b return err } -// MergeJitStateResponse1 performs a merge with any union data inside the JitStateResponse, using the provided JitStateResponse1 -func (t *JitStateResponse) MergeJitStateResponse1(v JitStateResponse1) error { - b, err := json.Marshal(v) - if err != nil { - return err - } - - merged, err := runtime.JSONMerge(t.union, b) - t.union = merged - return err -} - -func (t JitStateResponse) MarshalJSON() ([]byte, error) { - b, err := t.union.MarshalJSON() - return b, err -} - -func (t *JitStateResponse) UnmarshalJSON(b []byte) error { - err := t.union.UnmarshalJSON(b) - return err -} - -// AsListProjectAddonsResponseAvailableAddonsVariantsId0 returns the union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as a ListProjectAddonsResponseAvailableAddonsVariantsId0 -func (t ListProjectAddonsResponse_AvailableAddons_Variants_Id) AsListProjectAddonsResponseAvailableAddonsVariantsId0() (ListProjectAddonsResponseAvailableAddonsVariantsId0, error) { - var body ListProjectAddonsResponseAvailableAddonsVariantsId0 - err := json.Unmarshal(t.union, &body) - return body, err -} - -// FromListProjectAddonsResponseAvailableAddonsVariantsId0 overwrites any union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as the provided ListProjectAddonsResponseAvailableAddonsVariantsId0 -func (t *ListProjectAddonsResponse_AvailableAddons_Variants_Id) FromListProjectAddonsResponseAvailableAddonsVariantsId0(v ListProjectAddonsResponseAvailableAddonsVariantsId0) error { - b, err := json.Marshal(v) - t.union = b - return err -} - -// MergeListProjectAddonsResponseAvailableAddonsVariantsId0 performs a merge with any union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id, using the provided ListProjectAddonsResponseAvailableAddonsVariantsId0 -func (t *ListProjectAddonsResponse_AvailableAddons_Variants_Id) MergeListProjectAddonsResponseAvailableAddonsVariantsId0(v ListProjectAddonsResponseAvailableAddonsVariantsId0) error { - b, err := json.Marshal(v) - if err != nil { - return err - } - - merged, err := runtime.JSONMerge(t.union, b) - t.union = merged - return err -} - -// AsListProjectAddonsResponseAvailableAddonsVariantsId1 returns the union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as a ListProjectAddonsResponseAvailableAddonsVariantsId1 -func (t ListProjectAddonsResponse_AvailableAddons_Variants_Id) AsListProjectAddonsResponseAvailableAddonsVariantsId1() (ListProjectAddonsResponseAvailableAddonsVariantsId1, error) { - var body ListProjectAddonsResponseAvailableAddonsVariantsId1 - err := json.Unmarshal(t.union, &body) - return body, err -} - -// FromListProjectAddonsResponseAvailableAddonsVariantsId1 overwrites any union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as the provided ListProjectAddonsResponseAvailableAddonsVariantsId1 -func (t *ListProjectAddonsResponse_AvailableAddons_Variants_Id) FromListProjectAddonsResponseAvailableAddonsVariantsId1(v ListProjectAddonsResponseAvailableAddonsVariantsId1) error { - b, err := json.Marshal(v) - t.union = b - return err -} - -// MergeListProjectAddonsResponseAvailableAddonsVariantsId1 performs a merge with any union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id, using the provided ListProjectAddonsResponseAvailableAddonsVariantsId1 -func (t *ListProjectAddonsResponse_AvailableAddons_Variants_Id) MergeListProjectAddonsResponseAvailableAddonsVariantsId1(v ListProjectAddonsResponseAvailableAddonsVariantsId1) error { +// MergeListProjectAddonsResponseAvailableAddonsVariantsId1 performs a merge with any union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id, using the provided ListProjectAddonsResponseAvailableAddonsVariantsId1 +func (t *ListProjectAddonsResponse_AvailableAddons_Variants_Id) MergeListProjectAddonsResponseAvailableAddonsVariantsId1(v ListProjectAddonsResponseAvailableAddonsVariantsId1) error { b, err := json.Marshal(v) if err != nil { return err @@ -10487,6 +10628,244 @@ func (t *ListProjectAddonsResponse_SelectedAddons_Variant_Id) UnmarshalJSON(b [] return err } +// AsListProjectAddonsResponseJsonValue0 returns the union data inside the ListProjectAddonsResponseJsonValue as a ListProjectAddonsResponseJsonValue0 +func (t ListProjectAddonsResponseJsonValue) AsListProjectAddonsResponseJsonValue0() (ListProjectAddonsResponseJsonValue0, error) { + var body ListProjectAddonsResponseJsonValue0 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromListProjectAddonsResponseJsonValue0 overwrites any union data inside the ListProjectAddonsResponseJsonValue as the provided ListProjectAddonsResponseJsonValue0 +func (t *ListProjectAddonsResponseJsonValue) FromListProjectAddonsResponseJsonValue0(v ListProjectAddonsResponseJsonValue0) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeListProjectAddonsResponseJsonValue0 performs a merge with any union data inside the ListProjectAddonsResponseJsonValue, using the provided ListProjectAddonsResponseJsonValue0 +func (t *ListProjectAddonsResponseJsonValue) MergeListProjectAddonsResponseJsonValue0(v ListProjectAddonsResponseJsonValue0) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsListProjectAddonsResponseJsonValue1 returns the union data inside the ListProjectAddonsResponseJsonValue as a ListProjectAddonsResponseJsonValue1 +func (t ListProjectAddonsResponseJsonValue) AsListProjectAddonsResponseJsonValue1() (ListProjectAddonsResponseJsonValue1, error) { + var body ListProjectAddonsResponseJsonValue1 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromListProjectAddonsResponseJsonValue1 overwrites any union data inside the ListProjectAddonsResponseJsonValue as the provided ListProjectAddonsResponseJsonValue1 +func (t *ListProjectAddonsResponseJsonValue) FromListProjectAddonsResponseJsonValue1(v ListProjectAddonsResponseJsonValue1) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeListProjectAddonsResponseJsonValue1 performs a merge with any union data inside the ListProjectAddonsResponseJsonValue, using the provided ListProjectAddonsResponseJsonValue1 +func (t *ListProjectAddonsResponseJsonValue) MergeListProjectAddonsResponseJsonValue1(v ListProjectAddonsResponseJsonValue1) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsListProjectAddonsResponseJsonValue2 returns the union data inside the ListProjectAddonsResponseJsonValue as a ListProjectAddonsResponseJsonValue2 +func (t ListProjectAddonsResponseJsonValue) AsListProjectAddonsResponseJsonValue2() (ListProjectAddonsResponseJsonValue2, error) { + var body ListProjectAddonsResponseJsonValue2 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromListProjectAddonsResponseJsonValue2 overwrites any union data inside the ListProjectAddonsResponseJsonValue as the provided ListProjectAddonsResponseJsonValue2 +func (t *ListProjectAddonsResponseJsonValue) FromListProjectAddonsResponseJsonValue2(v ListProjectAddonsResponseJsonValue2) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeListProjectAddonsResponseJsonValue2 performs a merge with any union data inside the ListProjectAddonsResponseJsonValue, using the provided ListProjectAddonsResponseJsonValue2 +func (t *ListProjectAddonsResponseJsonValue) MergeListProjectAddonsResponseJsonValue2(v ListProjectAddonsResponseJsonValue2) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t ListProjectAddonsResponseJsonValue) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *ListProjectAddonsResponseJsonValue) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + +// AsListProjectAddonsResponseJsonValue00 returns the union data inside the ListProjectAddonsResponseJsonValue0 as a ListProjectAddonsResponseJsonValue00 +func (t ListProjectAddonsResponseJsonValue0) AsListProjectAddonsResponseJsonValue00() (ListProjectAddonsResponseJsonValue00, error) { + var body ListProjectAddonsResponseJsonValue00 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromListProjectAddonsResponseJsonValue00 overwrites any union data inside the ListProjectAddonsResponseJsonValue0 as the provided ListProjectAddonsResponseJsonValue00 +func (t *ListProjectAddonsResponseJsonValue0) FromListProjectAddonsResponseJsonValue00(v ListProjectAddonsResponseJsonValue00) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeListProjectAddonsResponseJsonValue00 performs a merge with any union data inside the ListProjectAddonsResponseJsonValue0, using the provided ListProjectAddonsResponseJsonValue00 +func (t *ListProjectAddonsResponseJsonValue0) MergeListProjectAddonsResponseJsonValue00(v ListProjectAddonsResponseJsonValue00) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsListProjectAddonsResponseJsonValue01 returns the union data inside the ListProjectAddonsResponseJsonValue0 as a ListProjectAddonsResponseJsonValue01 +func (t ListProjectAddonsResponseJsonValue0) AsListProjectAddonsResponseJsonValue01() (ListProjectAddonsResponseJsonValue01, error) { + var body ListProjectAddonsResponseJsonValue01 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromListProjectAddonsResponseJsonValue01 overwrites any union data inside the ListProjectAddonsResponseJsonValue0 as the provided ListProjectAddonsResponseJsonValue01 +func (t *ListProjectAddonsResponseJsonValue0) FromListProjectAddonsResponseJsonValue01(v ListProjectAddonsResponseJsonValue01) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeListProjectAddonsResponseJsonValue01 performs a merge with any union data inside the ListProjectAddonsResponseJsonValue0, using the provided ListProjectAddonsResponseJsonValue01 +func (t *ListProjectAddonsResponseJsonValue0) MergeListProjectAddonsResponseJsonValue01(v ListProjectAddonsResponseJsonValue01) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsListProjectAddonsResponseJsonValue02 returns the union data inside the ListProjectAddonsResponseJsonValue0 as a ListProjectAddonsResponseJsonValue02 +func (t ListProjectAddonsResponseJsonValue0) AsListProjectAddonsResponseJsonValue02() (ListProjectAddonsResponseJsonValue02, error) { + var body ListProjectAddonsResponseJsonValue02 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromListProjectAddonsResponseJsonValue02 overwrites any union data inside the ListProjectAddonsResponseJsonValue0 as the provided ListProjectAddonsResponseJsonValue02 +func (t *ListProjectAddonsResponseJsonValue0) FromListProjectAddonsResponseJsonValue02(v ListProjectAddonsResponseJsonValue02) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeListProjectAddonsResponseJsonValue02 performs a merge with any union data inside the ListProjectAddonsResponseJsonValue0, using the provided ListProjectAddonsResponseJsonValue02 +func (t *ListProjectAddonsResponseJsonValue0) MergeListProjectAddonsResponseJsonValue02(v ListProjectAddonsResponseJsonValue02) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t ListProjectAddonsResponseJsonValue0) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *ListProjectAddonsResponseJsonValue0) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + +// AsProjectUpgradeEligibilityResponseValidationErrors6ObjType0 returns the union data inside the ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType as a ProjectUpgradeEligibilityResponseValidationErrors6ObjType0 +func (t ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType) AsProjectUpgradeEligibilityResponseValidationErrors6ObjType0() (ProjectUpgradeEligibilityResponseValidationErrors6ObjType0, error) { + var body ProjectUpgradeEligibilityResponseValidationErrors6ObjType0 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromProjectUpgradeEligibilityResponseValidationErrors6ObjType0 overwrites any union data inside the ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType as the provided ProjectUpgradeEligibilityResponseValidationErrors6ObjType0 +func (t *ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType) FromProjectUpgradeEligibilityResponseValidationErrors6ObjType0(v ProjectUpgradeEligibilityResponseValidationErrors6ObjType0) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeProjectUpgradeEligibilityResponseValidationErrors6ObjType0 performs a merge with any union data inside the ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType, using the provided ProjectUpgradeEligibilityResponseValidationErrors6ObjType0 +func (t *ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType) MergeProjectUpgradeEligibilityResponseValidationErrors6ObjType0(v ProjectUpgradeEligibilityResponseValidationErrors6ObjType0) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsProjectUpgradeEligibilityResponseValidationErrors6ObjType1 returns the union data inside the ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType as a ProjectUpgradeEligibilityResponseValidationErrors6ObjType1 +func (t ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType) AsProjectUpgradeEligibilityResponseValidationErrors6ObjType1() (ProjectUpgradeEligibilityResponseValidationErrors6ObjType1, error) { + var body ProjectUpgradeEligibilityResponseValidationErrors6ObjType1 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromProjectUpgradeEligibilityResponseValidationErrors6ObjType1 overwrites any union data inside the ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType as the provided ProjectUpgradeEligibilityResponseValidationErrors6ObjType1 +func (t *ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType) FromProjectUpgradeEligibilityResponseValidationErrors6ObjType1(v ProjectUpgradeEligibilityResponseValidationErrors6ObjType1) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeProjectUpgradeEligibilityResponseValidationErrors6ObjType1 performs a merge with any union data inside the ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType, using the provided ProjectUpgradeEligibilityResponseValidationErrors6ObjType1 +func (t *ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType) MergeProjectUpgradeEligibilityResponseValidationErrors6ObjType1(v ProjectUpgradeEligibilityResponseValidationErrors6ObjType1) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *ProjectUpgradeEligibilityResponse_ValidationErrors_6_ObjType) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + // AsProjectUpgradeEligibilityResponseValidationErrors0 returns the union data inside the ProjectUpgradeEligibilityResponse_ValidationErrors_Item as a ProjectUpgradeEligibilityResponseValidationErrors0 func (t ProjectUpgradeEligibilityResponse_ValidationErrors_Item) AsProjectUpgradeEligibilityResponseValidationErrors0() (ProjectUpgradeEligibilityResponseValidationErrors0, error) { var body ProjectUpgradeEligibilityResponseValidationErrors0 @@ -10845,6 +11224,182 @@ func (t *ProjectUpgradeEligibilityResponse_Warnings_Item) UnmarshalJSON(b []byte return err } +// AsUpdateCustomHostnameResponseJsonValue0 returns the union data inside the UpdateCustomHostnameResponseJsonValue as a UpdateCustomHostnameResponseJsonValue0 +func (t UpdateCustomHostnameResponseJsonValue) AsUpdateCustomHostnameResponseJsonValue0() (UpdateCustomHostnameResponseJsonValue0, error) { + var body UpdateCustomHostnameResponseJsonValue0 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromUpdateCustomHostnameResponseJsonValue0 overwrites any union data inside the UpdateCustomHostnameResponseJsonValue as the provided UpdateCustomHostnameResponseJsonValue0 +func (t *UpdateCustomHostnameResponseJsonValue) FromUpdateCustomHostnameResponseJsonValue0(v UpdateCustomHostnameResponseJsonValue0) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeUpdateCustomHostnameResponseJsonValue0 performs a merge with any union data inside the UpdateCustomHostnameResponseJsonValue, using the provided UpdateCustomHostnameResponseJsonValue0 +func (t *UpdateCustomHostnameResponseJsonValue) MergeUpdateCustomHostnameResponseJsonValue0(v UpdateCustomHostnameResponseJsonValue0) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsUpdateCustomHostnameResponseJsonValue1 returns the union data inside the UpdateCustomHostnameResponseJsonValue as a UpdateCustomHostnameResponseJsonValue1 +func (t UpdateCustomHostnameResponseJsonValue) AsUpdateCustomHostnameResponseJsonValue1() (UpdateCustomHostnameResponseJsonValue1, error) { + var body UpdateCustomHostnameResponseJsonValue1 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromUpdateCustomHostnameResponseJsonValue1 overwrites any union data inside the UpdateCustomHostnameResponseJsonValue as the provided UpdateCustomHostnameResponseJsonValue1 +func (t *UpdateCustomHostnameResponseJsonValue) FromUpdateCustomHostnameResponseJsonValue1(v UpdateCustomHostnameResponseJsonValue1) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeUpdateCustomHostnameResponseJsonValue1 performs a merge with any union data inside the UpdateCustomHostnameResponseJsonValue, using the provided UpdateCustomHostnameResponseJsonValue1 +func (t *UpdateCustomHostnameResponseJsonValue) MergeUpdateCustomHostnameResponseJsonValue1(v UpdateCustomHostnameResponseJsonValue1) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsUpdateCustomHostnameResponseJsonValue2 returns the union data inside the UpdateCustomHostnameResponseJsonValue as a UpdateCustomHostnameResponseJsonValue2 +func (t UpdateCustomHostnameResponseJsonValue) AsUpdateCustomHostnameResponseJsonValue2() (UpdateCustomHostnameResponseJsonValue2, error) { + var body UpdateCustomHostnameResponseJsonValue2 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromUpdateCustomHostnameResponseJsonValue2 overwrites any union data inside the UpdateCustomHostnameResponseJsonValue as the provided UpdateCustomHostnameResponseJsonValue2 +func (t *UpdateCustomHostnameResponseJsonValue) FromUpdateCustomHostnameResponseJsonValue2(v UpdateCustomHostnameResponseJsonValue2) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeUpdateCustomHostnameResponseJsonValue2 performs a merge with any union data inside the UpdateCustomHostnameResponseJsonValue, using the provided UpdateCustomHostnameResponseJsonValue2 +func (t *UpdateCustomHostnameResponseJsonValue) MergeUpdateCustomHostnameResponseJsonValue2(v UpdateCustomHostnameResponseJsonValue2) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t UpdateCustomHostnameResponseJsonValue) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *UpdateCustomHostnameResponseJsonValue) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + +// AsUpdateCustomHostnameResponseJsonValue00 returns the union data inside the UpdateCustomHostnameResponseJsonValue0 as a UpdateCustomHostnameResponseJsonValue00 +func (t UpdateCustomHostnameResponseJsonValue0) AsUpdateCustomHostnameResponseJsonValue00() (UpdateCustomHostnameResponseJsonValue00, error) { + var body UpdateCustomHostnameResponseJsonValue00 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromUpdateCustomHostnameResponseJsonValue00 overwrites any union data inside the UpdateCustomHostnameResponseJsonValue0 as the provided UpdateCustomHostnameResponseJsonValue00 +func (t *UpdateCustomHostnameResponseJsonValue0) FromUpdateCustomHostnameResponseJsonValue00(v UpdateCustomHostnameResponseJsonValue00) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeUpdateCustomHostnameResponseJsonValue00 performs a merge with any union data inside the UpdateCustomHostnameResponseJsonValue0, using the provided UpdateCustomHostnameResponseJsonValue00 +func (t *UpdateCustomHostnameResponseJsonValue0) MergeUpdateCustomHostnameResponseJsonValue00(v UpdateCustomHostnameResponseJsonValue00) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsUpdateCustomHostnameResponseJsonValue01 returns the union data inside the UpdateCustomHostnameResponseJsonValue0 as a UpdateCustomHostnameResponseJsonValue01 +func (t UpdateCustomHostnameResponseJsonValue0) AsUpdateCustomHostnameResponseJsonValue01() (UpdateCustomHostnameResponseJsonValue01, error) { + var body UpdateCustomHostnameResponseJsonValue01 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromUpdateCustomHostnameResponseJsonValue01 overwrites any union data inside the UpdateCustomHostnameResponseJsonValue0 as the provided UpdateCustomHostnameResponseJsonValue01 +func (t *UpdateCustomHostnameResponseJsonValue0) FromUpdateCustomHostnameResponseJsonValue01(v UpdateCustomHostnameResponseJsonValue01) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeUpdateCustomHostnameResponseJsonValue01 performs a merge with any union data inside the UpdateCustomHostnameResponseJsonValue0, using the provided UpdateCustomHostnameResponseJsonValue01 +func (t *UpdateCustomHostnameResponseJsonValue0) MergeUpdateCustomHostnameResponseJsonValue01(v UpdateCustomHostnameResponseJsonValue01) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsUpdateCustomHostnameResponseJsonValue02 returns the union data inside the UpdateCustomHostnameResponseJsonValue0 as a UpdateCustomHostnameResponseJsonValue02 +func (t UpdateCustomHostnameResponseJsonValue0) AsUpdateCustomHostnameResponseJsonValue02() (UpdateCustomHostnameResponseJsonValue02, error) { + var body UpdateCustomHostnameResponseJsonValue02 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromUpdateCustomHostnameResponseJsonValue02 overwrites any union data inside the UpdateCustomHostnameResponseJsonValue0 as the provided UpdateCustomHostnameResponseJsonValue02 +func (t *UpdateCustomHostnameResponseJsonValue0) FromUpdateCustomHostnameResponseJsonValue02(v UpdateCustomHostnameResponseJsonValue02) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeUpdateCustomHostnameResponseJsonValue02 performs a merge with any union data inside the UpdateCustomHostnameResponseJsonValue0, using the provided UpdateCustomHostnameResponseJsonValue02 +func (t *UpdateCustomHostnameResponseJsonValue0) MergeUpdateCustomHostnameResponseJsonValue02(v UpdateCustomHostnameResponseJsonValue02) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t UpdateCustomHostnameResponseJsonValue0) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *UpdateCustomHostnameResponseJsonValue0) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + // AsV1CreateProjectBodyRegionSelection0 returns the union data inside the V1CreateProjectBody_RegionSelection as a V1CreateProjectBodyRegionSelection0 func (t V1CreateProjectBody_RegionSelection) AsV1CreateProjectBodyRegionSelection0() (V1CreateProjectBodyRegionSelection0, error) { var body V1CreateProjectBodyRegionSelection0 @@ -11206,3 +11761,127 @@ func (t *V1ServiceHealthResponse_Info) UnmarshalJSON(b []byte) error { err := t.union.UnmarshalJSON(b) return err } + +// AsV1GetJitAccessConfig200JSONResponseBody0 returns the union data inside the V1GetJitAccessConfig200JSONResponseBody as a V1GetJitAccessConfig200JSONResponseBody0 +func (t V1GetJitAccessConfig200JSONResponseBody) AsV1GetJitAccessConfig200JSONResponseBody0() (V1GetJitAccessConfig200JSONResponseBody0, error) { + var body V1GetJitAccessConfig200JSONResponseBody0 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromV1GetJitAccessConfig200JSONResponseBody0 overwrites any union data inside the V1GetJitAccessConfig200JSONResponseBody as the provided V1GetJitAccessConfig200JSONResponseBody0 +func (t *V1GetJitAccessConfig200JSONResponseBody) FromV1GetJitAccessConfig200JSONResponseBody0(v V1GetJitAccessConfig200JSONResponseBody0) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeV1GetJitAccessConfig200JSONResponseBody0 performs a merge with any union data inside the V1GetJitAccessConfig200JSONResponseBody, using the provided V1GetJitAccessConfig200JSONResponseBody0 +func (t *V1GetJitAccessConfig200JSONResponseBody) MergeV1GetJitAccessConfig200JSONResponseBody0(v V1GetJitAccessConfig200JSONResponseBody0) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsV1GetJitAccessConfig200JSONResponseBody1 returns the union data inside the V1GetJitAccessConfig200JSONResponseBody as a V1GetJitAccessConfig200JSONResponseBody1 +func (t V1GetJitAccessConfig200JSONResponseBody) AsV1GetJitAccessConfig200JSONResponseBody1() (V1GetJitAccessConfig200JSONResponseBody1, error) { + var body V1GetJitAccessConfig200JSONResponseBody1 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromV1GetJitAccessConfig200JSONResponseBody1 overwrites any union data inside the V1GetJitAccessConfig200JSONResponseBody as the provided V1GetJitAccessConfig200JSONResponseBody1 +func (t *V1GetJitAccessConfig200JSONResponseBody) FromV1GetJitAccessConfig200JSONResponseBody1(v V1GetJitAccessConfig200JSONResponseBody1) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeV1GetJitAccessConfig200JSONResponseBody1 performs a merge with any union data inside the V1GetJitAccessConfig200JSONResponseBody, using the provided V1GetJitAccessConfig200JSONResponseBody1 +func (t *V1GetJitAccessConfig200JSONResponseBody) MergeV1GetJitAccessConfig200JSONResponseBody1(v V1GetJitAccessConfig200JSONResponseBody1) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t V1GetJitAccessConfig200JSONResponseBody) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *V1GetJitAccessConfig200JSONResponseBody) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + +// AsV1UpdateJitAccessConfig200JSONResponseBody0 returns the union data inside the V1UpdateJitAccessConfig200JSONResponseBody as a V1UpdateJitAccessConfig200JSONResponseBody0 +func (t V1UpdateJitAccessConfig200JSONResponseBody) AsV1UpdateJitAccessConfig200JSONResponseBody0() (V1UpdateJitAccessConfig200JSONResponseBody0, error) { + var body V1UpdateJitAccessConfig200JSONResponseBody0 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromV1UpdateJitAccessConfig200JSONResponseBody0 overwrites any union data inside the V1UpdateJitAccessConfig200JSONResponseBody as the provided V1UpdateJitAccessConfig200JSONResponseBody0 +func (t *V1UpdateJitAccessConfig200JSONResponseBody) FromV1UpdateJitAccessConfig200JSONResponseBody0(v V1UpdateJitAccessConfig200JSONResponseBody0) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeV1UpdateJitAccessConfig200JSONResponseBody0 performs a merge with any union data inside the V1UpdateJitAccessConfig200JSONResponseBody, using the provided V1UpdateJitAccessConfig200JSONResponseBody0 +func (t *V1UpdateJitAccessConfig200JSONResponseBody) MergeV1UpdateJitAccessConfig200JSONResponseBody0(v V1UpdateJitAccessConfig200JSONResponseBody0) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsV1UpdateJitAccessConfig200JSONResponseBody1 returns the union data inside the V1UpdateJitAccessConfig200JSONResponseBody as a V1UpdateJitAccessConfig200JSONResponseBody1 +func (t V1UpdateJitAccessConfig200JSONResponseBody) AsV1UpdateJitAccessConfig200JSONResponseBody1() (V1UpdateJitAccessConfig200JSONResponseBody1, error) { + var body V1UpdateJitAccessConfig200JSONResponseBody1 + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromV1UpdateJitAccessConfig200JSONResponseBody1 overwrites any union data inside the V1UpdateJitAccessConfig200JSONResponseBody as the provided V1UpdateJitAccessConfig200JSONResponseBody1 +func (t *V1UpdateJitAccessConfig200JSONResponseBody) FromV1UpdateJitAccessConfig200JSONResponseBody1(v V1UpdateJitAccessConfig200JSONResponseBody1) error { + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeV1UpdateJitAccessConfig200JSONResponseBody1 performs a merge with any union data inside the V1UpdateJitAccessConfig200JSONResponseBody, using the provided V1UpdateJitAccessConfig200JSONResponseBody1 +func (t *V1UpdateJitAccessConfig200JSONResponseBody) MergeV1UpdateJitAccessConfig200JSONResponseBody1(v V1UpdateJitAccessConfig200JSONResponseBody1) error { + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t V1UpdateJitAccessConfig200JSONResponseBody) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *V1UpdateJitAccessConfig200JSONResponseBody) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} diff --git a/apps/cli-go/pkg/cast/cast.go b/apps/cli-go/pkg/cast/cast.go index 89840c8957..c4038e1815 100644 --- a/apps/cli-go/pkg/cast/cast.go +++ b/apps/cli-go/pkg/cast/cast.go @@ -1,6 +1,9 @@ package cast -import "math" +import ( + "math" + "strconv" +) // UintToInt converts a uint to an int, handling potential overflow func UintToInt(value uint) int { @@ -40,6 +43,13 @@ func IntToUintPtr(value *int) *uint { return Ptr(IntToUint(*value)) } +func BoolToStringPtr(value *bool) *string { + if value == nil { + return nil + } + return Ptr(strconv.FormatBool(*value)) +} + func Ptr[T any](v T) *T { return &v } diff --git a/apps/cli-go/pkg/config/auth.go b/apps/cli-go/pkg/config/auth.go index c8d2e58b4e..14d2f5462d 100644 --- a/apps/cli-go/pkg/config/auth.go +++ b/apps/cli-go/pkg/config/auth.go @@ -1129,33 +1129,33 @@ func (s sms) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) { // Api only overrides configs of enabled providers switch { case s.Twilio.Enabled: - body.SmsProvider = nullable.NewNullableWithValue(v1API.UpdateAuthConfigBodySmsProviderTwilio) + body.SmsProvider = nullable.NewNullableWithValue(v1API.Twilio) if len(s.Twilio.AuthToken.SHA256) > 0 { body.SmsTwilioAuthToken = nullable.NewNullableWithValue(s.Twilio.AuthToken.Value) } body.SmsTwilioAccountSid = nullable.NewNullableWithValue(s.Twilio.AccountSid) body.SmsTwilioMessageServiceSid = nullable.NewNullableWithValue(s.Twilio.MessageServiceSid) case s.TwilioVerify.Enabled: - body.SmsProvider = nullable.NewNullableWithValue(v1API.UpdateAuthConfigBodySmsProviderTwilioVerify) + body.SmsProvider = nullable.NewNullableWithValue(v1API.TwilioVerify) if len(s.TwilioVerify.AuthToken.SHA256) > 0 { body.SmsTwilioVerifyAuthToken = nullable.NewNullableWithValue(s.TwilioVerify.AuthToken.Value) } body.SmsTwilioVerifyAccountSid = nullable.NewNullableWithValue(s.TwilioVerify.AccountSid) body.SmsTwilioVerifyMessageServiceSid = nullable.NewNullableWithValue(s.TwilioVerify.MessageServiceSid) case s.Messagebird.Enabled: - body.SmsProvider = nullable.NewNullableWithValue(v1API.UpdateAuthConfigBodySmsProviderMessagebird) + body.SmsProvider = nullable.NewNullableWithValue(v1API.Messagebird) if len(s.Messagebird.AccessKey.SHA256) > 0 { body.SmsMessagebirdAccessKey = nullable.NewNullableWithValue(s.Messagebird.AccessKey.Value) } body.SmsMessagebirdOriginator = nullable.NewNullableWithValue(s.Messagebird.Originator) case s.Textlocal.Enabled: - body.SmsProvider = nullable.NewNullableWithValue(v1API.UpdateAuthConfigBodySmsProviderTextlocal) + body.SmsProvider = nullable.NewNullableWithValue(v1API.Textlocal) if len(s.Textlocal.ApiKey.SHA256) > 0 { body.SmsTextlocalApiKey = nullable.NewNullableWithValue(s.Textlocal.ApiKey.Value) } body.SmsTextlocalSender = nullable.NewNullableWithValue(s.Textlocal.Sender) case s.Vonage.Enabled: - body.SmsProvider = nullable.NewNullableWithValue(v1API.UpdateAuthConfigBodySmsProviderVonage) + body.SmsProvider = nullable.NewNullableWithValue(v1API.Vonage) if len(s.Vonage.ApiSecret.SHA256) > 0 { body.SmsVonageApiSecret = nullable.NewNullableWithValue(s.Vonage.ApiSecret.Value) } diff --git a/apps/cli-go/pkg/function/batch.go b/apps/cli-go/pkg/function/batch.go index 20b365cc75..f779f9c48f 100644 --- a/apps/cli-go/pkg/function/batch.go +++ b/apps/cli-go/pkg/function/batch.go @@ -16,6 +16,7 @@ import ( "github.com/docker/go-units" "github.com/go-errors/errors" "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" "github.com/supabase/cli/pkg/config" ) @@ -114,7 +115,7 @@ OUTER: func (s *EdgeRuntimeAPI) updateFunction(ctx context.Context, slug string, meta FunctionDeployMetadata, body io.Reader) (api.BulkUpdateFunctionBody, error) { resp, err := s.client.V1UpdateAFunctionWithBodyWithResponse(ctx, s.project, slug, &api.V1UpdateAFunctionParams{ - VerifyJwt: meta.VerifyJwt, + VerifyJwt: cast.BoolToStringPtr(meta.VerifyJwt), ImportMapPath: meta.ImportMapPath, EntrypointPath: &meta.EntrypointPath, EzbrSha256: &meta.SHA256, @@ -143,7 +144,7 @@ func (s *EdgeRuntimeAPI) createFunction(ctx context.Context, slug string, meta F resp, err := s.client.V1CreateAFunctionWithBodyWithResponse(ctx, s.project, &api.V1CreateAFunctionParams{ Slug: &slug, Name: &slug, - VerifyJwt: meta.VerifyJwt, + VerifyJwt: cast.BoolToStringPtr(meta.VerifyJwt), ImportMapPath: meta.ImportMapPath, EntrypointPath: &meta.EntrypointPath, EzbrSha256: &meta.SHA256, diff --git a/apps/cli-go/pkg/function/deploy.go b/apps/cli-go/pkg/function/deploy.go index 2c7045cffc..13c25b90cf 100644 --- a/apps/cli-go/pkg/function/deploy.go +++ b/apps/cli-go/pkg/function/deploy.go @@ -108,7 +108,7 @@ func (s *EdgeRuntimeAPI) bulkUpload(ctx context.Context, toDeploy []FunctionDepl for i, meta := range toDeploy { param := api.V1DeployAFunctionParams{ Slug: meta.Name, - BundleOnly: cast.Ptr(true), + BundleOnly: cast.Ptr("true"), } bundle := func() error { fmt.Fprintln(os.Stderr, "Deploying Function:", *meta.Name) diff --git a/apps/cli/src/legacy/commands/start/start.integration.test.ts b/apps/cli/src/legacy/commands/start/start.integration.test.ts index cf600de22e..c0f4210b2e 100644 --- a/apps/cli/src/legacy/commands/start/start.integration.test.ts +++ b/apps/cli/src/legacy/commands/start/start.integration.test.ts @@ -1852,9 +1852,9 @@ content_path = "./templates/custom_notice.html" const authMigrateJob = dbSetupJobCalls(child.spawned).find((s) => s.args.some((arg) => arg.includes("gotrue")), ); - expect(authMigrateJob?.args.some((arg) => arg.includes("registry.example.com"))).toBe( - true, - ); + expect( + authMigrateJob?.args.some((arg) => arg.startsWith("registry.example.com/supabase/")), + ).toBe(true); }).pipe(Effect.provide(layer)); }, ); diff --git a/mise.lock b/mise.lock index dd05625d5f..02d24bb308 100644 --- a/mise.lock +++ b/mise.lock @@ -49,52 +49,52 @@ checksum = "sha256:c68c7903c1190101590cc1b2129835f47211b3b37ae87759f2b97d6534aa3 url = "https://github.com/oven-sh/bun/releases/download/bun-v1.3.13/bun-windows-x64-baseline.zip" [[tools.go]] -version = "1.25.11" +version = "1.26.5" backend = "core:go" [tools.go."platforms.linux-arm64"] -checksum = "sha256:c30bf9e156a54ea4e31fbbbf31a712b32734b58cc9a22426fa5ee632d0885124" -url = "https://dl.google.com/go/go1.25.11.linux-arm64.tar.gz" +checksum = "sha256:fe4789e92b1f33358680864bbe8704289e7bb5fc207d80623c308935bd696d49" +url = "https://dl.google.com/go/go1.26.5.linux-arm64.tar.gz" [tools.go."platforms.linux-arm64-musl"] -checksum = "sha256:c30bf9e156a54ea4e31fbbbf31a712b32734b58cc9a22426fa5ee632d0885124" -url = "https://dl.google.com/go/go1.25.11.linux-arm64.tar.gz" +checksum = "sha256:fe4789e92b1f33358680864bbe8704289e7bb5fc207d80623c308935bd696d49" +url = "https://dl.google.com/go/go1.26.5.linux-arm64.tar.gz" [tools.go."platforms.linux-x64"] -checksum = "sha256:34f14304e856893f4ba30c2cacfe93906e9de7915c5f6aaaf3a81cdccd7ba30b" -url = "https://dl.google.com/go/go1.25.11.linux-amd64.tar.gz" +checksum = "sha256:5c2c3b16caefa1d968a94c1daca04a7ca301a496d9b086e17ad77bb81393f053" +url = "https://dl.google.com/go/go1.26.5.linux-amd64.tar.gz" [tools.go."platforms.linux-x64-baseline"] -checksum = "sha256:34f14304e856893f4ba30c2cacfe93906e9de7915c5f6aaaf3a81cdccd7ba30b" -url = "https://dl.google.com/go/go1.25.11.linux-amd64.tar.gz" +checksum = "sha256:5c2c3b16caefa1d968a94c1daca04a7ca301a496d9b086e17ad77bb81393f053" +url = "https://dl.google.com/go/go1.26.5.linux-amd64.tar.gz" [tools.go."platforms.linux-x64-musl"] -checksum = "sha256:34f14304e856893f4ba30c2cacfe93906e9de7915c5f6aaaf3a81cdccd7ba30b" -url = "https://dl.google.com/go/go1.25.11.linux-amd64.tar.gz" +checksum = "sha256:5c2c3b16caefa1d968a94c1daca04a7ca301a496d9b086e17ad77bb81393f053" +url = "https://dl.google.com/go/go1.26.5.linux-amd64.tar.gz" [tools.go."platforms.linux-x64-musl-baseline"] -checksum = "sha256:34f14304e856893f4ba30c2cacfe93906e9de7915c5f6aaaf3a81cdccd7ba30b" -url = "https://dl.google.com/go/go1.25.11.linux-amd64.tar.gz" +checksum = "sha256:5c2c3b16caefa1d968a94c1daca04a7ca301a496d9b086e17ad77bb81393f053" +url = "https://dl.google.com/go/go1.26.5.linux-amd64.tar.gz" [tools.go."platforms.macos-arm64"] -checksum = "sha256:cd8d4920e7930d55da1a5a57ba43a64b1305f71cdf2ca3c76cd8c549272b1680" -url = "https://dl.google.com/go/go1.25.11.darwin-arm64.tar.gz" +checksum = "sha256:efb87ff28af9a188d0536ef5d42e63dd52ba8263cd7344a993cc48dd11dedb6a" +url = "https://dl.google.com/go/go1.26.5.darwin-arm64.tar.gz" [tools.go."platforms.macos-x64"] -checksum = "sha256:26d0ee4071de42b5c332337db9fdd234072877697c547e46e85efb0f59507c66" -url = "https://dl.google.com/go/go1.25.11.darwin-amd64.tar.gz" +checksum = "sha256:6231d8d3b8f5552ec6cbf6d685bdd5482e1e703214b120e89b3bf0d7bf1ef725" +url = "https://dl.google.com/go/go1.26.5.darwin-amd64.tar.gz" [tools.go."platforms.macos-x64-baseline"] -checksum = "sha256:26d0ee4071de42b5c332337db9fdd234072877697c547e46e85efb0f59507c66" -url = "https://dl.google.com/go/go1.25.11.darwin-amd64.tar.gz" +checksum = "sha256:6231d8d3b8f5552ec6cbf6d685bdd5482e1e703214b120e89b3bf0d7bf1ef725" +url = "https://dl.google.com/go/go1.26.5.darwin-amd64.tar.gz" [tools.go."platforms.windows-x64"] -checksum = "sha256:b7401f1b41517428e537493316256fb7cf03c66a130a0103ab07f3a2152e2112" -url = "https://dl.google.com/go/go1.25.11.windows-amd64.zip" +checksum = "sha256:97e6b2a833b6d89f9ff17d25419ac0a7e3b482a044e9ab18cdef834bd834fd38" +url = "https://dl.google.com/go/go1.26.5.windows-amd64.zip" [tools.go."platforms.windows-x64-baseline"] -checksum = "sha256:b7401f1b41517428e537493316256fb7cf03c66a130a0103ab07f3a2152e2112" -url = "https://dl.google.com/go/go1.25.11.windows-amd64.zip" +checksum = "sha256:97e6b2a833b6d89f9ff17d25419ac0a7e3b482a044e9ab18cdef834bd834fd38" +url = "https://dl.google.com/go/go1.26.5.windows-amd64.zip" [[tools.golangci-lint]] version = "2.12.2" diff --git a/mise.toml b/mise.toml index ba262f3374..bae703a1af 100644 --- a/mise.toml +++ b/mise.toml @@ -1,7 +1,7 @@ min_version = '2026.7.0' [tools] -go = "1.25.11" +go = "1.26.5" golangci-lint = "2.12.2" [settings]