Skip to content

Commit

Permalink
chore: extract servicelogger to pkg (chainloop-dev#839)
Browse files Browse the repository at this point in the history 
Signed-off-by: Miguel Martinez Trivino <[email protected]>
  • Loading branch information
@migmartri
migmartri authored May 29, 2024
1 parent a0be0ce commit b02ec5a
Show file tree
Hide file tree
Showing 26 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion app/artifact-cas/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/artifact-cas/internal/service/bytestream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/artifact-cas/internal/service/download.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/artifact-cas/internal/service/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion app/artifact-cas/internal/service/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/apitoken.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/attestation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/casbackend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/casclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/casmapping.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/integration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/orginvitation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/referrer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/dispatcher/dispatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/service/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/service/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/plugins/plugins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/plugins/sdk/v1/fanout.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extras/dagger/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

var (
chainloopVersion = "v0.89.0"
chainloopVersion = "v0.88.1"
)

type Chainloop struct{}
Expand Down
2 changes: 1 addition & 1 deletion internal/credentials/aws/secretmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/credentials/azurekv/keyvault.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/credentials/gcp/secretmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/credentials/gcp/secretmanager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/credentials/vault/keyval.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 internal/servicelogger/logger.go → pkg/servicelogger/logger.go
View file
File renamed without changes.

0 comments on commit b02ec5a

Please sign in to comment.