repo: cleanup leftover references to the go directory

GitOrigin-RevId: f4b252ddaa7c90ff7617965c1e5101d08ded422d
scionproto · Mar 16, 2022 · bb4dd91 · bb4dd91
1 parent 309ecd9
commit bb4dd91
Show file tree

Hide file tree

Showing 14 changed files with 176 additions and 140 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -1,4 +1,3 @@
 bin
 docker/_build
-go/vendor
 rules_openapi/tools/node_modules
diff --git a/.editorconfig b/.editorconfig
@@ -15,9 +15,6 @@ indent_style = tab
 [Makefile]
 indent_style = tab
 
-[go/vendor/vendor.json]
-indent_style = tab
-
 [.gitmodules]
 indent_style = tab
 

diff --git a/.gitignore b/.gitignore
@@ -24,10 +24,6 @@ Thumbs.db
 __pycache__
 *.pyc
 
-# Vendor linkfarm #
-#########################
-/go/vendor/*/
-
 # vim files #
 #########################
 .*.sw?
@@ -57,7 +53,6 @@ compile_commands.json
 ##########################
 /.coverage
 /python/htmlcov/
-/go/gocover.html
 
 # C library binaries
 ##########################

diff --git a/gateway/routing/internal/fuzz/fuzz.go b/gateway/routing/internal/fuzz/fuzz.go
@@ -18,7 +18,7 @@ import (
 	"github.com/scionproto/scion/gateway/routing"
 )
 
-// For additional help, see: go/lib/slayers/internal/fuzz/README.md
+// For additional help, see: pkg/slayers/internal/fuzz/README.md
 
 // Fuzz policy parsing.
 func Fuzz(data []byte) int {

diff --git a/ineffassign.json b/ineffassign.json
diff --git a/nogo.json b/nogo.json
@@ -1,109 +1,148 @@
 {
-  "assign": {
-    "exclude_files": {
-      "gazelle/walk/walk.go": "",
-      "com_github_deepmap_oapi_codegen/pkg/codegen/": ""
-    }
-  },
-  "composites": {
-    "exclude_files": {
-      "gazelle/language/go/resolve.go": "",
-      "/io_bazel_rules_docker/": "",
-      "/com_github_bazelbuild_buildtools/": "",
-      "/com_github_grpc_ecosystem_grpc_opentracing/go/otgrpc/": "",
-      "/com_github_vishvananda_netlink/": "",
-      "/org_golang_x_tools/internal": "",
-      "/org_golang_google_protobuf": ""
-    }
-  },
-  "copylocks": {
-    "exclude_files": {
-      "/org_golang_google_protobuf/internal/impl/": ""
-    }
-  },
-  "nilness": {
-    "only_files": {
-      "/go/": "https://github.com/bazelbuild/rules_go/issues/2172"
+    "assign": {
+        "exclude_files": {
+            "gazelle/walk/walk.go": "",
+            "com_github_deepmap_oapi_codegen/pkg/codegen/": ""
+        }
     },
-    "exclude_files": {
-      "gazelle/cmd/gazelle/diff.go": "",
-      "/in_gopkg_yaml_v2/decode.go": "https://github.com/go-yaml/yaml/pull/492",
-      "/com_github_mattn_go_sqlite3": "",
-      "/com_github_lucas_clemente_quic_go": "",
-      "/com_github_cloudflare_sidh": "",
-      "/com_github_vishvananda_netlink": ""
-    }
-  },
-  "printf": {
-    "exclude_files": {
-      "/com_github_cloudflare_sidh/": ""
-    }
-  },
-  "stringintconv": {
-    "exclude_files": {
-      "/com_github_sergi_go_diff": "",
-      "/com_github_uber_jaeger_client_go": "",
-      "/com_github_google_gopacket": "",
-      "/net_starlark_go": "",
-      "/com_github_smartystreets_assertions/internal/go-diff/diffmatchpatch/patch.go": ""
-    }
-  },
-  "unreachable": {
-    "exclude_files": {
-      "gazelle/pathtools/path.go": "",
-      "/com_github_antlr_antlr4_runtime_go_antlr/": "",
-      "/com_github_uber_jaeger_client_go": "",
-      "/com_github_marten_seemann_qtls/": "",
-      "/org_golang_google_protobuf/": "",
-      "/com_github_magiconair_properties": "",
-      "/com_github_ghodss_yaml/": "",
-      "/com_github_lestrrat_go_iter/mapiter/": "",
-      "/com_github_lestrrat_go_iter/arrayiter/": ""
-    }
-  },
-  "unsafeptr": {
-    "only_files": {
-      "/go/": "https://github.com/bazelbuild/rules_go/issues/2172"
+    "composites": {
+        "exclude_files": {
+            "gazelle/language/go/resolve.go": "",
+            "/io_bazel_rules_docker/": "",
+            "/com_github_bazelbuild_buildtools/": "",
+            "/com_github_grpc_ecosystem_grpc_opentracing/go/otgrpc/": "",
+            "/com_github_vishvananda_netlink/": "",
+            "/org_golang_x_tools/internal": "",
+            "/org_golang_google_protobuf": ""
+        }
     },
-    "exclude_files": {
-      "/com_github_mattn_go_sqlite3/": "",
-      "/com_github_google_gopacket/afpacket/": ""
-    }
-  },
-  "shift": {
-    "exclude_files": {
-      "/com_github_marten_seemann_qtls/": ""
-    }
-  },
-  "stdmethods": {
-    "exclude_files": {
-      "/com_github_uber_jaeger_client_go": ""
-    }
-  },
-  "structtag": {
-    "exclude_files": {
-      "com_github_buildkite_go_buildkite": ""
-    }
-  },
-  "gocall": {
-    "only_files": {
-      "/go/": "https://github.com/bazelbuild/rules_go/issues/2172"
+    "copylocks": {
+        "exclude_files": {
+            "/org_golang_google_protobuf/internal/impl/": ""
+        }
     },
-    "exclude_files": {
-      "(vendor|external)/*": "Only applies to internal files",
-      "xtest/*": "",
-      "_test.go": "Doesn't apply for test files"
-    }
-  },
-  "lostcancel": {
-    "exclude_files": {
-      "com_github_grpc_ecosystem_go_grpc_middleware/retry": ""
-    }
-  },
-  "maincheck": {
-    "exclude_files": {
-        "/com_github_deepmap_oapi_codegen/": "",
-        "/com_github_golang_mock/mockgen": ""
+    "nilness": {
+        "only_files": {
+            "/acceptance/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/antlr/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/control/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/daemon/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/demo/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/dispatcher/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/gateway/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/pkg/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/private/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/router/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/rules_openapi/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/scion/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/scion-pki/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/tools/": "https://github.com/bazelbuild/rules_go/issues/2172"
+        },
+        "exclude_files": {
+            "gazelle/cmd/gazelle/diff.go": "",
+            "/in_gopkg_yaml_v2/decode.go": "https://github.com/go-yaml/yaml/pull/492",
+            "/com_github_mattn_go_sqlite3": "",
+            "/com_github_lucas_clemente_quic_go": "",
+            "/com_github_cloudflare_sidh": "",
+            "/com_github_vishvananda_netlink": ""
+        }
+    },
+    "printf": {
+        "exclude_files": {
+            "/com_github_cloudflare_sidh/": ""
+        }
+    },
+    "stringintconv": {
+        "exclude_files": {
+            "/com_github_sergi_go_diff": "",
+            "/com_github_uber_jaeger_client_go": "",
+            "/com_github_google_gopacket": "",
+            "/net_starlark_go": "",
+            "/com_github_smartystreets_assertions/internal/go-diff/diffmatchpatch/patch.go": ""
+        }
+    },
+    "unreachable": {
+        "exclude_files": {
+            "gazelle/pathtools/path.go": "",
+            "/com_github_antlr_antlr4_runtime_go_antlr/": "",
+            "/com_github_uber_jaeger_client_go": "",
+            "/com_github_marten_seemann_qtls/": "",
+            "/org_golang_google_protobuf/": "",
+            "/com_github_magiconair_properties": "",
+            "/com_github_ghodss_yaml/": "",
+            "/com_github_lestrrat_go_iter/mapiter/": "",
+            "/com_github_lestrrat_go_iter/arrayiter/": ""
+        }
+    },
+    "unsafeptr": {
+        "only_files": {
+            "/acceptance/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/antlr/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/control/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/daemon/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/demo/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/dispatcher/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/gateway/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/pkg/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/private/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/router/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/rules_openapi/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/scion/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/scion-pki/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/tools/": "https://github.com/bazelbuild/rules_go/issues/2172"
+        },
+        "exclude_files": {
+            "/com_github_mattn_go_sqlite3/": "",
+            "/com_github_google_gopacket/afpacket/": ""
+        }
+    },
+    "shift": {
+        "exclude_files": {
+            "/com_github_marten_seemann_qtls/": ""
+        }
+    },
+    "stdmethods": {
+        "exclude_files": {
+            "/com_github_uber_jaeger_client_go": ""
+        }
+    },
+    "structtag": {
+        "exclude_files": {
+            "com_github_buildkite_go_buildkite": ""
+        }
+    },
+    "gocall": {
+        "only_files": {
+            "/acceptance/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/antlr/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/control/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/daemon/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/demo/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/dispatcher/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/gateway/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/pkg/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/private/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/router/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/rules_openapi/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/scion/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/scion-pki/": "https://github.com/bazelbuild/rules_go/issues/2172",
+            "/tools/": "https://github.com/bazelbuild/rules_go/issues/2172"
+        },
+        "exclude_files": {
+            "(vendor|external)/*": "Only applies to internal files",
+            "xtest/*": "",
+            "_test.go": "Doesn't apply for test files"
+        }
+    },
+    "lostcancel": {
+        "exclude_files": {
+            "com_github_grpc_ecosystem_go_grpc_middleware/retry": ""
+        }
+    },
+    "maincheck": {
+        "exclude_files": {
+            "/com_github_deepmap_oapi_codegen/": "",
+            "/com_github_golang_mock/mockgen": ""
+        }
     }
-  }
 }
diff --git a/pkg/private/xtest/graphupdater/main.go b/pkg/private/xtest/graphupdater/main.go
@@ -22,7 +22,7 @@ import (
 
 const (
 	DefaultTopoFile = "topology/default.topo"
-	DefaultGenFile  = "go/lib/xtest/graph/default_gen.go"
+	DefaultGenFile  = "pkg/private/xtest/graph/default_gen.go"
 )
 
 var (

diff --git a/pkg/scrypto/cppki/certs_test.go b/pkg/scrypto/cppki/certs_test.go
@@ -787,14 +787,14 @@ func TestVerifyChain(t *testing.T) {
 	// testadata files generated with scion-pki:
 	/*
 		scion-pki testcrypto -t topology/default.topo -o gen
-		cp gen/ISD1/ISD1-B1-S1.trc go/lib/scrypto/cppki/testdata/verifychain
-		cp gen/ISD2/ISD2-B1-S1.trc go/lib/scrypto/cppki/testdata/verifychain
+		cp gen/ISD1/ISD1-B1-S1.trc pkg/scrypto/cppki/testdata/verifychain
+		cp gen/ISD2/ISD2-B1-S1.trc pkg/scrypto/cppki/testdata/verifychain
 		cp gen/ISD1/ASff00_0_111/certs/ISD1-ASff00_0_111.pem \
-			go/lib/scrypto/cppki/testdata/verifychain
+			pkg/scrypto/cppki/testdata/verifychain
 		cp gen/ISD1/ASff00_0_110/certs/ISD1-ASff00_0_110.pem \
-			go/lib/scrypto/cppki/testdata/verifychain
+			pkg/scrypto/cppki/testdata/verifychain
 		cp gen/ISD2/ASff00_0_210/certs/ISD2-ASff00_0_210.pem \
-			go/lib/scrypto/cppki/testdata/verifychain
+			pkg/scrypto/cppki/testdata/verifychain
 	*/
 
 	trc := loadTRC(t, "testdata/verifychain/ISD1-B1-S1.trc")

