Skip to content

Commit

Permalink
Updated go to 1.23 (#38)
Browse files Browse the repository at this point in the history
* Updated go to 1.23
* Changed docker-compose to docker compose
* Removed -i option from go build
* Added -v option to go build

CASMHMS-6317
  • Loading branch information
shunr-hpe authored Dec 11, 2024
1 parent a6e5e7d commit c06ff34
Show file tree
Hide file tree
Showing 30 changed files with 394 additions and 268 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20.0
1.21.0
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.21.0] - 2024-12-03

### Changed

- Updated go to 1.23

## [1.20.0] - 2022-07-12

### Changed
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Dockerfile for building hms-meds.

## Prepare Builder ##
FROM artifactory.algol60.net/docker.io/library/golang:1.18-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 All @@ -45,8 +45,8 @@ FROM base AS builder

# Now build
RUN set -ex \
&& go build -i -o /usr/local/bin/meds github.com/Cray-HPE/hms-meds/cmd/meds \
&& go build -i -o /usr/local/bin/vault_loader github.com/Cray-HPE/hms-meds/cmd/vault_loader
&& go build -v -o /usr/local/bin/meds github.com/Cray-HPE/hms-meds/cmd/meds \
&& go build -v -o /usr/local/bin/vault_loader github.com/Cray-HPE/hms-meds/cmd/vault_loader


### Final Stage ###
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.testing.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ This is a list of work that is either known to be coming or that should get done

## Testing with Docker Compose

A `docker-compose` environment can be set up by running:
A `docker compose` environment can be set up by running:

`docker-compose -f docker-compose.developer.full.yaml up -d --build`
`docker compose -f docker compose.developer.full.yaml up -d --build`

and torn down with:

`docker-compose -f docker-compose.developer.full.yaml down --remove-orphans`
`docker compose -f docker compose.developer.full.yaml down --remove-orphans`

This will set up an environment with one dummy endpoint, named `x1000c1s1b0`. It will *not* automatically be in SLS, you will have to add it using a command like:

Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module github.com/Cray-HPE/hms-meds

go 1.18
go 1.23

require (
github.com/Cray-HPE/hms-base/v2 v2.0.1
github.com/Cray-HPE/hms-base/v2 v2.1.0
github.com/Cray-HPE/hms-bmc-networkprotocol v1.5.3
github.com/Cray-HPE/hms-certs v1.3.3
github.com/Cray-HPE/hms-compcredentials v1.11.3
github.com/Cray-HPE/hms-dns-dhcp v1.6.0
github.com/Cray-HPE/hms-securestorage v1.13.0
github.com/Cray-HPE/hms-compcredentials v1.12.0
github.com/Cray-HPE/hms-dns-dhcp v1.7.0
github.com/Cray-HPE/hms-securestorage v1.14.0
github.com/Cray-HPE/hms-sls v1.20.0
github.com/Cray-HPE/hms-smd v1.55.0
github.com/Cray-HPE/hms-xname v1.1.0
github.com/Cray-HPE/hms-xname v1.4.0
github.com/mitchellh/mapstructure v1.4.1
)

Expand Down
29 changes: 10 additions & 19 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -41,40 +41,36 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
github.com/ClickHouse/clickhouse-go v1.3.12/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
github.com/Cray-HPE/hms-base v1.15.0 h1:VaQj6cY9OAs6rcD1miE133eqQnRTkEcX1lnwJA/SUuU=
github.com/Cray-HPE/hms-base v1.15.0/go.mod h1:+G8KFLPtanLC5lQ602hrf3MDfLTmIXedTavVCOdz5XA=
github.com/Cray-HPE/hms-base/v2 v2.0.1 h1:xHQWmoOlmA/UU0zDWjHxCK/qOF9WMLr7MrSpFAxLXWY=
github.com/Cray-HPE/hms-base/v2 v2.0.1/go.mod h1:Mq+Ao3q4YtNZJZ1ly9wnEIKyvc3+QaA1B/xpiUpyhzQ=
github.com/Cray-HPE/hms-base/v2 v2.1.0 h1:RtK/fFda1tQDBtmg/c0LnxhcHwTwK3DSmHQcWiImTKs=
github.com/Cray-HPE/hms-base/v2 v2.1.0/go.mod h1:zf6uo5y71JFMKSj/VbC2ixxi/Y1pCtZCjCickStvRK8=
github.com/Cray-HPE/hms-bmc-networkprotocol v1.5.3 h1:Luya4nCIN9PGFWqtx1bzxl5fe6+L4r5Y2Xi4qsXHEGA=
github.com/Cray-HPE/hms-bmc-networkprotocol v1.5.3/go.mod h1:aYMIYTJIEMzyb2mcpsM9uzlC42YAbGyjT1uETWTpZZg=
github.com/Cray-HPE/hms-certs v1.3.2/go.mod h1:6DymilWScLtbQkaQRMuf55K1MzEi0kYCoXfT212yLjY=
github.com/Cray-HPE/hms-certs v1.3.3 h1:0dUqeo+pE9xloliOCuIGFd0gEF66czrnI6lybW/tGmI=
github.com/Cray-HPE/hms-certs v1.3.3/go.mod h1:6DymilWScLtbQkaQRMuf55K1MzEi0kYCoXfT212yLjY=
github.com/Cray-HPE/hms-compcredentials v1.11.2/go.mod h1:tmurR+zsOtB61n6j3GlEfsl7wmNIAGJqErFymOUb0Hw=
github.com/Cray-HPE/hms-compcredentials v1.11.3 h1:y3VwLBby2b+pVUxVjiZUpsvPK5pspXr3w4pxeh/D35s=
github.com/Cray-HPE/hms-compcredentials v1.11.3/go.mod h1:tmurR+zsOtB61n6j3GlEfsl7wmNIAGJqErFymOUb0Hw=
github.com/Cray-HPE/hms-dns-dhcp v1.6.0 h1:m7yarg1Pju8ya9gkaATW7v1lcsMJFcDHCwNKwqkmYh4=
github.com/Cray-HPE/hms-dns-dhcp v1.6.0/go.mod h1:F5EyKyAD88Q+Mlc8N3YNUiY/hCfJDDtNyVF4MgN1h80=
github.com/Cray-HPE/hms-compcredentials v1.12.0 h1:xlAgEvbFlhGeiYIbbelvVgcTFY3E7aFoX90DpMLrEoE=
github.com/Cray-HPE/hms-compcredentials v1.12.0/go.mod h1:n97p0QnsVJTmzd3wl/hETIUdTS2IAerZ8NXxQ4t3Y2o=
github.com/Cray-HPE/hms-dns-dhcp v1.7.0 h1:/gRuVbuDb3cx+g7lHoYQZdCyR6wd1ca/7k9s6JmBJtw=
github.com/Cray-HPE/hms-dns-dhcp v1.7.0/go.mod h1:EuxLr7YPQr/iQ4Y+7t5TZd+6b4FqKu3Ct0j+WMZckrg=
github.com/Cray-HPE/hms-go-http-lib v1.5.3/go.mod h1:BKlB4HKAGW5GgS3x01y7zxxYFLaJM2byACUunmes2z8=
github.com/Cray-HPE/hms-msgbus v1.10.2/go.mod h1:DM5Iw58ejMxbCOX2KgmcBwDS5YWIlba3BOW9JsDQl4w=
github.com/Cray-HPE/hms-msgbus v1.11.0/go.mod h1:cxn+lUOq3tpY3+KdFml6L56ZQo8sqN2VoZ6gGxds6o8=
github.com/Cray-HPE/hms-s3 v1.9.2/go.mod h1:p5pVsMDeOdXKssd9qyFtXo4ztrn2lhD04nrO8+NOi7g=
github.com/Cray-HPE/hms-securestorage v1.12.2/go.mod h1:P4CMKqQVlx/lv+AdyEjNQubZw2FKNyo/IAtFNgQ3VuI=
github.com/Cray-HPE/hms-securestorage v1.13.0 h1:ut6z9TMtCzL902f9NPxcbtkkDuk9zbX6E30pP8j3k6Q=
github.com/Cray-HPE/hms-securestorage v1.13.0/go.mod h1:P4CMKqQVlx/lv+AdyEjNQubZw2FKNyo/IAtFNgQ3VuI=
github.com/Cray-HPE/hms-securestorage v1.14.0 h1:9s9eoUM6HYwOms16CK9hHBxk9Sr1RM+MmYpIKvzsyR8=
github.com/Cray-HPE/hms-securestorage v1.14.0/go.mod h1:izwfNP4T+AATt+XRfv4i9QjODL5Adpb/0nvby6YxBww=
github.com/Cray-HPE/hms-sls v1.20.0 h1:Vu8J7pbVct5v1xNeeN7610ieufIgbTzHhIk74UNxL+A=
github.com/Cray-HPE/hms-sls v1.20.0/go.mod h1:CbBCBXEhoJyWCGahFajUgDcqOtAnbIY+Atl8WITz3L8=
github.com/Cray-HPE/hms-smd v1.30.9/go.mod h1:9TFpxIiPnmgBphq0QfFt1BmKiuSZ8VXu5N7A5EJz6L4=
github.com/Cray-HPE/hms-smd v1.55.0 h1:a6XnnLtohVsjpkkQif+Ti17BDOvjUj2fGSmr/zBP+uo=
github.com/Cray-HPE/hms-smd v1.55.0/go.mod h1:7J7taeRXmceyLPHdKlLbucb10lqTrJxTUo3RhaTGMhs=
github.com/Cray-HPE/hms-xname v1.0.1/go.mod h1:3A70QF0ddmkt/nz0jis5o8UIB4zAmsgsUiN71dr97n4=
github.com/Cray-HPE/hms-xname v1.1.0 h1:y/JEM2PbBaD8VbU7u85+/YIugf1Evji59z5IeSffeO8=
github.com/Cray-HPE/hms-xname v1.1.0/go.mod h1:3A70QF0ddmkt/nz0jis5o8UIB4zAmsgsUiN71dr97n4=
github.com/Cray-HPE/hms-xname v1.4.0 h1:i47YmE8rbSfJ64simKCCC6ZVcGid3rDIX6/jfVbISAM=
github.com/Cray-HPE/hms-xname v1.4.0/go.mod h1:wH7t1UXYck0VdHSWjrMsxZmaCK5W1lmwgNnsYAFPTus=
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
github.com/Masterminds/squirrel v1.4.0/go.mod h1:yaPeOnPG5ZRwL9oKdTsO/prlkPbXWZlRVMQ/gGlzIuA=
github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/sarama v1.22.1/go.mod h1:FRzlvRpMFO/639zY1SDxUxkqH97Y0ndM5CbGj6oG3As=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
Expand All @@ -90,7 +86,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
github.com/bsm/sarama-cluster v2.1.15+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM=
github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
Expand Down Expand Up @@ -339,25 +334,21 @@ github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pierrec/lz4 v2.4.1+incompatible h1:mFe7ttWaflA46Mhqh+jUfjp2qTbPYxLB2/OyBppH9dg=
github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
Expand Down
6 changes: 3 additions & 3 deletions runUnitTest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ echo "COMPOSE_FILE: $COMPOSE_FILE"


