From 4034e3621ae6232ce63065c478b625ec565d7ec3 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Mon, 30 Oct 2023 05:17:56 +0100 Subject: [PATCH] chore: go fmt && gazelle --- cmd/aspect/root/BUILD.bazel | 2 +- cmd/aspect/root/root.go | 2 +- pkg/aspect/outputs/hash.go | 18 +++++++++++++++++- pkg/plugin/system/bep/BUILD.bazel | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/cmd/aspect/root/BUILD.bazel b/cmd/aspect/root/BUILD.bazel index 9904c56f4..22f1e553b 100644 --- a/cmd/aspect/root/BUILD.bazel +++ b/cmd/aspect/root/BUILD.bazel @@ -34,10 +34,10 @@ go_library( "//cmd/aspect/sync", "//cmd/aspect/test", "//cmd/aspect/version", + "//docs/help/topics", "//pkg/aspect/root/flags", "//pkg/ioutils", "//pkg/plugin/system", - "//docs/cli/help", "@com_github_fatih_color//:color", "@com_github_mattn_go_isatty//:go-isatty", "@com_github_spf13_cobra//:cobra", diff --git a/cmd/aspect/root/root.go b/cmd/aspect/root/root.go index 0adf67545..559e4d532 100644 --- a/cmd/aspect/root/root.go +++ b/cmd/aspect/root/root.go @@ -52,10 +52,10 @@ import ( "aspect.build/cli/cmd/aspect/sync" "aspect.build/cli/cmd/aspect/test" "aspect.build/cli/cmd/aspect/version" + help_docs "aspect.build/cli/docs/help/topics" "aspect.build/cli/pkg/aspect/root/flags" "aspect.build/cli/pkg/ioutils" "aspect.build/cli/pkg/plugin/system" - help_docs "aspect.build/cli/docs/help" ) var ( diff --git a/pkg/aspect/outputs/hash.go b/pkg/aspect/outputs/hash.go index 45cd19363..51bcbfb2b 100644 --- a/pkg/aspect/outputs/hash.go +++ b/pkg/aspect/outputs/hash.go @@ -1,3 +1,19 @@ +/* + * Copyright 2022 Aspect Build Systems, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package outputs import ( @@ -11,8 +27,8 @@ import ( "sort" "strings" - "github.com/alphadose/haxmap" "aspect.build/cli/pkg/bazel" + "github.com/alphadose/haxmap" "github.com/rogpeppe/go-internal/dirhash" concurrently "github.com/tejzpr/ordered-concurrently/v3" "github.com/twmb/murmur3" diff --git a/pkg/plugin/system/bep/BUILD.bazel b/pkg/plugin/system/bep/BUILD.bazel index 8cf32e466..09cfaee2a 100644 --- a/pkg/plugin/system/bep/BUILD.bazel +++ b/pkg/plugin/system/bep/BUILD.bazel @@ -14,8 +14,8 @@ go_library( "//pkg/aspecterrors", "//pkg/aspectgrpc", "//pkg/plugin/system/besproxy", + "@com_github_golang_protobuf//ptypes/empty", "@go_googleapis//google/devtools/build/v1:build_go_proto", - "@io_bazel_rules_go//proto/wkt:empty_go_proto", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//credentials/insecure", "@org_golang_google_protobuf//types/known/emptypb",