Moving references to the sharedproto dir

PiperOrigin-RevId: 721339714
GoogleCloudPlatform · Jan 30, 2025 · 1e40946 · 1e40946
1 parent 1c6573e
commit 1e40946
Show file tree

Hide file tree

Showing 60 changed files with 119 additions and 110 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Add workloadagentplatform submodule
       run: |
         git submodule add https://github.com/GoogleCloudPlatform/workloadagentplatform
-        find workloadagentplatform/integration/common/shared/protos -type f -exec sed -i 's|"integration/common/shared/protos|"workloadagentplatform/integration/common/shared/protos|g' {} +
+        find workloadagentplatform/sharedprotos -type f -exec sed -i 's|"sharedprotos|"workloadagentplatform/sharedprotos|g' {} +
 
     - name: Set up Go
       uses: actions/setup-go@v3
@@ -36,7 +36,7 @@ jobs:
     - name: Compile protocol buffers
       run: |
         export PATH=${PATH}:`go env GOPATH`/bin
-        protoc --go_opt=paths=source_relative protos/**/*.proto workloadagentplatform/integration/common/shared/protos/**/*.proto --go_out=.
+        protoc --go_opt=paths=source_relative protos/**/*.proto workloadagentplatform/sharedprotos/**/*.proto --go_out=.
 
     - name: Get the latest dependency versions
       run: |

diff --git a/build.sh b/build.sh
@@ -32,7 +32,7 @@ if [ ! -d "workloadagentplatform" ]; then
   echo "**************  Adding the workloadagent submodule"
     git submodule add https://github.com/GoogleCloudPlatform/workloadagentplatform
     # replace the proto imports in the platform that reference the platform
-    find workloadagentplatform/integration/common/shared/protos -type f -exec sed -i 's|"integration/common/shared/protos|"workloadagentplatform/integration/common/shared/protos|g' {} +
+    find workloadagentplatform/sharedprotos -type f -exec sed -i 's|"sharedprotos|"workloadagentplatform/sharedprotos|g' {} +
 fi
 
 echo "**************  Getting go 1.23.2"
@@ -68,7 +68,7 @@ mkdir -p "${pb_dest}"
 go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
 
 echo "**************  Compiling protobufs"
-protoc --go_opt=paths=source_relative protos/**/*.proto workloadagentplatform/integration/common/shared/protos/**/*.proto --go_out=.
+protoc --go_opt=paths=source_relative protos/**/*.proto workloadagentplatform/sharedprotos/**/*.proto --go_out=.
 
 mkdir -p buildoutput
 echo "**************  Generating the latest go.mod and go.sum dependencies"

diff --git a/go.mod b/go.mod
@@ -10,14 +10,17 @@ replace github.com/GoogleCloudPlatform/sapagent/protos => ./protos
 
 replace github.com/GoogleCloudPlatform/workloadagentplatform/integration/common => ./workloadagentplatform/integration/common
 
