diff --git a/agentendpoint/agentendpoint.go b/agentendpoint/agentendpoint.go index 27631c579..5fadf6749 100644 --- a/agentendpoint/agentendpoint.go +++ b/agentendpoint/agentendpoint.go @@ -41,7 +41,7 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) const apiRetrySec = 600 diff --git a/agentendpoint/agentendpoint_beta.go b/agentendpoint/agentendpoint_beta.go index 4e0ba988d..024fdbdaa 100644 --- a/agentendpoint/agentendpoint_beta.go +++ b/agentendpoint/agentendpoint_beta.go @@ -30,7 +30,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) // BetaClient is a an agentendpoint client. diff --git a/agentendpoint/agentendpoint_test.go b/agentendpoint/agentendpoint_test.go index 6187d15fb..9104eddfd 100644 --- a/agentendpoint/agentendpoint_test.go +++ b/agentendpoint/agentendpoint_test.go @@ -41,7 +41,7 @@ import ( "google.golang.org/grpc/status" "google.golang.org/grpc/test/bufconn" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) var testIDToken string diff --git a/agentendpoint/config_task.go b/agentendpoint/config_task.go index af7aa0f6a..af3ffa72b 100644 --- a/agentendpoint/config_task.go +++ b/agentendpoint/config_task.go @@ -26,7 +26,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/config" "github.com/GoogleCloudPlatform/osconfig/pretty" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) // This is the maximum size in bytes of the OSPolicyResourceConfigStep ErrorMessage field. diff --git a/agentendpoint/config_task_test.go b/agentendpoint/config_task_test.go index 6ec50cb02..aaa3056f5 100644 --- a/agentendpoint/config_task_test.go +++ b/agentendpoint/config_task_test.go @@ -29,7 +29,7 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/testing/protocmp" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) var errTest = errors.New("this is a test error") diff --git a/agentendpoint/exec_task.go b/agentendpoint/exec_task.go index 433be51f3..7f77074f0 100644 --- a/agentendpoint/exec_task.go +++ b/agentendpoint/exec_task.go @@ -30,7 +30,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/external" "github.com/GoogleCloudPlatform/osconfig/util" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) var ( diff --git a/agentendpoint/exec_task_test.go b/agentendpoint/exec_task_test.go index 18cb91738..a6aab6aea 100644 --- a/agentendpoint/exec_task_test.go +++ b/agentendpoint/exec_task_test.go @@ -24,7 +24,7 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/testing/protocmp" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) type agentEndpointServiceExecTestServer struct { diff --git a/agentendpoint/inventory.go b/agentendpoint/inventory.go index 28ae6b3ea..7da34632a 100644 --- a/agentendpoint/inventory.go +++ b/agentendpoint/inventory.go @@ -15,7 +15,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/retryutil" "google.golang.org/protobuf/types/known/timestamppb" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" datepb "google.golang.org/genproto/googleapis/type/date" ) @@ -225,12 +225,23 @@ func formatPackages(ctx context.Context, pkgs *packages.Packages, shortName stri } func formatAptPackage(pkg *packages.PkgInfo) *agentendpointpb.Inventory_SoftwarePackage_AptPackage { - return &agentendpointpb.Inventory_SoftwarePackage_AptPackage{ + fPkg := &agentendpointpb.Inventory_SoftwarePackage_AptPackage{ AptPackage: &agentendpointpb.Inventory_VersionedPackage{ PackageName: pkg.Name, Architecture: pkg.Arch, Version: pkg.Version, - }} + }, + } + + // for some of the APT packages source package might be available. + if pkg.Source.Name != "" { + fPkg.AptPackage.Source = &agentendpointpb.Inventory_VersionedPackage_Source{ + Name: pkg.Source.Name, + Version: pkg.Source.Version, + } + } + + return fPkg } func formatCOSPackage(pkg *packages.PkgInfo) *agentendpointpb.Inventory_SoftwarePackage_CosPackage { @@ -252,11 +263,23 @@ func formatGooGetPackage(pkg *packages.PkgInfo) *agentendpointpb.Inventory_Softw } func formatYumPackage(pkg *packages.PkgInfo) *agentendpointpb.Inventory_SoftwarePackage_YumPackage { - return &agentendpointpb.Inventory_SoftwarePackage_YumPackage{ + fPkg := &agentendpointpb.Inventory_SoftwarePackage_YumPackage{ YumPackage: &agentendpointpb.Inventory_VersionedPackage{ PackageName: pkg.Name, Architecture: pkg.Arch, - Version: pkg.Version}} + Version: pkg.Version, + }, + } + + // for some of the YUM packages source package might be available. + if pkg.Source.Name != "" { + fPkg.YumPackage.Source = &agentendpointpb.Inventory_VersionedPackage_Source{ + Name: pkg.Source.Name, + Version: pkg.Source.Version, + } + } + + return fPkg } func formatZypperPackage(pkg *packages.PkgInfo) *agentendpointpb.Inventory_SoftwarePackage_ZypperPackage { diff --git a/agentendpoint/inventory_test.go b/agentendpoint/inventory_test.go index 3958a8bb5..be22910e9 100644 --- a/agentendpoint/inventory_test.go +++ b/agentendpoint/inventory_test.go @@ -36,7 +36,7 @@ import ( "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/timestamppb" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) type agentEndpointServiceInventoryTestServer struct { @@ -84,10 +84,28 @@ func generateInventoryState() *inventory.InstanceInventory { KernelRelease: "KernelRelease", OSConfigAgentVersion: "OSConfigAgentVersion", InstalledPackages: &packages.Packages{ - Yum: []*packages.PkgInfo{{Name: "YumInstalledPkg", Arch: "Arch", Version: "Version"}}, - Rpm: []*packages.PkgInfo{{Name: "RpmInstalledPkg", Arch: "Arch", Version: "Version"}}, - Apt: []*packages.PkgInfo{{Name: "AptInstalledPkg", Arch: "Arch", Version: "Version"}}, - Deb: []*packages.PkgInfo{{Name: "DebInstalledPkg", Arch: "Arch", Version: "Version"}}, + Yum: []*packages.PkgInfo{{ + Name: "YumInstalledPkg", + Arch: "Arch", + Version: "Version", + Source: packages.Source{Name: "SourceName", Version: "SourceVersion"}}}, + + Rpm: []*packages.PkgInfo{{ + Name: "RpmInstalledPkg", + Arch: "Arch", + Version: "Version", + Source: packages.Source{Name: "SourceName", Version: "SourceVersion"}}}, + + Apt: []*packages.PkgInfo{{ + Name: "AptInstalledPkg", + Arch: "Arch", + Version: "Version", + Source: packages.Source{Name: "SourceName", Version: "SourceVersion"}}}, + Deb: []*packages.PkgInfo{{ + Name: "DebInstalledPkg", + Arch: "Arch", + Version: "Version", + Source: packages.Source{Name: "SourceName", Version: "SourceVersion"}}}, Zypper: []*packages.PkgInfo{{Name: "ZypperInstalledPkg", Arch: "Arch", Version: "Version"}}, ZypperPatches: []*packages.ZypperPatch{{Name: "ZypperInstalledPatch", Category: "Category", Severity: "Severity", Summary: "Summary"}}, Gem: []*packages.PkgInfo{{Name: "GemInstalledPkg", Arch: "Arch", Version: "Version"}}, @@ -148,13 +166,23 @@ func generateInventory() *agentendpointpb.Inventory { AptPackage: &agentendpointpb.Inventory_VersionedPackage{ PackageName: "AptInstalledPkg", Architecture: "Arch", - Version: "Version"}}}, + Version: "Version", + Source: &agentendpointpb.Inventory_VersionedPackage_Source{ + Name: "SourceName", + Version: "SourceVersion", + }, + }}}, { Details: &agentendpointpb.Inventory_SoftwarePackage_AptPackage{ AptPackage: &agentendpointpb.Inventory_VersionedPackage{ PackageName: "DebInstalledPkg", Architecture: "Arch", - Version: "Version"}}}, + Version: "Version", + Source: &agentendpointpb.Inventory_VersionedPackage_Source{ + Name: "SourceName", + Version: "SourceVersion", + }, + }}}, { Details: &agentendpointpb.Inventory_SoftwarePackage_GoogetPackage{ GoogetPackage: &agentendpointpb.Inventory_VersionedPackage{ @@ -166,7 +194,12 @@ func generateInventory() *agentendpointpb.Inventory { YumPackage: &agentendpointpb.Inventory_VersionedPackage{ PackageName: "YumInstalledPkg", Architecture: "Arch", - Version: "Version"}}}, + Version: "Version", + Source: &agentendpointpb.Inventory_VersionedPackage_Source{ + Name: "SourceName", + Version: "SourceVersion", + }, + }}}, { Details: &agentendpointpb.Inventory_SoftwarePackage_ZypperPackage{ ZypperPackage: &agentendpointpb.Inventory_VersionedPackage{ @@ -178,7 +211,12 @@ func generateInventory() *agentendpointpb.Inventory { YumPackage: &agentendpointpb.Inventory_VersionedPackage{ PackageName: "RpmInstalledPkg", Architecture: "Arch", - Version: "Version"}}}, + Version: "Version", + Source: &agentendpointpb.Inventory_VersionedPackage_Source{ + Name: "SourceName", + Version: "SourceVersion", + }, + }}}, { Details: &agentendpointpb.Inventory_SoftwarePackage_ZypperPatch{ ZypperPatch: &agentendpointpb.Inventory_ZypperPatch{ diff --git a/agentendpoint/patch_linux.go b/agentendpoint/patch_linux.go index 7e21da287..ff62a9510 100644 --- a/agentendpoint/patch_linux.go +++ b/agentendpoint/patch_linux.go @@ -26,7 +26,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/packages" "github.com/GoogleCloudPlatform/osconfig/retryutil" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) func (r *patchTask) runUpdates(ctx context.Context) error { diff --git a/agentendpoint/patch_task.go b/agentendpoint/patch_task.go index 40bbeee99..d098b14bc 100644 --- a/agentendpoint/patch_task.go +++ b/agentendpoint/patch_task.go @@ -24,7 +24,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/ospatch" "google.golang.org/protobuf/encoding/protojson" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) func systemRebootRequired(ctx context.Context) (bool, error) { diff --git a/agentendpoint/patch_windows.go b/agentendpoint/patch_windows.go index 8b94888b9..d14da7282 100644 --- a/agentendpoint/patch_windows.go +++ b/agentendpoint/patch_windows.go @@ -27,7 +27,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/packages" "github.com/GoogleCloudPlatform/osconfig/retryutil" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) func (r *patchTask) classFilter() ([]string, error) { diff --git a/agentendpoint/task_state_test.go b/agentendpoint/task_state_test.go index 9afc0c1eb..2687ebb0f 100644 --- a/agentendpoint/task_state_test.go +++ b/agentendpoint/task_state_test.go @@ -24,7 +24,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "google.golang.org/protobuf/testing/protocmp" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) var ( diff --git a/config/config.go b/config/config.go index 755b61098..5a736e3ae 100644 --- a/config/config.go +++ b/config/config.go @@ -20,7 +20,7 @@ import ( "fmt" "runtime" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) var goos = runtime.GOOS diff --git a/config/exec_resource.go b/config/exec_resource.go index a51416dc0..0b0c749e8 100644 --- a/config/exec_resource.go +++ b/config/exec_resource.go @@ -28,7 +28,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/clog" "github.com/GoogleCloudPlatform/osconfig/util" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) const maxExecOutputSize = 500 * 1024 diff --git a/config/exec_resource_test.go b/config/exec_resource_test.go index bcf85dbc5..51538effb 100644 --- a/config/exec_resource_test.go +++ b/config/exec_resource_test.go @@ -24,7 +24,7 @@ import ( "reflect" "testing" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) func TestExecResourceDownload(t *testing.T) { diff --git a/config/file.go b/config/file.go index a643d5f60..13ac07766 100644 --- a/config/file.go +++ b/config/file.go @@ -27,7 +27,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/external" "github.com/GoogleCloudPlatform/osconfig/util" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) func checksum(r io.Reader) string { diff --git a/config/file_resource.go b/config/file_resource.go index f505bc9d0..1352b1ec5 100644 --- a/config/file_resource.go +++ b/config/file_resource.go @@ -27,7 +27,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/clog" "github.com/GoogleCloudPlatform/osconfig/util" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) const defaultFilePerms = 0644 diff --git a/config/file_resource_test.go b/config/file_resource_test.go index 356249f1a..cd33003c3 100644 --- a/config/file_resource_test.go +++ b/config/file_resource_test.go @@ -24,7 +24,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/util" "github.com/google/go-cmp/cmp" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) func TestFileResourceValidate(t *testing.T) { diff --git a/config/package_resource.go b/config/package_resource.go index 83e5a6a42..d137330fb 100644 --- a/config/package_resource.go +++ b/config/package_resource.go @@ -30,7 +30,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/packages" "github.com/GoogleCloudPlatform/osconfig/util" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" "google.golang.org/protobuf/proto" ) diff --git a/config/package_resource_test.go b/config/package_resource_test.go index 761a4e702..efbf004ed 100644 --- a/config/package_resource_test.go +++ b/config/package_resource_test.go @@ -31,7 +31,7 @@ import ( "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/testing/protocmp" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) var ( diff --git a/config/repository_resource.go b/config/repository_resource.go index 92049f470..a4c1d2760 100644 --- a/config/repository_resource.go +++ b/config/repository_resource.go @@ -32,7 +32,7 @@ import ( "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/armor" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) const aptGPGDir = "/etc/apt/trusted.gpg.d" diff --git a/config/repository_resource_test.go b/config/repository_resource_test.go index 68e4c82e7..bbedd70f3 100644 --- a/config/repository_resource_test.go +++ b/config/repository_resource_test.go @@ -25,7 +25,7 @@ import ( "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/testing/protocmp" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1" + "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb" ) var ( diff --git a/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1/os_config_zonal_client.go b/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1/os_config_zonal_client.go index bb6253985..4cad9d70a 100644 --- a/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1/os_config_zonal_client.go +++ b/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1/os_config_zonal_client.go @@ -26,13 +26,14 @@ import ( "cloud.google.com/go/longrunning" lroauto "cloud.google.com/go/longrunning/autogen" osconfigpb "github.com/GoogleCloudPlatform/osconfig/e2e_tests/internal/google.golang.org/genproto/googleapis/cloud/osconfig/v1" + //"github.com/davecgh/go-spew/spew" + "cloud.google.com/go/longrunning/autogen/longrunningpb" gax "github.com/googleapis/gax-go/v2" "google.golang.org/api/iterator" "google.golang.org/api/option" "google.golang.org/api/option/internaloption" gtransport "google.golang.org/api/transport/grpc" - longrunningpb "google.golang.org/genproto/googleapis/longrunning" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/e2e_tests/internal/google.golang.org/genproto/googleapis/cloud/osconfig/v1/osconfig_zonal_service.pb.go b/e2e_tests/internal/google.golang.org/genproto/googleapis/cloud/osconfig/v1/osconfig_zonal_service.pb.go index 4e44d28b0..af5bd9223 100644 --- a/e2e_tests/internal/google.golang.org/genproto/googleapis/cloud/osconfig/v1/osconfig_zonal_service.pb.go +++ b/e2e_tests/internal/google.golang.org/genproto/googleapis/cloud/osconfig/v1/osconfig_zonal_service.pb.go @@ -22,15 +22,16 @@ package osconfig import ( context "context" + reflect "reflect" + + longrunning "cloud.google.com/go/longrunning/autogen/longrunningpb" proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" - longrunning "google.golang.org/genproto/googleapis/longrunning" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" ) const ( diff --git a/e2e_tests/osconfig_server/osconfig_data_builder.go b/e2e_tests/osconfig_server/osconfig_data_builder.go index 1dd9d0fa6..c3cd22b31 100644 --- a/e2e_tests/osconfig_server/osconfig_data_builder.go +++ b/e2e_tests/osconfig_server/osconfig_data_builder.go @@ -17,7 +17,7 @@ package osconfigserver import ( "fmt" - osconfigpb "google.golang.org/genproto/googleapis/cloud/osconfig/v1beta" + "cloud.google.com/go/osconfig/apiv1beta/osconfigpb" ) // BuildPackagePolicy creates an package policy. diff --git a/e2e_tests/test_suites/guestpolicies/guest_policies.go b/e2e_tests/test_suites/guestpolicies/guest_policies.go index d90a4b7db..61c1a1d32 100644 --- a/e2e_tests/test_suites/guestpolicies/guest_policies.go +++ b/e2e_tests/test_suites/guestpolicies/guest_policies.go @@ -35,7 +35,7 @@ import ( "github.com/kylelemons/godebug/pretty" computeApi "google.golang.org/api/compute/v1" - osconfigpb "google.golang.org/genproto/googleapis/cloud/osconfig/v1beta" + "cloud.google.com/go/osconfig/apiv1beta/osconfigpb" ) var ( diff --git a/e2e_tests/test_suites/guestpolicies/guest_policies_test_data.go b/e2e_tests/test_suites/guestpolicies/guest_policies_test_data.go index f872c1f58..96724c18b 100644 --- a/e2e_tests/test_suites/guestpolicies/guest_policies_test_data.go +++ b/e2e_tests/test_suites/guestpolicies/guest_policies_test_data.go @@ -26,7 +26,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/e2e_tests/utils" "github.com/golang/protobuf/jsonpb" - osconfigpb "google.golang.org/genproto/googleapis/cloud/osconfig/v1beta" + "cloud.google.com/go/osconfig/apiv1beta/osconfigpb" ) const ( diff --git a/e2e_tests/test_suites/patch/patch.go b/e2e_tests/test_suites/patch/patch.go index e1358e680..674e6c768 100644 --- a/e2e_tests/test_suites/patch/patch.go +++ b/e2e_tests/test_suites/patch/patch.go @@ -38,7 +38,7 @@ import ( "github.com/kylelemons/godebug/pretty" "google.golang.org/api/iterator" - osconfigpb "google.golang.org/genproto/googleapis/cloud/osconfig/v1beta" + "cloud.google.com/go/osconfig/apiv1beta/osconfigpb" ) const ( diff --git a/go.mod b/go.mod index a454eb71d..9bed870a8 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( cloud.google.com/go/compute/metadata v0.5.0 - cloud.google.com/go/osconfig v1.12.1 - cloud.google.com/go/storage v1.30.1 + cloud.google.com/go/osconfig v1.13.0 + cloud.google.com/go/storage v1.41.0 cos.googlesource.com/cos/tools.git v0.0.0-20210329212435-a349a79f950d github.com/GoogleCloudPlatform/guest-logging-go v0.0.0-20221216194522-f549ad6a1730 github.com/StackExchange/wmi v1.2.1 @@ -17,34 +17,45 @@ require ( golang.org/x/crypto v0.26.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sys v0.24.0 - google.golang.org/api v0.128.0 - google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 + google.golang.org/api v0.187.0 + google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 google.golang.org/grpc v1.67.0 google.golang.org/protobuf v1.34.2 ) require ( - cloud.google.com/go v0.110.8 // indirect - cloud.google.com/go/iam v1.1.2 // indirect - cloud.google.com/go/logging v1.8.1 // indirect - cloud.google.com/go/longrunning v0.5.1 // indirect + cloud.google.com/go v0.115.0 // indirect + cloud.google.com/go/auth v0.6.1 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect + cloud.google.com/go/iam v1.1.8 // indirect + cloud.google.com/go/logging v1.10.0 // indirect + cloud.google.com/go/longrunning v0.5.7 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/glog v1.2.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/s2a-go v0.1.4 // indirect + github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect - github.com/googleapis/gax-go/v2 v2.12.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.5 // indirect github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect go.chromium.org/luci v0.0.0-20201204084249-3e81ee3e83fe // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/text v0.17.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect ) diff --git a/go.sum b/go.sum index cf6595445..e424c847b 100644 --- a/go.sum +++ b/go.sum @@ -15,6 +15,12 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= +cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= +cloud.google.com/go/auth v0.6.1 h1:T0Zw1XM5c1GlpN2HYr2s+m3vr1p2wy+8VN+Z1FKxW38= +cloud.google.com/go/auth v0.6.1/go.mod h1:eFHG7zDzbXHKmjJddFG/rBlcGp6t25SwRUiEQSlO4x4= +cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= +cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.1.0/go.mod h1:g4RsfUkOvV3Vi5yRujQETpqwCN0F+faPZ2/ykNYfBJc= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= @@ -28,13 +34,21 @@ cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4= cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= +cloud.google.com/go/iam v1.1.8 h1:r7umDwhj+BQyz0ScZMp4QrGXjSTI3ZINnpgU2nlB/K0= +cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO1+zE= cloud.google.com/go/logging v1.0.0/go.mod h1:V1cc3ogwobYzQq5f2R7DS/GvRIrI4FKj01Gs5glwAls= cloud.google.com/go/logging v1.8.1 h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU= cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI= +cloud.google.com/go/logging v1.10.0 h1:f+ZXMqyrSJ5vZ5pE/zr0xC8y/M9BLNzQeLBwfeZ+wY4= +cloud.google.com/go/logging v1.10.0/go.mod h1:EHOwcxlltJrYGqMGfghSet736KR3hX1MAj614mrMk9I= cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= +cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU= +cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng= cloud.google.com/go/osconfig v1.12.1 h1:dgyEHdfqML6cUW6/MkihNdTVc0INQst0qSE8Ou1ub9c= cloud.google.com/go/osconfig v1.12.1/go.mod h1:4CjBxND0gswz2gfYRCUoUzCm9zCABp91EeTtWXyz0tE= +cloud.google.com/go/osconfig v1.13.0 h1:k+nAmaTcJ08BSR1yGadRZyLwRSvk5XgaZJinS1sEz4Q= +cloud.google.com/go/osconfig v1.13.0/go.mod h1:tlACnQi1rtSLnHRYzfw9SH9zXs0M7S1jqiW2EOCn2Y0= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -47,6 +61,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= +cloud.google.com/go/storage v1.41.0 h1:RusiwatSu6lHeEXe3kglxakAmAbfV+rhtPqA6i8RBx0= +cloud.google.com/go/storage v1.41.0/go.mod h1:J1WCa/Z2FcgdEDuPUY8DxT5I+d9mFKsCepp5vR6Sq80= cos.googlesource.com/cos/tools.git v0.0.0-20210329212435-a349a79f950d h1:qj1jlxRkQblujpwNPW4BOEWmGkrWP+Y5ADIoSKBxO5s= cos.googlesource.com/cos/tools.git v0.0.0-20210329212435-a349a79f950d/go.mod h1:1TJafpZtNmYwNzCwoWQRHfBDl59dxO6l/YW88HezBuk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -82,10 +98,17 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -151,16 +174,22 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4= github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA= +github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= @@ -228,6 +257,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -375,6 +414,8 @@ golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -425,6 +466,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -442,6 +484,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.128.0 h1:RjPESny5CnQRn9V6siglged+DZCgfu9l6mO9dkX9VOg= google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= +google.golang.org/api v0.187.0 h1:Mxs7VATVC2v7CY+7Xwm4ndkX71hpElcvx0D1Ji/p1eo= +google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SBp2gk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -482,6 +526,8 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0= google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= +google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d h1:PksQg4dV6Sem3/HkBX+Ltq8T0ke0PKIRBNBatoDTVls= +google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:s7iA721uChleev562UJO2OYB0PPT9CMFjV+Ce7VJH5M= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= diff --git a/policies/apt.go b/policies/apt.go index 74d619f37..26e8cbfd5 100644 --- a/policies/apt.go +++ b/policies/apt.go @@ -31,7 +31,7 @@ import ( "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/armor" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) var debArchiveTypeMap = map[agentendpointpb.AptRepository_ArchiveType]string{ diff --git a/policies/apt_test.go b/policies/apt_test.go index cc770cd4c..9afaedb9b 100644 --- a/policies/apt_test.go +++ b/policies/apt_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) func runAptRepositories(ctx context.Context, repos []*agentendpointpb.AptRepository) (string, error) { diff --git a/policies/changes.go b/policies/changes.go index de5f81802..187e6b86e 100644 --- a/policies/changes.go +++ b/policies/changes.go @@ -17,7 +17,7 @@ package policies import ( "github.com/GoogleCloudPlatform/osconfig/packages" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) // changes represents the delta between the actual and the desired package installation state. diff --git a/policies/changes_test.go b/policies/changes_test.go index 86083ab19..82c5a1665 100644 --- a/policies/changes_test.go +++ b/policies/changes_test.go @@ -20,7 +20,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/packages" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) func TestGetNecessaryChanges(t *testing.T) { diff --git a/policies/googet.go b/policies/googet.go index 971e66378..0b81fa4f1 100644 --- a/policies/googet.go +++ b/policies/googet.go @@ -24,7 +24,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/clog" "github.com/GoogleCloudPlatform/osconfig/packages" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) func googetRepositories(ctx context.Context, repos []*agentendpointpb.GooRepository, repoFile string) error { diff --git a/policies/googet_test.go b/policies/googet_test.go index 8a709c5cb..fe3a3a51e 100644 --- a/policies/googet_test.go +++ b/policies/googet_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) func runGooGetRepositories(ctx context.Context, repos []*agentendpointpb.GooRepository) (string, error) { diff --git a/policies/local.go b/policies/local.go index b186b6269..747d3b240 100644 --- a/policies/local.go +++ b/policies/local.go @@ -24,7 +24,7 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) // localConfig represents the structure of the config to the JSON parser. diff --git a/policies/local_test.go b/policies/local_test.go index bea111f5f..6056d02eb 100644 --- a/policies/local_test.go +++ b/policies/local_test.go @@ -17,7 +17,7 @@ import ( "encoding/json" "testing" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" "google.golang.org/protobuf/encoding/prototext" ) diff --git a/policies/policies.go b/policies/policies.go index 927b82db7..06d9f222e 100644 --- a/policies/policies.go +++ b/policies/policies.go @@ -33,7 +33,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/tasker" "github.com/GoogleCloudPlatform/osconfig/util" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) func run(ctx context.Context) { diff --git a/policies/recipes/artifacts.go b/policies/recipes/artifacts.go index 5b07089de..999dce05f 100644 --- a/policies/recipes/artifacts.go +++ b/policies/recipes/artifacts.go @@ -28,7 +28,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/external" "github.com/GoogleCloudPlatform/osconfig/util" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) // fetchArtifacts takes in a slice of artifacts and downloads them into the specified directory, diff --git a/policies/recipes/installrecipe.go b/policies/recipes/installrecipe.go index c8050f721..5d9b9c9d6 100644 --- a/policies/recipes/installrecipe.go +++ b/policies/recipes/installrecipe.go @@ -24,7 +24,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/clog" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) // InstallRecipe installs a recipe. diff --git a/policies/recipes/steps.go b/policies/recipes/steps.go index da7d72145..9f6d2bdd1 100644 --- a/policies/recipes/steps.go +++ b/policies/recipes/steps.go @@ -37,7 +37,7 @@ import ( "github.com/ulikunitz/xz" "github.com/ulikunitz/xz/lzma" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) var extensionMap = map[agentendpointpb.SoftwareRecipe_Step_RunScript_Interpreter]string{ diff --git a/policies/yum.go b/policies/yum.go index eeae44bea..e2c453771 100644 --- a/policies/yum.go +++ b/policies/yum.go @@ -24,7 +24,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/clog" "github.com/GoogleCloudPlatform/osconfig/packages" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) func yumRepositories(ctx context.Context, repos []*agentendpointpb.YumRepository, repoFile string) error { diff --git a/policies/yum_test.go b/policies/yum_test.go index 2f387fc20..6ede0a29b 100644 --- a/policies/yum_test.go +++ b/policies/yum_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) func runYumRepositories(ctx context.Context, repos []*agentendpointpb.YumRepository) (string, error) { diff --git a/policies/zypper.go b/policies/zypper.go index 6d2cbcc50..5b38fc5f6 100644 --- a/policies/zypper.go +++ b/policies/zypper.go @@ -24,7 +24,7 @@ import ( "github.com/GoogleCloudPlatform/osconfig/clog" "github.com/GoogleCloudPlatform/osconfig/packages" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) // TODO: Write repo_gpgcheck, pkg_gpgcheck, type diff --git a/policies/zypper_test.go b/policies/zypper_test.go index f598e8ed6..046f49949 100644 --- a/policies/zypper_test.go +++ b/policies/zypper_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta" + "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb" ) func runZypperRepositories(ctx context.Context, repos []*agentendpointpb.ZypperRepository) (string, error) {