Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")

go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
go_sdk.from_file(
go_mod = "//src/runtime:go.mod",
go_mod = "//src:go.mod",
)

go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//src/runtime:go.mod")
go_deps.from_file(go_mod = "//src:go.mod")

# Additional dependencies for building rsync for CLI distribution
go_deps.module(
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/runtime/cmd/ctrl/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gazelle(name = "gazelle")
go_library(
name = "ctrl",
srcs = ["ctrl.go"],
importpath = "go.corp.nvidia.com/osmo/cmd/user",
importpath = "go.corp.nvidia.com/osmo/runtime/cmd/user",
visibility = ["//visibility:private"],
deps = [
"//src/runtime/pkg/args:ctrl_args",
Expand Down
14 changes: 7 additions & 7 deletions src/runtime/cmd/ctrl/ctrl.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ import (
"syscall"
"time"

"go.corp.nvidia.com/osmo/pkg/args"
"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/pkg/data"
"go.corp.nvidia.com/osmo/pkg/messages"
"go.corp.nvidia.com/osmo/pkg/metrics"
"go.corp.nvidia.com/osmo/pkg/osmo_errors"
"go.corp.nvidia.com/osmo/pkg/rsync"
"go.corp.nvidia.com/osmo/runtime/pkg/args"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/data"
"go.corp.nvidia.com/osmo/runtime/pkg/messages"
"go.corp.nvidia.com/osmo/runtime/pkg/metrics"
"go.corp.nvidia.com/osmo/runtime/pkg/osmo_errors"
"go.corp.nvidia.com/osmo/runtime/pkg/rsync"

"github.com/gorilla/websocket"
"gopkg.in/yaml.v3"
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/cmd/rsync/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
go_library(
name = "rsync",
srcs = ["rsync.go"],
importpath = "go.corp.nvidia.com/osmo/cmd/user/rsync",
importpath = "go.corp.nvidia.com/osmo/runtime/cmd/user/rsync",
deps = [
"//src/runtime/pkg/common:common",
"@com_github_conduitio_bwlimit//:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/cmd/rsync/rsync.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/conduitio/bwlimit"
"github.com/gokrazy/rsync/rsyncd"
"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
)

// Parses the path allow list and returns a list of modules.
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/cmd/user/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gazelle(name = "gazelle")
go_library(
name = "user",
srcs = ["user.go"],
importpath = "go.corp.nvidia.com/osmo/cmd/user",
importpath = "go.corp.nvidia.com/osmo/runtime/cmd/user",
visibility = ["//visibility:private"],
deps = [
"//src/runtime/pkg/args:exec_args",
Expand Down
10 changes: 5 additions & 5 deletions src/runtime/cmd/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import (
"syscall"
"time"

"go.corp.nvidia.com/osmo/pkg/args"
"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/pkg/data"
"go.corp.nvidia.com/osmo/pkg/messages"
"go.corp.nvidia.com/osmo/pkg/rsync"
"go.corp.nvidia.com/osmo/runtime/pkg/args"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/data"
"go.corp.nvidia.com/osmo/runtime/pkg/messages"
"go.corp.nvidia.com/osmo/runtime/pkg/rsync"

"github.com/creack/pty"
"github.com/google/shlex"
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/pkg/args/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ go_library(
name = "exec_args",
srcs = ["exec_args.go",
"objects.go"],
importpath = "go.corp.nvidia.com/osmo/pkg/args",
importpath = "go.corp.nvidia.com/osmo/runtime/pkg/args",
visibility = ["//visibility:public"],
deps = [
"//src/runtime/pkg/common:common",
Expand All @@ -31,7 +31,7 @@ go_library(
name = "ctrl_args",
srcs = ["ctrl_args.go",
"objects.go"],
importpath = "go.corp.nvidia.com/osmo/pkg/args",
importpath = "go.corp.nvidia.com/osmo/runtime/pkg/args",
visibility = ["//visibility:public"],
deps = [
"//src/runtime/pkg/common:common",
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/args/ctrl_args.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"time"

"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
)

// Parse and process command line arguments
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/args/exec_args.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"flag"
"time"

"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
)

// Parse and process command line arguments
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/args/objects.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"net/url"
"time"

"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
)

type ExecArgs struct {
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/common/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "common",
srcs = ["common.go"],
importpath = "go.corp.nvidia.com/osmo/pkg/common",
importpath = "go.corp.nvidia.com/osmo/runtime/pkg/common",
visibility = ["//visibility:public"],
deps = [
"//src/runtime/pkg/osmo_errors:osmo_errors",
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"sort"
"sync"

"go.corp.nvidia.com/osmo/pkg/osmo_errors"
"go.corp.nvidia.com/osmo/runtime/pkg/osmo_errors"
)

type OsmoPort uint16
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/data/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ go_library(
"input_output.go",
"storage_backends.go"
],
importpath = "go.corp.nvidia.com/osmo/pkg/data",
importpath = "go.corp.nvidia.com/osmo/runtime/pkg/data",
visibility = ["//visibility:public"],
deps = [
"//src/runtime/pkg/common:common",
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/pkg/data/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
"syscall"
"time"

"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/pkg/osmo_errors"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/osmo_errors"
)

var DataTimeout time.Duration = 10 * time.Minute
Expand Down
6 changes: 3 additions & 3 deletions src/runtime/pkg/data/input_output.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"sync"
"time"

"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/pkg/metrics"
"go.corp.nvidia.com/osmo/pkg/osmo_errors"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/metrics"
"go.corp.nvidia.com/osmo/runtime/pkg/osmo_errors"
)

type DataCredential struct {
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/data/storage_backends.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net/url"
"strings"

"go.corp.nvidia.com/osmo/pkg/osmo_errors"
"go.corp.nvidia.com/osmo/runtime/pkg/osmo_errors"
)

type StorageBackendType string
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/messages/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "messages",
srcs = ["messages.go"],
importpath = "go.corp.nvidia.com/osmo/pkg/messages",
importpath = "go.corp.nvidia.com/osmo/runtime/pkg/messages",
visibility = ["//visibility:public"],
deps = [
"//src/runtime/pkg/osmo_errors:osmo_errors",
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/messages/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

"github.com/gorilla/websocket"
"go.corp.nvidia.com/osmo/pkg/osmo_errors"
"go.corp.nvidia.com/osmo/runtime/pkg/osmo_errors"
)

type RequestType string
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/metrics/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "metrics",
srcs = ["metrics.go"],
importpath = "go.corp.nvidia.com/osmo/pkg/metrics",
importpath = "go.corp.nvidia.com/osmo/runtime/pkg/metrics",
visibility = ["//visibility:public"],
deps = [
"//src/runtime/pkg/osmo_errors:osmo_errors",
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"encoding/json"
"time"

"go.corp.nvidia.com/osmo/pkg/osmo_errors"
"go.corp.nvidia.com/osmo/runtime/pkg/osmo_errors"
)

type IOType string
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/pkg/osmo_errors/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "osmo_errors",
srcs = ["osmo_errors.go"],
importpath = "go.corp.nvidia.com/osmo/pkg/osmo_errors",
importpath = "go.corp.nvidia.com/osmo/runtime/pkg/osmo_errors",
visibility = ["//visibility:public"],
deps = []
)
2 changes: 1 addition & 1 deletion src/runtime/pkg/rsync/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "rsync",
srcs = ["rsync.go"],
importpath = "go.corp.nvidia.com/osmo/pkg/rsync",
importpath = "go.corp.nvidia.com/osmo/runtime/pkg/rsync",
deps = [
"//src/runtime/pkg/common:common",
"//src/runtime/pkg/messages:messages",
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/pkg/rsync/rsync.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"syscall"
"time"

"go.corp.nvidia.com/osmo/pkg/common"
"go.corp.nvidia.com/osmo/pkg/messages"
"go.corp.nvidia.com/osmo/runtime/pkg/common"
"go.corp.nvidia.com/osmo/runtime/pkg/messages"
)

type RsyncStatus struct {
Expand Down