+replace github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos => ./workloadagentplatform/sharedprotos
+
 require (
   cloud.google.com/go/aiplatform v1.58.2
   cloud.google.com/go/iam v1.1.6
   cloud.google.com/go/logging v1.9.0
   cloud.google.com/go/monitoring v1.17.1
   cloud.google.com/go/secretmanager v1.11.5
   cloud.google.com/go/storage v1.36.0
-  github.com/GoogleCloudPlatform/workloadagentplatform/integration/common v0.0.0-20241216220000-e80b9b366dbe
+  github.com/GoogleCloudPlatform/workloadagentplatform/integration/common v0.0.0-20250130120719-3629ab2f4c43
+  github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos v0.0.0-20250130120719-3629ab2f4c43
   github.com/SAP/go-hdb v1.8.0
   github.com/cenkalti/backoff/v4 v4.1.3
   github.com/fsouza/fake-gcs-server v1.45.2
@@ -39,7 +42,7 @@ require (
   google.golang.org/api v0.168.0
   google.golang.org/genproto v0.0.0-20240205150955-31a09d347014
   google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014
-  google.golang.org/protobuf v1.34.3-0.20240708074925-b46f280f9725
+  google.golang.org/protobuf v1.36.4
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -312,8 +312,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.34.3-0.20240708074925-b46f280f9725 h1:uoTbbtQvKPw9dBNGz5mFAZ77JsiMa0BEt65tVMeipfY=
-google.golang.org/protobuf v1.34.3-0.20240708074925-b46f280f9725/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
+google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=

diff --git a/internal/collectiondefinition/collectiondefinition.go b/internal/collectiondefinition/collectiondefinition.go
@@ -37,7 +37,7 @@ import (
 	cdpb "github.com/GoogleCloudPlatform/sapagent/protos/collectiondefinition"
 	cpb "github.com/GoogleCloudPlatform/sapagent/protos/configuration"
 	wlmpb "github.com/GoogleCloudPlatform/sapagent/protos/wlmvalidation"
-	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/configurablemetrics"
+	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/configurablemetrics"
 )
 
 const (

diff --git a/internal/collectiondefinition/collectiondefinition_test.go b/internal/collectiondefinition/collectiondefinition_test.go
@@ -40,7 +40,7 @@ import (
 	cdpb "github.com/GoogleCloudPlatform/sapagent/protos/collectiondefinition"
 	cpb "github.com/GoogleCloudPlatform/sapagent/protos/configuration"
 	wlmpb "github.com/GoogleCloudPlatform/sapagent/protos/wlmvalidation"
-	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/configurablemetrics"
+	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/configurablemetrics"
 )
 
 var (

diff --git a/internal/collectiondefinition/validator.go b/internal/collectiondefinition/validator.go
@@ -27,7 +27,7 @@ import (
 
 	cdpb "github.com/GoogleCloudPlatform/sapagent/protos/collectiondefinition"
 	wlmpb "github.com/GoogleCloudPlatform/sapagent/protos/wlmvalidation"
-	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/configurablemetrics"
+	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/configurablemetrics"
 )
 
 // versionPattern matches version strings of type: MAJOR.MINOR or MAJOR.MINOR.RELEASE.

diff --git a/internal/collectiondefinition/validator_test.go b/internal/collectiondefinition/validator_test.go
@@ -23,7 +23,7 @@ import (
 
 	cdpb "github.com/GoogleCloudPlatform/sapagent/protos/collectiondefinition"
 	wlmpb "github.com/GoogleCloudPlatform/sapagent/protos/wlmvalidation"
-	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/configurablemetrics"
+	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/configurablemetrics"
 )
 
 func TestValidate(t *testing.T) {

diff --git a/internal/guestactions/guestactions.go b/internal/guestactions/guestactions.go
@@ -41,9 +41,9 @@ import (
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/commandlineexecutor"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/recovery"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/uap"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 const (

diff --git a/internal/guestactions/guestactions_test.go b/internal/guestactions/guestactions_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/commandlineexecutor"
 
 	cpb "github.com/GoogleCloudPlatform/sapagent/protos/configuration"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 type fakeRestarter struct{}

diff --git a/internal/guestactions/handlers/backinthandler/backinthandler.go b/internal/guestactions/handlers/backinthandler/backinthandler.go
@@ -28,7 +28,7 @@ import (
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates if the agent should be restarted after the backint guest action has been handled.

diff --git a/internal/guestactions/handlers/backinthandler/backinthandler_test.go b/internal/guestactions/handlers/backinthandler/backinthandler_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/google/subcommands"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestBackintHandler(t *testing.T) {

diff --git a/internal/guestactions/handlers/configurehandler/configurehandler.go b/internal/guestactions/handlers/configurehandler/configurehandler.go
@@ -29,7 +29,7 @@ import (
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates that the agent should be restarted after the configure guest action has been handled.

diff --git a/internal/guestactions/handlers/configurehandler/configurehandler_test.go b/internal/guestactions/handlers/configurehandler/configurehandler_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/google/subcommands"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestConfigureHandler(t *testing.T) {

diff --git a/internal/guestactions/handlers/configureinstancehandler/configureinstancehandler.go b/internal/guestactions/handlers/configureinstancehandler/configureinstancehandler.go
@@ -31,7 +31,7 @@ import (
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
 
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates that the agent should be restarted after the configure instance guest action has been handled.

diff --git a/internal/guestactions/handlers/configureinstancehandler/configureinstancehandler_test.go b/internal/guestactions/handlers/configureinstancehandler/configureinstancehandler_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/GoogleCloudPlatform/sapagent/internal/utils/protostruct"
 
 	ipb "github.com/GoogleCloudPlatform/sapagent/protos/instanceinfo"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestConfigureInstanceHandler(t *testing.T) {

diff --git a/internal/guestactions/handlers/gcbdrbackuphandler/gcbdrbackuphandler.go b/internal/guestactions/handlers/gcbdrbackuphandler/gcbdrbackuphandler.go
@@ -33,7 +33,7 @@ import (
 
 	apb "google.golang.org/protobuf/types/known/anypb"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates if the agent should be restarted after the gcbdr-backup guest action has been handled.

diff --git a/internal/guestactions/handlers/gcbdrbackuphandler/gcbdrbackuphandler_test.go b/internal/guestactions/handlers/gcbdrbackuphandler/gcbdrbackuphandler_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/google/subcommands"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestGCBDRBackupHandler(t *testing.T) {

diff --git a/internal/guestactions/handlers/gcbdrdiscoveryhandler/gcbdrdiscoveryhandler.go b/internal/guestactions/handlers/gcbdrdiscoveryhandler/gcbdrdiscoveryhandler.go
@@ -33,7 +33,7 @@ import (
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
 
 	apb "google.golang.org/protobuf/types/known/anypb"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates that the agent should be restarted after the gcbdr-discovery guest action has been handled.

diff --git a/internal/guestactions/handlers/gcbdrdiscoveryhandler/gcbdrdiscoveryhandler_test.go b/internal/guestactions/handlers/gcbdrdiscoveryhandler/gcbdrdiscoveryhandler_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/google/subcommands"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestGCBDRDiscoveryHandler(t *testing.T) {

diff --git a/internal/guestactions/handlers/hanadiskbackuphandler/hanadiskbackuphandler.go b/internal/guestactions/handlers/hanadiskbackuphandler/hanadiskbackuphandler.go
@@ -27,7 +27,7 @@ import (
 	"github.com/GoogleCloudPlatform/sapagent/internal/utils/protostruct"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates that the agent should be restarted after the hanadiskbackup guest action has been handled.

diff --git a/internal/guestactions/handlers/hanadiskbackuphandler/hanadiskbackuphandler_test.go b/internal/guestactions/handlers/hanadiskbackuphandler/hanadiskbackuphandler_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/google/subcommands"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestHANADiskBackupHandler(t *testing.T) {

diff --git a/internal/guestactions/handlers/handlers.go b/internal/guestactions/handlers/handlers.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/google/subcommands"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // ParseAgentCommandParameters parses the command parameters from the

diff --git a/internal/guestactions/handlers/handlers_test.go b/internal/guestactions/handlers/handlers_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/GoogleCloudPlatform/sapagent/internal/onetime/performancediagnostics"
 	"github.com/GoogleCloudPlatform/sapagent/internal/onetime/supportbundle"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestParseAgentCommandParameters(t *testing.T) {

diff --git a/internal/guestactions/handlers/instancemetadatahandler/instancemetadatahandler.go b/internal/guestactions/handlers/instancemetadatahandler/instancemetadatahandler.go
@@ -30,7 +30,7 @@ import (
 	"github.com/GoogleCloudPlatform/sapagent/internal/utils/protostruct"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates that the agent should be restarted after the instancemetadata guest action has been handled.

diff --git a/internal/guestactions/handlers/instancemetadatahandler/instancemetadatahandler_test.go b/internal/guestactions/handlers/instancemetadatahandler/instancemetadatahandler_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/GoogleCloudPlatform/sapagent/internal/utils/protostruct"
 	ipb "github.com/GoogleCloudPlatform/sapagent/protos/instanceinfo"
 	impb "github.com/GoogleCloudPlatform/sapagent/protos/instancemetadata"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func emptyAnyInstanceMetadataResponse() *apb.Any {

diff --git a/...rnal/guestactions/handlers/performancediagnosticshandler/performancediagnosticshandler.go b/...rnal/guestactions/handlers/performancediagnosticshandler/performancediagnosticshandler.go
@@ -29,7 +29,7 @@ import (
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates that the agent should be restarted after the performance diagnostics guest action has been handled.

diff --git a/...guestactions/handlers/performancediagnosticshandler/performancediagnosticshandler_test.go b/...guestactions/handlers/performancediagnosticshandler/performancediagnosticshandler_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/google/subcommands"
 
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/commandlineexecutor"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestPerformanceDiagnosticsHandler(t *testing.T) {

diff --git a/internal/guestactions/handlers/supportbundlehandler/supportbundlehandler.go b/internal/guestactions/handlers/supportbundlehandler/supportbundlehandler.go
@@ -30,7 +30,7 @@ import (
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates that the agent should be restarted after the supportbundle guest action has been handled.

diff --git a/internal/guestactions/handlers/supportbundlehandler/supportbundlehandler_test.go b/internal/guestactions/handlers/supportbundlehandler/supportbundlehandler_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/google/subcommands"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/commandlineexecutor"
 
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 func TestSupportBundleHandler(t *testing.T) {

diff --git a/internal/guestactions/handlers/versionhandler/versionhandler.go b/internal/guestactions/handlers/versionhandler/versionhandler.go
@@ -26,7 +26,7 @@ import (
 	"github.com/GoogleCloudPlatform/sapagent/internal/usagemetrics"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/gce/metadataserver"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
-	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/guestactions"
+	gpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/guestactions"
 )
 
 // RestartAgent indicates that the agent should be restarted after the version guest action has been handled.

diff --git a/internal/onetime/performancediagnostics/performancediagnostics_test.go b/internal/onetime/performancediagnostics/performancediagnostics_test.go
@@ -54,7 +54,7 @@ import (
 	bpb "github.com/GoogleCloudPlatform/sapagent/protos/backint"
 	ipb "github.com/GoogleCloudPlatform/sapagent/protos/instanceinfo"
 	sappb "github.com/GoogleCloudPlatform/sapagent/protos/sapapp"
-	spb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/system"
+	spb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/system"
 )
 
 func TestMain(t *testing.M) {

diff --git a/internal/onetime/remotevalidation/remotevalidation.go b/internal/onetime/remotevalidation/remotevalidation.go
@@ -55,7 +55,7 @@ import (
 	iipb "github.com/GoogleCloudPlatform/sapagent/protos/instanceinfo"
 	sappb "github.com/GoogleCloudPlatform/sapagent/protos/sapapp"
 	wlmpb "github.com/GoogleCloudPlatform/sapagent/protos/wlmvalidation"
-	spb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/system"
+	spb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/system"
 )
 
 var (

diff --git a/internal/onetime/remotevalidation/remotevalidation_test.go b/internal/onetime/remotevalidation/remotevalidation_test.go
@@ -38,7 +38,7 @@ import (
 	cpb "github.com/GoogleCloudPlatform/sapagent/protos/configuration"
 	iipb "github.com/GoogleCloudPlatform/sapagent/protos/instanceinfo"
 	sapb "github.com/GoogleCloudPlatform/sapagent/protos/sapapp"
-	spb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/system"
+	spb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/system"
 )
 
 func TestMain(t *testing.M) {

diff --git a/internal/onetime/status/status.go b/internal/onetime/status/status.go
@@ -46,9 +46,9 @@ import (
 	"github.com/GoogleCloudPlatform/sapagent/shared/iam"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/commandlineexecutor"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log"
-	spb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/status"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/statushelper"
 	"github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/storage"
+	spb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/status"
 )
 
 const (

diff --git a/internal/onetime/status/status_test.go b/internal/onetime/status/status_test.go
@@ -50,7 +50,7 @@ import (
 	wpb "google.golang.org/protobuf/types/known/wrapperspb"
 	cpb "github.com/GoogleCloudPlatform/sapagent/protos/configuration"
 	iipb "github.com/GoogleCloudPlatform/sapagent/protos/instanceinfo"
-	spb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/status"
+	spb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/status"
 )
 
 const (

diff --git a/internal/onetime/systemdiscovery/systemdiscovery_test.go b/internal/onetime/systemdiscovery/systemdiscovery_test.go
@@ -46,7 +46,7 @@ import (
 	iipb "github.com/GoogleCloudPlatform/sapagent/protos/instanceinfo"
 	sappb "github.com/GoogleCloudPlatform/sapagent/protos/sapapp"
 	logfake "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/log/fake"
-	spb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/system"
+	spb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/system"
 )
 
 func TestMain(t *testing.M) {

diff --git a/internal/pacemaker/pacemakermetrics_test.go b/internal/pacemaker/pacemakermetrics_test.go
@@ -45,7 +45,7 @@ import (
 	cnfpb "github.com/GoogleCloudPlatform/sapagent/protos/configuration"
 	iipb "github.com/GoogleCloudPlatform/sapagent/protos/instanceinfo"
 	wvpb "github.com/GoogleCloudPlatform/sapagent/protos/wlmvalidation"
-	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/integration/common/shared/protos/configurablemetrics"
+	cmpb "github.com/GoogleCloudPlatform/workloadagentplatform/sharedprotos/configurablemetrics"
 )
 
 func TestMain(t *testing.M) {