Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RELTEC-11991: use Interhyp/go-backend-service-common #334

Merged
merged 1 commit into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.21

require (
github.com/IBM/sarama v1.43.3
github.com/Interhyp/go-backend-service-common v0.12.0
github.com/Roshick/go-autumn-kafka v0.7.2
github.com/Roshick/go-autumn-synchronisation v0.7.0
github.com/StephanHCB/go-autumn-config-api v0.2.2
Expand All @@ -15,7 +16,6 @@ require (
github.com/StephanHCB/go-autumn-restclient-circuitbreaker v0.5.0
github.com/StephanHCB/go-autumn-restclient-circuitbreaker-prometheus v0.2.0
github.com/StephanHCB/go-autumn-restclient-prometheus v0.2.0
github.com/StephanHCB/go-backend-service-common v0.11.0
github.com/go-chi/chi/v5 v5.1.0
github.com/go-git/go-billy/v5 v5.5.0
github.com/go-git/go-git/v5 v5.12.0
Expand All @@ -29,7 +29,6 @@ require (
github.com/rs/zerolog v1.33.0
github.com/stretchr/testify v1.9.0
gopkg.in/yaml.v3 v3.0.1

)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/IBM/sarama v1.43.3 h1:Yj6L2IaNvb2mRBop39N7mmJAHBVY3dTPncr3qGVkxPA=
github.com/IBM/sarama v1.43.3/go.mod h1:FVIRaLrhK3Cla/9FfRF5X9Zua2KpS3SYIXxhac1H+FQ=
github.com/Interhyp/go-backend-service-common v0.12.0 h1:IkHHxp6o099WX7Wm5nlntrei2LhQ/gzE5E+TXtPtNfY=
github.com/Interhyp/go-backend-service-common v0.12.0/go.mod h1:wCJSbSSbn/5CWt5OKa8iMLYBhb/tncgot3TiG2ZDv0k=
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
Expand Down Expand Up @@ -33,8 +35,6 @@ github.com/StephanHCB/go-autumn-restclient-prometheus v0.2.0 h1:FFDXUpJiP/jI9VeP
github.com/StephanHCB/go-autumn-restclient-prometheus v0.2.0/go.mod h1:o16L6jhBel94ingm16iWSZgrTHa3iAG7PV2e7Qigklw=
github.com/StephanHCB/go-autumn-web-swagger-ui v0.3.3 h1:09gZKOO8ZMDknikt1tRpx/5BEc37yp053Sc/R8zP3HI=
github.com/StephanHCB/go-autumn-web-swagger-ui v0.3.3/go.mod h1:EBtCQXF8JhoADnadezundz2xWEdFPmx2NUTgZYtUE0M=
github.com/StephanHCB/go-backend-service-common v0.11.0 h1:BSkD8PMOAM0bPho+7GOvU3elcEObg6ePfC63ob/G/+M=
github.com/StephanHCB/go-backend-service-common v0.11.0/go.mod h1:rqjdoWT66PufMdrNCOW6c3iRLgEXVUrfG3R63OmMQsA=
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
Expand Down
2 changes: 1 addition & 1 deletion internal/acorn/config/customconfigint.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/Interhyp/metadata-service/internal/types"
"github.com/Roshick/go-autumn-kafka/pkg/kafka"

librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
)

type CustomConfiguration interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/acorn/service/repositoriesint.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package service

import (
"context"
"github.com/Interhyp/go-backend-service-common/api/apierrors"
"github.com/Interhyp/metadata-service/api"
"github.com/StephanHCB/go-backend-service-common/api/apierrors"
)

// Repositories provides the business logic for repository metadata.
Expand Down
2 changes: 1 addition & 1 deletion internal/repository/bitbucket/bbclient/bbclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package bbclient
import (
"context"
"fmt"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/errors/httperror"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
Expand All @@ -17,7 +18,6 @@ import (
aurestrecorder "github.com/StephanHCB/go-autumn-restclient/implementation/recorder"
aurestlogging "github.com/StephanHCB/go-autumn-restclient/implementation/requestlogging"
aurestretry "github.com/StephanHCB/go-autumn-restclient/implementation/retry"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/go-http-utils/headers"
"net/http"
"net/url"
Expand Down
2 changes: 1 addition & 1 deletion internal/repository/bitbucket/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package bitbucket
import (
"context"
"fmt"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/errors/httperror"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
"github.com/Interhyp/metadata-service/internal/repository/bitbucket/bbclient"
"github.com/Interhyp/metadata-service/internal/repository/bitbucket/bbclientint"
aulogging "github.com/StephanHCB/go-autumn-logging"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"net/http"
"sort"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/repository/bitbucket/repository_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ package bitbucket

import (
"context"
libconfig "github.com/Interhyp/go-backend-service-common/repository/config"
"github.com/Interhyp/go-backend-service-common/repository/logging"
configint "github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/errors/httperror"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
"github.com/Interhyp/metadata-service/internal/repository/config"
"github.com/Interhyp/metadata-service/test/mock/bbclientmock"
"github.com/Interhyp/metadata-service/test/mock/vaultmock"
auconfigenv "github.com/StephanHCB/go-autumn-config-env"
libconfig "github.com/StephanHCB/go-backend-service-common/repository/config"
"github.com/StephanHCB/go-backend-service-common/repository/logging"
"github.com/stretchr/testify/require"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/repository/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package cache

import (
"context"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
openapi "github.com/Interhyp/metadata-service/api"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
libcache "github.com/Roshick/go-autumn-synchronisation/pkg/cache"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"time"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/repository/cache/lowlevel.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cache
import (
"context"
"fmt"
"github.com/Interhyp/go-backend-service-common/api/apierrors"
libcache "github.com/Roshick/go-autumn-synchronisation/pkg/cache"
"github.com/StephanHCB/go-backend-service-common/api/apierrors"
"sort"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/repository/config/plumbing.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"strconv"
"strings"

librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
libconfig "github.com/Interhyp/go-backend-service-common/repository/config"
"github.com/Interhyp/go-backend-service-common/repository/vault"
"github.com/Interhyp/metadata-service/internal/acorn/config"
openapi "github.com/Interhyp/metadata-service/internal/types"
"github.com/Roshick/go-autumn-kafka/pkg/kafka"
auconfigapi "github.com/StephanHCB/go-autumn-config-api"
auconfigenv "github.com/StephanHCB/go-autumn-config-env"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
libconfig "github.com/StephanHCB/go-backend-service-common/repository/config"
"github.com/StephanHCB/go-backend-service-common/repository/vault"
)

type CustomConfigImpl struct {
Expand Down
8 changes: 4 additions & 4 deletions internal/repository/config/validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (

"github.com/Interhyp/metadata-service/internal/acorn/config"

librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/go-backend-service-common/docs"
libconfig "github.com/Interhyp/go-backend-service-common/repository/config"
"github.com/Interhyp/go-backend-service-common/repository/logging"
auconfigenv "github.com/StephanHCB/go-autumn-config-env"
goauzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/StephanHCB/go-backend-service-common/docs"
libconfig "github.com/StephanHCB/go-backend-service-common/repository/config"
"github.com/StephanHCB/go-backend-service-common/repository/logging"
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/repository/hostip/hostip.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package hostip
import (
"context"
"errors"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"net"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/repository/idp/idp.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"encoding/pem"
"errors"
"fmt"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
aurestclientprometheus "github.com/StephanHCB/go-autumn-restclient-prometheus"
aurestclientapi "github.com/StephanHCB/go-autumn-restclient/api"
auresthttpclient "github.com/StephanHCB/go-autumn-restclient/implementation/httpclient"
aurestlogging "github.com/StephanHCB/go-autumn-restclient/implementation/requestlogging"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/lestrrat-go/jwx/v2/jwk"
"net/http"
"time"
Expand Down
2 changes: 1 addition & 1 deletion internal/repository/kafka/kafka.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"time"

"github.com/IBM/sarama"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
"github.com/Roshick/go-autumn-kafka/pkg/kafka"
aulogging "github.com/StephanHCB/go-autumn-logging"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/rcrowley/go-metrics"
)
import _ "github.com/go-git/go-git/v5"
Expand Down
4 changes: 2 additions & 2 deletions internal/repository/metadata/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ import (
"bytes"
"context"
"fmt"
"github.com/Interhyp/go-backend-service-common/web/middleware/security"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
"github.com/StephanHCB/go-backend-service-common/web/middleware/security"
"io"
"os"
"strings"
"sync"
"time"
"unicode"

librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/errors/nochangeserror"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/go-git/go-billy/v5/memfs"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
Expand Down
2 changes: 1 addition & 1 deletion internal/repository/notifier/client/notifier/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
"net/http"
"time"

librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
aurestbreakerprometheus "github.com/StephanHCB/go-autumn-restclient-circuitbreaker-prometheus"
aurestbreaker "github.com/StephanHCB/go-autumn-restclient-circuitbreaker/implementation/breaker"
aurestclientprometheus "github.com/StephanHCB/go-autumn-restclient-prometheus"
aurestclientapi "github.com/StephanHCB/go-autumn-restclient/api"
auresthttpclient "github.com/StephanHCB/go-autumn-restclient/implementation/httpclient"
aurestlogging "github.com/StephanHCB/go-autumn-restclient/implementation/requestlogging"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
)

type NotifierClient interface {
Expand Down
4 changes: 2 additions & 2 deletions internal/repository/notifier/notifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package notifier
import (
"context"
"fmt"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/go-backend-service-common/web/util/contexthelper"
openapi "github.com/Interhyp/metadata-service/api"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
notifierclient "github.com/Interhyp/metadata-service/internal/repository/notifier/client/notifier"
"github.com/Interhyp/metadata-service/internal/types"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/StephanHCB/go-backend-service-common/web/util/contexthelper"
"time"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/repository/sshAuthProvider/sshAuthProvider.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/Interhyp/metadata-service/internal/acorn/repository"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"

librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
aulogging "github.com/StephanHCB/go-autumn-logging"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/go-git/go-git/v5/plumbing/transport/ssh"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/Interhyp/metadata-service/test/mock/configmock"
"testing"

"github.com/StephanHCB/go-backend-service-common/docs"
"github.com/Interhyp/go-backend-service-common/docs"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/service/mapper/generics.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package mapper
import (
"context"
"fmt"
"github.com/Interhyp/go-backend-service-common/web/middleware/requestid"
"github.com/Interhyp/metadata-service/api"
"github.com/Interhyp/metadata-service/internal/acorn/errors/nochangeserror"
"github.com/StephanHCB/go-backend-service-common/web/middleware/requestid"
"github.com/rs/zerolog/log"
"gopkg.in/yaml.v3"
"time"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/mapper/mapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package mapper

import (
"context"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
"github.com/Interhyp/metadata-service/internal/acorn/service"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"strings"
"sync"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/service/mapper/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"errors"
"fmt"
"github.com/Interhyp/go-backend-service-common/api/apierrors"
"github.com/Interhyp/metadata-service/api"
"github.com/Interhyp/metadata-service/internal/acorn/errors/nochangeserror"
"github.com/Interhyp/metadata-service/internal/service/util"
"github.com/StephanHCB/go-backend-service-common/api/apierrors"
"sort"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/service/mapper/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"errors"
"fmt"
"github.com/Interhyp/go-backend-service-common/api/apierrors"
"github.com/Interhyp/metadata-service/api"
"github.com/Interhyp/metadata-service/internal/acorn/errors/nochangeserror"
"github.com/StephanHCB/go-backend-service-common/api/apierrors"
"sort"
"strings"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/service/owners/owners.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
"strings"

librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/StephanHCB/go-backend-service-common/api/apierrors"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/go-backend-service-common/api/apierrors"
)

type Impl struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/owners/owners_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package owners

import (
"context"
"github.com/Interhyp/go-backend-service-common/docs"
"github.com/Interhyp/metadata-service/api"
"github.com/Interhyp/metadata-service/test/mock/cachemock"
"github.com/StephanHCB/go-backend-service-common/docs"
"github.com/stretchr/testify/require"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/service/prvalidator/prvalidator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package prvalidator
import (
"context"
"fmt"
librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
openapi "github.com/Interhyp/metadata-service/api"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
"github.com/Interhyp/metadata-service/internal/acorn/service"
aulogging "github.com/StephanHCB/go-autumn-logging"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"gopkg.in/yaml.v3"
"strings"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/service/repositories/repositories.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (
"net/url"
"strings"

librepo "github.com/Interhyp/go-backend-service-common/acorns/repository"
"github.com/Interhyp/go-backend-service-common/api/apierrors"
"github.com/Interhyp/metadata-service/api"
"github.com/Interhyp/metadata-service/internal/acorn/config"
"github.com/Interhyp/metadata-service/internal/acorn/repository"
"github.com/Interhyp/metadata-service/internal/acorn/service"
"github.com/Interhyp/metadata-service/internal/service/util"
auzerolog "github.com/StephanHCB/go-autumn-logging-zerolog"
librepo "github.com/StephanHCB/go-backend-service-common/acorns/repository"
"github.com/StephanHCB/go-backend-service-common/api/apierrors"
)

type Impl struct {
Expand Down
Loading
Loading