From 110f301661380e2dd49d0e3abce862c6c8c12b7f Mon Sep 17 00:00:00 2001 From: Alex Creasy Date: Thu, 22 Aug 2024 12:06:57 +0100 Subject: [PATCH 1/9] Add alexcreasy to owners of ui (#291) Signed-off-by: Alex Creasy --- clients/ui/OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/ui/OWNERS b/clients/ui/OWNERS index ee84ce39..9387a201 100644 --- a/clients/ui/OWNERS +++ b/clients/ui/OWNERS @@ -1,2 +1,3 @@ approvers: - ederign + - alexcreasy From 5db3e4efbd2fc0f2d96adadaf2cdc63bae192822 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:37:57 +0000 Subject: [PATCH 2/9] build(deps): bump k8s.io/client-go from 0.30.3 to 0.31.0 in /clients/ui/bff (#275) Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.30.3 to 0.31.0. - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.30.3...v0.31.0) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- clients/ui/bff/go.mod | 29 +++++++++------- clients/ui/bff/go.sum | 79 +++++++++++++++++++++++-------------------- 2 files changed, 58 insertions(+), 50 deletions(-) diff --git a/clients/ui/bff/go.mod b/clients/ui/bff/go.mod index 877b8afa..216d1acd 100644 --- a/clients/ui/bff/go.mod +++ b/clients/ui/bff/go.mod @@ -7,21 +7,23 @@ require ( github.com/julienschmidt/httprouter v1.3.0 github.com/kubeflow/model-registry v0.2.4-alpha github.com/stretchr/testify v1.9.0 - k8s.io/api v0.30.3 - k8s.io/apimachinery v0.30.3 - k8s.io/client-go v0.30.3 + k8s.io/api v0.31.0 + k8s.io/apimachinery v0.31.0 + k8s.io/client-go v0.31.0 ) require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.3 // indirect + github.com/go-openapi/swag v0.22.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/imdario/mergo v0.3.6 // indirect @@ -34,20 +36,21 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.2 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/oauth2 v0.20.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/term v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + github.com/x448/float16 v0.8.4 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/term v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.120.1 // indirect + k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/clients/ui/bff/go.sum b/clients/ui/bff/go.sum index 921c676b..ab9f2619 100644 --- a/clients/ui/bff/go.sum +++ b/clients/ui/bff/go.sum @@ -7,16 +7,19 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -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-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= +github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -29,8 +32,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= @@ -61,15 +64,15 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= 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/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= -github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= -github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE= -github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -83,6 +86,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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= @@ -94,32 +99,32 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -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/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= -golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= +golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -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/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= 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.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= 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-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= -golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= 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= @@ -137,21 +142,21 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= 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/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ= -k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04= -k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= -k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= -k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= -k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= -k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= +k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= +k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= +k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= +k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= 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/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= From 837e254404a841ae3f223c22e3dbe5604d6901f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:53:57 +0000 Subject: [PATCH 3/9] build(deps-dev): bump @cypress/code-coverage from 3.12.44 to 3.12.45 in /clients/ui/frontend (#281) Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.44 to 3.12.45. - [Release notes](https://github.com/cypress-io/code-coverage/releases) - [Changelog](https://github.com/cypress-io/code-coverage/blob/master/.releaserc) - [Commits](https://github.com/cypress-io/code-coverage/compare/v3.12.44...v3.12.45) --- updated-dependencies: - dependency-name: "@cypress/code-coverage" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- clients/ui/frontend/package-lock.json | 16 ++++++++-------- clients/ui/frontend/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/clients/ui/frontend/package-lock.json b/clients/ui/frontend/package-lock.json index 4da51909..50635158 100644 --- a/clients/ui/frontend/package-lock.json +++ b/clients/ui/frontend/package-lock.json @@ -17,7 +17,7 @@ "react-dom": "^18" }, "devDependencies": { - "@cypress/code-coverage": "^3.12.34", + "@cypress/code-coverage": "^3.12.45", "@testing-library/cypress": "^10.0.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^14.0.0", @@ -1953,15 +1953,15 @@ } }, "node_modules/@cypress/code-coverage": { - "version": "3.12.44", - "resolved": "https://registry.npmjs.org/@cypress/code-coverage/-/code-coverage-3.12.44.tgz", - "integrity": "sha512-5Eau3tnJqZJo1OddOOEMyWs1HCwlAOgDs1rFPaCXJ4a5Y2BR4PH4fAzCdMvIqpBnCiVSL8gOYv6JfND3aUuJJQ==", + "version": "3.12.45", + "resolved": "https://registry.npmjs.org/@cypress/code-coverage/-/code-coverage-3.12.45.tgz", + "integrity": "sha512-QRvdc9Zmner/CxQ1F5jcNVZR8P8VrRTyE8THcisxnB6D3AMIKKSmjYUGH6OnWBDF/vi3CqimuMSbrUfzmPzmhw==", "dev": true, "dependencies": { "@cypress/webpack-preprocessor": "^6.0.0", "chalk": "4.1.2", "dayjs": "1.11.12", - "debug": "4.3.5", + "debug": "4.3.6", "execa": "4.1.0", "globby": "11.1.0", "istanbul-lib-coverage": "^3.0.0", @@ -7742,9 +7742,9 @@ "dev": true }, "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "dependencies": { "ms": "2.1.2" diff --git a/clients/ui/frontend/package.json b/clients/ui/frontend/package.json index c45fcbac..c3de1287 100644 --- a/clients/ui/frontend/package.json +++ b/clients/ui/frontend/package.json @@ -29,7 +29,7 @@ "cypress:server": "serve ./dist -p 9001 -s -L" }, "devDependencies": { - "@cypress/code-coverage": "^3.12.34", + "@cypress/code-coverage": "^3.12.45", "@testing-library/cypress": "^10.0.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^14.0.0", From 37be89ddd1adb0829e227ad6d6ef8b035f2fac31 Mon Sep 17 00:00:00 2001 From: Isabella Basso Date: Thu, 22 Aug 2024 10:56:58 -0300 Subject: [PATCH 4/9] csi: drop go from bin (#292) Signed-off-by: Isabella do Amaral --- csi/Makefile | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/csi/Makefile b/csi/Makefile index d40da2c4..c614901f 100644 --- a/csi/Makefile +++ b/csi/Makefile @@ -2,7 +2,7 @@ MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH))) PROJECT_BIN := $(PROJECT_PATH)/bin -GO := $(PROJECT_BIN)/go1.21.9 +GO ?= "$(shell which go)" # add tools bin directory PATH := $(PROJECT_BIN):$(PATH) @@ -32,33 +32,26 @@ help: ## Display this help. ##@ Development -bin-go: ## Install go tool - GOBIN=$(PROJECT_BIN) go install golang.org/dl/go1.21.9@latest - $(PROJECT_BIN)/go1.21.9 download - -.PHONY: bin -bin: bin-go ## Install required dependencies - .PHONY: tidy tidy: ## Run go mod tidy. ${GO} mod tidy .PHONY: fmt -fmt: bin ## Run go fmt against code. +fmt: ## Run go fmt against code. ${GO} fmt ./... .PHONY: vet -vet: bin ## Run go vet against code. +vet: ## Run go vet against code. ${GO} vet ./... .PHONY: test -test: fmt vet bin ## Run tests. +test: fmt vet ## Run tests. ${GO} test ./... -coverprofile cover.out ##@ Build .PHONY: build -build: fmt vet bin ## Build binary. +build: fmt vet ## Build binary. ${GO} build -o bin/mr-storage-initializer main.go .PHONY: run @@ -75,4 +68,4 @@ docker-build-dev: ## Build container image using local model-registry module. .PHONY: docker-push docker-push: ## Push container image. - ${DOCKER} push ${IMG}:$(IMG_VERSION) \ No newline at end of file + ${DOCKER} push ${IMG}:$(IMG_VERSION) From 4f49d043b1decf9fc8d9ab0ac0b2ef24c5b0e3e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:11:57 +0000 Subject: [PATCH 5/9] build(deps-dev): bump eslint-plugin-react from 7.34.2 to 7.35.0 in /clients/ui/frontend (#280) Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.34.2 to 7.35.0. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.34.2...v7.35.0) --- updated-dependencies: - dependency-name: eslint-plugin-react dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- clients/ui/frontend/package-lock.json | 57 +++++++++------------------ clients/ui/frontend/package.json | 2 +- 2 files changed, 20 insertions(+), 39 deletions(-) diff --git a/clients/ui/frontend/package-lock.json b/clients/ui/frontend/package-lock.json index 50635158..e1b267bc 100644 --- a/clients/ui/frontend/package-lock.json +++ b/clients/ui/frontend/package-lock.json @@ -39,7 +39,7 @@ "dotenv-webpack": "^8.1.0", "eslint": "^8.57.0", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-react": "^7.34.2", + "eslint-plugin-react": "^7.35.0", "eslint-plugin-react-hooks": "^4.6.2", "html-webpack-plugin": "^5.6.0", "imagemin": "^9.0.0", @@ -5093,18 +5093,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.toreversed": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", - "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - } - }, "node_modules/array.prototype.tosorted": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", @@ -8668,35 +8656,35 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.34.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz", - "integrity": "sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw==", + "version": "7.35.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz", + "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==", "dev": true, "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", "array.prototype.flatmap": "^1.3.2", - "array.prototype.toreversed": "^1.1.2", - "array.prototype.tosorted": "^1.1.3", + "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", "es-iterator-helpers": "^1.0.19", "estraverse": "^5.3.0", + "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", "object.entries": "^1.1.8", "object.fromentries": "^2.0.8", - "object.hasown": "^1.1.4", "object.values": "^1.2.0", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.11" + "string.prototype.matchall": "^4.0.11", + "string.prototype.repeat": "^1.0.0" }, "engines": { "node": ">=4" }, "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" } }, "node_modules/eslint-plugin-react-hooks": { @@ -15547,23 +15535,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/object.hasown": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz", - "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==", - "dev": true, - "dependencies": { - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/object.values": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", @@ -18403,6 +18374,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, "node_modules/string.prototype.trim": { "version": "1.2.9", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", diff --git a/clients/ui/frontend/package.json b/clients/ui/frontend/package.json index c3de1287..be6aa510 100644 --- a/clients/ui/frontend/package.json +++ b/clients/ui/frontend/package.json @@ -51,7 +51,7 @@ "dotenv-webpack": "^8.1.0", "eslint": "^8.57.0", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-react": "^7.34.2", + "eslint-plugin-react": "^7.35.0", "eslint-plugin-react-hooks": "^4.6.2", "html-webpack-plugin": "^5.6.0", "imagemin": "^9.0.0", From 62d173f40b0ae1c6534dfc812048b4ccf08819eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:13:57 +0000 Subject: [PATCH 6/9] build(deps-dev): bump @testing-library/jest-dom from 5.17.0 to 6.4.8 in /clients/ui/frontend (#279) Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.17.0 to 6.4.8. - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/jest-dom/compare/v5.17.0...v6.4.8) --- updated-dependencies: - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- clients/ui/frontend/package-lock.json | 38 ++++++++++++--------------- clients/ui/frontend/package.json | 2 +- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/clients/ui/frontend/package-lock.json b/clients/ui/frontend/package-lock.json index e1b267bc..206a5cda 100644 --- a/clients/ui/frontend/package-lock.json +++ b/clients/ui/frontend/package-lock.json @@ -19,7 +19,7 @@ "devDependencies": { "@cypress/code-coverage": "^3.12.45", "@testing-library/cypress": "^10.0.1", - "@testing-library/jest-dom": "^5.16.5", + "@testing-library/jest-dom": "^6.4.8", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "14.4.3", "@types/jest": "^29.5.3", @@ -84,9 +84,9 @@ } }, "node_modules/@adobe/css-tools": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz", - "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz", + "integrity": "sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==", "dev": true }, "node_modules/@ampproject/remapping": { @@ -3702,23 +3702,22 @@ } }, "node_modules/@testing-library/jest-dom": { - "version": "5.17.0", - "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz", - "integrity": "sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==", + "version": "6.4.8", + "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.8.tgz", + "integrity": "sha512-JD0G+Zc38f5MBHA4NgxQMR5XtO5Jx9g86jqturNTt2WUfRmLDIY7iKkWHDCCTiDuFMre6nxAD5wHw9W5kI4rGw==", "dev": true, "dependencies": { - "@adobe/css-tools": "^4.0.1", + "@adobe/css-tools": "^4.4.0", "@babel/runtime": "^7.9.2", - "@types/testing-library__jest-dom": "^5.9.1", "aria-query": "^5.0.0", "chalk": "^3.0.0", "css.escape": "^1.5.1", - "dom-accessibility-api": "^0.5.6", - "lodash": "^4.17.15", + "dom-accessibility-api": "^0.6.3", + "lodash": "^4.17.21", "redent": "^3.0.0" }, "engines": { - "node": ">=8", + "node": ">=14", "npm": ">=6", "yarn": ">=1" } @@ -3769,6 +3768,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz", + "integrity": "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==", + "dev": true + }, "node_modules/@testing-library/jest-dom/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -4280,15 +4285,6 @@ "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", "dev": true }, - "node_modules/@types/testing-library__jest-dom": { - "version": "5.14.8", - "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.8.tgz", - "integrity": "sha512-NRfJE9Cgpmu4fx716q9SYmU4jxxhYRU1BQo239Txt/9N3EC745XZX1Yl7h/SBIDlo1ANVOCRB4YDXjaQdoKCHQ==", - "dev": true, - "dependencies": { - "@types/jest": "*" - } - }, "node_modules/@types/tough-cookie": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz", diff --git a/clients/ui/frontend/package.json b/clients/ui/frontend/package.json index be6aa510..af00c497 100644 --- a/clients/ui/frontend/package.json +++ b/clients/ui/frontend/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@cypress/code-coverage": "^3.12.45", "@testing-library/cypress": "^10.0.1", - "@testing-library/jest-dom": "^5.16.5", + "@testing-library/jest-dom": "^6.4.8", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "14.4.3", "@types/jest": "^29.5.3", From f29704cde0a07429bfb2a041dcd1ed413c1b9e8a Mon Sep 17 00:00:00 2001 From: Isabella Basso Date: Thu, 22 Aug 2024 11:28:57 -0300 Subject: [PATCH 7/9] tidy scripts (#293) * scripts: tidy and fix shebangs Signed-off-by: Isabella do Amaral * Makefile: restore staged file check on server rebuild Signed-off-by: Isabella do Amaral --------- Signed-off-by: Isabella do Amaral --- Makefile | 4 +-- scripts/build_deploy.sh | 65 ++++++++++++++++++----------------- scripts/gen_openapi_server.sh | 22 ++++++------ scripts/gen_type_asserts.sh | 19 +++++----- scripts/install_protoc.sh | 28 +++++++-------- 5 files changed, 71 insertions(+), 67 deletions(-) diff --git a/Makefile b/Makefile index 0e6c6e38..ed5503bd 100644 --- a/Makefile +++ b/Makefile @@ -77,10 +77,10 @@ openapi/validate: bin/openapi-generator-cli # generate the openapi server implementation .PHONY: gen/openapi-server gen/openapi-server: bin/openapi-generator-cli openapi/validate - @if git diff --exit-code --name-only | grep -q "api/openapi/model-registry.yaml" || \ + @if git diff --cached --exit-code --name-only | grep -q "api/openapi/model-registry.yaml" || \ git diff --exit-code --name-only | grep -q "api/openapi/model-registry.yaml" || \ [ -n "${FORCE_SERVER_GENERATION}" ]; then \ - ROOT_FOLDER="." ./scripts/gen_openapi_server.sh; \ + ./scripts/gen_openapi_server.sh; \ else \ echo "INFO api/openapi/model-registry.yaml is not staged or modified, will not re-generate server"; \ fi diff --git a/scripts/build_deploy.sh b/scripts/build_deploy.sh index 3a3dbf37..91fc4914 100755 --- a/scripts/build_deploy.sh +++ b/scripts/build_deploy.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e @@ -25,48 +25,51 @@ PUSH_IMAGE="${PUSH_IMAGE:-false}" SKIP_IF_EXISTING="${SKIP_IF_EXISTING:-false}" # assure docker exists -docker -v foo >/dev/null 2>&1 || { echo >&2 "::error:: Docker is required. Aborting."; exit 1; } +docker -v foo >/dev/null 2>&1 || { + echo >&2 "::error:: Docker is required. Aborting." + exit 1 +} # if quay.io, can opt to skip if image already existing if [[ "${SKIP_IF_EXISTING,,}" == "true" && "${IMG_REGISTRY,,}" == "quay.io" ]]; then - TAGS=$(curl --request GET "https://$IMG_REGISTRY/api/v1/repository/${IMG_ORG}/${IMG_REPO}/tag/?specificTag=${VERSION}") - LATEST_TAG_HAS_END_TS=$(echo $TAGS | jq .tags - | jq 'sort_by(.start_ts) | reverse' | jq '.[0].end_ts') - NOT_EMPTY=$(echo ${TAGS} | jq .tags - | jq any) + TAGS=$(curl --request GET "https://$IMG_REGISTRY/api/v1/repository/${IMG_ORG}/${IMG_REPO}/tag/?specificTag=${VERSION}") + LATEST_TAG_HAS_END_TS=$(echo "$TAGS" | jq .tags - | jq 'sort_by(.start_ts) | reverse' | jq '.[0].end_ts') + NOT_EMPTY=$(echo "${TAGS}" | jq .tags - | jq any) - # Image only exists if there is a tag that does not have "end_ts" (i.e. it is still present). - if [[ "$NOT_EMPTY" == "true" && $LATEST_TAG_HAS_END_TS == "null" ]]; then - echo "::error:: The image ${IMG_ORG}/${IMG_REPO}:${VERSION} already exists" - exit 1 - else - echo "Image does not exist...proceeding with build & push." - fi + # Image only exists if there is a tag that does not have "end_ts" (i.e. it is still present). + if [[ "$NOT_EMPTY" == "true" && $LATEST_TAG_HAS_END_TS == "null" ]]; then + echo "::error:: The image ${IMG_ORG}/${IMG_REPO}:${VERSION} already exists" + exit 1 + else + echo "Image does not exist...proceeding with build & push." + fi fi # build docker image, login is not required at this step if [[ "${BUILD_IMAGE,,}" == "true" ]]; then - echo "Building container image.." - make \ - IMG_REGISTRY="${IMG_REGISTRY}" \ - IMG_ORG="${IMG_ORG}" \ - IMG_REPO="${IMG_REPO}" \ - IMG_VERSION="${VERSION}" \ - image/build + echo "Building container image.." + make \ + IMG_REGISTRY="${IMG_REGISTRY}" \ + IMG_ORG="${IMG_ORG}" \ + IMG_REPO="${IMG_REPO}" \ + IMG_VERSION="${VERSION}" \ + image/build else - echo "Skip container image build." + echo "Skip container image build." fi # push container image to registry, requires login if [[ "${PUSH_IMAGE,,}" == "true" ]]; then - echo "Pushing container image.." - make \ - IMG_REGISTRY="${IMG_REGISTRY}" \ - IMG_ORG="${IMG_ORG}" \ - IMG_REPO="${IMG_REPO}" \ - IMG_VERSION="${VERSION}" \ - DOCKER_USER="${DOCKER_USER}"\ - DOCKER_PWD="${DOCKER_PWD}" \ - docker/login \ - image/push + echo "Pushing container image.." + make \ + IMG_REGISTRY="${IMG_REGISTRY}" \ + IMG_ORG="${IMG_ORG}" \ + IMG_REPO="${IMG_REPO}" \ + IMG_VERSION="${VERSION}" \ + DOCKER_USER="${DOCKER_USER}" \ + DOCKER_PWD="${DOCKER_PWD}" \ + docker/login \ + image/push else - echo "Skip container image push." + echo "Skip container image push." fi diff --git a/scripts/gen_openapi_server.sh b/scripts/gen_openapi_server.sh index 94ce1493..00de5010 100755 --- a/scripts/gen_openapi_server.sh +++ b/scripts/gen_openapi_server.sh @@ -1,28 +1,28 @@ -#!/bin/bash +#!/usr/bin/env bash set -e echo "Generating the OpenAPI server" -ROOT_FOLDER="${ROOT_FOLDER:-..}" +PROJECT_ROOT=$(realpath "$(dirname "$0")"/..) openapi-generator-cli generate \ - -i $ROOT_FOLDER/api/openapi/model-registry.yaml -g go-server -o $ROOT_FOLDER/internal/server/openapi --package-name openapi --global-property models,apis \ - --ignore-file-override $ROOT_FOLDER/.openapi-generator-ignore --additional-properties=outputAsLibrary=true,enumClassPrefix=true,router=chi,sourceFolder=,onlyInterfaces=true,isGoSubmodule=true,enumClassPrefix=true,useOneOfDiscriminatorLookup=true \ - --template-dir $ROOT_FOLDER/templates/go-server + -i "$PROJECT_ROOT"/api/openapi/model-registry.yaml -g go-server -o "$PROJECT_ROOT"/internal/server/openapi --package-name openapi --global-property models,apis \ + --ignore-file-override "$PROJECT_ROOT"/.openapi-generator-ignore --additional-properties=outputAsLibrary=true,enumClassPrefix=true,router=chi,sourceFolder=,onlyInterfaces=true,isGoSubmodule=true,enumClassPrefix=true,useOneOfDiscriminatorLookup=true \ + --template-dir "$PROJECT_ROOT"/templates/go-server if [[ $(uname) == "Darwin" ]]; then - # introduce -i parameter for Mac OSX sed compatibility - sed -i '' 's/, orderByParam/, model.OrderByField(orderByParam)/g' $ROOT_FOLDER/internal/server/openapi/api_model_registry_service.go - sed -i '' 's/, sortOrderParam/, model.SortOrder(sortOrderParam)/g' $ROOT_FOLDER/internal/server/openapi/api_model_registry_service.go + # introduce -i parameter for Mac OSX sed compatibility + sed -i '' 's/, orderByParam/, model.OrderByField(orderByParam)/g' "$PROJECT_ROOT"/internal/server/openapi/api_model_registry_service.go + sed -i '' 's/, sortOrderParam/, model.SortOrder(sortOrderParam)/g' "$PROJECT_ROOT"/internal/server/openapi/api_model_registry_service.go else - sed -i 's/, orderByParam/, model.OrderByField(orderByParam)/g' $ROOT_FOLDER/internal/server/openapi/api_model_registry_service.go - sed -i 's/, sortOrderParam/, model.SortOrder(sortOrderParam)/g' $ROOT_FOLDER/internal/server/openapi/api_model_registry_service.go + sed -i 's/, orderByParam/, model.OrderByField(orderByParam)/g' "$PROJECT_ROOT"/internal/server/openapi/api_model_registry_service.go + sed -i 's/, sortOrderParam/, model.SortOrder(sortOrderParam)/g' "$PROJECT_ROOT"/internal/server/openapi/api_model_registry_service.go fi echo "Assembling type_assert Go file" ./scripts/gen_type_asserts.sh -gofmt -w $ROOT_FOLDER/internal/server/openapi +gofmt -w "$PROJECT_ROOT"/internal/server/openapi echo "OpenAPI server generation completed" diff --git a/scripts/gen_type_asserts.sh b/scripts/gen_type_asserts.sh index a9a3458c..d4b06c28 100755 --- a/scripts/gen_type_asserts.sh +++ b/scripts/gen_type_asserts.sh @@ -1,11 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash set -e -ROOT_FOLDER="${ROOT_FOLDER:-..}" +PROJECT_ROOT=$(realpath "$(dirname "$0")"/..) -ASSERT_FILE_PATH="internal/server/openapi/type_asserts.go" -PATCH="./patches/type_asserts.patch" +ASSERT_FILE_PATH="${PROJECT_ROOT}/internal/server/openapi/type_asserts.go" +PATCH="${PROJECT_ROOT}/patches/type_asserts.patch" # Remove the existing file identified by env.ASSERT_FILE_PATH if [ -f "$ASSERT_FILE_PATH" ]; then @@ -15,7 +15,8 @@ fi # Create an empty file touch "$ASSERT_FILE_PATH" -INITIAL_CONTENT=$(cat < "$ASSERT_FILE_PATH" +echo -e "$INITIAL_CONTENT" >"$ASSERT_FILE_PATH" # Iterate over files starting with "model_" in the internal/server/openapi/ folder -for file in internal/server/openapi/model_*; do +for file in "$PROJECT_ROOT"/internal/server/openapi/model_*; do # Check if the file is a regular file if [ -f "$file" ]; then # Ignore first 15 lines containing license, package and imports - sed -n '13,$p' "$file" >> "$ASSERT_FILE_PATH" + sed -n '13,$p' "$file" >>"$ASSERT_FILE_PATH" # Remove the merged file rm "$file" fi done -gofmt -w $ROOT_FOLDER/internal/server/openapi/type_asserts.go +gofmt -w "$ASSERT_FILE_PATH" git apply "$PATCH" diff --git a/scripts/install_protoc.sh b/scripts/install_protoc.sh index 3eec5d1c..6f8fc3b5 100755 --- a/scripts/install_protoc.sh +++ b/scripts/install_protoc.sh @@ -1,22 +1,22 @@ -#! /bin/bash +#!/usr/bin/env bash set -euxo pipefail -SCRIPT_PARENT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd ) - -VERSION="24.3" +OSTYPE=$(uname -s) OS="linux" -if [[ "$OSTYPE" == "darwin"* ]]; then - # Mac OSX - OS="osx" +if [[ ${OSTYPE,,} =~ darwin ]]; then + OS="osx" fi + ARCH="x86_64" -if [[ "$(uname -m)" == "arm"* ]]; then - ARCH="aarch_64" +if [[ $(uname -m) =~ arm ]]; then + ARCH="aarch_64" fi -mkdir -p ${SCRIPT_PARENT_DIR}/bin +PROJECT_ROOT=$(realpath "$(dirname "$0")"/..) -wget -q https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-${OS}-${ARCH}.zip -O ${SCRIPT_PARENT_DIR}/protoc.zip && \ - unzip -qo ${SCRIPT_PARENT_DIR}/protoc.zip -d ${SCRIPT_PARENT_DIR} && \ - bin/protoc --version && \ - rm ${SCRIPT_PARENT_DIR}/protoc.zip +VERSION="24.3" +URL=https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-${OS}-${ARCH}.zip +wget -qx "$URL" -O "$PROJECT_ROOT"/protoc.zip && + unzip -qo "$PROJECT_ROOT"/protoc.zip -d "$PROJECT_ROOT" && + "$PROJECT_ROOT"/bin/protoc --version && + rm "$PROJECT_ROOT"/protoc.zip From 15729ac39025ac98403b11925885b4627ef3b39b Mon Sep 17 00:00:00 2001 From: Eder Ignatowicz Date: Thu, 22 Aug 2024 11:11:57 -0400 Subject: [PATCH 8/9] build(deps): bump @patternfly/react-{core|icons|style} (#294) Signed-off-by: Eder Ignatowicz --- clients/ui/frontend/docs/dev-setup.md | 2 +- clients/ui/frontend/package-lock.json | 45 ++++++++++------- clients/ui/frontend/package.json | 6 +-- .../frontend/src/app/Dashboard/Dashboard.tsx | 46 +++++++++--------- .../ui/frontend/src/app/Settings/Admin.tsx | 45 +++++++++-------- .../ui/frontend/src/app/Support/Support.tsx | 48 +++++++++---------- 6 files changed, 100 insertions(+), 92 deletions(-) diff --git a/clients/ui/frontend/docs/dev-setup.md b/clients/ui/frontend/docs/dev-setup.md index aaed76f6..4ea61f8b 100644 --- a/clients/ui/frontend/docs/dev-setup.md +++ b/clients/ui/frontend/docs/dev-setup.md @@ -37,7 +37,7 @@ npm run build This is the default context for running a local UI. Make sure you build the project using the instructions above prior to running the command below. ```bash -npm run start +npm run start:dev ``` For in-depth local run guidance review the [contribution guidelines](../CONTRIBUTING.md). diff --git a/clients/ui/frontend/package-lock.json b/clients/ui/frontend/package-lock.json index 206a5cda..bc275dae 100644 --- a/clients/ui/frontend/package-lock.json +++ b/clients/ui/frontend/package-lock.json @@ -9,9 +9,9 @@ "version": "0.0.1", "license": "Apache-2.0", "dependencies": { - "@patternfly/react-core": "6.0.0-alpha.68", - "@patternfly/react-icons": "6.0.0-alpha.34", - "@patternfly/react-styles": "6.0.0-alpha.34", + "@patternfly/react-core": "6.0.0-alpha.102", + "@patternfly/react-icons": "6.0.0-alpha.35", + "@patternfly/react-styles": "6.0.0-alpha.35", "npm-run-all": "^4.1.5", "react": "^18", "react-dom": "^18" @@ -3290,13 +3290,13 @@ } }, "node_modules/@patternfly/react-core": { - "version": "6.0.0-alpha.68", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.68.tgz", - "integrity": "sha512-YhZY4xuDF0WJyDAAzHdvhgYCECs5bY4+QYUbkPe+dGLNLnwVMU3ZwZlLD9ARHRwfXDRV3g+ttS8HRbigbHgtpQ==", + "version": "6.0.0-alpha.102", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-6.0.0-alpha.102.tgz", + "integrity": "sha512-NjnLhgYwJ3LuA3/DDwzM10X9dlZyR9ICAKOXI2FlxRM0kTAnAK0kLx7MuQjZ7wboIjxpRaA3lG8c9zlHDrCWdQ==", "dependencies": { - "@patternfly/react-icons": "^6.0.0-alpha.24", - "@patternfly/react-styles": "^6.0.0-alpha.24", - "@patternfly/react-tokens": "^6.0.0-alpha.24", + "@patternfly/react-icons": "^6.0.0-alpha.36", + "@patternfly/react-styles": "^6.0.0-alpha.35", + "@patternfly/react-tokens": "^6.0.0-alpha.35", "focus-trap": "7.5.4", "react-dropzone": "^14.2.3", "tslib": "^2.6.2" @@ -3306,24 +3306,33 @@ "react-dom": "^17 || ^18" } }, + "node_modules/@patternfly/react-core/node_modules/@patternfly/react-icons": { + "version": "6.0.0-alpha.36", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.36.tgz", + "integrity": "sha512-9gxJr3UxqZnUKwtPfV1JrzcH76hN/5hHM5CL5HJVWnAhI6WjRm3oQ9dA/PLo91Kyo3tN6TQKV1b2x/LhPiBscw==", + "peerDependencies": { + "react": "^17 || ^18", + "react-dom": "^17 || ^18" + } + }, "node_modules/@patternfly/react-icons": { - "version": "6.0.0-alpha.34", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.34.tgz", - "integrity": "sha512-YApbSfIEevWhTila9OzG6RHmbu/f+08XCUiNjTri2ZY54flvX/+GZDdt6gLzS+JQlysA6MCtzRxLgWAKh27Uew==", + "version": "6.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0-alpha.35.tgz", + "integrity": "sha512-3gdFXGME/BVUW647W6wt3w+P95/l5zrK/EtLQ59Gx11faOlClwGniqloxRC5Cv+yo8kPpIFezjiZiia4vGGO7w==", "peerDependencies": { "react": "^17 || ^18", "react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-styles": { - "version": "6.0.0-alpha.34", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.34.tgz", - "integrity": "sha512-mJSpYrgI/Sgu+gwSv5h8ZP+prvzNUbfEkWP+LV6hZuw70N0UnarJacTsMD0zouCWUwIVt1NOJfawLOVmzAsxbA==" + "version": "6.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-6.0.0-alpha.35.tgz", + "integrity": "sha512-9ddQpDJ1CXDbsuV5lYmynw8hqGncKXxnhNwvUKc+s/i50pNBAMmNO9CP5dkKhnZPcjHQj0A35aleQ7xdRgNWQw==" }, "node_modules/@patternfly/react-tokens": { - "version": "6.0.0-alpha.24", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.24.tgz", - "integrity": "sha512-jIVaGxxZD8Wsp2Xbf8z9mrpfYQx4NzlWlUza0IoTuwslEdcxt77Yo3sh0qlyfRBDNx+Q01tdEFXftJ+6OZQ3Gw==" + "version": "6.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-6.0.0-alpha.35.tgz", + "integrity": "sha512-TYLYxyx7tDVRYeso+72eGZbM/O3G90brLzHQai2JtKI66XE3T2R89N0VxPT65gbc1cnqNkiTtUKkpUUHmOK9qg==" }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", diff --git a/clients/ui/frontend/package.json b/clients/ui/frontend/package.json index af00c497..b9488603 100644 --- a/clients/ui/frontend/package.json +++ b/clients/ui/frontend/package.json @@ -83,9 +83,9 @@ "webpack-merge": "^6.0.1" }, "dependencies": { - "@patternfly/react-core": "6.0.0-alpha.68", - "@patternfly/react-icons": "6.0.0-alpha.34", - "@patternfly/react-styles": "6.0.0-alpha.34", + "@patternfly/react-core": "6.0.0-alpha.102", + "@patternfly/react-icons": "6.0.0-alpha.35", + "@patternfly/react-styles": "6.0.0-alpha.35", "npm-run-all": "^4.1.5", "react": "^18", "react-dom": "^18" diff --git a/clients/ui/frontend/src/app/Dashboard/Dashboard.tsx b/clients/ui/frontend/src/app/Dashboard/Dashboard.tsx index b93c21a1..9c6159b3 100644 --- a/clients/ui/frontend/src/app/Dashboard/Dashboard.tsx +++ b/clients/ui/frontend/src/app/Dashboard/Dashboard.tsx @@ -1,31 +1,31 @@ import * as React from 'react'; import { - Button, - EmptyState, - EmptyStateBody, - EmptyStateFooter, - EmptyStateVariant, - PageSection, - Text, - TextContent + Button, + Content, + ContentVariants, + EmptyState, + EmptyStateBody, + EmptyStateFooter, + EmptyStateVariant, + PageSection, } from '@patternfly/react-core'; -import { CubesIcon } from '@patternfly/react-icons'; +import {CubesIcon} from '@patternfly/react-icons'; const Dashboard: React.FunctionComponent = () => ( - - - - - - This represents an the empty state pattern in Patternfly 6. Hopefully it's simple enough to use but - flexible enough to meet a variety of needs. - - - - + + + + + This represents an the empty state pattern in Patternfly 6. Hopefully it's simple enough to use + but + flexible enough to meet a variety of needs. + - - + + + + + ); -export { Dashboard }; +export {Dashboard}; diff --git a/clients/ui/frontend/src/app/Settings/Admin.tsx b/clients/ui/frontend/src/app/Settings/Admin.tsx index 47fa9844..f279e39c 100644 --- a/clients/ui/frontend/src/app/Settings/Admin.tsx +++ b/clients/ui/frontend/src/app/Settings/Admin.tsx @@ -1,31 +1,30 @@ import * as React from 'react'; -import { CubesIcon } from '@patternfly/react-icons'; +import {CubesIcon} from '@patternfly/react-icons'; import { - Button, - EmptyState, - EmptyStateBody, - EmptyStateFooter, - EmptyStateVariant, - PageSection, - Text, - TextContent + Button, + Content, + ContentVariants, + EmptyState, + EmptyStateBody, + EmptyStateFooter, + EmptyStateVariant, + PageSection, } from '@patternfly/react-core'; const Admin: React.FunctionComponent = () => ( - - - - - - This represents an the empty state pattern in Patternfly 6. Hopefully it's simple enough to use but - flexible enough to meet a variety of needs. - - - - + + + + + This represents an the empty state pattern in Patternfly 6. Hopefully it's simple enough to use + but + flexible enough to meet a variety of needs. + + + - - + + ); -export { Admin }; \ No newline at end of file +export {Admin}; \ No newline at end of file diff --git a/clients/ui/frontend/src/app/Support/Support.tsx b/clients/ui/frontend/src/app/Support/Support.tsx index b188b7c8..2b4e6c4c 100644 --- a/clients/ui/frontend/src/app/Support/Support.tsx +++ b/clients/ui/frontend/src/app/Support/Support.tsx @@ -1,31 +1,31 @@ import * as React from 'react'; -import { CubesIcon } from '@patternfly/react-icons'; +import {CubesIcon} from '@patternfly/react-icons'; import { - Button, - EmptyState, - EmptyStateBody, - EmptyStateFooter, - EmptyStateVariant, - PageSection, - Text, - TextContent + Button, + Content, + ContentVariants, + EmptyState, + EmptyStateBody, + EmptyStateFooter, + EmptyStateVariant, + PageSection, } from '@patternfly/react-core'; const Support: React.FunctionComponent = () => ( - - - - - - This represents an the empty state pattern in Patternfly 6. Hopefully it's simple enough to use but - flexible enough to meet a variety of needs. - - - - - - - + + + + + This represents an the empty state pattern in Patternfly 6. Hopefully it's simple enough to + use but + flexible enough to meet a variety of needs. + + + + + + + ); -export { Support }; +export {Support}; From 82ec37abfb921ebe41f5bf634f1c9d4747ce74fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 15:13:57 +0000 Subject: [PATCH 9/9] build(deps-dev): bump @types/jest from 29.5.3 to 29.5.12 in /clients/ui/frontend (#223) Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 29.5.3 to 29.5.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) --- updated-dependencies: - dependency-name: "@types/jest" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- clients/ui/frontend/package-lock.json | 8 ++++---- clients/ui/frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/ui/frontend/package-lock.json b/clients/ui/frontend/package-lock.json index bc275dae..609d8d9b 100644 --- a/clients/ui/frontend/package-lock.json +++ b/clients/ui/frontend/package-lock.json @@ -22,7 +22,7 @@ "@testing-library/jest-dom": "^6.4.8", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "14.4.3", - "@types/jest": "^29.5.3", + "@types/jest": "^29.5.12", "@types/react-router-dom": "^5.3.3", "@types/victory": "^35.0.0", "@typescript-eslint/eslint-plugin": "^6.21.0", @@ -4105,9 +4105,9 @@ } }, "node_modules/@types/jest": { - "version": "29.5.3", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.3.tgz", - "integrity": "sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==", + "version": "29.5.12", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz", + "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==", "dev": true, "dependencies": { "expect": "^29.0.0", diff --git a/clients/ui/frontend/package.json b/clients/ui/frontend/package.json index b9488603..7a902c75 100644 --- a/clients/ui/frontend/package.json +++ b/clients/ui/frontend/package.json @@ -34,7 +34,7 @@ "@testing-library/jest-dom": "^6.4.8", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "14.4.3", - "@types/jest": "^29.5.3", + "@types/jest": "^29.5.12", "@types/react-router-dom": "^5.3.3", "@types/victory": "^35.0.0", "@typescript-eslint/eslint-plugin": "^6.21.0",