diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ac6621f..c907224 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,10 @@ version: 2 updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" - package-ecosystem: "" # See documentation for possible values directory: "/" # Location of package manifests schedule: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3cf58ed..c1bf672 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,10 +7,10 @@ jobs: name: lint runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version-file: "go.mod" - run: make lint diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index bea7923..fe13597 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -7,10 +7,10 @@ jobs: name: unit runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version-file: "go.mod" - run: make test diff --git a/go.mod b/go.mod index 3fd141e..cef11f9 100644 --- a/go.mod +++ b/go.mod @@ -1,28 +1,30 @@ module github.com/operator-framework/java-operator-plugins -go 1.21 +go 1.22.0 + +toolchain go1.22.4 require ( - github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.33.0 + github.com/onsi/ginkgo/v2 v2.17.3 + github.com/onsi/gomega v1.33.1 github.com/sirupsen/logrus v1.9.3 github.com/spf13/afero v1.11.0 github.com/spf13/pflag v1.0.5 - k8s.io/apimachinery v0.29.2 - sigs.k8s.io/kubebuilder/v3 v3.14.2 + k8s.io/apimachinery v0.30.2 + sigs.k8s.io/kubebuilder/v4 v4.0.0 ) require ( - github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gobuffalo/flect v1.0.2 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/nxadm/tail v1.4.8 // indirect + github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.20.0 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + golang.org/x/tools v0.21.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index 9a4d21f..24d98fb 100644 --- a/go.sum +++ b/go.sum @@ -1,45 +1,21 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA= github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb h1:LCMfzVg3sflxTs4UvuP4D8CkoZnfHLe2qzqgDn/4OHs= -github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -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.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/onsi/ginkgo/v2 v2.17.3 h1:oJcvKpIb7/8uLpDDtnQuf18xVnwKp8DTD7DQ6gTd/MU= +github.com/onsi/ginkgo/v2 v2.17.3/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= 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/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= @@ -51,81 +27,37 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= -golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= +golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg= +k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/kubebuilder/v3 v3.14.2 h1:LMZW8Y5eItnP4kh9tpp4Gs2Gd5V3DgLgzbNnXfMAShY= -sigs.k8s.io/kubebuilder/v3 v3.14.2/go.mod h1:gEZM8SUkewOQnpRDiewh4gmbQ1FMkT/CDlMddOg053M= +sigs.k8s.io/kubebuilder/v4 v4.0.0 h1:cEuFbjyyYH3OkF/7ppiBGhzNiItFyqrjhPNU4GT86eo= +sigs.k8s.io/kubebuilder/v4 v4.0.0/go.mod h1:c2I7vEMkI9adjqjOasga3oHIwtBhCTdAw15zSZR/BK8= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/quarkus/v1beta/api.go b/pkg/quarkus/v1beta/api.go index 6aa15c7..40cae70 100644 --- a/pkg/quarkus/v1beta/api.go +++ b/pkg/quarkus/v1beta/api.go @@ -22,17 +22,18 @@ import ( "path/filepath" "strings" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds" log "github.com/sirupsen/logrus" "github.com/spf13/afero" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/util" + + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" + pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" ) const filePath = "Makefile" @@ -152,7 +153,7 @@ func (p *createAPISubcommand) InjectResource(res *resource.Resource) error { } // Selected CRD version must match existing CRD versions. - if pluginutil.HasDifferentCRDVersion(p.config, p.resource.API.CRDVersion) { + if util.HasDifferentCRDVersion(p.config, p.resource.API.CRDVersion) { return fmt.Errorf("only one CRD version can be used for all resources, cannot add %q", p.resource.API.CRDVersion) } @@ -197,7 +198,7 @@ func findOldFilesForReplacement(path, newfile string) bool { } // ReplaceInFile replaces all instances of old with new in the file at path. - err = util.ReplaceInFile(path, catLine, updatedLine) + err = pluginutil.ReplaceInFile(path, catLine, updatedLine) if err != nil { log.Error(err, "Unable to replace existing bundle target command from the Makefile. New bundle target command being created. This may overwrite any existing commands.") return false diff --git a/pkg/quarkus/v1beta/api_test.go b/pkg/quarkus/v1beta/api_test.go index 79ed753..add4ca3 100644 --- a/pkg/quarkus/v1beta/api_test.go +++ b/pkg/quarkus/v1beta/api_test.go @@ -15,12 +15,12 @@ package v1 import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" ) var _ = Describe("v1", func() { diff --git a/pkg/quarkus/v1beta/init.go b/pkg/quarkus/v1beta/init.go index fce19a8..9e53682 100644 --- a/pkg/quarkus/v1beta/init.go +++ b/pkg/quarkus/v1beta/init.go @@ -20,13 +20,14 @@ import ( "path/filepath" "strings" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds" "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/util/validation" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds" + + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) // This file represents the CLI for this plugin. diff --git a/pkg/quarkus/v1beta/init_test.go b/pkg/quarkus/v1beta/init_test.go index 1941040..87e867c 100644 --- a/pkg/quarkus/v1beta/init_test.go +++ b/pkg/quarkus/v1beta/init_test.go @@ -19,12 +19,12 @@ import ( "path/filepath" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) var _ = Describe("v1", func() { diff --git a/pkg/quarkus/v1beta/plugin.go b/pkg/quarkus/v1beta/plugin.go index 7ca70c5..40804b5 100644 --- a/pkg/quarkus/v1beta/plugin.go +++ b/pkg/quarkus/v1beta/plugin.go @@ -15,10 +15,10 @@ package v1 import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" - v3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + v3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) const pluginName = "quarkus.javaoperatorsdk.io" @@ -66,3 +66,10 @@ func (p Plugin) GetCreateAPISubcommand() plugin.CreateAPISubcommand { return &p. // // GetEditSubcommand will return the subcommand which is responsible for editing the scaffold of the project // func (p Plugin) GetEditSubcommand() plugin.EditSubcommand { return &p.editSubcommand } + +func (p Plugin) DeprecationWarning() string { + return "This plugin is deprecated and will be eventually removed." + + " It is recommended that you bootstrap your Quarkus-based operator with" + + " the provided Quarkus tools as described in the bootstraping instructions -" + + " https://github.com/quarkiverse/quarkus-operator-sdk?tab=readme-ov-file#bootstrapping-a-project." +} diff --git a/pkg/quarkus/v1beta/plugin_test.go b/pkg/quarkus/v1beta/plugin_test.go index a2cc909..9cd6047 100644 --- a/pkg/quarkus/v1beta/plugin_test.go +++ b/pkg/quarkus/v1beta/plugin_test.go @@ -15,12 +15,12 @@ package v1 import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - v3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" - "sigs.k8s.io/kubebuilder/v3/pkg/model/stage" - "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + v3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3" + "sigs.k8s.io/kubebuilder/v4/pkg/model/stage" + "sigs.k8s.io/kubebuilder/v4/pkg/plugin" ) var _ = Describe("v1", func() { diff --git a/pkg/quarkus/v1beta/scaffolds/api.go b/pkg/quarkus/v1beta/scaffolds/api.go index fec7eee..97e6b77 100644 --- a/pkg/quarkus/v1beta/scaffolds/api.go +++ b/pkg/quarkus/v1beta/scaffolds/api.go @@ -15,10 +15,10 @@ package scaffolds import ( - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/controller" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/model" diff --git a/pkg/quarkus/v1beta/scaffolds/init.go b/pkg/quarkus/v1beta/scaffolds/init.go index 08ce49a..89db4e1 100644 --- a/pkg/quarkus/v1beta/scaffolds/init.go +++ b/pkg/quarkus/v1beta/scaffolds/init.go @@ -18,12 +18,14 @@ import ( "os" "path/filepath" + "sigs.k8s.io/kubebuilder/v4/pkg/config" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/util" - "sigs.k8s.io/kubebuilder/v3/pkg/config" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + + "sigs.k8s.io/kubebuilder/v4/pkg/plugins" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates" - "sigs.k8s.io/kubebuilder/v3/pkg/plugins" ) const ( diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/applicationproperties.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/applicationproperties.go index 15a3b0a..9b8dd6b 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/applicationproperties.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/applicationproperties.go @@ -17,7 +17,7 @@ package templates import ( "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" ) diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/controller/controller.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/controller/controller.go index 96a1ebb..e6481aa 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/controller/controller.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/controller/controller.go @@ -17,7 +17,7 @@ package controller import ( "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" ) diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/gitignore.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/gitignore.go index f5d0c4d..99ff403 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/gitignore.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/gitignore.go @@ -15,7 +15,7 @@ package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &GitIgnore{} diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/makefile.go index 1770479..d63f911 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/makefile.go @@ -17,7 +17,7 @@ package templates import ( "errors" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &Makefile{} diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/model/model.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/model.go index fcf3679..3f18e9f 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/model/model.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/model.go @@ -17,7 +17,7 @@ package model import ( "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" ) diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelspec.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelspec.go index fd6d82f..9447988 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelspec.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelspec.go @@ -17,7 +17,7 @@ package model import ( "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" ) diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelstatus.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelstatus.go index 9fb5b80..277a775 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelstatus.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelstatus.go @@ -17,8 +17,9 @@ package model import ( "fmt" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) var _ machinery.Template = &ModelStatus{} diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile.go index 1c5f028..9b6d552 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile.go @@ -18,8 +18,9 @@ import ( "fmt" "strings" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) var _ machinery.Template = &OperatorFile{} diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile_test.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile_test.go index c0600bc..52edb35 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile_test.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile_test.go @@ -17,7 +17,7 @@ package templates import ( "bytes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "text/template" diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/pomxml.go index cf2a482..3d9dc38 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/pomxml.go @@ -15,7 +15,7 @@ package templates import ( - "sigs.k8s.io/kubebuilder/v3/pkg/machinery" + "sigs.k8s.io/kubebuilder/v4/pkg/machinery" ) var _ machinery.Template = &PomXmlFile{} @@ -57,8 +57,8 @@ const pomxmlTemplate = ` 17 UTF-8 UTF-8 - 6.7.1 - 3.11.0 + 6.7.3 + 3.13.2 diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/templates_suite_test.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/templates_suite_test.go index 5c07c51..fee2637 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/templates_suite_test.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/templates_suite_test.go @@ -17,7 +17,7 @@ package templates import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/util/file_test.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/util/file_test.go index cef4918..807b210 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/util/file_test.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/util/file_test.go @@ -15,7 +15,7 @@ package util import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/quarkus/v1beta/scaffolds/internal/templates/util/util_suite_test.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/util/util_suite_test.go index 14c32d9..d1e17c2 100644 --- a/pkg/quarkus/v1beta/scaffolds/internal/templates/util/util_suite_test.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/util/util_suite_test.go @@ -17,7 +17,7 @@ package util import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/quarkus/v1beta/util/helpers.go b/pkg/quarkus/v1beta/util/helpers.go new file mode 100644 index 0000000..fe861f5 --- /dev/null +++ b/pkg/quarkus/v1beta/util/helpers.go @@ -0,0 +1,28 @@ +// Copyright 2024 The Operator-SDK Authors +// +// Licensed 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. + +package util + +import ( + "sigs.k8s.io/kubebuilder/v4/pkg/config" +) + +// HasDifferentCRDVersion returns true if any other CRD version is tracked in the project configuration. +func HasDifferentCRDVersion(config config.Config, crdVersion string) bool { + return hasDifferentAPIVersion(config.ListCRDVersions(), crdVersion) +} + +func hasDifferentAPIVersion(versions []string, version string) bool { + return !(len(versions) == 0 || (len(versions) == 1 && versions[0] == version)) +} diff --git a/pkg/quarkus/v1beta/util/helpers_test.go b/pkg/quarkus/v1beta/util/helpers_test.go new file mode 100644 index 0000000..474b062 --- /dev/null +++ b/pkg/quarkus/v1beta/util/helpers_test.go @@ -0,0 +1,35 @@ +// Copyright 2024 The Operator-SDK Authors +// +// Licensed 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. + +package util + +import ( + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("hasDifferentAPIVersion", func() { + DescribeTable("should return false", + func(versions []string) { Expect(hasDifferentAPIVersion(versions, "v1")).To(BeFalse()) }, + Entry("for an empty list of versions", []string{}), + Entry("for a list of only that version", []string{"v1"}), + ) + + DescribeTable("should return true", + func(versions []string) { Expect(hasDifferentAPIVersion(versions, "v1")).To(BeTrue()) }, + Entry("for a list of only a different version", []string{"v2"}), + Entry("for a list of several different versions", []string{"v2", "v3"}), + Entry("for a list of several versions containing that version", []string{"v1", "v2"}), + ) +}) diff --git a/pkg/quarkus/v1beta/util/util_suite_test.go b/pkg/quarkus/v1beta/util/util_suite_test.go index 7e4f747..0cc4cd9 100644 --- a/pkg/quarkus/v1beta/util/util_suite_test.go +++ b/pkg/quarkus/v1beta/util/util_suite_test.go @@ -17,7 +17,7 @@ package util import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/quarkus/v1beta/util/util_test.go b/pkg/quarkus/v1beta/util/util_test.go index ffda3b5..d698a29 100644 --- a/pkg/quarkus/v1beta/util/util_test.go +++ b/pkg/quarkus/v1beta/util/util_test.go @@ -15,7 +15,7 @@ package util import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/quarkus/v1beta/v1_suite_test.go b/pkg/quarkus/v1beta/v1_suite_test.go index dd29ac3..c2332c4 100644 --- a/pkg/quarkus/v1beta/v1_suite_test.go +++ b/pkg/quarkus/v1beta/v1_suite_test.go @@ -17,7 +17,7 @@ package v1 import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/testdata/quarkus/memcached-quarkus-operator/pom.xml b/testdata/quarkus/memcached-quarkus-operator/pom.xml index 6c375fa..f7409b7 100644 --- a/testdata/quarkus/memcached-quarkus-operator/pom.xml +++ b/testdata/quarkus/memcached-quarkus-operator/pom.xml @@ -15,8 +15,8 @@ 11 UTF-8 UTF-8 - 6.7.1 - 3.11.0 + 6.7.3 + 3.13.2