function cleanup() {
docker-compose $args down
docker compose $args down
if ! [[ $? -eq 0 ]]; then
echo "Failed to decompose environment!"
exit 1
Expand All @@ -52,8 +52,8 @@ function cleanup() {


echo "Starting containers..."
docker-compose $args build
docker-compose $args up --exit-code-from unit-tests unit-tests
docker compose $args build
docker compose $args up --exit-code-from unit-tests unit-tests

test_result=$?

Expand Down
8 changes: 8 additions & 0 deletions vendor/github.com/Cray-HPE/hms-base/v2/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/Cray-HPE/hms-base/v2/.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/Cray-HPE/hms-base/v2/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions vendor/github.com/Cray-HPE/hms-compcredentials/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/Cray-HPE/hms-compcredentials/.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/Cray-HPE/hms-compcredentials/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

29 changes: 0 additions & 29 deletions vendor/github.com/Cray-HPE/hms-compcredentials/Dockerfile.coverage

This file was deleted.

29 changes: 0 additions & 29 deletions vendor/github.com/Cray-HPE/hms-compcredentials/Dockerfile.testing

This file was deleted.

34 changes: 0 additions & 34 deletions vendor/github.com/Cray-HPE/hms-compcredentials/Jenkinsfile.github

This file was deleted.

Loading

0 comments on commit c06ff34

Please sign in to comment.