Updated go to 1.23 (#60)

* Updated go to 1.23
* Changed docker-compose to docker compose
* Updated hms-msgbus version

CASMHMS-6317

.version

@@ -1 +1 @@
-1.21.0
+1.22.0

CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 These are changes to charts in support of:
 
+## [1.22.0] - 2023-12-03
+
+### Changed
+
+- Updated go to 1.23
+
 ## [1.21.0] - 2023-09-21
 
 ### Added

Dockerfile

@@ -1,6 +1,6 @@
 # MIT License
 #
-# (C) Copyright [2019-2022] Hewlett Packard Enterprise Development LP
+# (C) Copyright [2019-2022,2024] Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 
 ### build-base stage ###
 # Build base just has the packages installed we need.
-FROM artifactory.algol60.net/docker.io/library/golang:1.16-alpine AS build-base
+FROM artifactory.algol60.net/docker.io/library/golang:1.23-alpine AS build-base
 
 RUN set -ex \
     && apk -U upgrade \
@@ -45,7 +45,7 @@ COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-hmnfd/vendor
 ### Build Stage ###
 FROM base AS builder
 
-RUN set -ex && go build -v -tags musl -i -o /usr/local/bin/hmnfd github.com/Cray-HPE/hms-hmnfd/cmd/hmi-nfd
+RUN set -ex && go build -v -tags musl -o /usr/local/bin/hmnfd github.com/Cray-HPE/hms-hmnfd/cmd/hmi-nfd
 
 
 ### Final Stage ###

Dockerfile.testing.unit.Dockerfile

@@ -1,6 +1,6 @@
 # MIT License
 #
-# (C) Copyright [2021-2022] Hewlett Packard Enterprise Development LP
+# (C) Copyright [2021-2022,2024] Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 
 ### build-base stage ###
 # Build base just has the packages installed we need.
-FROM artifactory.algol60.net/docker.io/library/golang:1.16-alpine AS build-base
+FROM artifactory.algol60.net/docker.io/library/golang:1.23-alpine AS build-base
 
 RUN set -ex \
     && apk -U upgrade \

docker-compose.test.ct.yaml

@@ -206,7 +206,7 @@ services:
   #
   # When adding additional HSM resources here, verify that their presence will still work with test/ct/wait-for.sh
   emulator-loader:
-    image: artifactory.algol60.net/docker.io/library/golang:1.16-alpine
+    image: artifactory.algol60.net/docker.io/library/golang:1.23-alpine
     command: >
       sh -c "apk add curl && sleep 10 &&
       echo \"== post redfish endpoints\" &&

go.mod

@@ -1,12 +1,35 @@
 module github.com/Cray-HPE/hms-hmnfd
 
-go 1.16
+go 1.23
 
 require (
-	github.com/Cray-HPE/hms-base/v2 v2.0.1
-	github.com/Cray-HPE/hms-hmetcd v1.10.3
-	github.com/Cray-HPE/hms-msgbus v1.11.0
-	github.com/Cray-HPE/hms-xname v1.3.0
+	github.com/Cray-HPE/hms-base/v2 v2.1.0
+	github.com/Cray-HPE/hms-hmetcd v1.11.0
+	github.com/Cray-HPE/hms-msgbus v1.12.0
+	github.com/Cray-HPE/hms-xname v1.4.0
 	github.com/gorilla/mux v1.8.0
-	github.com/gorilla/websocket v1.4.1 // indirect
+)
+
+require (
+	github.com/confluentinc/confluent-kafka-go v1.7.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+	github.com/hashicorp/go-retryablehttp v0.5.4 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.16 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.16 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
+	google.golang.org/grpc v1.68.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 )

runCT.sh

@@ -32,7 +32,7 @@ echo "COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME}"
 echo "COMPOSE_FILE: $COMPOSE_FILE"
 
 function cleanup() {
-  docker-compose down
+  docker compose down
   if [[ $? -ne 0 ]]; then
     echo "Failed to decompose environment!"
     exit 1
@@ -42,12 +42,12 @@ function cleanup() {
 
 # Get the base containers running
 echo "Starting containers..."
-docker-compose build --no-cache
-docker-compose up --exit-code-from wait-for-smd wait-for-smd
-docker-compose up -d cray-hmnfd
+docker compose build --no-cache
+docker compose up --exit-code-from wait-for-smd wait-for-smd
+docker compose up -d cray-hmnfd
 
 # Run the CT smoke tests
-docker-compose up --exit-code-from smoke-tests smoke-tests
+docker compose up --exit-code-from smoke-tests smoke-tests
 test_result=$?
 echo "Cleaning up containers..."
 if [[ $test_result -ne 0 ]]; then
@@ -56,7 +56,7 @@ if [[ $test_result -ne 0 ]]; then
 fi
 
 # Run the CT Tavern tests
-docker-compose up --exit-code-from tavern-tests tavern-tests
+docker compose up --exit-code-from tavern-tests tavern-tests
 test_result=$?
 if [[ $test_result -ne 0 ]]; then
   echo "CT tavern tests FAILED!"

runIntegration.sh

@@ -33,7 +33,7 @@ echo "COMPOSE_FILE: $COMPOSE_FILE"
 
 
 function cleanup() {
-  docker-compose down
+  docker compose down
   if [[ $? -ne 0 ]]; then
     echo "Failed to decompose environment!"
     exit 1
@@ -44,9 +44,9 @@ function cleanup() {
 
 # Get the base containers running
 echo "Starting containers..."
-docker-compose build
-docker-compose up -d cray-hmnfd
-docker-compose up --exit-code-from integration-tests integration-tests
+docker compose build
+docker compose up -d cray-hmnfd
+docker compose up --exit-code-from integration-tests integration-tests
 
 test_result=$?
 

runUnitTest.sh

@@ -35,7 +35,7 @@ echo "COMPOSE_FILE: $COMPOSE_FILE"
 
 
 function cleanup() {
-  docker-compose down
+  docker compose down
   if ! [[ $? -eq 0 ]]; then
     echo "Failed to decompose environment!"
     exit 1
@@ -45,8 +45,8 @@ function cleanup() {
 
 
 echo "Starting containers..."
-docker-compose build  --no-cache
-docker-compose up --exit-code-from unit-tests unit-tests
+docker compose build  --no-cache
+docker compose up --exit-code-from unit-tests unit-tests
 
 test_result=$?
 

test/fake-subscriber/Dockerfile.fake-subscriber

@@ -1,6 +1,6 @@
 # MIT License
 #
-# (C) Copyright [2019-2022] Hewlett Packard Enterprise Development LP
+# (C) Copyright [2019-2022,2024] Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,13 +24,13 @@
 # Author: mpkelly
 # Date: 12-February 2019
 
-FROM artifactory.algol60.net/docker.io/library/golang:1.16-alpine AS builder
+FROM artifactory.algol60.net/docker.io/library/golang:1.23-alpine AS builder
 
 RUN go env -w GO111MODULE=auto
 
 COPY fake-subscriber.go ${GOPATH}/src/fake-subscriber/
 
-RUN set -ex && go build -v -tags musl -i -o /usr/local/bin/fake-subscriber fake-subscriber
+RUN set -ex && go build -v -tags musl -o /usr/local/bin/fake-subscriber fake-subscriber
 
 ### Final Stage ###