From c5454acb05109a50d78f8e1e34b5aa8742832f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=91=D0=BE=D1=80=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Sun, 15 Feb 2026 17:51:07 +0200 Subject: [PATCH] working commit --- app/handler/handler.go | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- go.mod | 4 +--- go.sum | 5 ----- test/account_test.go | 3 ++- test/image_test.go | 2 +- 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/app/handler/handler.go b/app/handler/handler.go index 73c948f..aab7435 100644 --- a/app/handler/handler.go +++ b/app/handler/handler.go @@ -15,7 +15,7 @@ import ( "mstore/app/operator" "mstore/app/router" - "sigs.k8s.io/yaml" + yaml "go.yaml.in/yaml/v4" ) type HandlerParams struct { diff --git a/configure b/configure index 6eeee3d..af3bdfc 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for mstore 0.1.0. +# Generated by GNU Autoconf 2.71 for mstore 0.2.0. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -607,8 +607,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='mstore' PACKAGE_TARNAME='mstore' -PACKAGE_VERSION='0.1.0' -PACKAGE_STRING='mstore 0.1.0' +PACKAGE_VERSION='0.2.0' +PACKAGE_STRING='mstore 0.2.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1283,7 +1283,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mstore 0.1.0 to adapt to many kinds of systems. +\`configure' configures mstore 0.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1354,7 +1354,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mstore 0.1.0:";; + short | recursive ) echo "Configuration of mstore 0.2.0:";; esac cat <<\_ACEOF @@ -1441,7 +1441,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mstore configure 0.1.0 +mstore configure 0.2.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1478,7 +1478,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mstore $as_me 0.1.0, which was +It was created by mstore $as_me 0.2.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2430,7 +2430,7 @@ fi # Define the identity of the package. PACKAGE='mstore' - VERSION='0.1.0' + VERSION='0.2.0' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -4271,7 +4271,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mstore $as_me 0.1.0, which was +This file was extended by mstore $as_me 0.2.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4326,7 +4326,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -mstore config.status 0.1.0 +mstore config.status 0.2.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4158d85..b16cdd8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([mstore],[0.1.0]) +AC_INIT([mstore],[0.2.0]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax]) AC_PREFIX_DEFAULT(/usr/local) diff --git a/go.mod b/go.mod index d27c0b9..5d8efdf 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module mstore -go 1.25.6 +go 1.24.0 require ( github.com/google/go-containerregistry v0.20.7 @@ -12,7 +12,6 @@ require ( github.com/spf13/cobra v1.10.2 github.com/stretchr/testify v1.11.1 go.yaml.in/yaml/v4 v4.0.0-rc.4 - sigs.k8s.io/yaml v1.6.0 ) require ( @@ -28,7 +27,6 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.9 // indirect github.com/vbatts/tar-split v0.12.2 // indirect - go.yaml.in/yaml/v2 v2.4.2 // indirect golang.org/x/sync v0.18.0 // indirect golang.org/x/sys v0.38.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index ef9bc2e..d169018 100644 --- a/go.sum +++ b/go.sum @@ -54,9 +54,6 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/vbatts/tar-split v0.12.2 h1:w/Y6tjxpeiFMR47yzZPlPj/FcPLpXbTUi/9H7d3CPa4= github.com/vbatts/tar-split v0.12.2/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA= -go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= -go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U= go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= @@ -72,5 +69,3 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= -sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= -sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/test/account_test.go b/test/account_test.go index 273f581..174e94b 100644 --- a/test/account_test.go +++ b/test/account_test.go @@ -21,7 +21,8 @@ import ( "mstore/pkg/client" "github.com/stretchr/testify/require" - "sigs.k8s.io/yaml" + + yaml "go.yaml.in/yaml/v4" ) func TestAccountLife(t *testing.T) { diff --git a/test/image_test.go b/test/image_test.go index 5546bc5..0d89587 100644 --- a/test/image_test.go +++ b/test/image_test.go @@ -20,7 +20,7 @@ import ( "mstore/pkg/client" "github.com/stretchr/testify/require" - "sigs.k8s.io/yaml" + yaml "go.yaml.in/yaml/v4" ) func TestImageLife(t *testing.T) {