Merge branch 'master' into tener/oracle-tcp

.github/workflows/dependency-review.yaml

@@ -16,13 +16,40 @@ jobs:
       # but because of the replace, the dependency cannot find the correct
       # Teleport version.
       allow-ghsas: 'GHSA-6xf3-5hp7-xqqg'
+      # IronRDP uses MIT/Apache-2.0 but slashes are not recognized by dependency review action
       allow-dependencies-licenses: >-
+        pkg:cargo/ironrdp-core,
+        pkg:cargo/ironrdp-async,
+        pkg:cargo/ironrdp-connector,
+        pkg:cargo/ironrdp-pdu,
+        pkg:cargo/ironrdp-session,
+        pkg:cargo/ironrdp-svc,
+        pkg:cargo/ironrdp-tokio,
+        pkg:cargo/asn1-rs,
+        pkg:cargo/asn1-rs-derive,
+        pkg:cargo/asn1-rs-impl,
         pkg:cargo/curve25519-dalek-derive,
+        pkg:cargo/der-parser,
+        pkg:cargo/icu_collections,
+        pkg:cargo/icu_locid,
+        pkg:cargo/icu_locid_transform,
+        pkg:cargo/icu_locid_transform_data,
+        pkg:cargo/icu_normalizer,
+        pkg:cargo/icu_normalizer_data,
+        pkg:cargo/icu_properties,
+        pkg:cargo/icu_properties_data,
+        pkg:cargo/icu_provider,
+        pkg:cargo/icu_provider_macros,
+        pkg:cargo/litemap,
         pkg:cargo/ring,
         pkg:cargo/sspi,
         pkg:cargo/tokio-boring,
         pkg:cargo/tokio-rustls,
-        pkg:cargo/asn1-rs,
-        pkg:cargo/asn1-rs-derive,
-        pkg:cargo/asn1-rs-impl,
-        pkg:cargo/der-parser
+        pkg:cargo/writeable,
+        pkg:cargo/yoke,
+        pkg:cargo/yoke-derive,
+        pkg:cargo/zerofrom,
+        pkg:cargo/zerofrom-derive,
+        pkg:cargo/zerovec,
+        pkg:cargo/zerovec-derive,
+        pkg:npm/prettier

.github/workflows/post-release.yaml

@@ -94,8 +94,8 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "GitHub"
 
-          # get Go version from go.mod
-          GO_VERSION=$(go mod edit -json | jq -r .Go)
+          # get Go version from go.mod (preferring the toolchain directive if it's present)
+          GO_VERSION=$(go mod edit -json | jq -r 'if has("Toolchain") then .Toolchain | sub("go"; "") else .Go end')
 
           # update versions in docs/config.json
           # for docker images replace version number after <docker image name>: