From 4d6b4375a3dc58f0c35f9f82730864c4d3209123 Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Sun, 10 Apr 2022 07:43:59 -0700 Subject: [PATCH] `src/` is in the repo's root Now that we're no longer create BOSH releases, we don't need to bury the `src/` directory under `bosh-release`; we can now place it under the repo root, and we no longer need to fiddle with symbolic links. We're not creating BOSH releases because when we decided to implement a key-value store, we'd have to create an `etcd` BOSH release, and we didn't want to invest the time. --- README.md | 9 +++++---- src | 1 - {bosh-release/src => src}/.gitignore | 0 {bosh-release/src => src}/sslip.io-dns-server/go.mod | 0 {bosh-release/src => src}/sslip.io-dns-server/go.sum | 0 .../sslip.io-dns-server/integration_metrics_test.go | 0 .../sslip.io-dns-server/integration_suite_test.go | 0 .../src => src}/sslip.io-dns-server/integration_test.go | 0 {bosh-release/src => src}/sslip.io-dns-server/main.go | 0 .../src => src}/sslip.io-dns-server/xip/tools.go | 0 {bosh-release/src => src}/sslip.io-dns-server/xip/xip.go | 0 .../sslip.io-dns-server/xip/xip_suite_test.go | 0 .../src => src}/sslip.io-dns-server/xip/xip_test.go | 0 .../sslip.io-dns-server/xip/xipfakes/fake_v3client.go | 0 .../src => src}/wildcard-dns-http-server/go.mod | 0 .../src => src}/wildcard-dns-http-server/go.sum | 0 .../src => src}/wildcard-dns-http-server/main.go | 0 17 files changed, 5 insertions(+), 5 deletions(-) delete mode 120000 src rename {bosh-release/src => src}/.gitignore (100%) rename {bosh-release/src => src}/sslip.io-dns-server/go.mod (100%) rename {bosh-release/src => src}/sslip.io-dns-server/go.sum (100%) rename {bosh-release/src => src}/sslip.io-dns-server/integration_metrics_test.go (100%) rename {bosh-release/src => src}/sslip.io-dns-server/integration_suite_test.go (100%) rename {bosh-release/src => src}/sslip.io-dns-server/integration_test.go (100%) rename {bosh-release/src => src}/sslip.io-dns-server/main.go (100%) rename {bosh-release/src => src}/sslip.io-dns-server/xip/tools.go (100%) rename {bosh-release/src => src}/sslip.io-dns-server/xip/xip.go (100%) rename {bosh-release/src => src}/sslip.io-dns-server/xip/xip_suite_test.go (100%) rename {bosh-release/src => src}/sslip.io-dns-server/xip/xip_test.go (100%) rename {bosh-release/src => src}/sslip.io-dns-server/xip/xipfakes/fake_v3client.go (100%) rename {bosh-release/src => src}/wildcard-dns-http-server/go.mod (100%) rename {bosh-release/src => src}/wildcard-dns-http-server/go.sum (100%) rename {bosh-release/src => src}/wildcard-dns-http-server/main.go (100%) diff --git a/README.md b/README.md index 5ca002a..3cf6856 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ developers; the website targets users. ```bash git clone git@github.com:cunnie/sslip.io.git -cd sslip.io/bosh-release/src/sslip.io-dns-server/ +cd sslip.io/src/sslip.io-dns-server/ sudo go run main.go # sudo is required on Linux, but not on macOS, to bind to privileged port 53 ``` @@ -50,9 +50,10 @@ sudo ~/go/bin/ginkgo -r . - `k8s/document_root/` contains the HTML content of the sslip.io website. Please run `tidy -im -w 120 k8s/document_root/index.html` before submitting pull requests -- `bosh-release/` contains the [BOSH](https://bosh.io/docs/) release. BOSH is - the mechanism we use to deploy the servers, and the sslip.io BOSH release is a - packaging of the DNS server (analogous to a `.msi`, `.pkg`, `.deb` or `.rpm`) +- `bosh-release/` _[deprecated]_ contains the [BOSH](https://bosh.io/docs/) + release. BOSH is the mechanism we previously used to deploy the servers, and + the sslip.io BOSH release is a packaging of the DNS server (analogous to a + `.msi`, `.pkg`, `.deb` or `.rpm`) ## DNS Server diff --git a/src b/src deleted file mode 120000 index 8d961d9..0000000 --- a/src +++ /dev/null @@ -1 +0,0 @@ -bosh-release/src \ No newline at end of file diff --git a/bosh-release/src/.gitignore b/src/.gitignore similarity index 100% rename from bosh-release/src/.gitignore rename to src/.gitignore diff --git a/bosh-release/src/sslip.io-dns-server/go.mod b/src/sslip.io-dns-server/go.mod similarity index 100% rename from bosh-release/src/sslip.io-dns-server/go.mod rename to src/sslip.io-dns-server/go.mod diff --git a/bosh-release/src/sslip.io-dns-server/go.sum b/src/sslip.io-dns-server/go.sum similarity index 100% rename from bosh-release/src/sslip.io-dns-server/go.sum rename to src/sslip.io-dns-server/go.sum diff --git a/bosh-release/src/sslip.io-dns-server/integration_metrics_test.go b/src/sslip.io-dns-server/integration_metrics_test.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/integration_metrics_test.go rename to src/sslip.io-dns-server/integration_metrics_test.go diff --git a/bosh-release/src/sslip.io-dns-server/integration_suite_test.go b/src/sslip.io-dns-server/integration_suite_test.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/integration_suite_test.go rename to src/sslip.io-dns-server/integration_suite_test.go diff --git a/bosh-release/src/sslip.io-dns-server/integration_test.go b/src/sslip.io-dns-server/integration_test.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/integration_test.go rename to src/sslip.io-dns-server/integration_test.go diff --git a/bosh-release/src/sslip.io-dns-server/main.go b/src/sslip.io-dns-server/main.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/main.go rename to src/sslip.io-dns-server/main.go diff --git a/bosh-release/src/sslip.io-dns-server/xip/tools.go b/src/sslip.io-dns-server/xip/tools.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/xip/tools.go rename to src/sslip.io-dns-server/xip/tools.go diff --git a/bosh-release/src/sslip.io-dns-server/xip/xip.go b/src/sslip.io-dns-server/xip/xip.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/xip/xip.go rename to src/sslip.io-dns-server/xip/xip.go diff --git a/bosh-release/src/sslip.io-dns-server/xip/xip_suite_test.go b/src/sslip.io-dns-server/xip/xip_suite_test.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/xip/xip_suite_test.go rename to src/sslip.io-dns-server/xip/xip_suite_test.go diff --git a/bosh-release/src/sslip.io-dns-server/xip/xip_test.go b/src/sslip.io-dns-server/xip/xip_test.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/xip/xip_test.go rename to src/sslip.io-dns-server/xip/xip_test.go diff --git a/bosh-release/src/sslip.io-dns-server/xip/xipfakes/fake_v3client.go b/src/sslip.io-dns-server/xip/xipfakes/fake_v3client.go similarity index 100% rename from bosh-release/src/sslip.io-dns-server/xip/xipfakes/fake_v3client.go rename to src/sslip.io-dns-server/xip/xipfakes/fake_v3client.go diff --git a/bosh-release/src/wildcard-dns-http-server/go.mod b/src/wildcard-dns-http-server/go.mod similarity index 100% rename from bosh-release/src/wildcard-dns-http-server/go.mod rename to src/wildcard-dns-http-server/go.mod diff --git a/bosh-release/src/wildcard-dns-http-server/go.sum b/src/wildcard-dns-http-server/go.sum similarity index 100% rename from bosh-release/src/wildcard-dns-http-server/go.sum rename to src/wildcard-dns-http-server/go.sum diff --git a/bosh-release/src/wildcard-dns-http-server/main.go b/src/wildcard-dns-http-server/main.go similarity index 100% rename from bosh-release/src/wildcard-dns-http-server/main.go rename to src/wildcard-dns-http-server/main.go