Skip to content

Commit

Permalink
refactor: Consume V2 Go Modules for edgex go-mods (#155)
Browse files Browse the repository at this point in the history 
closes #154

Signed-off-by: lenny <[email protected]>
  • Loading branch information
@lenny-goodell
lenny-goodell authored Jan 20, 2021
1 parent b42b1bf commit ec2d1cf
Show file tree
Hide file tree
Showing 19 changed files with 45 additions and 45 deletions.
6 changes: 3 additions & 3 deletions bootstrap/bootstrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup"
"github.com/edgexfoundry/go-mod-bootstrap/v2/di"

"github.com/edgexfoundry/go-mod-registry/registry"
"github.com/edgexfoundry/go-mod-registry/v2/registry"

"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/models"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/v2/models"
)

// Deferred defines the signature of a function returned by RunAndReturnWaitGroup that should be executed via defer.
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup"
"github.com/edgexfoundry/go-mod-bootstrap/v2/di"

"github.com/edgexfoundry/go-mod-configuration/configuration"
"github.com/edgexfoundry/go-mod-configuration/pkg/types"
"github.com/edgexfoundry/go-mod-configuration/v2/configuration"
"github.com/edgexfoundry/go-mod-configuration/v2/pkg/types"

"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"

"github.com/BurntSushi/toml"
)
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/config/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package config

import (
"github.com/edgexfoundry/go-mod-configuration/pkg/types"
"github.com/edgexfoundry/go-mod-configuration/v2/pkg/types"

"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/environment"
)
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/config/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/environment"
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/container/logging.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package container

import (
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"

"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
)
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/container/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package container
import (
"github.com/edgexfoundry/go-mod-bootstrap/v2/di"

"github.com/edgexfoundry/go-mod-registry/registry"
"github.com/edgexfoundry/go-mod-registry/v2/registry"
)

// RegistryClientInterfaceName contains the name of the registry.Client implementation in the DIC.
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/container/token.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package container

import (
"github.com/edgexfoundry/go-mod-secrets/pkg/token/authtokenloader"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg/token/authtokenloader"

"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
)
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/environment/variables.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"strconv"
"strings"

"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/models"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/v2/models"

"github.com/edgexfoundry/go-mod-configuration/pkg/types"
"github.com/edgexfoundry/go-mod-configuration/v2/pkg/types"

"github.com/pelletier/go-toml"
)
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/environment/variables_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"github.com/edgexfoundry/go-mod-bootstrap/v2/config"

"github.com/edgexfoundry/go-mod-configuration/pkg/types"
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
secretsTypes "github.com/edgexfoundry/go-mod-secrets/pkg/types"
"github.com/edgexfoundry/go-mod-configuration/v2/pkg/types"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
secretsTypes "github.com/edgexfoundry/go-mod-secrets/v2/pkg/types"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
8 changes: 4 additions & 4 deletions bootstrap/handlers/secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup"
"github.com/edgexfoundry/go-mod-bootstrap/v2/config"
"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
"github.com/edgexfoundry/go-mod-secrets/pkg/types"
"github.com/edgexfoundry/go-mod-secrets/secrets"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg/types"
"github.com/edgexfoundry/go-mod-secrets/v2/secrets"

"github.com/edgexfoundry/go-mod-secrets/pkg/token/authtokenloader"
"github.com/edgexfoundry/go-mod-secrets/pkg/token/fileioperformer"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg/token/authtokenloader"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg/token/fileioperformer"
)

// SecureProviderBootstrapHandler full initializes the Secret Provider.
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/handlers/secret_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup"
bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v2/config"
"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-secrets/pkg/token/authtokenloader/mocks"
"github.com/edgexfoundry/go-mod-secrets/pkg/types"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg/token/authtokenloader/mocks"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
8 changes: 4 additions & 4 deletions bootstrap/registration/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"errors"
"fmt"

"github.com/edgexfoundry/go-mod-core-contracts/clients"
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
registryTypes "github.com/edgexfoundry/go-mod-registry/pkg/types"
"github.com/edgexfoundry/go-mod-registry/registry"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
registryTypes "github.com/edgexfoundry/go-mod-registry/v2/pkg/types"
"github.com/edgexfoundry/go-mod-registry/v2/registry"

"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces"
"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup"
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/registration/registry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/edgexfoundry/go-mod-bootstrap/v2/config"

"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/secret/insecure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces"
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
)

// InsecureProvider implements the SecretProvider interface for insecure secrets
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/secret/insecure_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v2/config"
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/secret/secure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"fmt"

"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces"
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-secrets/pkg/token/authtokenloader"
"github.com/edgexfoundry/go-mod-secrets/secrets"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg/token/authtokenloader"
"github.com/edgexfoundry/go-mod-secrets/v2/secrets"

"sync"
"time"
Expand Down
10 changes: 5 additions & 5 deletions bootstrap/secret/secure_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"time"

bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v2/config"
"github.com/edgexfoundry/go-mod-core-contracts/clients/logger"
"github.com/edgexfoundry/go-mod-secrets/pkg"
mocks2 "github.com/edgexfoundry/go-mod-secrets/pkg/token/authtokenloader/mocks"
"github.com/edgexfoundry/go-mod-secrets/secrets"
"github.com/edgexfoundry/go-mod-secrets/secrets/mocks"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg"
mocks2 "github.com/edgexfoundry/go-mod-secrets/v2/pkg/token/authtokenloader/mocks"
"github.com/edgexfoundry/go-mod-secrets/v2/secrets"
"github.com/edgexfoundry/go-mod-secrets/v2/secrets/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions config/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"time"

"github.com/edgexfoundry/go-mod-core-contracts/clients"
"github.com/edgexfoundry/go-mod-secrets/pkg/types"
"github.com/edgexfoundry/go-mod-core-contracts/v2/clients"
"github.com/edgexfoundry/go-mod-secrets/v2/pkg/types"
)

// ServiceInfo contains configuration settings necessary for the basic operation of any EdgeX service.
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ module github.com/edgexfoundry/go-mod-bootstrap/v2

require (
github.com/BurntSushi/toml v0.3.1
github.com/edgexfoundry/go-mod-configuration v0.0.8
github.com/edgexfoundry/go-mod-core-contracts v0.1.147
github.com/edgexfoundry/go-mod-registry v0.1.27
github.com/edgexfoundry/go-mod-secrets v0.0.32
github.com/edgexfoundry/go-mod-configuration/v2 v2.0.0-dev.1
github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.1
github.com/edgexfoundry/go-mod-registry/v2 v2.0.0-dev.1
github.com/edgexfoundry/go-mod-secrets/v2 v2.0.0-dev.2
github.com/gorilla/mux v1.7.1
github.com/pelletier/go-toml v1.2.0
github.com/stretchr/testify v1.6.1
Expand Down

0 comments on commit ec2d1cf

Please sign in to comment.