From bbef795287e9c03d4db488d24f21b344d032365f Mon Sep 17 00:00:00 2001 From: Higor Oliveira QA Azion Date: Wed, 22 May 2024 15:01:36 -0300 Subject: [PATCH 1/5] chore: Add GoVulnCheck --- .github/workflows/package-audit.yaml | 18 ++++++++++++++++++ Makefile | 9 +++++++++ 2 files changed, 27 insertions(+) create mode 100644 .github/workflows/package-audit.yaml diff --git a/.github/workflows/package-audit.yaml b/.github/workflows/package-audit.yaml new file mode 100644 index 00000000..04d42a98 --- /dev/null +++ b/.github/workflows/package-audit.yaml @@ -0,0 +1,18 @@ +name: Package Auditing + +on: + pull_request: + types: [opened, synchronize] + +jobs: + PackageAuditing: + name: Package Auditor (GoVulnCheck) + runs-on: ubuntu-latest + container: + image: golang:1.22.3 + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: GoVulnCheck + run: make govulncheck diff --git a/Makefile b/Makefile index a76f2bc3..9f292f41 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ endif GOPATH ?= $(shell $(GO) env GOPATH) GOBIN ?= $(GOPATH)/bin GOSEC ?= $(GOBIN)/gosec +GOVULNCHECK ?= $(GOBIN)/govulncheck GOLINT ?= $(GOBIN)/golint GOFMT ?= $(GOBIN)/gofmt RELOAD ?= $(GOBIN)/CompileDaemon @@ -86,6 +87,14 @@ get-gosec-deps: @ cd $(GOPATH); \ $(GO) install github.com/securego/gosec/v2/cmd/gosec@latest +.PHONY: govulncheck +govulncheck: get-govulncheck-deps ## running GoVulnCheck + @ $(GOVULNCHECK) ./... + +.PHONY: get-govulncheck-deps +get-govulncheck-deps: + @ $(GO) install golang.org/x/vuln/cmd/govulncheck@latest + .PHONY : build build: ## build application @ $(GO) version From 65444ca77a7c4fa93f39c5bca649d798388fe7fa Mon Sep 17 00:00:00 2001 From: maxwelbm Date: Wed, 22 May 2024 21:19:33 -0300 Subject: [PATCH 2/5] chore: notes --- pkg/cmd/root/root.go | 11 ++++++++--- pkg/schedule/bucket.go | 2 +- pkg/schedule/schedule.go | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkg/cmd/root/root.go b/pkg/cmd/root/root.go index 30c54a58..175edd3c 100644 --- a/pkg/cmd/root/root.go +++ b/pkg/cmd/root/root.go @@ -79,11 +79,16 @@ func NewCobraCmd(rootCmd *RootCmd, f *cmdutil.Factory) *cobra.Command { if strings.HasPrefix(configFlag, PREFIX_FLAG) { return msg.ErrorPrefix } - schedule.ExecSchedules(f) - return doPreCommandCheck(cmd, f, PreCmd{ + + if err := doPreCommandCheck(cmd, f, PreCmd{ config: configFlag, token: tokenFlag, - }) + }); err != nil { + return err + } + + schedule.ExecSchedules(f) + return nil }, Example: heredoc.Doc(` $ azion diff --git a/pkg/schedule/bucket.go b/pkg/schedule/bucket.go index e5cdb242..132c7ce3 100644 --- a/pkg/schedule/bucket.go +++ b/pkg/schedule/bucket.go @@ -8,7 +8,7 @@ import ( api "github.com/aziontech/azion-cli/pkg/api/storage" ) -const DELETE_BUCKET = "DeleteBucket" +const DELETE_BUCKET = "DeleteBucket" func TriggerDeleteBucket(f *cmdutil.Factory, name string) error { client := api.NewClient( diff --git a/pkg/schedule/schedule.go b/pkg/schedule/schedule.go index 9a2b93cb..feb0537d 100644 --- a/pkg/schedule/schedule.go +++ b/pkg/schedule/schedule.go @@ -92,12 +92,16 @@ func readFileSchedule() ([]Schedule, error) { return schedules, nil } +// @PatrickMenoti +// NOTE: preciso investigar o pq esse cara não consegui excluir a o item +// NOTE: preciso que o item sejá deletado do json assim q o delete é feito com sucesso func ExecSchedules(factory *cmdutil.Factory) { + logger.Debug("Exec Schedules") schedules, err := readFileSchedule() if err != nil { logger.Debug("Error while reading the schedule", zap.Error(err)) return - } + } for _, s := range schedules { if CheckIf24HoursPassed(s.Time) { From 99f84843b35a0fc36a62708ec421d5bd847891f8 Mon Sep 17 00:00:00 2001 From: maxwelbm Date: Thu, 23 May 2024 11:01:33 -0300 Subject: [PATCH 3/5] fix: clean schedule file #patch --- pkg/cmd/delete/edge_storage/bucket.go | 7 ++++--- pkg/schedule/schedule.go | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkg/cmd/delete/edge_storage/bucket.go b/pkg/cmd/delete/edge_storage/bucket.go index f0a7467d..c05498b2 100644 --- a/pkg/cmd/delete/edge_storage/bucket.go +++ b/pkg/cmd/delete/edge_storage/bucket.go @@ -56,7 +56,8 @@ func (b *bucket) runE(cmd *cobra.Command, _ []string) error { } } logger.FInfo(b.factory.IOStreams.Out, "Delete all objects from bucket\n") - if err := deleteAllObjects(client, ctx, b.name, ""); err != nil { + logger.FInfo(b.factory.IOStreams.Out, "deleting objects...") + if err := deleteAllObjects(client, b, ctx, b.name, ""); err != nil { return err } err := client.DeleteBucket(ctx, b.name) @@ -87,7 +88,7 @@ func (f *bucket) addFlags(flags *pflag.FlagSet) { flags.BoolP("help", "h", false, msg.FLAG_HELP_DELETE_BUCKET) } -func deleteAllObjects(client *api.Client, ctx context.Context, name, continuationToken string) error { +func deleteAllObjects(client *api.Client, b *bucket, ctx context.Context, name, continuationToken string) error { objects, err := client.ListObject(ctx, name, &contracts.ListOptions{ContinuationToken: continuationToken}) if err != nil { return err @@ -99,7 +100,7 @@ func deleteAllObjects(client *api.Client, ctx context.Context, name, continuatio return err } } - return deleteAllObjects(client, ctx, name, continuationToken) + return deleteAllObjects(client, b, ctx, name, continuationToken) } return nil } diff --git a/pkg/schedule/schedule.go b/pkg/schedule/schedule.go index feb0537d..1b617f71 100644 --- a/pkg/schedule/schedule.go +++ b/pkg/schedule/schedule.go @@ -92,9 +92,6 @@ func readFileSchedule() ([]Schedule, error) { return schedules, nil } -// @PatrickMenoti -// NOTE: preciso investigar o pq esse cara não consegui excluir a o item -// NOTE: preciso que o item sejá deletado do json assim q o delete é feito com sucesso func ExecSchedules(factory *cmdutil.Factory) { logger.Debug("Exec Schedules") schedules, err := readFileSchedule() @@ -103,15 +100,21 @@ func ExecSchedules(factory *cmdutil.Factory) { return } + scheds := []Schedule{} for _, s := range schedules { if CheckIf24HoursPassed(s.Time) { if s.Kind == DELETE_BUCKET { if err := TriggerDeleteBucket(factory, s.Name); err != nil { logger.Debug("Event execution error", zap.Error(err)) + scheds = append(scheds, s) } } } } + + if err := createFileSchedule(scheds); err != nil { + logger.Debug("Scheduling error", zap.Error(err)) + } } // CheckIf24HoursPassed Checks if the current time is before 24 hours after the time 's'. From e30835726f1cc1272f537e834b19c951b7289976 Mon Sep 17 00:00:00 2001 From: maxwelbm Date: Thu, 23 May 2024 11:07:18 -0300 Subject: [PATCH 4/5] chore: removed params not used --- pkg/cmd/delete/edge_storage/bucket.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/delete/edge_storage/bucket.go b/pkg/cmd/delete/edge_storage/bucket.go index c05498b2..50801ea5 100644 --- a/pkg/cmd/delete/edge_storage/bucket.go +++ b/pkg/cmd/delete/edge_storage/bucket.go @@ -57,7 +57,7 @@ func (b *bucket) runE(cmd *cobra.Command, _ []string) error { } logger.FInfo(b.factory.IOStreams.Out, "Delete all objects from bucket\n") logger.FInfo(b.factory.IOStreams.Out, "deleting objects...") - if err := deleteAllObjects(client, b, ctx, b.name, ""); err != nil { + if err := deleteAllObjects(client, ctx, b.name, ""); err != nil { return err } err := client.DeleteBucket(ctx, b.name) @@ -88,7 +88,7 @@ func (f *bucket) addFlags(flags *pflag.FlagSet) { flags.BoolP("help", "h", false, msg.FLAG_HELP_DELETE_BUCKET) } -func deleteAllObjects(client *api.Client, b *bucket, ctx context.Context, name, continuationToken string) error { +func deleteAllObjects(client *api.Client, ctx context.Context, name, continuationToken string) error { objects, err := client.ListObject(ctx, name, &contracts.ListOptions{ContinuationToken: continuationToken}) if err != nil { return err @@ -100,7 +100,7 @@ func deleteAllObjects(client *api.Client, b *bucket, ctx context.Context, name, return err } } - return deleteAllObjects(client, b, ctx, name, continuationToken) + return deleteAllObjects(client, ctx, name, continuationToken) } return nil } From 04c9d7fdca9372094c009810b949fd432a7d7c71 Mon Sep 17 00:00:00 2001 From: Maxwel Mazur <52722027+maxwelbm@users.noreply.github.com> Date: Thu, 23 May 2024 11:53:21 -0300 Subject: [PATCH 5/5] chore: Capitalize message Co-authored-by: Rodrigo Maria --- pkg/cmd/delete/edge_storage/bucket.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/delete/edge_storage/bucket.go b/pkg/cmd/delete/edge_storage/bucket.go index 50801ea5..db6d8c2f 100644 --- a/pkg/cmd/delete/edge_storage/bucket.go +++ b/pkg/cmd/delete/edge_storage/bucket.go @@ -56,7 +56,7 @@ func (b *bucket) runE(cmd *cobra.Command, _ []string) error { } } logger.FInfo(b.factory.IOStreams.Out, "Delete all objects from bucket\n") - logger.FInfo(b.factory.IOStreams.Out, "deleting objects...") + logger.FInfo(b.factory.IOStreams.Out, "Deleting objects...") if err := deleteAllObjects(client, ctx, b.name, ""); err != nil { return err }