fix: update guestinfo on incoming ping

On incoming ping request send updated guest info. Exclude NIC info,
since that is already sent on incoming broadcastIP option request.

This commit includes the results of `make rekres`.

Signed-off-by: Robin Elfrink <[email protected]>

Dockerfile

@@ -1,8 +1,8 @@
-# syntax = docker/dockerfile-upstream:1.9.0-labs
+# syntax = docker/dockerfile-upstream:1.10.0-labs
 
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-07-30T11:32:20Z by kres faf91e3.
+# Generated on 2024-10-25T10:04:59Z by kres 6d3cad4.
 
 ARG TOOLCHAIN
 
@@ -12,9 +12,9 @@ COPY manifest.yaml /
 COPY talos-vmtoolsd.yaml /rootfs/usr/local/etc/containers/talos-vmtoolsd.yaml
 
 # runs markdownlint
-FROM docker.io/oven/bun:1.1.20-alpine AS lint-markdown
+FROM docker.io/oven/bun:1.1.32-alpine AS lint-markdown
 WORKDIR /src
-RUN bun i markdownlint-cli@0.41.0 [email protected]
+RUN bun i markdownlint-cli@0.42.0 [email protected]
 COPY .markdownlint.json .
 COPY ./README.md ./README.md
 RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules node_modules/sentences-per-line/index.js .

Makefile

@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-07-30T11:32:20Z by kres faf91e3.
+# Generated on 2024-10-25T10:04:59Z by kres 6d3cad4.
 
 # common variables
 
@@ -17,15 +17,15 @@ WITH_RACE ?= false
 REGISTRY ?= ghcr.io
 USERNAME ?= siderolabs
 REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
-PROTOBUF_GO_VERSION ?= 1.34.2
-GRPC_GO_VERSION ?= 1.4.0
-GRPC_GATEWAY_VERSION ?= 2.20.0
+PROTOBUF_GO_VERSION ?= 1.35.1
+GRPC_GO_VERSION ?= 1.5.1
+GRPC_GATEWAY_VERSION ?= 2.22.0
 VTPROTOBUF_VERSION ?= 0.6.0
-GOIMPORTS_VERSION ?= 0.23.0
+GOIMPORTS_VERSION ?= 0.26.0
 DEEPCOPY_VERSION ?= v0.5.6
-GOLANGCILINT_VERSION ?= v1.59.1
-GOFUMPT_VERSION ?= v0.6.0
-GO_VERSION ?= 1.22.5
+GOLANGCILINT_VERSION ?= v1.61.0
+GOFUMPT_VERSION ?= v0.7.0
+GO_VERSION ?= 1.23.2
 GO_BUILDFLAGS ?=
 GO_LDFLAGS ?=
 CGO_ENABLED ?= 0
@@ -67,7 +67,7 @@ COMMON_ARGS += --build-arg=DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)"
 COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
 COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
 COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
-TOOLCHAIN ?= docker.io/golang:1.22-alpine
+TOOLCHAIN ?= docker.io/golang:1.23-alpine
 
 # help menu
 

hack/release.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-03-28T12:14:24Z by kres 88d1199.
+# Generated on 2024-10-25T10:04:59Z by kres 6d3cad4.
 
 set -e
 
@@ -44,9 +44,92 @@ function commit {
     exit 1
   fi
 
+  if is_on_main_branch; then
+    update_license_files
+  fi
+
   git commit -s -m "release($1): prepare release" -m "This is the official $1 release."
 }
 
