From c03f72f754497192d3c67299010552befa209276 Mon Sep 17 00:00:00 2001 From: Adrian Stobbe Date: Thu, 5 Sep 2024 10:50:06 +0200 Subject: [PATCH] move cli to internal --- .github/actions/e2e_attestationconfigapi/action.yml | 2 +- MODULE.bazel.lock | 8 ++++---- api/attestationconfigapi/BUILD.bazel | 2 +- api/attestationconfigapi/{ => internal}/cli/BUILD.bazel | 6 +++--- .../{ => internal}/cli/client/BUILD.bazel | 2 +- .../{ => internal}/cli/client/client.go | 0 .../{ => internal}/cli/client/client_test.go | 0 .../{ => internal}/cli/client/reporter.go | 0 .../{ => internal}/cli/client/reporter_test.go | 0 api/attestationconfigapi/{ => internal}/cli/compare.go | 2 +- api/attestationconfigapi/{ => internal}/cli/delete.go | 2 +- .../{ => internal}/cli/e2e/test.sh.in | 0 api/attestationconfigapi/{ => internal}/cli/main.go | 0 api/attestationconfigapi/{ => internal}/cli/upload.go | 2 +- api/attestationconfigapi/{ => internal}/cli/validargs.go | 0 15 files changed, 13 insertions(+), 13 deletions(-) rename api/attestationconfigapi/{ => internal}/cli/BUILD.bazel (84%) rename api/attestationconfigapi/{ => internal}/cli/client/BUILD.bazel (94%) rename api/attestationconfigapi/{ => internal}/cli/client/client.go (100%) rename api/attestationconfigapi/{ => internal}/cli/client/client_test.go (100%) rename api/attestationconfigapi/{ => internal}/cli/client/reporter.go (100%) rename api/attestationconfigapi/{ => internal}/cli/client/reporter_test.go (100%) rename api/attestationconfigapi/{ => internal}/cli/compare.go (99%) rename api/attestationconfigapi/{ => internal}/cli/delete.go (99%) rename api/attestationconfigapi/{ => internal}/cli/e2e/test.sh.in (100%) rename api/attestationconfigapi/{ => internal}/cli/main.go (100%) rename api/attestationconfigapi/{ => internal}/cli/upload.go (99%) rename api/attestationconfigapi/{ => internal}/cli/validargs.go (100%) diff --git a/.github/actions/e2e_attestationconfigapi/action.yml b/.github/actions/e2e_attestationconfigapi/action.yml index 02ec28084..229b6c014 100644 --- a/.github/actions/e2e_attestationconfigapi/action.yml +++ b/.github/actions/e2e_attestationconfigapi/action.yml @@ -30,4 +30,4 @@ runs: COSIGN_PRIVATE_KEY: ${{ inputs.cosignPrivateKey }} COSIGN_PASSWORD: ${{ inputs.cosignPassword }} run: | - bazel run //internal/api/attestationconfigapi/cli:cli_e2e_test -- ${{ inputs.attestationVariant }} + bazel run //api/attestationconfigapi/cli:cli_e2e_test -- ${{ inputs.attestationVariant }} diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index c624e4c0d..a2bf8d9e9 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -71,8 +71,8 @@ "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74", "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86", "https://bcr.bazel.build/modules/rules_java/7.1.0/MODULE.bazel": "30d9135a2b6561c761bd67bd4990da591e6bdc128790ce3e7afd6a3558b2fb64", - "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", - "https://bcr.bazel.build/modules/rules_java/7.6.1/source.json": "8f3f3076554e1558e8e468b2232991c510ecbcbed9e6f8c06ac31c93bcf38362", + "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1", + "https://bcr.bazel.build/modules/rules_java/7.6.5/source.json": "a805b889531d1690e3c72a7a7e47a870d00323186a9904b36af83aa3d053ee8d", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909", "https://bcr.bazel.build/modules/rules_jvm_external/5.1/source.json": "5abb45cc9beb27b77aec6a65a11855ef2b55d95dfdc358e9f312b78ae0ba32d5", @@ -104,8 +104,8 @@ "https://bcr.bazel.build/modules/upb/0.0.0-20230516-61a97ef/source.json": "b2150404947339e8b947c6b16baa39fa75657f4ddec5e37272c7b11c7ab533bc", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", - "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72", - "https://bcr.bazel.build/modules/zlib/1.3/source.json": "b6b43d0737af846022636e6e255fd4a96fee0d34f08f3830e6e0bac51465c37c" + "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79", + "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d" }, "selectedYankedVersions": {}, "moduleExtensions": { diff --git a/api/attestationconfigapi/BUILD.bazel b/api/attestationconfigapi/BUILD.bazel index 80397adb3..45fc68bc4 100644 --- a/api/attestationconfigapi/BUILD.bazel +++ b/api/attestationconfigapi/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "fetcher.go", "version.go", ], - importpath = "github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi", + importpath = "github.com/edgelesssys/constellation/v2/api/attestationconfigapi", visibility = ["//:__subpackages__"], deps = [ "//internal/api/fetcher", diff --git a/api/attestationconfigapi/cli/BUILD.bazel b/api/attestationconfigapi/internal/cli/BUILD.bazel similarity index 84% rename from api/attestationconfigapi/cli/BUILD.bazel rename to api/attestationconfigapi/internal/cli/BUILD.bazel index df2856aeb..86381a8f5 100644 --- a/api/attestationconfigapi/cli/BUILD.bazel +++ b/api/attestationconfigapi/internal/cli/BUILD.bazel @@ -16,11 +16,11 @@ go_library( "upload.go", "validargs.go", ], - importpath = "github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi/cli", + importpath = "github.com/edgelesssys/constellation/v2/api/attestationconfigapi/internal/cli", visibility = ["//visibility:private"], deps = [ - "//internal/api/attestationconfigapi", - "//internal/api/attestationconfigapi/cli/client", + "//api/attestationconfigapi", + "//api/attestationconfigapi/internal/cli/client", "//internal/api/fetcher", "//internal/attestation/variant", "//internal/constants", diff --git a/api/attestationconfigapi/cli/client/BUILD.bazel b/api/attestationconfigapi/internal/cli/client/BUILD.bazel similarity index 94% rename from api/attestationconfigapi/cli/client/BUILD.bazel rename to api/attestationconfigapi/internal/cli/client/BUILD.bazel index c90cb34b9..547112e8a 100644 --- a/api/attestationconfigapi/cli/client/BUILD.bazel +++ b/api/attestationconfigapi/internal/cli/client/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "client.go", "reporter.go", ], - importpath = "github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi/cli/client", + importpath = "github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi/internal/cli/client", visibility = ["//:__subpackages__"], deps = [ "//internal/api/attestationconfigapi", diff --git a/api/attestationconfigapi/cli/client/client.go b/api/attestationconfigapi/internal/cli/client/client.go similarity index 100% rename from api/attestationconfigapi/cli/client/client.go rename to api/attestationconfigapi/internal/cli/client/client.go diff --git a/api/attestationconfigapi/cli/client/client_test.go b/api/attestationconfigapi/internal/cli/client/client_test.go similarity index 100% rename from api/attestationconfigapi/cli/client/client_test.go rename to api/attestationconfigapi/internal/cli/client/client_test.go diff --git a/api/attestationconfigapi/cli/client/reporter.go b/api/attestationconfigapi/internal/cli/client/reporter.go similarity index 100% rename from api/attestationconfigapi/cli/client/reporter.go rename to api/attestationconfigapi/internal/cli/client/reporter.go diff --git a/api/attestationconfigapi/cli/client/reporter_test.go b/api/attestationconfigapi/internal/cli/client/reporter_test.go similarity index 100% rename from api/attestationconfigapi/cli/client/reporter_test.go rename to api/attestationconfigapi/internal/cli/client/reporter_test.go diff --git a/api/attestationconfigapi/cli/compare.go b/api/attestationconfigapi/internal/cli/compare.go similarity index 99% rename from api/attestationconfigapi/cli/compare.go rename to api/attestationconfigapi/internal/cli/compare.go index 287f32b53..046b3bde1 100644 --- a/api/attestationconfigapi/cli/compare.go +++ b/api/attestationconfigapi/internal/cli/compare.go @@ -10,7 +10,7 @@ import ( "os" "slices" - "github.com/edgelesssys/constellation/v2/api/attestationconfigapi/cli/client" + "github.com/edgelesssys/constellation/v2/api/attestationconfigapi/internal/cli/client" "github.com/edgelesssys/constellation/v2/internal/attestation/variant" "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/verify" diff --git a/api/attestationconfigapi/cli/delete.go b/api/attestationconfigapi/internal/cli/delete.go similarity index 99% rename from api/attestationconfigapi/cli/delete.go rename to api/attestationconfigapi/internal/cli/delete.go index 851d34c3a..4f5a17fc0 100644 --- a/api/attestationconfigapi/cli/delete.go +++ b/api/attestationconfigapi/internal/cli/delete.go @@ -16,7 +16,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" s3types "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/edgelesssys/constellation/v2/api/attestationconfigapi" - "github.com/edgelesssys/constellation/v2/api/attestationconfigapi/cli/client" + "github.com/edgelesssys/constellation/v2/api/attestationconfigapi/internal/cli/client" "github.com/edgelesssys/constellation/v2/internal/attestation/variant" "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/edgelesssys/constellation/v2/internal/staticupload" diff --git a/api/attestationconfigapi/cli/e2e/test.sh.in b/api/attestationconfigapi/internal/cli/e2e/test.sh.in similarity index 100% rename from api/attestationconfigapi/cli/e2e/test.sh.in rename to api/attestationconfigapi/internal/cli/e2e/test.sh.in diff --git a/api/attestationconfigapi/cli/main.go b/api/attestationconfigapi/internal/cli/main.go similarity index 100% rename from api/attestationconfigapi/cli/main.go rename to api/attestationconfigapi/internal/cli/main.go diff --git a/api/attestationconfigapi/cli/upload.go b/api/attestationconfigapi/internal/cli/upload.go similarity index 99% rename from api/attestationconfigapi/cli/upload.go rename to api/attestationconfigapi/internal/cli/upload.go index d55102ae8..1283d617f 100644 --- a/api/attestationconfigapi/cli/upload.go +++ b/api/attestationconfigapi/internal/cli/upload.go @@ -15,7 +15,7 @@ import ( "time" "github.com/edgelesssys/constellation/v2/api/attestationconfigapi" - "github.com/edgelesssys/constellation/v2/api/attestationconfigapi/cli/client" + "github.com/edgelesssys/constellation/v2/api/attestationconfigapi/internal/cli/client" "github.com/edgelesssys/constellation/v2/internal/api/fetcher" "github.com/edgelesssys/constellation/v2/internal/attestation/variant" "github.com/edgelesssys/constellation/v2/internal/file" diff --git a/api/attestationconfigapi/cli/validargs.go b/api/attestationconfigapi/internal/cli/validargs.go similarity index 100% rename from api/attestationconfigapi/cli/validargs.go rename to api/attestationconfigapi/internal/cli/validargs.go