Merge pull request #306 from simondeziel/move-to-the-top

all: Move `microcloud/*` one level up
canonical · May 8, 2024 · 9c8fd0d · 9c8fd0d
2 parents 3e516f9 + 8f11bb2
commit 9c8fd0d
Show file tree

Hide file tree

Showing 50 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/commits.yml b/.github/workflows/commits.yml
@@ -11,4 +11,4 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check if CLA signed
-        uses: canonical/has-signed-canonical-cla@v1
+        uses: canonical/has-signed-canonical-cla@main
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -31,6 +31,16 @@ jobs:
           # A non-shallow clone is needed for the Differential ShellCheck
           fetch-depth: 0
 
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.x
+
+      - name: Check compatibility with min Go version (1.22.0)
+        run: |
+          set -eux
+          go mod tidy -go=1.22.0
+
       - name: Dependency Review
         uses: actions/dependency-review-action@v4
         if: github.event_name == 'pull_request'
@@ -50,33 +60,19 @@ jobs:
           path: ${{ steps.ShellCheck.outputs.sarif }}
         if: github.event_name == 'pull_request'
 
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.22.x
-
-      - name: Check compatibility with min Go version (1.22.0)
-        working-directory: microcloud
-        run: |
-          set -eux
-          go mod tidy -go=1.22.0
-
       - name: Install dependencies
         run: |
           sudo add-apt-repository ppa:dqlite/dev -y --no-update
           sudo apt-get update
           sudo apt-get install --no-install-recommends -y libdqlite-dev pkg-config
 
       - name: Build
-        working-directory: microcloud
         run: make
 
       - name: Run static analysis
-        working-directory: microcloud
         run: make check-static
 
       - name: Unit tests
-        working-directory: microcloud
         run: make check-unit
 
   system-tests:
@@ -163,7 +159,6 @@ jobs:
           sudo apt-get install --no-install-recommends -y libdqlite-dev pkg-config
 
       - name: Build
-        working-directory: microcloud
         run: |
           set -eux
 
@@ -212,15 +207,15 @@ jobs:
         run: |
           set -eux
           chmod +x ~
-          cd microcloud/test
+          cd test
           sudo --preserve-env=DEBUG,GITHUB_ACTIONS,MICROCLOUD_DEBUG_PATH,MICROCLOUDD_DEBUG_PATH,SKIP_VM_LAUNCH,SNAPSHOT_RESTORE,TEST_STORAGE_SOURCE,TESTBED_READY ./main.sh setup
           echo "TESTBED_READY=1" >> "${GITHUB_ENV}"
 
       - name: "Run system tests (${{ matrix.go }}, ${{ matrix.suite }})"
         run: |
           set -eux
           chmod +x ~
-          cd microcloud/test
+          cd test
           sudo --preserve-env=DEBUG,GITHUB_ACTIONS,MICROCLOUD_DEBUG_PATH,MICROCLOUDD_DEBUG_PATH,SKIP_VM_LAUNCH,SNAPSHOT_RESTORE,TEST_STORAGE_SOURCE,TESTBED_READY ./main.sh ${{ matrix.suite }}
 
   documentation-checks:

