Skip to content

OCM-12652 | build: bump golang version to 1.24 and ocm-sdk-go@v0.1.481 #1002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BraeTroutman wants to merge 1 commit into from
+21 −17
Closed

OCM-12652 | build: bump golang version to 1.24 and ocm-sdk-go@v0.1.481 #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.24-openshift-4.21
4 changes: 2 additions & 2 deletions build/ci-tf-e2e.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN yum install -y wget &&\
chmod +x /usr/local/bin/ocm

# go
RUN curl -Ls https://go.dev/dl/go1.23.9.linux-amd64.tar.gz |tar -C /usr/local -xzf -
RUN curl -Ls https://go.dev/dl/go1.24.9.linux-amd64.tar.gz |tar -C /usr/local -xzf -
ENV PATH="/usr/local/go/bin:${PATH}"
ENV GOPATH=/usr/local/go
ENV TEST_OFFLINE_TOKEN=""
Expand All @@ -27,4 +27,4 @@ RUN yum install -y yum-utils && \
go install go.uber.org/mock/mockgen@v0.3.0 &&\
cd terraform-provider-rhcs && go mod tidy && go mod vendor && make install &&\
chmod -R 777 $GOPATH &&\
echo 'RUN done'
echo 'RUN done'
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/terraform-redhat/terraform-provider-rhcs

go 1.23.0
go 1.24.0

toolchain go1.23.9
toolchain go1.24.9

require (
github.com/Masterminds/semver v1.5.0
Expand All @@ -17,9 +17,8 @@ require (
github.com/hashicorp/terraform-plugin-sdk v1.17.2
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.30.0
github.com/openshift-online/ocm-api-model/clientapi v0.0.434
github.com/openshift-online/ocm-common v0.0.12
github.com/openshift-online/ocm-sdk-go v0.1.479
github.com/openshift-online/ocm-sdk-go v0.1.481
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
github.com/thoas/go-funk v0.9.3
Expand Down Expand Up @@ -60,7 +59,8 @@ require (
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/openshift-online/ocm-api-model/model v0.0.434 // indirect
github.com/openshift-online/ocm-api-model/clientapi v0.0.436 // indirect
github.com/openshift-online/ocm-api-model/model v0.0.436 // indirect
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
golang.org/x/net v0.43.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,14 +498,14 @@ github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8
github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
github.com/openshift-online/ocm-api-model/clientapi v0.0.434 h1:ZpTM+gxzOFpSuV8OSYJvlXWocuchgRs301kfxU52dXA=
github.com/openshift-online/ocm-api-model/clientapi v0.0.434/go.mod h1:fZwy5HY2URG9nrExvQeXrDU/08TGqZ16f8oymVEN5lo=
github.com/openshift-online/ocm-api-model/model v0.0.434 h1:XhbQoeOh0BMESvFqXZdc1Nrm5CydyaT/hpuNWxTm1Ys=
github.com/openshift-online/ocm-api-model/model v0.0.434/go.mod h1:PQIoq6P8Vlb7goOdRMLK8nJY+B7HH0RTqYAa4kyidTE=
github.com/openshift-online/ocm-api-model/clientapi v0.0.436 h1:Uz+LG7fZ6d5hab1XSPqCg2JJrxq4fMmpiZYfuaIH9ck=
github.com/openshift-online/ocm-api-model/clientapi v0.0.436/go.mod h1:fZwy5HY2URG9nrExvQeXrDU/08TGqZ16f8oymVEN5lo=
github.com/openshift-online/ocm-api-model/model v0.0.436 h1:8KIJ2GHsFiroPdqvjOnqpwnAzIJUIg2ikYYjCmLCLw4=
github.com/openshift-online/ocm-api-model/model v0.0.436/go.mod h1:PQIoq6P8Vlb7goOdRMLK8nJY+B7HH0RTqYAa4kyidTE=
github.com/openshift-online/ocm-common v0.0.12 h1:2oGZCXd8O/nZVlM0pvTtm3hDGbW/ncTtvSLLB+nuQf0=
github.com/openshift-online/ocm-common v0.0.12/go.mod h1:6MWje2NFNJ3IWpGs7BYj6DWagWXHyp8EnmYY7XFTtI4=
github.com/openshift-online/ocm-sdk-go v0.1.479 h1:Zcvlc9UWx6Opyx2+2TrDpMmKDji7WDCDtWBG4BT8anc=
github.com/openshift-online/ocm-sdk-go v0.1.479/go.mod h1:z7e8pdSD/3xYYwS5imxizLB9z6xVaE5LclGDreLpYls=
github.com/openshift-online/ocm-sdk-go v0.1.481 h1:DGB4i3gXUNQwZlKth0m3N+i2FAM9IxetJ70NJdNvQ8M=
github.com/openshift-online/ocm-sdk-go v0.1.481/go.mod h1:/9HjZnR6/uyRaketBvbe4eyvbgZtrkd7Y4TzaqpZLcY=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
Expand Down
2 changes: 1 addition & 1 deletion provider/clusterrosa/classic/cluster_rosa_classic_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ func validateHttpTokensVersion(ctx context.Context, state *ClusterRosaClassicSta
msg := fmt.Sprintf("version '%s' is not supported with ec2_metadata_http_tokens, "+
"minimum supported version is %s", version, lowestHttpTokensVer)
tflog.Error(ctx, msg)
return fmt.Errorf(msg)
return fmt.Errorf("version '%s' is not supported with ec2_metadata_http_tokens, minimum supported version is %s", version, lowestHttpTokensVer)
}
return nil
}
Expand Down
6 changes: 3 additions & 3 deletions provider/common/cluster_waiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (dw *DefaultClusterWait) WaitForStdComputeNodesToBeReady(ctx context.Contex
if err != nil && resp.Status() == http.StatusNotFound {
message := fmt.Sprintf("Failed to get Cluster '%s', with error: %v", clusterId, err)
tflog.Error(ctx, message)
return nil, fmt.Errorf(message)
return nil, fmt.Errorf("Failed to get Cluster '%s', with error: %v", clusterId, err)
}

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