Merge pull request #4982 from jinlinGuan/v4-module

refactor!: update module to v4 and replace vault with openbao
edgexfoundry · Oct 28, 2024 · c963200 · c963200
2 parents c89e7d4 + 2fd20ad
commit c963200
Show file tree

Hide file tree

Showing 311 changed files with 1,232 additions and 1,672 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,15 +6,15 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "github.com/edgexfoundry/go-mod-configuration/v3"
+      - dependency-name: "github.com/edgexfoundry/go-mod-configuration/v4"
         # Included when go-mod-bootstrap is updated
-      - dependency-name: "github.com/edgexfoundry/go-mod-core-contracts/v3"
+      - dependency-name: "github.com/edgexfoundry/go-mod-core-contracts/v4"
         # Included when go-mod-bootstrap is updated
-      - dependency-name: "github.com/edgexfoundry/go-mod-messaging/v3"
+      - dependency-name: "github.com/edgexfoundry/go-mod-messaging/v4"
         # Included when go-mod-bootstrap is updated
-      - dependency-name: "github.com/edgexfoundry/go-mod-registry/v3"
+      - dependency-name: "github.com/edgexfoundry/go-mod-registry/v4"
         # Included when go-mod-bootstrap is updated
-      - dependency-name: "github.com/edgexfoundry/go-mod-secrets/v3"
+      - dependency-name: "github.com/edgexfoundry/go-mod-secrets/v4"
         # Included when go-mod-bootstrap is updated
       - dependency-name: "github.com/gomodule/redigo"
         # For github.com/gomodule/redigo, ignore version v2.0.0

diff --git a/Attribution.txt b/Attribution.txt
@@ -98,22 +98,22 @@ https://bitbucket.org/bertimus9/systemstat/src/master/LICENSE
 davecgh/go-spew (ISC) https://github.com/davecgh/go-spew
 https://github.com/davecgh/go-spew/blob/master/LICENSE
 