diff --git a/microcloud/.golangci.yml → .golangci.yml b/microcloud/.golangci.yml → .golangci.yml
diff --git a/microcloud/Makefile → Makefile b/microcloud/Makefile → Makefile
diff --git a/microcloud/api/response.go → api/response.go b/microcloud/api/response.go → api/response.go
diff --git a/microcloud/api/services.go → api/services.go b/microcloud/api/services.go → api/services.go
diff --git a/microcloud/api/services_proxy.go → api/services_proxy.go b/microcloud/api/services_proxy.go → api/services_proxy.go
diff --git a/microcloud/api/types/services.go → api/types/services.go b/microcloud/api/types/services.go → api/types/services.go
diff --git a/microcloud/client/client.go → client/client.go b/microcloud/client/client.go → client/client.go
diff --git a/microcloud/cmd/microcloud/add.go → cmd/microcloud/add.go b/microcloud/cmd/microcloud/add.go → cmd/microcloud/add.go
diff --git a/microcloud/cmd/microcloud/ask.go → cmd/microcloud/ask.go b/microcloud/cmd/microcloud/ask.go → cmd/microcloud/ask.go
diff --git a/microcloud/cmd/microcloud/cluster_members.go → cmd/microcloud/cluster_members.go b/microcloud/cmd/microcloud/cluster_members.go → cmd/microcloud/cluster_members.go
diff --git a/microcloud/cmd/microcloud/input_test.go → cmd/microcloud/input_test.go b/microcloud/cmd/microcloud/input_test.go → cmd/microcloud/input_test.go
diff --git a/microcloud/cmd/microcloud/main.go → cmd/microcloud/main.go b/microcloud/cmd/microcloud/main.go → cmd/microcloud/main.go
diff --git a/microcloud/cmd/microcloud/main_init.go → cmd/microcloud/main_init.go b/microcloud/cmd/microcloud/main_init.go → cmd/microcloud/main_init.go
diff --git a/...cloud/cmd/microcloud/main_init_preseed.go → cmd/microcloud/main_init_preseed.go b/...cloud/cmd/microcloud/main_init_preseed.go → cmd/microcloud/main_init_preseed.go
diff --git a/microcloud/cmd/microcloud/main_init_test.go → cmd/microcloud/main_init_test.go b/microcloud/cmd/microcloud/main_init_test.go → cmd/microcloud/main_init_test.go
diff --git a/microcloud/cmd/microcloud/preseed_test.go → cmd/microcloud/preseed_test.go b/microcloud/cmd/microcloud/preseed_test.go → cmd/microcloud/preseed_test.go
diff --git a/microcloud/cmd/microcloud/selection_table.go → cmd/microcloud/selection_table.go b/microcloud/cmd/microcloud/selection_table.go → cmd/microcloud/selection_table.go
diff --git a/microcloud/cmd/microcloud/shutdown.go → cmd/microcloud/shutdown.go b/microcloud/cmd/microcloud/shutdown.go → cmd/microcloud/shutdown.go
diff --git a/microcloud/cmd/microcloud/sql.go → cmd/microcloud/sql.go b/microcloud/cmd/microcloud/sql.go → cmd/microcloud/sql.go
diff --git a/microcloud/cmd/microcloud/test_console.go → cmd/microcloud/test_console.go b/microcloud/cmd/microcloud/test_console.go → cmd/microcloud/test_console.go
diff --git a/microcloud/cmd/microcloud/tokens.go → cmd/microcloud/tokens.go b/microcloud/cmd/microcloud/tokens.go → cmd/microcloud/tokens.go
diff --git a/microcloud/cmd/microcloud/waitready.go → cmd/microcloud/waitready.go b/microcloud/cmd/microcloud/waitready.go → cmd/microcloud/waitready.go
diff --git a/microcloud/cmd/microcloudd/main.go → cmd/microcloudd/main.go b/microcloud/cmd/microcloudd/main.go → cmd/microcloudd/main.go
diff --git a/microcloud/go.mod → go.mod b/microcloud/go.mod → go.mod
diff --git a/microcloud/go.sum → go.sum b/microcloud/go.sum → go.sum
diff --git a/microcloud/mdns/lookup.go → mdns/lookup.go b/microcloud/mdns/lookup.go → mdns/lookup.go
diff --git a/microcloud/mdns/mdns.go → mdns/mdns.go b/microcloud/mdns/mdns.go → mdns/mdns.go
diff --git a/microcloud/mdns/version.go → mdns/version.go b/microcloud/mdns/version.go → mdns/version.go
diff --git a/microcloud/revive.toml → revive.toml b/microcloud/revive.toml → revive.toml
diff --git a/microcloud/service/interface.go → service/interface.go b/microcloud/service/interface.go → service/interface.go
diff --git a/microcloud/service/lxd.go → service/lxd.go b/microcloud/service/lxd.go → service/lxd.go
diff --git a/microcloud/service/lxd_config.go → service/lxd_config.go b/microcloud/service/lxd_config.go → service/lxd_config.go
diff --git a/microcloud/service/lxd_join.go → service/lxd_join.go b/microcloud/service/lxd_join.go → service/lxd_join.go
diff --git a/microcloud/service/microceph.go → service/microceph.go b/microcloud/service/microceph.go → service/microceph.go
diff --git a/microcloud/service/microcloud.go → service/microcloud.go b/microcloud/service/microcloud.go → service/microcloud.go
diff --git a/microcloud/service/microovn.go → service/microovn.go b/microcloud/service/microovn.go → service/microovn.go
diff --git a/microcloud/service/service_handler.go → service/service_handler.go b/microcloud/service/service_handler.go → service/service_handler.go
diff --git a/microcloud/test/includes/check.sh → test/includes/check.sh b/microcloud/test/includes/check.sh → test/includes/check.sh
diff --git a/microcloud/test/includes/microcloud.sh → test/includes/microcloud.sh b/microcloud/test/includes/microcloud.sh → test/includes/microcloud.sh
@@ -496,6 +496,7 @@ reset_snaps() {
 # Makes only `num_disks` and `num_ifaces` disks and interfaces available for the next test.
 reset_system() {
   if [ "${SNAPSHOT_RESTORE}" = 1 ]; then
+    # shellcheck disable=SC2048,SC2086
     restore_system ${*}
     return
   fi
@@ -633,6 +634,7 @@ cluster_reset() {
 # reset_systems: Concurrently or sequentially resets the specified number of systems.
 reset_systems() {
   if [ "${SNAPSHOT_RESTORE}" = 1 ]; then
+    # shellcheck disable=SC2048,SC2086
     restore_systems ${*}
     return
   fi

diff --git a/microcloud/test/lint/negated-is-bool.sh → test/lint/negated-is-bool.sh b/microcloud/test/lint/negated-is-bool.sh → test/lint/negated-is-bool.sh
diff --git a/microcloud/test/lint/newline-after-block.sh → test/lint/newline-after-block.sh b/microcloud/test/lint/newline-after-block.sh → test/lint/newline-after-block.sh
diff --git a/...d/test/lint/no-oneline-assign-and-test.sh → test/lint/no-oneline-assign-and-test.sh b/...d/test/lint/no-oneline-assign-and-test.sh → test/lint/no-oneline-assign-and-test.sh
diff --git a/...ocloud/test/lint/no-short-form-imports.sh → test/lint/no-short-form-imports.sh b/...ocloud/test/lint/no-short-form-imports.sh → test/lint/no-short-form-imports.sh
diff --git a/microcloud/test/main.sh → test/main.sh b/microcloud/test/main.sh → test/main.sh
diff --git a/microcloud/test/suites/add.sh → test/suites/add.sh b/microcloud/test/suites/add.sh → test/suites/add.sh
diff --git a/microcloud/test/suites/basic.sh → test/suites/basic.sh b/microcloud/test/suites/basic.sh → test/suites/basic.sh
diff --git a/microcloud/test/suites/preseed.sh → test/suites/preseed.sh b/microcloud/test/suites/preseed.sh → test/suites/preseed.sh
diff --git a/microcloud/version/version.go → version/version.go b/microcloud/version/version.go → version/version.go