Skip to content

Commit

Permalink
refactor: back out of vanity go module name
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan committed Dec 16, 2024
1 parent f6f1f1e commit 4472f3c
Show file tree
Hide file tree
Showing 258 changed files with 604 additions and 604 deletions.
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ nogo(
],
)

# gazelle:prefix aspect.build/cli
# gazelle:prefix github.com/aspect-build/aspect-cli
# gazelle:exclude **/*.pb.go
# gazelle:resolve go github.com/bazelbuild/buildtools/edit @com_github_bazelbuild_buildtools//edit:go_default_library
# gazelle:resolve go github.com/bazelbuild/buildtools/build @com_github_bazelbuild_buildtools//build:go_default_library
Expand Down
4 changes: 2 additions & 2 deletions bazel/action_cache/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proto_library(

go_proto_library(
name = "bazel_go_proto",
importpath = "aspect.build/cli/bazel/action_cache",
importpath = "github.com/aspect-build/aspect-cli/bazel/action_cache",
proto = ":bazel_proto",
visibility = ["//visibility:public"],
)
Expand All @@ -29,7 +29,7 @@ write_go_generated_source_files(
go_library(
name = "action_cache",
embed = [":bazel_go_proto"],
importpath = "aspect.build/cli/bazel/action_cache",
importpath = "github.com/aspect-build/aspect-cli/bazel/action_cache",
visibility = ["//visibility:public"],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/analysis/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ proto_library(

go_proto_library(
name = "bazel_go_proto",
importpath = "aspect.build/cli/bazel/analysis",
importpath = "github.com/aspect-build/aspect-cli/bazel/analysis",
proto = ":bazel_proto",
visibility = ["//visibility:public"],
deps = ["//bazel/query"],
Expand All @@ -31,7 +31,7 @@ write_go_generated_source_files(
go_library(
name = "analysis",
embed = [":bazel_go_proto"],
importpath = "aspect.build/cli/bazel/analysis",
importpath = "github.com/aspect-build/aspect-cli/bazel/analysis",
visibility = ["//visibility:public"],
)

Expand Down
2 changes: 1 addition & 1 deletion bazel/analysis/analysis_v2.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bazel/buildeventstream/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ proto_library(

go_proto_library(
name = "buildeventstream_go_proto",
importpath = "aspect.build/cli/bazel/buildeventstream",
importpath = "github.com/aspect-build/aspect-cli/bazel/buildeventstream",
proto = ":buildeventstream_proto",
visibility = ["//visibility:public"],
deps = [
Expand All @@ -46,7 +46,7 @@ write_go_generated_source_files(
go_library(
name = "buildeventstream",
embed = [":buildeventstream_go_proto"],
importpath = "aspect.build/cli/bazel/buildeventstream",
importpath = "github.com/aspect-build/aspect-cli/bazel/buildeventstream",
visibility = ["//visibility:public"],
)

Expand Down
19 changes: 10 additions & 9 deletions bazel/buildeventstream/build_event_stream.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bazel/buildeventstream/build_event_stream.proto
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import "google/protobuf/any.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";

option go_package = "aspect.build/cli/bazel/buildeventstream";
option go_package = "github.com/aspect-build/aspect-cli/bazel/buildeventstream";

// Identifier for a build event. It is deliberately structured to also provide
// information about which build target etc the event is related to.
Expand Down
4 changes: 2 additions & 2 deletions bazel/command_line/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ proto_library(

go_proto_library(
name = "command_line_go_proto",
importpath = "aspect.build/cli/bazel/command_line",
importpath = "github.com/aspect-build/aspect-cli/bazel/command_line",
proto = ":command_line_proto",
visibility = ["//visibility:public"],
deps = ["//bazel/options"],
Expand All @@ -31,7 +31,7 @@ write_go_generated_source_files(
go_library(
name = "command_line",
embed = [":command_line_go_proto"],
importpath = "aspect.build/cli/bazel/command_line",
importpath = "github.com/aspect-build/aspect-cli/bazel/command_line",
visibility = ["//visibility:public"],
)

Expand Down
2 changes: 1 addition & 1 deletion bazel/command_line/command_line.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bazel/failure_details/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ proto_library(

go_proto_library(
name = "failure_details_go_proto",
importpath = "aspect.build/cli/bazel/failure_details",
importpath = "github.com/aspect-build/aspect-cli/bazel/failure_details",
proto = ":failure_details_proto",
visibility = ["//visibility:public"],
)
Expand All @@ -30,7 +30,7 @@ write_go_generated_source_files(
go_library(
name = "failure_details",
embed = [":failure_details_go_proto"],
importpath = "aspect.build/cli/bazel/failure_details",
importpath = "github.com/aspect-build/aspect-cli/bazel/failure_details",
visibility = ["//visibility:public"],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/flags/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proto_library(

go_proto_library(
name = "bazel_go_proto",
importpath = "aspect.build/cli/bazel/flags",
importpath = "github.com/aspect-build/aspect-cli/bazel/flags",
proto = ":bazel_proto",
visibility = ["//visibility:public"],
)
Expand All @@ -29,7 +29,7 @@ write_go_generated_source_files(
go_library(
name = "flags",
embed = [":bazel_go_proto"],
importpath = "aspect.build/cli/bazel/flags",
importpath = "github.com/aspect-build/aspect-cli/bazel/flags",
visibility = ["//visibility:public"],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/invocation_policy/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proto_library(

go_proto_library(
name = "blaze_invocation_policy_go_proto",
importpath = "aspect.build/cli/bazel/invocation_policy",
importpath = "github.com/aspect-build/aspect-cli/bazel/invocation_policy",
proto = ":invocation_policy_proto",
visibility = ["//visibility:public"],
)
Expand All @@ -29,7 +29,7 @@ write_go_generated_source_files(
go_library(
name = "invocation_policy",
embed = [":blaze_invocation_policy_go_proto"],
importpath = "aspect.build/cli/bazel/invocation_policy",
importpath = "github.com/aspect-build/aspect-cli/bazel/invocation_policy",
visibility = ["//visibility:public"],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/options/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proto_library(

go_proto_library(
name = "options_go_proto",
importpath = "aspect.build/cli/bazel/options",
importpath = "github.com/aspect-build/aspect-cli/bazel/options",
proto = ":options_proto",
visibility = ["//visibility:public"],
)
Expand All @@ -29,7 +29,7 @@ write_go_generated_source_files(
go_library(
name = "options",
embed = [":options_go_proto"],
importpath = "aspect.build/cli/bazel/options",
importpath = "github.com/aspect-build/aspect-cli/bazel/options",
visibility = ["//visibility:public"],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/packages_metrics/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ proto_library(

go_proto_library(
name = "devtools_build_lib_packages_metrics_go_proto",
importpath = "aspect.build/cli/bazel/packages_metrics",
importpath = "github.com/aspect-build/aspect-cli/bazel/packages_metrics",
proto = ":devtools_build_lib_packages_metrics_proto",
visibility = ["//visibility:public"],
)
Expand All @@ -30,7 +30,7 @@ write_go_generated_source_files(
go_library(
name = "packages_metrics",
embed = [":devtools_build_lib_packages_metrics_go_proto"],
importpath = "aspect.build/cli/bazel/packages_metrics",
importpath = "github.com/aspect-build/aspect-cli/bazel/packages_metrics",
visibility = ["//visibility:public"],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/query/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proto_library(

go_proto_library(
name = "blaze_query_aspect_mirror_go_proto",
importpath = "aspect.build/cli/bazel/query",
importpath = "github.com/aspect-build/aspect-cli/bazel/query",
proto = ":blaze_query_aspect_mirror_proto",
visibility = ["//visibility:public"],
)
Expand All @@ -29,7 +29,7 @@ write_go_generated_source_files(
go_library(
name = "query",
embed = [":blaze_query_aspect_mirror_go_proto"],
importpath = "aspect.build/cli/bazel/query",
importpath = "github.com/aspect-build/aspect-cli/bazel/query",
visibility = ["//visibility:public"],
)

Expand Down
2 changes: 1 addition & 1 deletion buildinfo/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ go_library(
"build_info.go",
"stamp.go",
],
importpath = "aspect.build/cli/buildinfo",
importpath = "github.com/aspect-build/aspect-cli/buildinfo",
visibility = ["//visibility:public"],
x_defs = _GO_STAMP_X_DEFS,
)
Expand Down
2 changes: 1 addition & 1 deletion buildinfo/build_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package buildinfo_test
import (
"testing"

"aspect.build/cli/buildinfo"
"github.com/aspect-build/aspect-cli/buildinfo"
. "github.com/onsi/gomega"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/aspect/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "aspect_lib",
srcs = ["main.go"],
importpath = "aspect.build/cli/cmd/aspect",
importpath = "github.com/aspect-build/aspect-cli/cmd/aspect",
visibility = [
"//cli:__pkg__", # For silo release
"//cmd:__subpackages__",
"//release:__pkg__", # For https://github.com/aspect-build/aspect-cli release
],
x_defs = {"aspect.build/cli/buildinfo.OpenSource": "true"},
x_defs = {"github.com/aspect-build/aspect-cli/buildinfo.OpenSource": "true"},
deps = [
"//cmd/aspect/root",
"//pkg/aspect/root/config",
Expand Down
2 changes: 1 addition & 1 deletion cmd/aspect/analyzeprofile/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "analyzeprofile",
srcs = ["analyzeprofile.go"],
importpath = "aspect.build/cli/cmd/aspect/analyzeprofile",
importpath = "github.com/aspect-build/aspect-cli/cmd/aspect/analyzeprofile",
visibility = ["//visibility:public"],
deps = [
"//pkg/aspect/analyzeprofile",
Expand Down
10 changes: 5 additions & 5 deletions cmd/aspect/analyzeprofile/analyzeprofile.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package analyzeprofile
import (
"github.com/spf13/cobra"

"aspect.build/cli/pkg/aspect/analyzeprofile"
"aspect.build/cli/pkg/aspect/root/flags"
"aspect.build/cli/pkg/bazel"
"aspect.build/cli/pkg/interceptors"
"aspect.build/cli/pkg/ioutils"
"github.com/aspect-build/aspect-cli/pkg/aspect/analyzeprofile"
"github.com/aspect-build/aspect-cli/pkg/aspect/root/flags"
"github.com/aspect-build/aspect-cli/pkg/bazel"
"github.com/aspect-build/aspect-cli/pkg/interceptors"
"github.com/aspect-build/aspect-cli/pkg/ioutils"
)

func NewDefaultCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/aspect/aquery/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "aquery",
srcs = ["aquery.go"],
importpath = "aspect.build/cli/cmd/aspect/aquery",
importpath = "github.com/aspect-build/aspect-cli/cmd/aspect/aquery",
visibility = ["//visibility:public"],
deps = [
"//pkg/aspect/aquery",
Expand Down
10 changes: 5 additions & 5 deletions cmd/aspect/aquery/aquery.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package aquery
import (
"github.com/spf13/cobra"

"aspect.build/cli/pkg/aspect/aquery"
"aspect.build/cli/pkg/aspect/root/flags"
"aspect.build/cli/pkg/bazel"
"aspect.build/cli/pkg/interceptors"
"aspect.build/cli/pkg/ioutils"
"github.com/aspect-build/aspect-cli/pkg/aspect/aquery"
"github.com/aspect-build/aspect-cli/pkg/aspect/root/flags"
"github.com/aspect-build/aspect-cli/pkg/bazel"
"github.com/aspect-build/aspect-cli/pkg/interceptors"
"github.com/aspect-build/aspect-cli/pkg/ioutils"
)

func NewDefaultCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/aspect/build/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "build",
srcs = ["build.go"],
importpath = "aspect.build/cli/cmd/aspect/build",
importpath = "github.com/aspect-build/aspect-cli/cmd/aspect/build",
visibility = ["//visibility:public"],
deps = [
"//pkg/aspect/build",
Expand Down
12 changes: 6 additions & 6 deletions cmd/aspect/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ package build
import (
"github.com/spf13/cobra"

"aspect.build/cli/pkg/aspect/build"
"aspect.build/cli/pkg/aspect/root/flags"
"aspect.build/cli/pkg/bazel"
"aspect.build/cli/pkg/interceptors"
"aspect.build/cli/pkg/ioutils"
"aspect.build/cli/pkg/plugin/system"
"github.com/aspect-build/aspect-cli/pkg/aspect/build"
"github.com/aspect-build/aspect-cli/pkg/aspect/root/flags"
"github.com/aspect-build/aspect-cli/pkg/bazel"
"github.com/aspect-build/aspect-cli/pkg/interceptors"
"github.com/aspect-build/aspect-cli/pkg/ioutils"
"github.com/aspect-build/aspect-cli/pkg/plugin/system"
)

// NewDefaultCmd creates a new build cobra command with the default
Expand Down
2 changes: 1 addition & 1 deletion cmd/aspect/canonicalizeflags/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "canonicalizeflags",
srcs = ["canonicalizeflags.go"],
importpath = "aspect.build/cli/cmd/aspect/canonicalizeflags",
importpath = "github.com/aspect-build/aspect-cli/cmd/aspect/canonicalizeflags",
visibility = ["//visibility:public"],
deps = [
"//pkg/aspect/canonicalizeflags",
Expand Down
10 changes: 5 additions & 5 deletions cmd/aspect/canonicalizeflags/canonicalizeflags.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package canonicalizeflags
import (
"github.com/spf13/cobra"

"aspect.build/cli/pkg/aspect/canonicalizeflags"
"aspect.build/cli/pkg/aspect/root/flags"
"aspect.build/cli/pkg/bazel"
"aspect.build/cli/pkg/interceptors"
"aspect.build/cli/pkg/ioutils"
"github.com/aspect-build/aspect-cli/pkg/aspect/canonicalizeflags"
"github.com/aspect-build/aspect-cli/pkg/aspect/root/flags"
"github.com/aspect-build/aspect-cli/pkg/bazel"
"github.com/aspect-build/aspect-cli/pkg/interceptors"
"github.com/aspect-build/aspect-cli/pkg/ioutils"
)

func NewDefaultCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/aspect/clean/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "clean",
srcs = ["clean.go"],
importpath = "aspect.build/cli/cmd/aspect/clean",
importpath = "github.com/aspect-build/aspect-cli/cmd/aspect/clean",
visibility = ["//visibility:public"],
deps = [
"//pkg/aspect/clean",
Expand Down
Loading

0 comments on commit 4472f3c

Please sign in to comment.