-edgexfoundry/go-mod-bootstrap (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v3
+edgexfoundry/go-mod-bootstrap (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v4
 https://github.com/edgexfoundry/go-mod-bootstrap/blob/master/LICENSE
 
-edgexfoundry/go-mod-configuration (Apache 2.0) https://github.com/edgexfoundry/go-mod-configuration/v3
+edgexfoundry/go-mod-configuration (Apache 2.0) https://github.com/edgexfoundry/go-mod-configuration/v4
 https://github.com/edgexfoundry/go-mod-configuration/blob/master/LICENSE
 
-edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v3
+edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v4
 https://github.com/edgexfoundry/go-mod-core-contracts/blob/master/LICENSE
 
-edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v3
+edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v4
 https://github.com/edgexfoundry/go-mod-messaging/blob/master/LICENSE
 
-edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v3
+edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v4
 https://github.com/edgexfoundry/go-mod-registry/blob/master/LICENSE
 
-edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v3
+edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v4
 https://github.com/edgexfoundry/go-mod-secrets/blob/master/LICENSE
 
 gorilla/context (BSD-3) https://github.com/gorilla/context

diff --git a/cmd/secrets-config/res/configuration.yaml b/cmd/secrets-config/res/configuration.yaml
@@ -1,22 +1,23 @@
 #
 # Copyright (c) 2023 Intel Corporation
+# Copyright (c) 2024 IOTech Ltd
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
 LogLevel: DEBUG
 SecretStore:
-  Type: vault
+  Type: openbao
   Protocol: http
   Host: localhost
   Port: 8200
   CertPath: ""
   CaFilePath: ""
   CertFilePath: ""
   KeyFilePath: ""
-  # for root token use: /vault/config/assets
+  # for root token use: /openbao/config/assets
   # for service token use: /tmp/edgex/secrets/security-proxy-setup 
-  TokenFolderPath: /vault/config/assets
+  TokenFolderPath: /openbao/config/assets
   # for root token use: resp-init.json
   # for service token use: secrets-token.json
   TokenFile: resp-init.json

diff --git a/.../entrypoint-scripts/vault_wait_install.sh → ...point-scripts/secretstore_wait_install.sh b/.../entrypoint-scripts/vault_wait_install.sh → ...point-scripts/secretstore_wait_install.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/dumb-init /bin/sh
 #  ----------------------------------------------------------------------------------
 #  Copyright (c) 2021 Intel Corporation
+#  Copyright (c) 2024 IOTech Ltd
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,41 +18,41 @@
 #  SPDX-License-Identifier: Apache-2.0
 #  ----------------------------------------------------------------------------------
 
-# This is customized entrypoint script for Vault.
+# This is customized entrypoint script for secret store.
 # In particular, it waits for the BootstrapPort ready to roll
 
 set -e
 
 # env settings are populated from env files of docker-compose
 
-echo "Script for waiting security bootstrapping on Vault"
+echo "Script for waiting security bootstrapping on Secret Store"
 
-DEFAULT_VAULT_LOCAL_CONFIG='
+DEFAULT_BAO_LOCAL_CONFIG='
 listener "tcp" { 
-              address = "edgex-vault:8200" 
+              address = "edgex-secret-store:8200"
               tls_disable = "1" 
-              cluster_address = "edgex-vault:8201" 
+              cluster_address = "edgex-secret-store:8201"
           } 
           backend "file" {
-              path = "/vault/file"
+              path = "/openbao/file"
           } 
           default_lease_ttl = "168h" 
           max_lease_ttl = "720h"
 '
 
-VAULT_LOCAL_CONFIG=${VAULT_LOCAL_CONFIG:-$DEFAULT_VAULT_LOCAL_CONFIG}
+BAO_LOCAL_CONFIG=${BAO_LOCAL_CONFIG:-$DEFAULT_BAO_LOCAL_CONFIG}
 
-export VAULT_LOCAL_CONFIG
+export BAO_LOCAL_CONFIG
 
-echo "$(date) VAULT_LOCAL_CONFIG: ${VAULT_LOCAL_CONFIG}"
+echo "$(date) BAO_LOCAL_CONFIG: ${BAO_LOCAL_CONFIG}"
 
 if [ "$1" = 'server' ]; then
-  echo "$(date) Executing waitFor on vault $* with \
+  echo "$(date) Executing waitFor on secret store $* with \
     tcp://${STAGEGATE_BOOTSTRAPPER_HOST}:${STAGEGATE_BOOTSTRAPPER_STARTPORT}"
   /edgex-init/security-bootstrapper --configDir=/edgex-init/res waitFor \
     -uri tcp://"${STAGEGATE_BOOTSTRAPPER_HOST}":"${STAGEGATE_BOOTSTRAPPER_STARTPORT}" \
     -timeout "${STAGEGATE_WAITFOR_TIMEOUT}"
 
-  echo "$(date) Starting edgex-vault..."
+  echo "$(date) Starting edgex-secret-store..."
   exec /usr/local/bin/docker-entrypoint.sh server -log-level=info
 fi
diff --git a/cmd/security-bootstrapper/res/configuration.yaml b/cmd/security-bootstrapper/res/configuration.yaml
@@ -61,7 +61,7 @@ StageGate:
 # protocol, host, and port of secretstore using in the security-bootstrapper
 # we are not really using the secret store provider from go-mod-bootstrap in the code
 SecretStore:
-  Type: vault
+  Type: openbao
   Protocol: http
   Host: localhost
   Port: 8200
diff --git a/cmd/security-proxy-setup/entrypoint.sh b/cmd/security-proxy-setup/entrypoint.sh
@@ -305,21 +305,21 @@ server {
       proxy_set_header   Host \$host;
     }
 
-    # Note: Vault login API does not require authentication at the gateway for obvious reasons
-    set \$upstream_vault edgex-vault;
+    # Note: OpenBao login API does not require authentication at the gateway for obvious reasons
+    set \$upstream_secret_store edgex-secret-store;
     location /vault/v1/auth/userpass/login {
 `cat "${corssnippet}"`
       rewrite            /vault/(.*) /\$1 break;
       resolver           127.0.0.11 valid=30s;
-      proxy_pass         http://\$upstream_vault:8200;
+      proxy_pass         http://\$upstream_secret_store:8200;
       proxy_redirect     off;
       proxy_set_header   Host \$host;
     }
     location /vault/v1/identity/oidc/token {
 `cat "${corssnippet}"`
       rewrite            /vault/(.*) /\$1 break;
       resolver           127.0.0.11 valid=30s;
-      proxy_pass         http://\$upstream_vault:8200;
+      proxy_pass         http://\$upstream_secret_store:8200;
       proxy_redirect     off;
       proxy_set_header   Host \$host;
     }

diff --git a/cmd/security-secretstore-setup/README.md b/cmd/security-secretstore-setup/README.md
@@ -18,13 +18,13 @@ This will create an executable located at `cmd/security-secretstore-setup/` if s
 
 The binary supports multiple command line parameters
 
-| Parameter                         | Description                                                                                                    |
-|-----------------------------------|----------------------------------------------------------------------------------------------------------------|
-| -p, --profile `name`              | Indicate configuration profile other than default                                                              |
-| -r, --registry                    | Indicates service should use Registry                                                                          |
-| --insecureSkipVerify=`true/false` | Indicates if skipping the server side SSL cert verifcation, similar to -k of curl                              |
-| --configfile=`file.yaml`          | Use a different config file (default: res/configuration.yaml)                                                  |
-| --vaultInterval=`seconds`         | **Required** Indicates how long the program will pause between vault initialization attempts until it succeeds |
+| Parameter                         | Description                                                                                                           |
+|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------|
+| -p, --profile `name`              | Indicate configuration profile other than default                                                                     |
+| -r, --registry                    | Indicates service should use Registry                                                                                 |
+| --insecureSkipVerify=`true/false` | Indicates if skipping the server side SSL cert verifcation, similar to -k of curl                                     |
+| --configfile=`file.yaml`          | Use a different config file (default: res/configuration.yaml)                                                         |
+| --secretStoreInterval=`seconds`   | **Required** Indicates how long the program will pause between secret store initialization attempts until it succeeds |
 
 An example of using the parameters can be found in the following docker compose
 file:
@@ -50,19 +50,19 @@ It should create a docker image with the name `edgexfoundry/docker_security_secr
       RevokeRootTokens = false
     ```
 
-* The edgex-vault-worker uses _compose-files_vault-config_ volume to store its token. To copy the root token from edgex-vault-worker, use
+* The edgex-vault-worker uses _compose-files_secret-store-config_ volume to store its token. To copy the root token from edgex-vault-worker, use
 
     ```sh
-    docker run --rm -v compose-files_vault-config:/vault/config alpine:latest cat /vault/config/assets/resp-init.json > resp-init.json
+    docker run --rm -v compose-secret-store-config:/openbao/config alpine:latest cat /openbao/config/assets/resp-init.json > resp-init.json
     ```
 
 * To verify the root token
 
     ```sh
-    docker exec -ti edgex-vault sh -l
+    docker exec -ti edgex-secret-store sh -l
     export VAULT_SKIP_VERIFY=true
     export VAULT_TOKEN=s.xxxxxxxxxxxxxxxx
-    vault token lookup
+    bao token lookup
     ```
 
     where `s.xxxxxxxxxxxxxxxx` is the _root_token_ member of `resp-init.json`
@@ -72,19 +72,19 @@ It should create a docker image with the name `edgexfoundry/docker_security_secr
 * To explore the vault
 
     ```sh
-    docker exec -ti edgex-vault sh -l
+    docker exec -ti edgex-secret-store sh -l
     export VAULT_SKIP_VERIFY=true
     export VAULT_TOKEN=s.xxxxxxxxxxxxxxxx
-    vault kv list secret/
+    bao kv list secret/
     ```
 
-    and drill down from there. To read a key use `vault kv get` or `vault read`.
+    and drill down from there. To read a key use `bao kv get` or `bao read`.
 
     ```sh
-    docker exec -ti edgex-vault sh -l
+    docker exec -ti edgex-secret-store sh -l
     export VAULT_SKIP_VERIFY=true
     export VAULT_TOKEN=s.xxxxxxxxxxxxxxxx
-    vault kv get /secret/edgex/redis/redis5
+    bao kv get /secret/edgex/redis/redis5
     ```
 
     Note you can set the environment variables on the docker command line with `-e` and avoid the additional shell commands.

diff --git a/cmd/security-secretstore-setup/entrypoint.sh b/cmd/security-secretstore-setup/entrypoint.sh
@@ -27,11 +27,11 @@ if [ ! -z "${TOKENFILEPROVIDER_OUTPUTDIR}" ]; then
 fi
 
 # create token dir, and assign perms
-mkdir -p /vault/config/assets
-chown -Rh 100:1000 /vault/
+mkdir -p /openbao/config/assets
+chown -Rh 100:1000 /openbao/
 
 echo "Initializing secret store..."
-/security-secretstore-setup --vaultInterval=10
+/security-secretstore-setup --secretStoreInterval=10
 
 # default User and Group in case never set
 if [ -z "${EDGEX_USER}" ]; then

diff --git a/cmd/security-secretstore-setup/res-file-token-provider/configuration.yaml b/cmd/security-secretstore-setup/res-file-token-provider/configuration.yaml
@@ -1,6 +1,6 @@
 LogLevel: DEBUG
 SecretStore:
-  Type: vault
+  Type: openbao
   Protocol: http
   Host: localhost
   Port: 8200

diff --git a/cmd/security-secretstore-setup/res/configuration.yaml b/cmd/security-secretstore-setup/res/configuration.yaml
@@ -16,18 +16,18 @@
 
 LogLevel: DEBUG
 SecretStore:
-  Type: vault
+  Type: openbao
   Protocol: http
   Host: localhost
   Port: 8200
   CertPath: ""
   CaFilePath: ""
   CertFilePath: ""
   KeyFilePath: ""
-  TokenFolderPath: /vault/config/assets
+  TokenFolderPath: /openbao/config/assets
   TokenFile: resp-init.json
-  VaultSecretShares: 5
-  VaultSecretThreshold: 3
+  SecretShares: 5
+  SecretThreshold: 3
   TokenProvider: /security-file-token-provider
   TokenProviderArgs:
     - "-configDir"

diff --git a/go.mod b/go.mod
@@ -4,11 +4,11 @@ go 1.23
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.5.0
-	github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66
-	github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19
-	github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53
-	github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40
-	github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18
+	github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.1
+	github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.1
+	github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2
+	github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.2
+	github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.1
 	github.com/fxamacker/cbor/v2 v2.7.0
 	github.com/go-co-op/gocron/v2 v2.12.1
 	github.com/gomodule/redigo v1.9.2
@@ -33,7 +33,7 @@ require (
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18 // indirect
+	github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.1 // indirect
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect

diff --git a/go.sum b/go.sum
@@ -84,18 +84,18 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o=
 github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk=
-github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66 h1:kmBEAhNi4ftrJMXM3IvEbwrRCOWUDuUOKTVAOgHnoPw=
-github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66/go.mod h1:3IXVpc5Qez5nwFJ8IkMyJMba8Iavj620E0XB42BQzfQ=
-github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19 h1:274NZdVBkJBuQP6yT3tVrb7psTFuIPogX/DLQqv7OCQ=
-github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19/go.mod h1:BG6hCDxXizpgMdNEljwNfLWSsd4Op7GAHd3Pis1dVv8=
-github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 h1:aHnYwqpg0LcnMrgNQlkRQjzHAS/IML/9GI368OmNCz4=
-github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53/go.mod h1:MLk37/79M26+bZr3IptNZuYmQBEVbXwzDp1VHQkFhIk=
-github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40 h1:YyB21HEapV5pENG01vFlpjPI6UkmKpJuaWFfgGFVUsY=
-github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40/go.mod h1:8NpZ6/eAsiyZHgn/s3DRIpcOjUrve+ZONIgvcDvA3Yg=
-github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18 h1:AzILZ/xcEmSYVhIwSF4zkWpXyFoBA733E/j8ttzlNnI=
-github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18/go.mod h1:TBgZZMF8FAJwxUl3AJgHQaT0S5pwKJKKDP3d638ttrc=
-github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18 h1:UHyNs7pAdFqURAVL/BWd5riiZczVRdyb7r76dUGxqUU=
-github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18/go.mod h1:2q9qMnQD4MCAZHgXyB8ltpwuct554HOiPrbRydyXyWQ=
+github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.1 h1:9uiZON4CDOVAZNNawtncvfX4Abgz31r8QcOVEWvlUD4=
+github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.1/go.mod h1:OJdeMt2HyzMZZyKy89ICwGu4Ui7ddWd+dQXGMJTAmYk=
+github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.1 h1:eWcDmVFwkFSmlrD745lZQ6xs+ZKJ9u6TqNUnXuWJ5AY=
+github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.1/go.mod h1:AHvE7RQJabfMVHXCDDDKhg3hzJNQtUqbyB9yJxv2Qbk=
+github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2 h1:BEJKSvyW+dMTW/yzEKWjs0tGUZnMkFPYX4eypyoG0IY=
+github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2/go.mod h1:I3EG+Tg/gcVSUJ+IJDuvVKFISnRu8oQtMXqltE1rzT8=
+github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.2 h1:2zRS7LTEoucQmAkZ33b/Erw13ne1LoxexPhhHGa065Q=
+github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.2/go.mod h1:eAmCHilZWXL0skB9Frnm2kZTeY81sF6xKOmePoWKTNE=
+github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.1 h1:/CrP00ozrLjMR0R9OTSJlQi5zJ7/9IKnfG0zS2ZN+8U=
+github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.1/go.mod h1:YgkZ1ThNEEXPzC2iu3/53QcrDQ3tlQHlflnjb3Jseo8=
+github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.1 h1:lw9GNOujQhqnPMJko6n9BGU9Pu3P9RPUQYCT5GpoSw0=
+github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.1/go.mod h1:p6RbhVfJ/SNBLYlz8P/v6kOJmj5Zz1In5/T3TSXylO4=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

diff --git a/internal/core/command/application/command.go b/internal/core/command/application/command.go
@@ -12,13 +12,13 @@ import (
 
 	commandContainer "github.com/edgexfoundry/edgex-go/internal/core/command/container"
 
-	bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container"
-	"github.com/edgexfoundry/go-mod-bootstrap/v3/di"
-	"github.com/edgexfoundry/go-mod-core-contracts/v3/common"
-	"github.com/edgexfoundry/go-mod-core-contracts/v3/dtos"
-	commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common"
-	"github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses"
-	"github.com/edgexfoundry/go-mod-core-contracts/v3/errors"
+	bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container"
+	"github.com/edgexfoundry/go-mod-bootstrap/v4/di"
+	"github.com/edgexfoundry/go-mod-core-contracts/v4/common"
+	"github.com/edgexfoundry/go-mod-core-contracts/v4/dtos"
+	commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common"
+	"github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/responses"
+	"github.com/edgexfoundry/go-mod-core-contracts/v4/errors"
 )
 
 // AllCommands query commands by offset, and limit

diff --git a/internal/core/command/application/command_test.go b/internal/core/command/application/command_test.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/edgexfoundry/go-mod-core-contracts/v3/common"
-	"github.com/edgexfoundry/go-mod-core-contracts/v3/dtos"
+	"github.com/edgexfoundry/go-mod-core-contracts/v4/common"
+	"github.com/edgexfoundry/go-mod-core-contracts/v4/dtos"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/internal/core/command/config/config.go b/internal/core/command/config/config.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config"
+	bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v4/config"
 )
 
 // ConfigurationStruct contains the configuration properties for the core-command service.

diff --git a/internal/core/command/container/config.go b/internal/core/command/container/config.go
@@ -17,7 +17,7 @@ package container
 import (
 	"github.com/edgexfoundry/edgex-go/internal/core/command/config"
 
-	"github.com/edgexfoundry/go-mod-bootstrap/v3/di"
+	"github.com/edgexfoundry/go-mod-bootstrap/v4/di"
 )
 
 // ConfigurationName contains the name of command's config.ConfigurationStruct implementation in the DIC.