From b02ec5ac2d488a69ac6fe09c5541f9dc64346d91 Mon Sep 17 00:00:00 2001 From: Miguel Martinez Trivino Date: Wed, 29 May 2024 10:00:55 +0200 Subject: [PATCH] chore: extract servicelogger to pkg (#839) Signed-off-by: Miguel Martinez Trivino --- app/artifact-cas/cmd/main.go | 2 +- app/artifact-cas/internal/service/bytestream.go | 2 +- app/artifact-cas/internal/service/download.go | 2 +- app/artifact-cas/internal/service/resource.go | 2 +- app/artifact-cas/internal/service/service.go | 2 +- app/controlplane/cmd/main.go | 2 +- app/controlplane/internal/biz/apitoken.go | 2 +- app/controlplane/internal/biz/attestation.go | 2 +- app/controlplane/internal/biz/casbackend.go | 2 +- app/controlplane/internal/biz/casclient.go | 2 +- app/controlplane/internal/biz/casmapping.go | 2 +- app/controlplane/internal/biz/integration.go | 2 +- app/controlplane/internal/biz/orginvitation.go | 2 +- app/controlplane/internal/biz/referrer.go | 2 +- app/controlplane/internal/dispatcher/dispatcher.go | 2 +- app/controlplane/internal/service/auth.go | 2 +- app/controlplane/internal/service/service.go | 2 +- app/controlplane/plugins/plugins.go | 2 +- app/controlplane/plugins/sdk/v1/fanout.go | 2 +- extras/dagger/main.go | 2 +- internal/credentials/aws/secretmanager.go | 2 +- internal/credentials/azurekv/keyvault.go | 2 +- internal/credentials/gcp/secretmanager.go | 2 +- internal/credentials/gcp/secretmanager_test.go | 2 +- internal/credentials/vault/keyval.go | 2 +- {internal => pkg}/servicelogger/logger.go | 0 26 files changed, 25 insertions(+), 25 deletions(-) rename {internal => pkg}/servicelogger/logger.go (100%) diff --git a/app/artifact-cas/cmd/main.go b/app/artifact-cas/cmd/main.go index a06179ac0..442cd3c77 100644 --- a/app/artifact-cas/cmd/main.go +++ b/app/artifact-cas/cmd/main.go @@ -28,7 +28,7 @@ import ( backend "github.com/chainloop-dev/chainloop/internal/blobmanager" "github.com/chainloop-dev/chainloop/internal/credentials" "github.com/chainloop-dev/chainloop/internal/credentials/manager" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2" "github.com/go-kratos/kratos/v2/config" diff --git a/app/artifact-cas/internal/service/bytestream.go b/app/artifact-cas/internal/service/bytestream.go index 9bd3ced3b..c28d717c7 100644 --- a/app/artifact-cas/internal/service/bytestream.go +++ b/app/artifact-cas/internal/service/bytestream.go @@ -30,7 +30,7 @@ import ( v1 "github.com/chainloop-dev/chainloop/app/artifact-cas/api/cas/v1" backend "github.com/chainloop-dev/chainloop/internal/blobmanager" casJWT "github.com/chainloop-dev/chainloop/internal/robotaccount/cas" - sl "github.com/chainloop-dev/chainloop/internal/servicelogger" + sl "github.com/chainloop-dev/chainloop/pkg/servicelogger" kerrors "github.com/go-kratos/kratos/v2/errors" "github.com/go-kratos/kratos/v2/log" "google.golang.org/genproto/googleapis/bytestream" diff --git a/app/artifact-cas/internal/service/download.go b/app/artifact-cas/internal/service/download.go index f424c9164..94bd35176 100644 --- a/app/artifact-cas/internal/service/download.go +++ b/app/artifact-cas/internal/service/download.go @@ -28,7 +28,7 @@ import ( "code.cloudfoundry.org/bytefmt" backend "github.com/chainloop-dev/chainloop/internal/blobmanager" casJWT "github.com/chainloop-dev/chainloop/internal/robotaccount/cas" - sl "github.com/chainloop-dev/chainloop/internal/servicelogger" + sl "github.com/chainloop-dev/chainloop/pkg/servicelogger" kerrors "github.com/go-kratos/kratos/v2/errors" cr_v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/gorilla/mux" diff --git a/app/artifact-cas/internal/service/resource.go b/app/artifact-cas/internal/service/resource.go index ad3b661fe..5ac01e122 100644 --- a/app/artifact-cas/internal/service/resource.go +++ b/app/artifact-cas/internal/service/resource.go @@ -20,7 +20,7 @@ import ( v1 "github.com/chainloop-dev/chainloop/app/artifact-cas/api/cas/v1" backend "github.com/chainloop-dev/chainloop/internal/blobmanager" - sl "github.com/chainloop-dev/chainloop/internal/servicelogger" + sl "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/errors" ) diff --git a/app/artifact-cas/internal/service/service.go b/app/artifact-cas/internal/service/service.go index c3ee442ea..619580498 100644 --- a/app/artifact-cas/internal/service/service.go +++ b/app/artifact-cas/internal/service/service.go @@ -21,7 +21,7 @@ import ( backend "github.com/chainloop-dev/chainloop/internal/blobmanager" casJWT "github.com/chainloop-dev/chainloop/internal/robotaccount/cas" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" kerrors "github.com/go-kratos/kratos/v2/errors" "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/middleware/auth/jwt" diff --git a/app/controlplane/cmd/main.go b/app/controlplane/cmd/main.go index 46391b68e..d3a216885 100644 --- a/app/controlplane/cmd/main.go +++ b/app/controlplane/cmd/main.go @@ -31,7 +31,7 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" "github.com/chainloop-dev/chainloop/internal/credentials" "github.com/chainloop-dev/chainloop/internal/credentials/manager" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2" "github.com/go-kratos/kratos/v2/config" diff --git a/app/controlplane/internal/biz/apitoken.go b/app/controlplane/internal/biz/apitoken.go index 7de010db8..2723df7b5 100644 --- a/app/controlplane/internal/biz/apitoken.go +++ b/app/controlplane/internal/biz/apitoken.go @@ -25,7 +25,7 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf" "github.com/chainloop-dev/chainloop/app/controlplane/internal/jwt" "github.com/chainloop-dev/chainloop/app/controlplane/internal/jwt/apitoken" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" ) diff --git a/app/controlplane/internal/biz/attestation.go b/app/controlplane/internal/biz/attestation.go index 5ebc11117..851e376b9 100644 --- a/app/controlplane/internal/biz/attestation.go +++ b/app/controlplane/internal/biz/attestation.go @@ -22,7 +22,7 @@ import ( "io" "github.com/chainloop-dev/chainloop/internal/attestation" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" cr_v1 "github.com/google/go-containerregistry/pkg/v1" diff --git a/app/controlplane/internal/biz/casbackend.go b/app/controlplane/internal/biz/casbackend.go index 243957cfe..8c8fbaca4 100644 --- a/app/controlplane/internal/biz/casbackend.go +++ b/app/controlplane/internal/biz/casbackend.go @@ -28,7 +28,7 @@ import ( "github.com/chainloop-dev/chainloop/internal/blobmanager/oci" "github.com/chainloop-dev/chainloop/internal/blobmanager/s3" "github.com/chainloop-dev/chainloop/internal/credentials" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" ) diff --git a/app/controlplane/internal/biz/casclient.go b/app/controlplane/internal/biz/casclient.go index 81725819e..1ee5c1736 100644 --- a/app/controlplane/internal/biz/casclient.go +++ b/app/controlplane/internal/biz/casclient.go @@ -27,7 +27,7 @@ import ( "github.com/chainloop-dev/chainloop/internal/casclient" "github.com/chainloop-dev/chainloop/internal/grpcconn" casJWT "github.com/chainloop-dev/chainloop/internal/robotaccount/cas" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" ) diff --git a/app/controlplane/internal/biz/casmapping.go b/app/controlplane/internal/biz/casmapping.go index e5268e5d8..df72efbec 100644 --- a/app/controlplane/internal/biz/casmapping.go +++ b/app/controlplane/internal/biz/casmapping.go @@ -24,7 +24,7 @@ import ( "time" "github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" cr_v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/uuid" diff --git a/app/controlplane/internal/biz/integration.go b/app/controlplane/internal/biz/integration.go index 8e6733de5..7f328ed22 100644 --- a/app/controlplane/internal/biz/integration.go +++ b/app/controlplane/internal/biz/integration.go @@ -24,7 +24,7 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" "github.com/chainloop-dev/chainloop/internal/credentials" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" "google.golang.org/protobuf/types/known/structpb" diff --git a/app/controlplane/internal/biz/orginvitation.go b/app/controlplane/internal/biz/orginvitation.go index 0cc8cdcce..482e12aa6 100644 --- a/app/controlplane/internal/biz/orginvitation.go +++ b/app/controlplane/internal/biz/orginvitation.go @@ -21,7 +21,7 @@ import ( "time" "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" ) diff --git a/app/controlplane/internal/biz/referrer.go b/app/controlplane/internal/biz/referrer.go index 2c6c79e52..11fdb3055 100644 --- a/app/controlplane/internal/biz/referrer.go +++ b/app/controlplane/internal/biz/referrer.go @@ -26,7 +26,7 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf" "github.com/chainloop-dev/chainloop/internal/attestation" "github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" v1 "github.com/in-toto/attestation/go/v1" diff --git a/app/controlplane/internal/dispatcher/dispatcher.go b/app/controlplane/internal/dispatcher/dispatcher.go index 1a50fda06..51b4d67ef 100644 --- a/app/controlplane/internal/dispatcher/dispatcher.go +++ b/app/controlplane/internal/dispatcher/dispatcher.go @@ -31,7 +31,7 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" "github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop" "github.com/chainloop-dev/chainloop/internal/credentials" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/secure-systems-lab/go-securesystemslib/dsse" ) diff --git a/app/controlplane/internal/service/auth.go b/app/controlplane/internal/service/auth.go index d8b9c5d43..ffea3aedb 100644 --- a/app/controlplane/internal/service/auth.go +++ b/app/controlplane/internal/service/auth.go @@ -33,7 +33,7 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/internal/jwt/user" authenticator "github.com/chainloop-dev/chainloop/app/controlplane/internal/oidcauthenticator" "github.com/chainloop-dev/chainloop/internal/oauth" - sl "github.com/chainloop-dev/chainloop/internal/servicelogger" + sl "github.com/chainloop-dev/chainloop/pkg/servicelogger" "golang.org/x/oauth2" ) diff --git a/app/controlplane/internal/service/service.go b/app/controlplane/internal/service/service.go index f652f590c..6d544f0ba 100644 --- a/app/controlplane/internal/service/service.go +++ b/app/controlplane/internal/service/service.go @@ -21,7 +21,7 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/internal/biz" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" errors "github.com/go-kratos/kratos/v2/errors" "github.com/go-kratos/kratos/v2/log" "github.com/google/wire" diff --git a/app/controlplane/plugins/plugins.go b/app/controlplane/plugins/plugins.go index f5ae7a1cd..8b6ab5dba 100644 --- a/app/controlplane/plugins/plugins.go +++ b/app/controlplane/plugins/plugins.go @@ -27,7 +27,7 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/plugins/core/smtp/v1" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" plugin_sdk "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1/plugin" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" diff --git a/app/controlplane/plugins/sdk/v1/fanout.go b/app/controlplane/plugins/sdk/v1/fanout.go index f5d3d2cb5..7bccdc159 100644 --- a/app/controlplane/plugins/sdk/v1/fanout.go +++ b/app/controlplane/plugins/sdk/v1/fanout.go @@ -29,7 +29,7 @@ import ( schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1" "github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" intoto "github.com/in-toto/attestation/go/v1" "github.com/invopop/jsonschema" diff --git a/extras/dagger/main.go b/extras/dagger/main.go index d8a94c13f..9c7795e3c 100644 --- a/extras/dagger/main.go +++ b/extras/dagger/main.go @@ -9,7 +9,7 @@ import ( ) var ( - chainloopVersion = "v0.89.0" + chainloopVersion = "v0.88.1" ) type Chainloop struct{} diff --git a/internal/credentials/aws/secretmanager.go b/internal/credentials/aws/secretmanager.go index 21110c2e1..ca619a39a 100644 --- a/internal/credentials/aws/secretmanager.go +++ b/internal/credentials/aws/secretmanager.go @@ -30,7 +30,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sso/types" "github.com/aws/smithy-go" "github.com/chainloop-dev/chainloop/internal/credentials" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/google/uuid" "github.com/go-kratos/kratos/v2/log" diff --git a/internal/credentials/azurekv/keyvault.go b/internal/credentials/azurekv/keyvault.go index a1ed87d72..00ab94be9 100644 --- a/internal/credentials/azurekv/keyvault.go +++ b/internal/credentials/azurekv/keyvault.go @@ -29,7 +29,7 @@ import ( "github.com/chainloop-dev/chainloop/internal/credentials" "github.com/google/uuid" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" ) diff --git a/internal/credentials/gcp/secretmanager.go b/internal/credentials/gcp/secretmanager.go index 6f76e22ed..dc0f83fa0 100644 --- a/internal/credentials/gcp/secretmanager.go +++ b/internal/credentials/gcp/secretmanager.go @@ -28,7 +28,7 @@ import ( "google.golang.org/api/option" "github.com/chainloop-dev/chainloop/internal/credentials" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/docker/distribution/uuid" "github.com/go-kratos/kratos/v2/log" "github.com/googleapis/gax-go/v2" diff --git a/internal/credentials/gcp/secretmanager_test.go b/internal/credentials/gcp/secretmanager_test.go index f0975e587..d546eab83 100644 --- a/internal/credentials/gcp/secretmanager_test.go +++ b/internal/credentials/gcp/secretmanager_test.go @@ -24,7 +24,7 @@ import ( "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb" "github.com/chainloop-dev/chainloop/internal/credentials" gcpmocks "github.com/chainloop-dev/chainloop/internal/credentials/gcp/mocks" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/credentials/vault/keyval.go b/internal/credentials/vault/keyval.go index 5cccbf0fd..4a1f30390 100644 --- a/internal/credentials/vault/keyval.go +++ b/internal/credentials/vault/keyval.go @@ -26,7 +26,7 @@ import ( "time" "github.com/chainloop-dev/chainloop/internal/credentials" - "github.com/chainloop-dev/chainloop/internal/servicelogger" + "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/docker/distribution/uuid" "github.com/go-kratos/kratos/v2/log" vault "github.com/hashicorp/vault/api" diff --git a/internal/servicelogger/logger.go b/pkg/servicelogger/logger.go similarity index 100% rename from internal/servicelogger/logger.go rename to pkg/servicelogger/logger.go