Skip to content

Commit

Permalink
CASMHMS-6294: Update Go to 1.23
Browse files Browse the repository at this point in the history
  • Loading branch information
jwlv committed Dec 8, 2024
1 parent b1f5ff1 commit b31c705
Show file tree
Hide file tree
Showing 48 changed files with 78 additions and 1,409 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# (C) Copyright [2019-2023] Hewlett Packard Enterprise Development LP
# (C) Copyright [2019-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"),
Expand All @@ -25,7 +25,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 \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.test.unit.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# (C) Copyright [2019-2023] Hewlett Packard Enterprise Development LP
# (C) Copyright [2019-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"),
Expand All @@ -22,7 +22,7 @@


### Build Base Stage ###
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 \
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.test.ct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ services:
networks:
- smd
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 &&
curl -X POST -d '{\"RedfishEndpoints\":[{
Expand Down Expand Up @@ -304,4 +304,4 @@ services:
networks:
smd:
aliases:
- x0c0s4b0
- x0c0s4b0
6 changes: 3 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# (C) Copyright [2022] Hewlett Packard Enterprise Development LP
# (C) Copyright [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"),
Expand Down Expand Up @@ -98,7 +98,7 @@ services:

# Redfish Emulators
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 &&
curl -X POST -d '{\"RedfishEndpoints\":[{
Expand Down Expand Up @@ -186,4 +186,4 @@ services:
networks:
smd:
aliases:
- x1c0s3b0
- x1c0s3b0
33 changes: 27 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/Cray-HPE/hms-smd/v2

go 1.16
go 1.23

require (
github.com/Cray-HPE/hms-base/v2 v2.0.1
Expand All @@ -12,17 +12,37 @@ require (
github.com/Cray-HPE/hms-xname v1.3.0
github.com/DATA-DOG/go-sqlmock v1.3.3
github.com/Masterminds/squirrel v1.4.0
github.com/frankban/quicktest v1.7.3 // indirect
github.com/golang-migrate/migrate/v4 v4.11.0
github.com/golang/protobuf v1.4.2 // indirect
github.com/google/go-cmp v0.5.1 // indirect
github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.4
github.com/hashicorp/go-hclog v0.14.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.0
github.com/lib/pq v1.3.0
github.com/pierrec/lz4 v2.4.1+incompatible // indirect
github.com/sirupsen/logrus v1.8.1
)

require (
github.com/Cray-HPE/hms-base v1.15.0 // indirect
github.com/confluentinc/confluent-kafka-go v1.7.0 // indirect
github.com/frankban/quicktest v1.7.3 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/go-cmp v0.5.1 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-hclog v0.14.1 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.1 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/vault/api v1.0.4 // indirect
github.com/hashicorp/vault/sdk v0.1.13 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.3.0 // indirect
github.com/pierrec/lz4 v2.4.1+incompatible // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/stretchr/testify v1.5.1 // indirect
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
Expand All @@ -33,4 +53,5 @@ require (
google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70 // indirect
google.golang.org/grpc v1.29.1 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
)
9 changes: 0 additions & 9 deletions vendor/github.com/Cray-HPE/hms-base/go.mod

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/Cray-HPE/hms-base/go.sum

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/Cray-HPE/hms-base/v2/go.mod

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/Cray-HPE/hms-base/v2/go.sum

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/Cray-HPE/hms-compcredentials/go.mod

This file was deleted.

133 changes: 0 additions & 133 deletions vendor/github.com/Cray-HPE/hms-compcredentials/go.sum

This file was deleted.

Loading

0 comments on commit b31c705

Please sign in to comment.