From 768ed6e892025ee41efcdcdabb96ba5392221bc0 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 8 Feb 2024 09:22:53 -0800
Subject: [PATCH] Support Go 1.22 (#950)

---
 src/go/.devcontainer/Dockerfile |  3 +--
 src/go/README.md                |  3 ++-
 src/go/manifest.json            | 21 +++++++++++++++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/go/.devcontainer/Dockerfile b/src/go/.devcontainer/Dockerfile
index e38574cfd..df952d8a4 100644
--- a/src/go/.devcontainer/Dockerfile
+++ b/src/go/.devcontainer/Dockerfile
@@ -1,5 +1,4 @@
-# [Choice] Go version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon): 1, 1.21, 1.20, 1-bookworm, 1.21-bookworm, 1.20-bookworm, 1-bullseye, 1.21-bullseye, 1.20-bullseye
-ARG VARIANT=1.21-bookworm
+ARG VARIANT=1.22-bookworm
 FROM golang:${VARIANT}
 
 # [Optional] Uncomment the next line to use go get to install anything else you need
diff --git a/src/go/README.md b/src/go/README.md
index 477014dad..56688db2b 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -10,7 +10,7 @@
 | *Categories* | Core, Languages |
 | *Definition type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/go |
-| *Available image variants* | 1 / 1-bookworm, 1.21 / 1.21-bookworm, 1.20 / 1.20-bookworm, 1-bullseye, 1.21-bullseye, 1.20-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
+| *Available image variants* | 1 / 1-bookworm, 1.22 / 1.22-bookworm, 1.21 / 1.21-bookworm, 1.20 / 1.20-bookworm, 1-bullseye, 1.22-bullseye, 1.21-bullseye, 1.20-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -24,6 +24,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 
 - `mcr.microsoft.com/devcontainers/go` (latest)
 - `mcr.microsoft.com/devcontainers/go:1` (or `1-bookworm`, `1-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/go:1.22` (or `1.22-bookworm`, `1.22-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/go:1.21` (or `1.21-bookworm`, `1.21-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/go:1.20` (or `1.20-bookworm`, `1.20-bullseye` to pin to an OS version)
 
diff --git a/src/go/manifest.json b/src/go/manifest.json
index 0792558c0..7868f2e93 100644
--- a/src/go/manifest.json
+++ b/src/go/manifest.json
@@ -1,18 +1,24 @@
 {
   "version": "1.1.7",
   "variants": [
+		"1.22-bookworm",
 		"1.21-bookworm",
 		"1.20-bookworm",
+		"1.22-bullseye",
 		"1.21-bullseye",
     "1.20-bullseye"
   ],
   "build": {
-    "latest": "1.21-bookworm",
+    "latest": "1.22-bookworm",
     "rootDistro": "debian",
     "tags": [
       "go:${VERSION}-${VARIANT}"
     ],
     "architectures": {
+			"1.22-bookworm": [
+        "linux/amd64",
+        "linux/arm64"
+      ],
 			"1.21-bookworm": [
         "linux/amd64",
         "linux/arm64"
@@ -20,6 +26,10 @@
 			"1.20-bookworm": [
         "linux/amd64",
         "linux/arm64"
+      ],
+			"1.22-bullseye": [
+        "linux/amd64",
+        "linux/arm64"
       ],
       "1.21-bullseye": [
         "linux/amd64",
@@ -31,15 +41,18 @@
       ]
     },
     "variantTags": {
-			"1.21-bookworm": [
-        "go:${VERSION}-1.21",
+			"1.22-bookworm": [
+        "go:${VERSION}-1.22",
         "go:${VERSION}-1",
         "go:${VERSION}-1-bookworm",
         "go:${VERSION}-bookworm"
       ],
-			"1.21-bullseye": [
+			"1.22-bullseye": [
         "go:${VERSION}-1-bullseye",
         "go:${VERSION}-bullseye"
+      ],
+			"1.21-bookworm": [
+        "go:${VERSION}-1.21"
       ],
       "1.20-bookworm": [
         "go:${VERSION}-1.20"