diff --git a/private/ca/renewal/grpc/delegating_handler.go b/private/ca/renewal/grpc/delegating_handler.go
@@ -35,7 +35,7 @@ import (
 )
 
 // CAServiceClient is the minimal interface that is needed from
-// go/pkg/ca/api:ClientWithResponsesInterface.
+// private/ca/api:ClientWithResponsesInterface.
 type CAServiceClient interface {
 	PostCertificateRenewal(
 		ctx context.Context,

diff --git a/router/control/conf.go b/router/control/conf.go
@@ -148,7 +148,7 @@ func DeriveHFMacKey(k []byte) []byte {
 	if len(k) == 0 {
 		panic("empty key")
 	}
-	// XXX Generate keys - MUST be kept in sync with go/lib/scrypto/mac.go
+	// XXX Generate keys - MUST be kept in sync with pkg/scrypto/mac.go
 	hfMacSalt := []byte("Derive OF Key")
 	// This uses 16B keys with 1000 hash iterations, which is the same as the
 	// defaults used by pycrypto.

diff --git a/scion.bzl b/scion.bzl
@@ -4,6 +4,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary")
 def scion_go_binary(*args, **kwargs):
     x_defs = kwargs.get("x_defs", {})
     x_defs.update({
-        "github.com/scionproto/scion/go/lib/env.StartupVersion": "{STABLE_GIT_VERSION}",
+        "github.com/scionproto/scion/private/env.StartupVersion": "{STABLE_GIT_VERSION}",
     })
     go_binary(x_defs = x_defs, *args, **kwargs)
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ import ( @@
     const (
     	DefaultTopoFile = "topology/default.topo"
-    	DefaultGenFile  = "go/lib/xtest/graph/default_gen.go"
+    	DefaultGenFile  = "pkg/private/xtest/graph/default_gen.go"
     )
     var (
@@ Expand Down @@