diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml index 50d6f96e62..ee7f17a40e 100644 --- a/.github/actions/setup-go/action.yaml +++ b/.github/actions/setup-go/action.yaml @@ -4,7 +4,7 @@ description: | inputs: version: description: "The Go version to use." - default: "1.25.9" + default: "1.26.2" use-cache: description: "Whether to use the cache." default: "true" diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index b9c79e8399..7d45a4efb2 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -26415,19 +26415,19 @@ const docTemplate = `{ "type": "object", "properties": { "forceQuery": { - "description": "append a query ('?') even if RawQuery is empty", + "description": "ForceQuery indicates whether the original URL contained a query ('?') character.\nWhen set, the String method will include a trailing '?', even when RawQuery is empty.", "type": "boolean" }, "fragment": { - "description": "fragment for references, without '#'", + "description": "fragment for references (without '#')", "type": "string" }, "host": { - "description": "host or host:port (see Hostname and Port methods)", + "description": "\"host\" or \"host:port\" (see Hostname and Port methods)", "type": "string" }, "omitHost": { - "description": "do not emit empty host (authority)", + "description": "OmitHost indicates the URL has an empty host (authority).\nWhen set, the String method will not include the host when it is empty.", "type": "boolean" }, "opaque": { @@ -26439,15 +26439,15 @@ const docTemplate = `{ "type": "string" }, "rawFragment": { - "description": "encoded fragment hint (see EscapedFragment method)", + "description": "RawFragment is an optional field containing an encoded fragment hint.\nSee the EscapedFragment method for more details.\n\nIn general, code should call EscapedFragment instead of reading RawFragment.", "type": "string" }, "rawPath": { - "description": "encoded path hint (see EscapedPath method)", + "description": "RawPath is an optional field containing an encoded path hint.\nSee the EscapedPath method for more details.\n\nIn general, code should call EscapedPath instead of reading RawPath.", "type": "string" }, "rawQuery": { - "description": "encoded query values, without '?'", + "description": "RawQuery contains the encoded query values, without the initial '?'.\nUse URL.Query to decode the query.", "type": "string" }, "scheme": { diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 9b45c69235..b6d9fcfce4 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -24386,19 +24386,19 @@ "type": "object", "properties": { "forceQuery": { - "description": "append a query ('?') even if RawQuery is empty", + "description": "ForceQuery indicates whether the original URL contained a query ('?') character.\nWhen set, the String method will include a trailing '?', even when RawQuery is empty.", "type": "boolean" }, "fragment": { - "description": "fragment for references, without '#'", + "description": "fragment for references (without '#')", "type": "string" }, "host": { - "description": "host or host:port (see Hostname and Port methods)", + "description": "\"host\" or \"host:port\" (see Hostname and Port methods)", "type": "string" }, "omitHost": { - "description": "do not emit empty host (authority)", + "description": "OmitHost indicates the URL has an empty host (authority).\nWhen set, the String method will not include the host when it is empty.", "type": "boolean" }, "opaque": { @@ -24410,15 +24410,15 @@ "type": "string" }, "rawFragment": { - "description": "encoded fragment hint (see EscapedFragment method)", + "description": "RawFragment is an optional field containing an encoded fragment hint.\nSee the EscapedFragment method for more details.\n\nIn general, code should call EscapedFragment instead of reading RawFragment.", "type": "string" }, "rawPath": { - "description": "encoded path hint (see EscapedPath method)", + "description": "RawPath is an optional field containing an encoded path hint.\nSee the EscapedPath method for more details.\n\nIn general, code should call EscapedPath instead of reading RawPath.", "type": "string" }, "rawQuery": { - "description": "encoded query values, without '?'", + "description": "RawQuery contains the encoded query values, without the initial '?'.\nUse URL.Query to decode the query.", "type": "string" }, "scheme": { diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md index 68b16a473f..57c50a8d7b 100644 --- a/docs/reference/api/schemas.md +++ b/docs/reference/api/schemas.md @@ -17562,19 +17562,21 @@ None ### Properties -| Name | Type | Required | Restrictions | Description | -|---------------|------------------------------|----------|--------------|----------------------------------------------------| -| `forceQuery` | boolean | false | | append a query ('?') even if RawQuery is empty | -| `fragment` | string | false | | fragment for references, without '#' | -| `host` | string | false | | host or host:port (see Hostname and Port methods) | -| `omitHost` | boolean | false | | do not emit empty host (authority) | -| `opaque` | string | false | | encoded opaque data | -| `path` | string | false | | path (relative paths may omit leading slash) | -| `rawFragment` | string | false | | encoded fragment hint (see EscapedFragment method) | -| `rawPath` | string | false | | encoded path hint (see EscapedPath method) | -| `rawQuery` | string | false | | encoded query values, without '?' | -| `scheme` | string | false | | | -| `user` | [url.Userinfo](#urluserinfo) | false | | username and password information | +| Name | Type | Required | Restrictions | Description | +|--------------|---------|----------|--------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `forceQuery` | boolean | false | | Forcequery indicates whether the original URL contained a query ('?') character. When set, the String method will include a trailing '?', even when RawQuery is empty. | +| `fragment` | string | false | | fragment for references (without '#') | +| `host` | string | false | | "host" or "host:port" (see Hostname and Port methods) | +| `omitHost` | boolean | false | | Omithost indicates the URL has an empty host (authority). When set, the String method will not include the host when it is empty. | +| `opaque` | string | false | | encoded opaque data | +| `path` | string | false | | path (relative paths may omit leading slash) | +|`rawFragment`|string|false||Rawfragment is an optional field containing an encoded fragment hint. See the EscapedFragment method for more details. +In general, code should call EscapedFragment instead of reading RawFragment.| +|`rawPath`|string|false||Rawpath is an optional field containing an encoded path hint. See the EscapedPath method for more details. +In general, code should call EscapedPath instead of reading RawPath.| +|`rawQuery`|string|false||Rawquery contains the encoded query values, without the initial '?'. Use URL.Query to decode the query.| +|`scheme`|string|false||| +|`user`|[url.Userinfo](#urluserinfo)|false||username and password information| ## serpent.ValueSource diff --git a/dogfood/coder/ubuntu-22.04/Dockerfile b/dogfood/coder/ubuntu-22.04/Dockerfile index 439a36f510..62ab6c1334 100644 --- a/dogfood/coder/ubuntu-22.04/Dockerfile +++ b/dogfood/coder/ubuntu-22.04/Dockerfile @@ -11,8 +11,8 @@ RUN cargo install jj-cli typos-cli watchexec-cli FROM ubuntu:jammy@sha256:eb29ed27b0821dca09c2e28b39135e185fc1302036427d5f4d70a41ce8fd7659 AS go # Install Go manually, so that we can control the version -ARG GO_VERSION=1.25.9 -ARG GO_CHECKSUM="00859d7bd6defe8bf84d9db9e57b9a4467b2887c18cd93ae7460e713db774bc1" +ARG GO_VERSION=1.26.2 +ARG GO_CHECKSUM="990e6b4bbba816dc3ee129eaeaf4b42f17c2800b88a2166c265ac1a200262282" # Boring Go is needed to build FIPS-compliant binaries. RUN apt-get update && \ diff --git a/dogfood/coder/ubuntu-26.04/Dockerfile b/dogfood/coder/ubuntu-26.04/Dockerfile index 9e507996fe..82de9a7a02 100644 --- a/dogfood/coder/ubuntu-26.04/Dockerfile +++ b/dogfood/coder/ubuntu-26.04/Dockerfile @@ -11,8 +11,8 @@ RUN cargo install jj-cli typos-cli watchexec-cli FROM ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4 AS go # Install Go manually, so that we can control the version -ARG GO_VERSION=1.25.9 -ARG GO_CHECKSUM="00859d7bd6defe8bf84d9db9e57b9a4467b2887c18cd93ae7460e713db774bc1" +ARG GO_VERSION=1.26.2 +ARG GO_CHECKSUM="990e6b4bbba816dc3ee129eaeaf4b42f17c2800b88a2166c265ac1a200262282" # Boring Go is needed to build FIPS-compliant binaries. RUN apt-get update && \ diff --git a/flake.nix b/flake.nix index cccd529c33..0484cbcfe9 100644 --- a/flake.nix +++ b/flake.nix @@ -94,7 +94,7 @@ # 3. Update the sha256 and run again # 4. Nix will fail with the correct vendorHash # 5. Update the vendorHash - sqlc-custom = unstablePkgs.buildGo125Module { + sqlc-custom = unstablePkgs.buildGo126Module { pname = "sqlc"; version = "coder-fork-aab4e865a51df0c43e1839f81a9d349b41d14f05"; @@ -242,7 +242,7 @@ # slim bundle into it's own derivation. buildFat = osArch: - unstablePkgs.buildGo125Module { + unstablePkgs.buildGo126Module { name = "coder-${osArch}"; # Updated with ./scripts/update-flake.sh`. # This should be updated whenever go.mod changes! diff --git a/go.mod b/go.mod index 7776bc3df0..59da642853 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/coder/coder/v2 -go 1.25.9 +go 1.26.2 // Required until a v3 of chroma is created to lazily initialize all XML files. // None of our dependencies seem to use the registries anyways, so this