Skip to content

Commit d03a84e

Browse files
BraeTroutmanBraeTroutman
committed
OCM-12652 | build: bump golang version to 1.24 and ocm-sdk-go@v0.1.481
1 parent 3c71048 commit d03a84e

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎build/ci-tf-e2e.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN yum install -y wget &&\
1010
chmod +x /usr/local/bin/ocm
1111

1212
# go
13-
RUN curl -Ls https://go.dev/dl/go1.23.9.linux-amd64.tar.gz |tar -C /usr/local -xzf -
13+
RUN curl -Ls https://go.dev/dl/go1.24.9.linux-amd64.tar.gz |tar -C /usr/local -xzf -
1414
ENV PATH="/usr/local/go/bin:${PATH}"
1515
ENV GOPATH=/usr/local/go
1616
ENV TEST_OFFLINE_TOKEN=""
@@ -27,4 +27,4 @@ RUN yum install -y yum-utils && \
2727
go install go.uber.org/mock/mockgen@v0.3.0 &&\
2828
cd terraform-provider-rhcs && go mod tidy && go mod vendor && make install &&\
2929
chmod -R 777 $GOPATH &&\
30-
echo 'RUN done'
30+
echo 'RUN done'

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/terraform-redhat/terraform-provider-rhcs
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.23.9
5+
toolchain go1.24.9
66

