fix: using new timeout option of bingo to make sure the build won't fail during the hot days

Author: Nikokolas3270

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.19 as builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.20 as builder
 
 WORKDIR /work
 
@@ -23,4 +23,4 @@ COPY --from=builder /work/bin/obsctl-reloader-rules-checker /usr/bin/
 
 WORKDIR /work
 COPY .yamllint /
-ENTRYPOINT ["/usr/bin/obsctl-reloader-rules-checker"]
+ENTRYPOINT ["/usr/bin/obsctl-reloader-rules-checker"]

README.md

@@ -120,7 +120,7 @@ Once again, the `-h` / `--help` flag is pretty explicit about those checks. Here
 - You have to checkout the code.
 - The following tools must be present on your computer:
   - `make`
-  - `go` (version 1.19 or later)
+  - `go` (version 1.20 or later)
 
 To build the binary you just have to run:
 ```
@@ -155,7 +155,7 @@ Local development is not just about building the code. It is also about making s
 - You have to checkout the code.
 - The following tools must be present on your computer:
   - `make`
-  - `go` (version 1.19 or later)
+  - `go` (version 1.20 or later)
   - a container engine: either `docker` or `podman`
   - [`yamllint`](https://github.com/adrienverge/yamllint) (eventually run `make yamllint-tool` to install the tool)
   - [`golangci-lint`](https://golangci-lint.run/usage/install/)

go.mod

@@ -1,6 +1,6 @@
 module github.com/observatorium/obsctl-reloader-rules-checker
 
-go 1.19
+go 1.20
 
 require (
 	github.com/go-git/go-git/v5 v5.7.0

hack/install-go-tools.sh

@@ -11,9 +11,6 @@ cd "$(dirname $BASH_SOURCE)/.."
 
 go install -mod=readonly github.com/bwplotka/bingo@latest
 
-# The following PR has been merged in bingo:
-# https://github.com/bwplotka/bingo/pull/142
-# Once the new bingo version is released, make sure to append '-t 0' in below commands
 unset GOFLAGS
-bingo get -v -l github.com/prometheus/prometheus/cmd/promtool@v0.46.0
-bingo get -v -l github.com/cloudflare/pint/cmd/pint@v0.44.1
+bingo get -v -l -t 0 github.com/prometheus/prometheus/cmd/promtool@v0.46.0
+bingo get -v -l -t 0 github.com/cloudflare/pint/cmd/pint@v0.44.1

main.go

@@ -525,7 +525,10 @@ func runTests(testsDirPath, rulesDirPath string) {
 				return fmt.Errorf("unable to create a temporary directory: %w", err)
 			}
 
-			defer os.RemoveAll(tempDirPath)
+			//defer os.RemoveAll(tempDirPath)
+			log.Println(tempDirPath)
+
+			var allRulesObj ruleGroupsObj
 
 			for _, ruleFileRelPath := range testObj.RuleFiles {
 				if !isNamedAsARuleFile(ruleFileRelPath) {
@@ -544,20 +547,24 @@ func runTests(testsDirPath, rulesDirPath string) {
 					return fmt.Errorf("unexpected error: %w", err)
 				}
 
-				ruleFileTempPath := filepath.Join(tempDirPath, ruleFileRelPath)
+				var ruleGroupsObj ruleGroupsObj
 
-				if err := os.MkdirAll(filepath.Dir(ruleFileTempPath), 0700); err != nil {
+				if err := ruleObj.Spec.Decode(&ruleGroupsObj); err != nil {
 					return fmt.Errorf("unexpected error: %w", err)
 				}
 
-				if err := storeAsYaml(&ruleObj.Spec, ruleFileTempPath); err != nil {
-					return fmt.Errorf("unexpected error: %w", err)
-				}
+				allRulesObj.Groups = append(allRulesObj.Groups, ruleGroupsObj.Groups...)
 			}
 
+			if err := storeAsYaml(&allRulesObj, filepath.Join(tempDirPath, "rules.yaml")); err != nil {
+				return fmt.Errorf("unexpected error: %w", err)
+			}
+
+			testObj.RuleFiles = []string{"rules.yaml"}
+
 			testTempPath := filepath.Join(tempDirPath, filepath.Base(testPath))
 
-			if err := os.WriteFile(testTempPath, testContent, 0600); err != nil {
+			if err := storeAsYaml(&testObj, testTempPath); err != nil {
 				return fmt.Errorf("unexpected error: %w", err)
 			}