SIG: Move config to internal (#3408)

scionproto · Nov 21, 2019 · 1faca3e · 1faca3e
1 parent 026bdda
commit 1faca3e
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 8 deletions.
diff --git a/go/sig/BUILD.bazel b/go/sig/BUILD.bazel
@@ -13,9 +13,9 @@ go_library(
         "//go/lib/log:go_default_library",
         "//go/lib/prom:go_default_library",
         "//go/lib/serrors:go_default_library",
-        "//go/sig/config:go_default_library",
         "//go/sig/egress:go_default_library",
         "//go/sig/internal/base:go_default_library",
+        "//go/sig/internal/config:go_default_library",
         "//go/sig/internal/disp:go_default_library",
         "//go/sig/internal/ingress:go_default_library",
         "//go/sig/internal/metrics:go_default_library",

diff --git a/go/sig/egress/BUILD.bazel b/go/sig/egress/BUILD.bazel
@@ -8,9 +8,9 @@ go_library(
     deps = [
         "//go/lib/fatal:go_default_library",
         "//go/lib/log:go_default_library",
-        "//go/sig/config:go_default_library",
         "//go/sig/egress/asmap:go_default_library",
         "//go/sig/egress/iface:go_default_library",
         "//go/sig/egress/reader:go_default_library",
+        "//go/sig/internal/config:go_default_library",
     ],
 )
diff --git a/go/sig/egress/api.go b/go/sig/egress/api.go
@@ -20,10 +20,10 @@ import (
 
 	"github.com/scionproto/scion/go/lib/fatal"
 	"github.com/scionproto/scion/go/lib/log"
-	"github.com/scionproto/scion/go/sig/config"
 	"github.com/scionproto/scion/go/sig/egress/asmap"
 	"github.com/scionproto/scion/go/sig/egress/iface"
 	"github.com/scionproto/scion/go/sig/egress/reader"
+	"github.com/scionproto/scion/go/sig/internal/config"
 )
 
 func Init(tunIO io.ReadWriteCloser) {

diff --git a/go/sig/egress/asmap/BUILD.bazel b/go/sig/egress/asmap/BUILD.bazel
@@ -13,12 +13,12 @@ go_library(
         "//go/lib/common:go_default_library",
         "//go/lib/log:go_default_library",
         "//go/lib/ringbuf:go_default_library",
-        "//go/sig/config:go_default_library",
         "//go/sig/egress/dispatcher:go_default_library",
         "//go/sig/egress/iface:go_default_library",
         "//go/sig/egress/router:go_default_library",
         "//go/sig/egress/selector:go_default_library",
         "//go/sig/egress/session:go_default_library",
         "//go/sig/internal/base:go_default_library",
+        "//go/sig/internal/config:go_default_library",
     ],
 )
diff --git a/go/sig/egress/asmap/as.go b/go/sig/egress/asmap/as.go
@@ -25,13 +25,13 @@ import (
 	"github.com/scionproto/scion/go/lib/common"
 	"github.com/scionproto/scion/go/lib/log"
 	"github.com/scionproto/scion/go/lib/ringbuf"
-	"github.com/scionproto/scion/go/sig/config"
 	"github.com/scionproto/scion/go/sig/egress/dispatcher"
 	"github.com/scionproto/scion/go/sig/egress/iface"
 	"github.com/scionproto/scion/go/sig/egress/router"
 	"github.com/scionproto/scion/go/sig/egress/selector"
 	"github.com/scionproto/scion/go/sig/egress/session"
 	"github.com/scionproto/scion/go/sig/internal/base"
+	"github.com/scionproto/scion/go/sig/internal/config"
 )
 
 const (

diff --git a/go/sig/egress/asmap/map.go b/go/sig/egress/asmap/map.go
@@ -22,7 +22,7 @@ import (
 	"github.com/scionproto/scion/go/lib/addr"
 	"github.com/scionproto/scion/go/lib/common"
 	"github.com/scionproto/scion/go/lib/log"
-	"github.com/scionproto/scion/go/sig/config"
+	"github.com/scionproto/scion/go/sig/internal/config"
 )
 
 var Map = &ASMap{}

diff --git a/go/sig/config/BUILD.bazel → go/sig/internal/config/BUILD.bazel b/go/sig/config/BUILD.bazel → go/sig/internal/config/BUILD.bazel
@@ -6,7 +6,7 @@ go_library(
         "config.go",
         "ipnet.go",
     ],
-    importpath = "github.com/scionproto/scion/go/sig/config",
+    importpath = "github.com/scionproto/scion/go/sig/internal/config",
     visibility = ["//visibility:public"],
     deps = [
         "//go/lib/addr:go_default_library",

diff --git a/go/sig/config/config.go → go/sig/internal/config/config.go b/go/sig/config/config.go → go/sig/internal/config/config.go
diff --git a/go/sig/config/config_test.go → go/sig/internal/config/config_test.go b/go/sig/config/config_test.go → go/sig/internal/config/config_test.go
diff --git a/go/sig/config/ipnet.go → go/sig/internal/config/ipnet.go b/go/sig/config/ipnet.go → go/sig/internal/config/ipnet.go
diff --git a/go/sig/config/testdata/01-loadfromfile.json → ...rnal/config/testdata/01-loadfromfile.json b/go/sig/config/testdata/01-loadfromfile.json → ...rnal/config/testdata/01-loadfromfile.json
diff --git a/go/sig/config/testdata/README.md → go/sig/internal/config/testdata/README.md b/go/sig/config/testdata/README.md → go/sig/internal/config/testdata/README.md
diff --git a/go/sig/main.go b/go/sig/main.go
@@ -33,9 +33,9 @@ import (
 	"github.com/scionproto/scion/go/lib/log"
 	"github.com/scionproto/scion/go/lib/prom"
 	"github.com/scionproto/scion/go/lib/serrors"
-	"github.com/scionproto/scion/go/sig/config"
 	"github.com/scionproto/scion/go/sig/egress"
 	"github.com/scionproto/scion/go/sig/internal/base"
+	"github.com/scionproto/scion/go/sig/internal/config"
 	"github.com/scionproto/scion/go/sig/internal/disp"
 	"github.com/scionproto/scion/go/sig/internal/ingress"
 	"github.com/scionproto/scion/go/sig/internal/metrics"