77
require (
88
github.com/Masterminds/semver v1.5.0
@@ -17,9 +17,8 @@ require (
1717
github.com/hashicorp/terraform-plugin-sdk v1.17.2
1818
github.com/onsi/ginkgo/v2 v2.17.1
1919
github.com/onsi/gomega v1.30.0
20-
github.com/openshift-online/ocm-api-model/clientapi v0.0.434
2120
github.com/openshift-online/ocm-common v0.0.12
22-
github.com/openshift-online/ocm-sdk-go v0.1.479
21+
github.com/openshift-online/ocm-sdk-go v0.1.481
2322
github.com/pkg/errors v0.9.1
2423
github.com/sirupsen/logrus v1.9.3
2524
github.com/thoas/go-funk v0.9.3
@@ -60,7 +59,8 @@ require (
6059
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
6160
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
6261
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
63-
github.com/openshift-online/ocm-api-model/model v0.0.434 // indirect
62+
github.com/openshift-online/ocm-api-model/clientapi v0.0.436 // indirect
63+
github.com/openshift-online/ocm-api-model/model v0.0.436 // indirect
6464
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
6565
go.yaml.in/yaml/v2 v2.4.2 // indirect
6666
golang.org/x/net v0.43.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -498,14 +498,14 @@ github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8
498498
github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
499499
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
500500
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
501-
github.com/openshift-online/ocm-api-model/clientapi v0.0.434 h1:ZpTM+gxzOFpSuV8OSYJvlXWocuchgRs301kfxU52dXA=
502-
github.com/openshift-online/ocm-api-model/clientapi v0.0.434/go.mod h1:fZwy5HY2URG9nrExvQeXrDU/08TGqZ16f8oymVEN5lo=
503-
github.com/openshift-online/ocm-api-model/model v0.0.434 h1:XhbQoeOh0BMESvFqXZdc1Nrm5CydyaT/hpuNWxTm1Ys=
504-
github.com/openshift-online/ocm-api-model/model v0.0.434/go.mod h1:PQIoq6P8Vlb7goOdRMLK8nJY+B7HH0RTqYAa4kyidTE=
501+
github.com/openshift-online/ocm-api-model/clientapi v0.0.436 h1:Uz+LG7fZ6d5hab1XSPqCg2JJrxq4fMmpiZYfuaIH9ck=
502+
github.com/openshift-online/ocm-api-model/clientapi v0.0.436/go.mod h1:fZwy5HY2URG9nrExvQeXrDU/08TGqZ16f8oymVEN5lo=
503+
github.com/openshift-online/ocm-api-model/model v0.0.436 h1:8KIJ2GHsFiroPdqvjOnqpwnAzIJUIg2ikYYjCmLCLw4=
504+
github.com/openshift-online/ocm-api-model/model v0.0.436/go.mod h1:PQIoq6P8Vlb7goOdRMLK8nJY+B7HH0RTqYAa4kyidTE=
505505
github.com/openshift-online/ocm-common v0.0.12 h1:2oGZCXd8O/nZVlM0pvTtm3hDGbW/ncTtvSLLB+nuQf0=
506506
github.com/openshift-online/ocm-common v0.0.12/go.mod h1:6MWje2NFNJ3IWpGs7BYj6DWagWXHyp8EnmYY7XFTtI4=
507-
github.com/openshift-online/ocm-sdk-go v0.1.479 h1:Zcvlc9UWx6Opyx2+2TrDpMmKDji7WDCDtWBG4BT8anc=
508-
github.com/openshift-online/ocm-sdk-go v0.1.479/go.mod h1:z7e8pdSD/3xYYwS5imxizLB9z6xVaE5LclGDreLpYls=
507+
github.com/openshift-online/ocm-sdk-go v0.1.481 h1:DGB4i3gXUNQwZlKth0m3N+i2FAM9IxetJ70NJdNvQ8M=
508+
github.com/openshift-online/ocm-sdk-go v0.1.481/go.mod h1:/9HjZnR6/uyRaketBvbe4eyvbgZtrkd7Y4TzaqpZLcY=
509509
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
510510
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
511511
github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=

‎provider/clusterrosa/classic/cluster_rosa_classic_resource.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ func validateHttpTokensVersion(ctx context.Context, state *ClusterRosaClassicSta
778778
msg := fmt.Sprintf("version '%s' is not supported with ec2_metadata_http_tokens, "+
779779
"minimum supported version is %s", version, lowestHttpTokensVer)
780780
tflog.Error(ctx, msg)
781-
return fmt.Errorf(msg)
781+
return fmt.Errorf("version '%s' is not supported with ec2_metadata_http_tokens, minimum supported version is %s", version, lowestHttpTokensVer)
782782
}
783783
return nil
784784
}

‎provider/common/cluster_waiter.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (dw *DefaultClusterWait) WaitForStdComputeNodesToBeReady(ctx context.Contex
3737
if err != nil && resp.Status() == http.StatusNotFound {
3838
message := fmt.Sprintf("Failed to get Cluster '%s', with error: %v", clusterId, err)
3939
tflog.Error(ctx, message)
40-
return nil, fmt.Errorf(message)
40+
return nil, fmt.Errorf("Failed to get Cluster '%s', with error: %v", clusterId, err)
4141
}
4242

4343
tflog.Info(ctx, fmt.Sprintf("WaitForStdComputeNodesToBeReady: Cluster '%s' is expected to initiate with %d worker replicas."+
@@ -85,13 +85,13 @@ func (dw *DefaultClusterWait) WaitForClusterToBeReady(ctx context.Context, clust
8585
if err != nil && resp.Status() == http.StatusNotFound {
8686
message := fmt.Sprintf("Failed to get Cluster '%s', with error: %v", clusterId, err)
8787
tflog.Error(ctx, message)
88-
return nil, fmt.Errorf(message)
88+
return nil, fmt.Errorf("Failed to get Cluster '%s', with error: %w", clusterId, err)
8989
}
9090
currentState := resp.Body().State()
9191
if currentState == cmv1.ClusterStateError || currentState == cmv1.ClusterStateUninstalling {
9292
message := fmt.Sprintf("Cluster '%s' is in state '%s' and will not become ready", clusterId, currentState)
9393
tflog.Error(ctx, message)
94-
return resp.Body(), fmt.Errorf(message)
94+
return resp.Body(), fmt.Errorf("Cluster '%s' is in state '%s' and will not become ready", clusterId, currentState)
9595
}
9696
if currentState == cmv1.ClusterStateReady {
9797
tflog.Info(ctx, fmt.Sprintf("WaitForClusterToBeReady: Cluster '%s' is with state \"READY\"", clusterId))

0 commit comments

Comments
 (0)