+function is_on_main_branch {
+  main_remotes=("upstream" "origin")
+  branch_names=("main" "master")
+  current_branch=$(git rev-parse --abbrev-ref HEAD)
+
+  echo "Check current branch: $current_branch"
+
+  for remote in "${main_remotes[@]}"; do
+    echo "Fetch remote $remote..."
+
+    if ! git fetch --quiet "$remote" &>/dev/null; then
+      echo "Failed to fetch $remote, skip..."
+
+      continue
+    fi
+
+    for branch_name in "${branch_names[@]}"; do
+      if ! git rev-parse --verify "$branch_name" &>/dev/null; then
+        echo "Branch $branch_name does not exist, skip..."
+
+        continue
+      fi
+
+      echo "Branch $remote/$branch_name exists, comparing..."
+
+      merge_base=$(git merge-base "$current_branch" "$remote/$branch_name")
+      latest_main=$(git rev-parse "$remote/$branch_name")
+
+      if [ "$merge_base" = "$latest_main" ]; then
+        echo "Current branch is up-to-date with $remote/$branch_name"
+
+        return 0
+      else
+        echo "Current branch is not on $remote/$branch_name"
+
+        return 1
+      fi
+    done
+  done
+
+  echo "No main or master branch found on any remote"
+
+  return 1
+}
+
+function update_license_files {
+  script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  parent_dir="$(dirname "$script_dir")"
+  current_year=$(date +"%Y")
+  change_date=$(date -v+4y +"%Y-%m-%d" 2>/dev/null || date -d "+4 years" +"%Y-%m-%d" 2>/dev/null || date --date="+4 years" +"%Y-%m-%d")
+
+  # Find LICENSE and .kres.yaml files recursively in the parent directory (project root)
+  find "$parent_dir" \( -name "LICENSE" -o -name ".kres.yaml" \) -type f | while read -r file; do
+    temp_file="${file}.tmp"
+
+    if [[ $file == *"LICENSE" ]]; then
+      if grep -q "^Business Source License" "$file"; then
+        sed -e "s/The Licensed Work is (c) [0-9]\{4\}/The Licensed Work is (c) $current_year/" \
+          -e "s/Change Date:          [0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}/Change Date:          $change_date/" \
+          "$file" >"$temp_file"
+      else
+        continue # Not a Business Source License file
+      fi
+    elif [[ $file == *".kres.yaml" ]]; then
+      sed -E 's/^([[:space:]]*)ChangeDate:.*$/\1ChangeDate: "'"$change_date"'"/' "$file" >"$temp_file"
+    fi
+
+    # Check if the file has changed
+    if ! cmp -s "$file" "$temp_file"; then
+      mv "$temp_file" "$file"
+      echo "Updated: $file"
+      git add "$file"
+    else
+      echo "No changes: $file"
+      rm "$temp_file"
+    fi
+  done
+}
+
 if declare -f "$1" > /dev/null
 then
   cmd="$1"
@@ -55,7 +138,7 @@ then
 else
   cat <<EOF
 Usage:
-  commit:        Create the official release commit message.
+  commit:        Create the official release commit message (updates BUSL license dates if there is any).
   cherry-pick:   Cherry-pick a commit into a release branch.
   changelog:     Update the specified CHANGELOG.
   release-notes: Create release notes for GitHub release.

internal/tboxcmds/guestinfo.go

@@ -211,6 +211,15 @@ func (cmd *GuestInfoCommands) PushGuestInfo() {
 	cmd.SendGuestInfoNIC()
 }
 
+// PingHandler pushes updated guest info on ping request.
+func (cmd *GuestInfoCommands) PingHandler([]byte) ([]byte, error) {
+	cmd.SendGuestInfoDNSName()
+	cmd.SendGuestInfoOSNameFull()
+	cmd.SendGuestInfoOSName()
+	cmd.SendGuestInfoUptime()
+	return nil, nil
+}
+
 // RegisterGuestInfoCommands registers the guest info commands.
 func RegisterGuestInfoCommands(svc *nanotoolbox.Service, delegate NicDelegate) {
 	cmd := &GuestInfoCommands{
@@ -220,6 +229,7 @@ func RegisterGuestInfoCommands(svc *nanotoolbox.Service, delegate NicDelegate) {
 	}
 	svc.RegisterResetHandler(cmd.PushGuestInfo)
 	svc.RegisterOptionHandler("broadcastIP", cmd.BroadcastIPOptionHandler)
+	svc.RegisterCommandHandler("ping", cmd.PingHandler)
 
 	// As stated in guestInfoServer.c, VMX expects uptime information in response
 	// to the capabilities request.