From a3bc4960ce2417c3ae9be5f9528219c6dfa67666 Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Mon, 27 May 2024 15:02:49 +0300 Subject: [PATCH 1/5] Copy jvm*-client.options from Cassandra base configs and logback files (cherry picked from commit 6eb4299b95d5b35501ef9ad93e0edf6f7a60c1a5) --- go.mod | 26 +++++++++++----------- go.sum | 40 ++++++++++++++++++---------------- pkg/config/builder.go | 44 ++++++++++++++++++++++++++++++++++++++ pkg/config/builder_test.go | 14 ++++++++++++ 4 files changed, 92 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index d13c5fb..99f23fd 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/k8ssandra/k8ssandra-client -go 1.21 +go 1.22 require ( github.com/adutra/goalesce v0.0.0-20221124153206-5643f911003d @@ -10,21 +10,23 @@ require ( github.com/charmbracelet/lipgloss v0.10.0 github.com/charmbracelet/log v0.4.0 github.com/google/uuid v1.3.0 - github.com/k8ssandra/cass-operator v1.19.1-0.20240307065059-c273e274310b - github.com/k8ssandra/k8ssandra-operator v1.9.2 + github.com/k8ssandra/cass-operator v1.20.0 + github.com/k8ssandra/k8ssandra-operator v1.16.1-0.20240524164338-5e45f078d7f3 github.com/pkg/errors v0.9.1 + github.com/prometheus/client_golang v1.18.0 + github.com/prometheus/common v0.45.0 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.14.2 - k8s.io/api v0.29.0 - k8s.io/apiextensions-apiserver v0.29.0 - k8s.io/apimachinery v0.29.0 + k8s.io/api v0.29.2 + k8s.io/apiextensions-apiserver v0.29.2 + k8s.io/apimachinery v0.29.2 k8s.io/cli-runtime v0.29.0 - k8s.io/client-go v0.29.0 + k8s.io/client-go v0.29.2 k8s.io/kubectl v0.29.0 - sigs.k8s.io/controller-runtime v0.17.2 + sigs.k8s.io/controller-runtime v0.17.5 ) require ( @@ -126,9 +128,7 @@ require ( github.com/opencontainers/image-spec v1.1.0-rc5 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/rubenv/sql-migrate v1.5.2 // indirect @@ -162,8 +162,8 @@ require ( google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apiserver v0.29.0 // indirect - k8s.io/component-base v0.29.0 // indirect + k8s.io/apiserver v0.29.2 // indirect + k8s.io/component-base v0.29.2 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect @@ -174,5 +174,3 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) - -replace github.com/k8ssandra/k8ssandra-operator => github.com/burmanm/k8ssandra-operator v0.0.0-20231023115030-770374922376 diff --git a/go.sum b/go.sum index 92d732e..71d1e98 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,6 @@ github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXe github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/burmanm/definitions-parser v0.0.0-20230720114634-62c738b72e61 h1:JgGOw1bU6nCB3wlORn+1stQOGXlyig2djSvCk5rjoNg= github.com/burmanm/definitions-parser v0.0.0-20230720114634-62c738b72e61/go.mod h1:pJnSicezmEGVRxj0BdymVxthDZK6TGMrNFjbwSbrFJQ= -github.com/burmanm/k8ssandra-operator v0.0.0-20231023115030-770374922376 h1:3bmvKOn38B+bPSwi5fqTAiR7ond2fLA9RKbzdEYy34I= -github.com/burmanm/k8ssandra-operator v0.0.0-20231023115030-770374922376/go.mod h1:ZA21yjlF7cF8WNcUOwp07XWrloDWwQfvk2uYjLntEMI= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -246,13 +244,17 @@ github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/k8ssandra/cass-operator v1.19.1-0.20240307065059-c273e274310b h1:hE0/0RZk3fRODovmRsHQKP78TIYYkePShXJXSauzXck= -github.com/k8ssandra/cass-operator v1.19.1-0.20240307065059-c273e274310b/go.mod h1:zXhK7q5+ymAYCuOvhwpLyNnjJAnQDGqwFc/j8nQQN6M= +github.com/k8ssandra/cass-operator v1.20.0 h1:gbLAJL7bF0+PCwjeFULpBnqbXAxYfs5wOIKKaKARC+s= +github.com/k8ssandra/cass-operator v1.20.0/go.mod h1:zXhK7q5+ymAYCuOvhwpLyNnjJAnQDGqwFc/j8nQQN6M= +github.com/k8ssandra/k8ssandra-operator v1.16.1-0.20240524164338-5e45f078d7f3 h1:dd84RK9QVqPqnbcJ3VLIQH695UDoB+BikKCRTMlfqHg= +github.com/k8ssandra/k8ssandra-operator v1.16.1-0.20240524164338-5e45f078d7f3/go.mod h1:X8HrVfDKfHy/FK3TpJWa7lwuFz4mZe5VqvIZDb0Gkyg= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -346,6 +348,8 @@ github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1n github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY= @@ -610,20 +614,20 @@ helm.sh/helm/v3 v3.14.2 h1:V71fv+NGZv0icBlr+in1MJXuUIHCiPG1hW9gEBISTIA= helm.sh/helm/v3 v3.14.2/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= -k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= -k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= -k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc= -k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= -k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= -k8s.io/apiserver v0.29.0 h1:Y1xEMjJkP+BIi0GSEv1BBrf1jLU9UPfAnnGGbbDdp7o= -k8s.io/apiserver v0.29.0/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM= +k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= +k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/apiextensions-apiserver v0.29.2 h1:UK3xB5lOWSnhaCk0RFZ0LUacPZz9RY4wi/yt2Iu+btg= +k8s.io/apiextensions-apiserver v0.29.2/go.mod h1:aLfYjpA5p3OwtqNXQFkhJ56TB+spV8Gc4wfMhUA3/b8= +k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= +k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apiserver v0.29.2 h1:+Z9S0dSNr+CjnVXQePG8TcBWHr3Q7BmAr7NraHvsMiQ= +k8s.io/apiserver v0.29.2/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ= k8s.io/cli-runtime v0.29.0 h1:q2kC3cex4rOBLfPOnMSzV2BIrrQlx97gxHJs21KxKS4= k8s.io/cli-runtime v0.29.0/go.mod h1:VKudXp3X7wR45L+nER85YUzOQIru28HQpXr0mTdeCrk= -k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= -k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= -k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s= -k8s.io/component-base v0.29.0/go.mod h1:sADonFTQ9Zc9yFLghpDpmNXEdHyQmFIGbiuZbqAXQ1M= +k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= +k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8= +k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= @@ -634,8 +638,8 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY= oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324= -sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0= -sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s= +sigs.k8s.io/controller-runtime v0.17.5 h1:1FI9Lm7NiOOmBsgTV36/s2XrEFXnO2C4sbg/Zme72Rw= +sigs.k8s.io/controller-runtime v0.17.5/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0= diff --git a/pkg/config/builder.go b/pkg/config/builder.go index e3c3228..83bba8a 100644 --- a/pkg/config/builder.go +++ b/pkg/config/builder.go @@ -5,6 +5,7 @@ import ( "context" "encoding/json" "fmt" + "io" "net" "os" "path/filepath" @@ -16,6 +17,7 @@ import ( "github.com/adutra/goalesce" metadata "github.com/burmanm/definitions-parser/pkg/types" gentypes "github.com/burmanm/definitions-parser/pkg/types/generated" + "github.com/pkg/errors" "gopkg.in/yaml.v3" ) @@ -85,6 +87,11 @@ func (b *Builder) Build(ctx context.Context) error { return err } + // Copy files which we're not modifying + if err := copyFiles(b.configInputDir, b.configOutputDir); err != nil { + return err + } + return nil } @@ -484,3 +491,40 @@ func writeYaml(doc map[string]interface{}, targetFile string) error { return os.WriteFile(targetFile, b, 0660) } + +func copyFiles(sourceDir, targetDir string) error { + // Copy the files we're not modifying + files := []string{"jvm-client.options", "jvm11-client.options", "jvm17-client.options", "logback.xml", "logback-tools.xml"} + + for _, f := range files { + sourceFile := filepath.Join(sourceDir, f) + targetFile := filepath.Join(targetDir, f) + + if _, err := os.Stat(sourceFile); err == nil { + if err := copyFile(sourceFile, targetFile); err != nil { + return err + } + } else if !os.IsNotExist(err) { + return err + } + } + + return nil +} + +func copyFile(source, target string) error { + src, err := os.Open(source) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("failed to open %s", source)) + } + defer src.Close() + + dst, err := os.Create(target) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("failed to open %s", target)) + } + defer dst.Close() + + _, err = io.Copy(dst, src) + return err +} diff --git a/pkg/config/builder_test.go b/pkg/config/builder_test.go index ee51466..885faa9 100644 --- a/pkg/config/builder_test.go +++ b/pkg/config/builder_test.go @@ -427,3 +427,17 @@ func readFileToLines(dir, filename string) ([]string, error) { return lines, nil } + +func TestCopyFiles(t *testing.T) { + require := require.New(t) + inputDir := filepath.Join(envtest.RootDir(), "testfiles") + tempDir, err := os.MkdirTemp("", "client-test") + require.NoError(err) + defer os.RemoveAll(tempDir) + + require.NoError(copyFiles(inputDir, tempDir)) + + // We should have tempDir/jvm11-client.options + _, err = os.Stat(filepath.Join(tempDir, "jvm11-client.options")) + require.NoError(err) +} From 7e9432bd4e726a376934f383f48098dadd4d919b Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Mon, 27 May 2024 15:10:37 +0300 Subject: [PATCH 2/5] Add missing testfile --- testfiles/jvm11-client.options | 47 ++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 testfiles/jvm11-client.options diff --git a/testfiles/jvm11-client.options b/testfiles/jvm11-client.options new file mode 100644 index 0000000..aeca2c3 --- /dev/null +++ b/testfiles/jvm11-client.options @@ -0,0 +1,47 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +########################################################################### +# jvm11-clients.options # +# # +# See jvm-clients.options. This file is specific for Java 11 and newer. # +########################################################################### + +################### +# JPMS SETTINGS # +################### + +-Djdk.attach.allowAttachSelf=true +--add-exports java.base/jdk.internal.misc=ALL-UNNAMED +--add-exports java.base/jdk.internal.ref=ALL-UNNAMED +--add-exports java.base/sun.nio.ch=ALL-UNNAMED +--add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED +--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED +--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED +--add-exports java.sql/java.sql=ALL-UNNAMED + +--add-opens java.base/java.lang.module=ALL-UNNAMED +--add-opens java.base/jdk.internal.loader=ALL-UNNAMED +--add-opens java.base/jdk.internal.ref=ALL-UNNAMED +--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED +--add-opens java.base/jdk.internal.math=ALL-UNNAMED +--add-opens java.base/jdk.internal.module=ALL-UNNAMED +--add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED +--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED + +# The newline in the end of file is intentional From 43b08b6e15a23a1bcc37aa26df20a1cc4942bf94 Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Tue, 28 May 2024 15:05:33 +0300 Subject: [PATCH 3/5] Fix Dockerfile --- cmd/kubectl-k8ssandra/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubectl-k8ssandra/Dockerfile b/cmd/kubectl-k8ssandra/Dockerfile index 94210ae..ce64f18 100644 --- a/cmd/kubectl-k8ssandra/Dockerfile +++ b/cmd/kubectl-k8ssandra/Dockerfile @@ -1,5 +1,5 @@ # Build the binary -FROM golang:1.21 as builder +FROM golang:1.22 as builder ARG TARGETOS ARG TARGETARCH From 787eccc9f5e393397eb776887899f6ffbd160be9 Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Tue, 28 May 2024 16:27:58 +0300 Subject: [PATCH 4/5] Fix typo --- pkg/config/builder.go | 2 +- testfiles/{jvm11-client.options => jvm11-clients.options} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename testfiles/{jvm11-client.options => jvm11-clients.options} (100%) diff --git a/pkg/config/builder.go b/pkg/config/builder.go index 83bba8a..b1cdb45 100644 --- a/pkg/config/builder.go +++ b/pkg/config/builder.go @@ -494,7 +494,7 @@ func writeYaml(doc map[string]interface{}, targetFile string) error { func copyFiles(sourceDir, targetDir string) error { // Copy the files we're not modifying - files := []string{"jvm-client.options", "jvm11-client.options", "jvm17-client.options", "logback.xml", "logback-tools.xml"} + files := []string{"jvm-clients.options", "jvm11-clients.options", "jvm17-clients.options", "logback.xml", "logback-tools.xml"} for _, f := range files { sourceFile := filepath.Join(sourceDir, f) diff --git a/testfiles/jvm11-client.options b/testfiles/jvm11-clients.options similarity index 100% rename from testfiles/jvm11-client.options rename to testfiles/jvm11-clients.options From a8c496b4e45561057c3a15bbadce83c5979ec374 Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Tue, 28 May 2024 16:28:27 +0300 Subject: [PATCH 5/5] Fix the test also --- pkg/config/builder_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/config/builder_test.go b/pkg/config/builder_test.go index 885faa9..f2ed29f 100644 --- a/pkg/config/builder_test.go +++ b/pkg/config/builder_test.go @@ -437,7 +437,7 @@ func TestCopyFiles(t *testing.T) { require.NoError(copyFiles(inputDir, tempDir)) - // We should have tempDir/jvm11-client.options - _, err = os.Stat(filepath.Join(tempDir, "jvm11-client.options")) + // We should have tempDir/jvm11-clients.options + _, err = os.Stat(filepath.Join(tempDir, "jvm11-clients.options")) require.NoError(err) }