From 86ae31238486d5215911dd717006ae0eceb69e6d 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, 8 Mar 2026 21:57:38 +0200 Subject: [PATCH] working commit --- Makefile.am | 20 +++-- Makefile.in | 232 ++++++++++++++++++---------------------------------- 2 files changed, 92 insertions(+), 160 deletions(-) diff --git a/Makefile.am b/Makefile.am index 86bd23d..d897a67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,12 +36,11 @@ EXTRA_mstorectl_SOURCES = \ cmd/mstorectl/filecmd/listfiles.go \ cmd/mstorectl/filecmd/putfile.go \ cmd/mstorectl/imagecmd/imagecmd.go \ - cmd/mstorectl/imagecmd/printresp.go \ - cmd/mstorectl/main.go \ - cmd/mstorectl/util.go + cmd/mstorectl/imagecmd/printresp.go -mstored_SOURCES = cmd/mstored/main.go \ - cmd/mstored/starter/starter.go +mstored_SOURCES = cmd/mstored/main.go + +EXTRA_mstored_SOURCES = cmd/mstored/starter/starter.go mstorectl$(EXEEXT): $(mstorectl_SOURCES) $(EXTRA_mstorectl_SOURCES) $(EXTRA_mstored_SOURCES) env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mstorectl$(EXEEXT) $(mstorectl_SOURCES) @@ -54,7 +53,7 @@ run: $(mstored_SOURCES) CWD=$(shell pwd) -EXTRA_mstored_SOURCES = \ +EXTRA_mstored_SOURCES += \ app/accoper/createacc.go \ app/accoper/creategrant.go \ app/accoper/delacc.go \ @@ -201,13 +200,19 @@ EXTRA_mstored_SOURCES = \ pkg/terms/terms.go -EXTRA_DIST = vendor/ \ +EXTRA_DIST = vendor/* \ \ Containerfile \ go.mod \ go.sum \ LICENSE.txt \ README.md \ + DEVEL.md \ + \ + test/attic/account_test.go \ + test/attic/file_test.go \ + test/attic/image_test.go \ + test/file_test.go \ \ chart/Chart.yaml.in \ chart/.gitignore \ @@ -275,6 +280,7 @@ EXTRA_DIST = vendor/ \ + format: @dirs=$$($(FIND) $(CWD)/app $(CWD)/cmd $(CWD)/pkg $(CWD)/test \ -name '*.go' | $(XARGS) -n1 dirname | $(SORT) | $(UNIQ)); \ diff --git a/Makefile.in b/Makefile.in index 5fd2a02..80f9673 100644 --- a/Makefile.in +++ b/Makefile.in @@ -382,167 +382,93 @@ EXTRA_mstorectl_SOURCES = \ cmd/mstorectl/filecmd/listfiles.go \ cmd/mstorectl/filecmd/putfile.go \ cmd/mstorectl/imagecmd/imagecmd.go \ - cmd/mstorectl/imagecmd/printresp.go \ - cmd/mstorectl/main.go \ - cmd/mstorectl/util.go - -mstored_SOURCES = cmd/mstored/main.go \ - cmd/mstored/starter/starter.go + cmd/mstorectl/imagecmd/printresp.go +mstored_SOURCES = cmd/mstored/main.go +EXTRA_mstored_SOURCES = cmd/mstored/starter/starter.go \ + app/accoper/createacc.go app/accoper/creategrant.go \ + app/accoper/delacc.go app/accoper/delgrant.go \ + app/accoper/getacc.go app/accoper/getgrant.go \ + app/accoper/listacc.go app/accoper/listgrant.go \ + app/accoper/operator.go app/accoper/updacc.go \ + app/accoper/updgrant.go app/config/config.go \ + app/config/variant.go app/fileoper/delcats.go \ + app/fileoper/delfile.go app/fileoper/fileinfo.go \ + app/fileoper/getfile.go app/fileoper/listcats.go \ + app/fileoper/listfiles.go app/fileoper/operator.go \ + app/fileoper/putfile.go app/handler/aaafunc.go \ + app/handler/account.go app/handler/blob.go app/handler/file.go \ + app/handler/grant.go app/handler/handler.go \ + app/handler/manifest.go app/handler/notfound.go \ + app/handler/response.go app/handler/service.go \ + app/handler/version.go app/imageoper/blobexist.go \ + app/imageoper/delblob.go app/imageoper/delman.go \ + app/imageoper/getblob.go app/imageoper/getman.go \ + app/imageoper/getrefer.go app/imageoper/gettags.go \ + app/imageoper/imgaux.go app/imageoper/listman.go \ + app/imageoper/manexist.go app/imageoper/ociaux.go \ + app/imageoper/operator.go app/imageoper/patchupload.go \ + app/imageoper/postupload.go app/imageoper/putman.go \ + app/imageoper/putupload.go app/imageoper/service.go \ + app/imageoper/version.go app/locker/locker.go \ + app/logger/logger.go app/maindb/account.go app/maindb/blob.go \ + app/maindb/file.go app/maindb/grant.go app/maindb/init.go \ + app/maindb/maindb.go app/maindb/manifest.go \ + app/maindb/scheme.go app/router/bindobj.go \ + app/router/context.go app/router/corsmw.go \ + app/router/loggingmw.go app/router/pathc.go \ + app/router/recovermw.go app/router/router.go \ + app/server/server.go app/service/service.go \ + app/storage/storage.go pkg/accntcli/client.go \ + pkg/accntcli/createacc.go pkg/accntcli/creategrant.go \ + pkg/accntcli/delacc.go pkg/accntcli/delgrant.go \ + pkg/accntcli/getacc.go pkg/accntcli/getgrant.go \ + pkg/accntcli/httpcall.go pkg/accntcli/listacc.go \ + pkg/accntcli/listgrants.go pkg/accntcli/referer.go \ + pkg/accntcli/servhello.go pkg/accntcli/updateacc.go \ + pkg/accntcli/updgrant.go pkg/auxhttp/basic.go \ + pkg/auxhttp/crange.go pkg/auxoci/ociaux.go \ + pkg/auxpwd/passwd.go pkg/auxtool/cleandir.go \ + pkg/auxtool/fileex.go pkg/auxtool/randstr.go \ + pkg/auxtool/tmpfile.go pkg/auxtool/unixnow.go \ + pkg/auxutar/utar.go pkg/auxuuid/uuid.go \ + pkg/auxx509/x509cert.go pkg/client/account.go \ + pkg/client/client.go pkg/client/grant.go \ + pkg/client/httpcall.go pkg/client/imageaux.go \ + pkg/client/imagedelete.go pkg/client/imageinfo.go \ + pkg/client/imagepull.go pkg/client/imagepush.go \ + pkg/client/servaux.go pkg/client/service.go \ + pkg/descr/account.go pkg/descr/blob.go pkg/descr/file.go \ + pkg/descr/grant.go pkg/descr/manifest.go pkg/descr/server.go \ + pkg/digest/digest.go pkg/filecli/authbas.go \ + pkg/filecli/client.go pkg/filecli/copyctx.go \ + pkg/filecli/delcoll.go pkg/filecli/delfile.go \ + pkg/filecli/fileinfo.go pkg/filecli/getfile.go \ + pkg/filecli/listcoll.go pkg/filecli/listfiles.go \ + pkg/filecli/putfile.go pkg/filecli/referer.go \ + pkg/repocli/blobexist.go pkg/repocli/client.go \ + pkg/repocli/copywctx.go pkg/repocli/delblob.go \ + pkg/repocli/delman.go pkg/repocli/getblob.go \ + pkg/repocli/getman.go pkg/repocli/gettoken.go \ + pkg/repocli/getupload.go pkg/repocli/imager.go \ + pkg/repocli/manexist.go pkg/repocli/patchupload.go \ + pkg/repocli/pullimage.go pkg/repocli/putman.go \ + pkg/repocli/putupload.go pkg/repocli/reference.go \ + pkg/repocli/referer.go pkg/repocli/uuid.go pkg/terms/terms.go CWD = $(shell pwd) -EXTRA_mstored_SOURCES = \ - app/accoper/createacc.go \ - app/accoper/creategrant.go \ - app/accoper/delacc.go \ - app/accoper/delgrant.go \ - app/accoper/getacc.go \ - app/accoper/getgrant.go \ - app/accoper/listacc.go \ - app/accoper/listgrant.go \ - app/accoper/operator.go \ - app/accoper/updacc.go \ - app/accoper/updgrant.go \ - app/config/config.go \ - app/config/variant.go \ - app/fileoper/delcats.go \ - app/fileoper/delfile.go \ - app/fileoper/fileinfo.go \ - app/fileoper/getfile.go \ - app/fileoper/listcats.go \ - app/fileoper/listfiles.go \ - app/fileoper/operator.go \ - app/fileoper/putfile.go \ - app/handler/aaafunc.go \ - app/handler/account.go \ - app/handler/blob.go \ - app/handler/file.go \ - app/handler/grant.go \ - app/handler/handler.go \ - app/handler/manifest.go \ - app/handler/notfound.go \ - app/handler/response.go \ - app/handler/service.go \ - app/handler/version.go \ - app/imageoper/blobexist.go \ - app/imageoper/delblob.go \ - app/imageoper/delman.go \ - app/imageoper/getblob.go \ - app/imageoper/getman.go \ - app/imageoper/getrefer.go \ - app/imageoper/gettags.go \ - app/imageoper/imgaux.go \ - app/imageoper/listman.go \ - app/imageoper/manexist.go \ - app/imageoper/ociaux.go \ - app/imageoper/operator.go \ - app/imageoper/patchupload.go \ - app/imageoper/postupload.go \ - app/imageoper/putman.go \ - app/imageoper/putupload.go \ - app/imageoper/service.go \ - app/imageoper/version.go \ - app/locker/locker.go \ - app/logger/logger.go \ - app/maindb/account.go \ - app/maindb/blob.go \ - app/maindb/file.go \ - app/maindb/grant.go \ - app/maindb/init.go \ - app/maindb/maindb.go \ - app/maindb/manifest.go \ - app/maindb/scheme.go \ - app/router/bindobj.go \ - app/router/context.go \ - app/router/corsmw.go \ - app/router/loggingmw.go \ - app/router/pathc.go \ - app/router/recovermw.go \ - app/router/router.go \ - app/server/server.go \ - app/service/service.go \ - app/storage/storage.go \ - pkg/accntcli/client.go \ - pkg/accntcli/createacc.go \ - pkg/accntcli/creategrant.go \ - pkg/accntcli/delacc.go \ - pkg/accntcli/delgrant.go \ - pkg/accntcli/getacc.go \ - pkg/accntcli/getgrant.go \ - pkg/accntcli/httpcall.go \ - pkg/accntcli/listacc.go \ - pkg/accntcli/listgrants.go \ - pkg/accntcli/referer.go \ - pkg/accntcli/servhello.go \ - pkg/accntcli/updateacc.go \ - pkg/accntcli/updgrant.go \ - pkg/auxhttp/basic.go \ - pkg/auxhttp/crange.go \ - pkg/auxoci/ociaux.go \ - pkg/auxpwd/passwd.go \ - pkg/auxtool/cleandir.go \ - pkg/auxtool/fileex.go \ - pkg/auxtool/randstr.go \ - pkg/auxtool/tmpfile.go \ - pkg/auxtool/unixnow.go \ - pkg/auxutar/utar.go \ - pkg/auxuuid/uuid.go \ - pkg/auxx509/x509cert.go \ - pkg/client/account.go \ - pkg/client/client.go \ - pkg/client/grant.go \ - pkg/client/httpcall.go \ - pkg/client/imageaux.go \ - pkg/client/imagedelete.go \ - pkg/client/imageinfo.go \ - pkg/client/imagepull.go \ - pkg/client/imagepush.go \ - pkg/client/servaux.go \ - pkg/client/service.go \ - pkg/descr/account.go \ - pkg/descr/blob.go \ - pkg/descr/file.go \ - pkg/descr/grant.go \ - pkg/descr/manifest.go \ - pkg/descr/server.go \ - pkg/digest/digest.go \ - pkg/filecli/authbas.go \ - pkg/filecli/client.go \ - pkg/filecli/copyctx.go \ - pkg/filecli/delcoll.go \ - pkg/filecli/delfile.go \ - pkg/filecli/fileinfo.go \ - pkg/filecli/getfile.go \ - pkg/filecli/listcoll.go \ - pkg/filecli/listfiles.go \ - pkg/filecli/putfile.go \ - pkg/filecli/referer.go \ - pkg/repocli/blobexist.go \ - pkg/repocli/client.go \ - pkg/repocli/copywctx.go \ - pkg/repocli/delblob.go \ - pkg/repocli/delman.go \ - pkg/repocli/getblob.go \ - pkg/repocli/getman.go \ - pkg/repocli/gettoken.go \ - pkg/repocli/getupload.go \ - pkg/repocli/imager.go \ - pkg/repocli/manexist.go \ - pkg/repocli/patchupload.go \ - pkg/repocli/pullimage.go \ - pkg/repocli/putman.go \ - pkg/repocli/putupload.go \ - pkg/repocli/reference.go \ - pkg/repocli/referer.go \ - pkg/repocli/uuid.go \ - pkg/terms/terms.go - -EXTRA_DIST = vendor/ \ +EXTRA_DIST = vendor/* \ \ Containerfile \ go.mod \ go.sum \ LICENSE.txt \ README.md \ + DEVEL.md \ + \ + test/attic/account_test.go \ + test/attic/file_test.go \ + test/attic/image_test.go \ + test/file_test.go \ \ chart/Chart.yaml.in \ chart/.gitignore \