diff --git a/.gitignore b/.gitignore index 3cfd882..51d9370 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Cloud-init files -cloud-init/user-data -cloud-init/meta-data +hal/ubuntu/user-data +hal/ubuntu/meta-data # QEMU files *.qcow2 diff --git a/buildroot/linux/package/setup/setup.mk b/buildroot/linux/package/setup/setup.mk deleted file mode 100644 index 384f901..0000000 --- a/buildroot/linux/package/setup/setup.mk +++ /dev/null @@ -1,11 +0,0 @@ -define SETUP_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/cube/ -endef - -define SETUP_INSTALL_INIT_SYSTEMD - cp ../cube/buildroot/linux/systemd/cube.service $(TARGET_DIR)/usr/lib/systemd/system/cube.service - cp ../cube/buildroot/linux/systemd/setup-cube.sh $(TARGET_DIR)/cube/setup-cube.sh - cp ../cube/buildroot/linux/systemd/attest.sh $(TARGET_DIR)/cube/attest.sh -endef - -$(eval $(generic-package)) diff --git a/docker-compose/.env b/docker/.env similarity index 100% rename from docker-compose/.env rename to docker/.env diff --git a/docker-compose/compose.yaml b/docker/compose.yaml similarity index 100% rename from docker-compose/compose.yaml rename to docker/compose.yaml diff --git a/docker-compose/magistrala-compose.yaml b/docker/magistrala-compose.yaml similarity index 100% rename from docker-compose/magistrala-compose.yaml rename to docker/magistrala-compose.yaml diff --git a/docker-compose/nats/nats.conf b/docker/nats/nats.conf similarity index 100% rename from docker-compose/nats/nats.conf rename to docker/nats/nats.conf diff --git a/docker-compose/ollama-compose.yaml b/docker/ollama-compose.yaml similarity index 100% rename from docker-compose/ollama-compose.yaml rename to docker/ollama-compose.yaml diff --git a/docker-compose/proxy-compose.yaml b/docker/proxy-compose.yaml similarity index 100% rename from docker-compose/proxy-compose.yaml rename to docker/proxy-compose.yaml diff --git a/docker-compose/spicedb/schema.zed b/docker/spicedb/schema.zed similarity index 100% rename from docker-compose/spicedb/schema.zed rename to docker/spicedb/schema.zed diff --git a/docker-compose/ssl/.gitignore b/docker/ssl/.gitignore similarity index 100% rename from docker-compose/ssl/.gitignore rename to docker/ssl/.gitignore diff --git a/docker-compose/ssl/Makefile b/docker/ssl/Makefile similarity index 100% rename from docker-compose/ssl/Makefile rename to docker/ssl/Makefile diff --git a/docker-compose/ssl/certs/ca.crt b/docker/ssl/certs/ca.crt similarity index 100% rename from docker-compose/ssl/certs/ca.crt rename to docker/ssl/certs/ca.crt diff --git a/docker-compose/ssl/certs/ca.key b/docker/ssl/certs/ca.key similarity index 100% rename from docker-compose/ssl/certs/ca.key rename to docker/ssl/certs/ca.key diff --git a/docker-compose/ssl/certs/magistrala-server.crt b/docker/ssl/certs/magistrala-server.crt similarity index 100% rename from docker-compose/ssl/certs/magistrala-server.crt rename to docker/ssl/certs/magistrala-server.crt diff --git a/docker-compose/ssl/certs/magistrala-server.key b/docker/ssl/certs/magistrala-server.key similarity index 100% rename from docker-compose/ssl/certs/magistrala-server.key rename to docker/ssl/certs/magistrala-server.key diff --git a/docker-compose/ssl/dhparam.pem b/docker/ssl/dhparam.pem similarity index 100% rename from docker-compose/ssl/dhparam.pem rename to docker/ssl/dhparam.pem diff --git a/docker-compose/templates/users.tmpl b/docker/templates/users.tmpl similarity index 100% rename from docker-compose/templates/users.tmpl rename to docker/templates/users.tmpl diff --git a/docker-compose/traefik/dynamic.yaml b/docker/traefik/dynamic.yaml similarity index 100% rename from docker-compose/traefik/dynamic.yaml rename to docker/traefik/dynamic.yaml diff --git a/docker-compose/traefik/traefik.yaml b/docker/traefik/traefik.yaml similarity index 100% rename from docker-compose/traefik/traefik.yaml rename to docker/traefik/traefik.yaml diff --git a/hal/README.md b/hal/README.md new file mode 100644 index 0000000..9075e42 --- /dev/null +++ b/hal/README.md @@ -0,0 +1 @@ +# HAL diff --git a/buildroot/README.md b/hal/buildroot/README.md similarity index 98% rename from buildroot/README.md rename to hal/buildroot/README.md index 13ac642..dd3e7c8 100644 --- a/buildroot/README.md +++ b/hal/buildroot/README.md @@ -69,7 +69,7 @@ Your username is your github username and your password is the access token you Pull the docker images ```bash -cd cube/docker-compose/ +cd cube/docker/ docker compose pull ``` diff --git a/buildroot/linux/Config.in b/hal/buildroot/linux/Config.in similarity index 100% rename from buildroot/linux/Config.in rename to hal/buildroot/linux/Config.in diff --git a/buildroot/linux/README.md b/hal/buildroot/linux/README.md similarity index 90% rename from buildroot/linux/README.md rename to hal/buildroot/linux/README.md index 6040229..b0aee5a 100644 --- a/buildroot/linux/README.md +++ b/hal/buildroot/linux/README.md @@ -10,7 +10,7 @@ HAL uses [Buildroot](https://buildroot.org/)'s [_External Tree_ mechanism](https git clone https://gitlab.com/buildroot.org/buildroot.git git clone https://github.com/ultravioletrs/cube.git cd buildroot -make BR2_EXTERNAL=../cube/buildroot/linux cube_defconfig +make BR2_EXTERNAL=../cube/hal/buildroot/linux cube_defconfig # Execute 'make menuconfig' only if you want to make additional configuration changes to Buildroot. make menuconfig make diff --git a/buildroot/linux/board/cube/linux.config b/hal/buildroot/linux/board/cube/linux.config similarity index 100% rename from buildroot/linux/board/cube/linux.config rename to hal/buildroot/linux/board/cube/linux.config diff --git a/buildroot/linux/board/cube/post-build.sh b/hal/buildroot/linux/board/cube/post-build.sh similarity index 100% rename from buildroot/linux/board/cube/post-build.sh rename to hal/buildroot/linux/board/cube/post-build.sh diff --git a/buildroot/linux/board/cube/post-image.sh b/hal/buildroot/linux/board/cube/post-image.sh similarity index 100% rename from buildroot/linux/board/cube/post-image.sh rename to hal/buildroot/linux/board/cube/post-image.sh diff --git a/buildroot/linux/board/cube/readme.txt b/hal/buildroot/linux/board/cube/readme.txt similarity index 100% rename from buildroot/linux/board/cube/readme.txt rename to hal/buildroot/linux/board/cube/readme.txt diff --git a/buildroot/linux/board/cube/start-qemu.sh.in b/hal/buildroot/linux/board/cube/start-qemu.sh.in similarity index 100% rename from buildroot/linux/board/cube/start-qemu.sh.in rename to hal/buildroot/linux/board/cube/start-qemu.sh.in diff --git a/buildroot/linux/configs/cube_defconfig b/hal/buildroot/linux/configs/cube_defconfig similarity index 100% rename from buildroot/linux/configs/cube_defconfig rename to hal/buildroot/linux/configs/cube_defconfig diff --git a/buildroot/linux/external.desc b/hal/buildroot/linux/external.desc similarity index 100% rename from buildroot/linux/external.desc rename to hal/buildroot/linux/external.desc diff --git a/buildroot/linux/external.mk b/hal/buildroot/linux/external.mk similarity index 100% rename from buildroot/linux/external.mk rename to hal/buildroot/linux/external.mk diff --git a/buildroot/linux/package/setup/Config.in b/hal/buildroot/linux/package/setup/Config.in similarity index 100% rename from buildroot/linux/package/setup/Config.in rename to hal/buildroot/linux/package/setup/Config.in diff --git a/hal/buildroot/linux/package/setup/setup.mk b/hal/buildroot/linux/package/setup/setup.mk new file mode 100644 index 0000000..d77ad90 --- /dev/null +++ b/hal/buildroot/linux/package/setup/setup.mk @@ -0,0 +1,11 @@ +define SETUP_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/cube/ +endef + +define SETUP_INSTALL_INIT_SYSTEMD + cp ../cube/hal/buildroot/linux/systemd/cube.service $(TARGET_DIR)/usr/lib/systemd/system/cube.service + cp ../cube/hal/buildroot/linux/systemd/setup-cube.sh $(TARGET_DIR)/cube/setup-cube.sh + cp ../cube/hal/buildroot/linux/systemd/attest.sh $(TARGET_DIR)/cube/attest.sh +endef + +$(eval $(generic-package)) diff --git a/buildroot/linux/package/snpguest/Config.in b/hal/buildroot/linux/package/snpguest/Config.in similarity index 100% rename from buildroot/linux/package/snpguest/Config.in rename to hal/buildroot/linux/package/snpguest/Config.in diff --git a/buildroot/linux/package/snpguest/snpguest.mk b/hal/buildroot/linux/package/snpguest/snpguest.mk similarity index 100% rename from buildroot/linux/package/snpguest/snpguest.mk rename to hal/buildroot/linux/package/snpguest/snpguest.mk diff --git a/buildroot/linux/systemd/attest.sh b/hal/buildroot/linux/systemd/attest.sh similarity index 100% rename from buildroot/linux/systemd/attest.sh rename to hal/buildroot/linux/systemd/attest.sh diff --git a/buildroot/linux/systemd/cube.service b/hal/buildroot/linux/systemd/cube.service similarity index 100% rename from buildroot/linux/systemd/cube.service rename to hal/buildroot/linux/systemd/cube.service diff --git a/buildroot/linux/systemd/setup-cube.sh b/hal/buildroot/linux/systemd/setup-cube.sh similarity index 100% rename from buildroot/linux/systemd/setup-cube.sh rename to hal/buildroot/linux/systemd/setup-cube.sh diff --git a/buildroot/qemu.sh b/hal/buildroot/qemu.sh similarity index 93% rename from buildroot/qemu.sh rename to hal/buildroot/qemu.sh index f83a798..a4338dd 100644 --- a/buildroot/qemu.sh +++ b/hal/buildroot/qemu.sh @@ -6,8 +6,8 @@ CPU="4" CPU_TYPE="EPYC-v4" QEMU_AMDSEV_BINARY="/var/cube-ai/bin/qemu-system-x86_64" QEMU_OVMF_CODE="/var/cube-ai/OVMF.fd" -KERNEL_PATH="../buildroot/output/images/bzImage" -INITRD_PATH="../buildroot/output/images/rootfs.cpio.gz" +KERNEL_PATH="../../buildroot/output/images/bzImage" +INITRD_PATH="../../buildroot/output/images/rootfs.cpio.gz" FS_PATH="./rootfs.img" QEMU_APPEND_ARG="root=/dev/vda rw console=ttyS0" @@ -17,12 +17,12 @@ function check(){ exit 1 fi - if [ ! -f "../buildroot/output/images/bzImage" ]; then + if [ ! -f "../../buildroot/output/images/bzImage" ]; then echo "bzImage file not found. Please build it and try again." exit 1 fi - if [ ! -f "../buildroot/output/images/rootfs.cpio.gz" ]; then + if [ ! -f "../../buildroot/output/images/rootfs.cpio.gz" ]; then echo "rootfs.cpio.gz file not found. Please build it and try again." exit 1 fi diff --git a/cloud-init/README.md b/hal/ubuntu/README.md similarity index 89% rename from cloud-init/README.md rename to hal/ubuntu/README.md index 44c5bef..bb609b0 100644 --- a/cloud-init/README.md +++ b/hal/ubuntu/README.md @@ -1,4 +1,4 @@ -# Cloud Init +# Ubuntu This directory contains the cloud-init configuration files for Cube AI. @@ -24,11 +24,11 @@ Your username is your github username and your password is the access token you 4. Pull the docker images ```bash -cd cube/docker-compose/ +cd cube/docker/ docker compose pull ``` -5. For local development, replace the following IP address entries in `docker-compose/.env` with your local IP address as follows: +5. For local development, replace the following IP address entries in `docker/.env` with your local IP address as follows: ```bash UV_CUBE_UI_BASE_URL=http://localhost:3001 diff --git a/cloud-init/qemu.sh b/hal/ubuntu/qemu.sh similarity index 98% rename from cloud-init/qemu.sh rename to hal/ubuntu/qemu.sh index 89e0966..176f9c4 100644 --- a/cloud-init/qemu.sh +++ b/hal/ubuntu/qemu.sh @@ -85,7 +85,7 @@ instance-id: iid-${VM_NAME} local-hostname: $VM_NAME EOF -echo "Creating cloud-init seed image..." +echo "Creating ubuntu seed image..." cloud-localds $SEED_IMAGE $USER_DATA $META_DATA echo "Starting QEMU VM..." diff --git a/proxy/go.mod b/proxy/go.mod index 1a296e2..f3baf26 100644 --- a/proxy/go.mod +++ b/proxy/go.mod @@ -4,7 +4,7 @@ go 1.23.1 require ( github.com/absmach/callhome v0.14.0 - github.com/absmach/magistrala v0.14.1-0.20240910164952-1ce5952d1abd + github.com/absmach/magistrala v0.14.1-0.20241007084629-d454db70e8aa github.com/caarlos0/env/v11 v11.2.2 github.com/go-chi/chi/v5 v5.1.0 github.com/go-kit/kit v0.13.0 @@ -26,7 +26,7 @@ require ( github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/gofrs/uuid v4.4.0+incompatible // indirect + github.com/gofrs/uuid/v5 v5.3.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect @@ -41,7 +41,7 @@ require ( github.com/klauspost/compress v1.17.9 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.59.1 // indirect + github.com/prometheus/common v0.60.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rubenv/sql-migrate v1.7.0 // indirect github.com/smarty/assertions v1.16.0 // indirect @@ -53,13 +53,13 @@ require ( go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/sdk v1.30.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect - golang.org/x/crypto v0.27.0 // indirect - golang.org/x/net v0.29.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/crypto v0.28.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/grpc v1.66.1 // indirect - google.golang.org/protobuf v1.34.2 // indirect + google.golang.org/grpc v1.67.1 // indirect + google.golang.org/protobuf v1.35.1 // indirect moul.io/http2curl v1.0.0 // indirect ) diff --git a/proxy/go.sum b/proxy/go.sum index d6ade10..a24d634 100644 --- a/proxy/go.sum +++ b/proxy/go.sum @@ -16,8 +16,8 @@ github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrd github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/absmach/callhome v0.14.0 h1:zB4tIZJ1YUmZ1VGHFPfMA/Lo6/Mv19y2dvoOiXj2BWs= github.com/absmach/callhome v0.14.0/go.mod h1:l12UJOfibK4Muvg/AbupHuquNV9qSz/ROdTEPg7f2Vk= -github.com/absmach/magistrala v0.14.1-0.20240910164952-1ce5952d1abd h1:FCPd2BeFO7WokXo63G9YcDmXT7PFraCuHBaaLxZglO0= -github.com/absmach/magistrala v0.14.1-0.20240910164952-1ce5952d1abd/go.mod h1:VHzCfpD5wUOFW1BtigOrO/tV4TO8XhqXAD6JUBhS7qA= +github.com/absmach/magistrala v0.14.1-0.20241007084629-d454db70e8aa h1:V1Xo80emZdrZb45PUV1bCg/HbQ25l2fNiup9PI8Sc3U= +github.com/absmach/magistrala v0.14.1-0.20241007084629-d454db70e8aa/go.mod h1:sEWHhL0sm1pgvRcF48BhfI91LesetL5GR4kixc7z7uA= github.com/absmach/mproxy v0.4.3-0.20240712131952-28f88581126a h1:3JtJSekVHb02U3NmIJa5f3a1I15aczKrBBCczGGCbxM= github.com/absmach/mproxy v0.4.3-0.20240712131952-28f88581126a/go.mod h1:Nevip6o8u5Zx7l3LTtN8BwlCI5h5KpsnI9YnAxF5RT8= github.com/absmach/senml v1.0.5 h1:zNPRYpGr2Wsb8brAusz8DIfFqemy1a2dNbmMnegY3GE= @@ -26,8 +26,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/caarlos0/env/v11 v11.2.2 h1:95fApNrUyueipoZN/EhA8mMxiNxrBwDa+oAZrMWl3Kg= github.com/caarlos0/env/v11 v11.2.2/go.mod h1:JBfcdeQiBoI3Zh1QRAWfe+tpiNTmDtcCj/hHHHMx0vc= -github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M= -github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -62,8 +60,8 @@ github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs= github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw= -github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= -github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= +github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E= +github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc= github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU= github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= @@ -83,8 +81,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= -github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk= +github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -116,10 +114,10 @@ github.com/hashicorp/go-sockaddr v1.0.6 h1:RSG8rKU28VTUTvEKghe5gIhIQpv8evvNpnDEy github.com/hashicorp/go-sockaddr v1.0.6/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/vault/api v1.14.0 h1:Ah3CFLixD5jmjusOgm8grfN9M0d+Y8fVR2SW0K6pJLU= -github.com/hashicorp/vault/api v1.14.0/go.mod h1:pV9YLxBGSz+cItFDd8Ii4G17waWOQ32zVjMWHe/cOqk= -github.com/hashicorp/vault/api/auth/approle v0.7.0 h1:R5IRVuFA5JSdG3UdGVcGysi0StrL1lPmyJnrawiV0Ss= -github.com/hashicorp/vault/api/auth/approle v0.7.0/go.mod h1:B+WaC6VR+aSXiUxykpaPUoFiiZAhic53tDLbGjWZmRA= +github.com/hashicorp/vault/api v1.15.0 h1:O24FYQCWwhwKnF7CuSqP30S51rTV7vz1iACXE/pj5DA= +github.com/hashicorp/vault/api v1.15.0/go.mod h1:+5YTO09JGn0u+b6ySD/LLVf8WkJCPLAL2Vkmrn2+CM8= +github.com/hashicorp/vault/api/auth/approle v0.8.0 h1:FuVtWZ0xD6+wz1x0l5s0b4852RmVXQNEiKhVXt6lfQY= +github.com/hashicorp/vault/api/auth/approle v0.8.0/go.mod h1:NV7O9r5JUtNdVnqVZeMHva81AIdpG0WoIQohNt1VCPM= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= @@ -239,8 +237,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/opencontainers/runc v1.1.14 h1:rgSuzbmgz5DUJjeSnw337TxDbRuqjs6iqQck/2weR6w= -github.com/opencontainers/runc v1.1.14/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= +github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= +github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= github.com/ory/dockertest/v3 v3.11.0 h1:OiHcxKAvSDUwsEVh2BjxQQc/5EHz9n0va9awCtNGuyA= github.com/ory/dockertest/v3 v3.11.0/go.mod h1:VIPxS1gwT9NpPOrfD3rACs8Y9Z7yhzO4SB194iUDnUI= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= @@ -257,8 +255,8 @@ github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zI github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0= -github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= +github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA= +github.com/prometheus/common v0.60.0/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw= @@ -354,8 +352,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= @@ -370,8 +368,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -396,8 +394,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -413,10 +411,10 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -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/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.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-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -437,10 +435,10 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.66.1 h1:hO5qAXR19+/Z44hmvIM4dQFMSYX9XcWsByfoxutBpAM= -google.golang.org/grpc v1.66.1/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=