From 69fe13f7ca3ca96f34e042596c11e40bb3277924 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Mon, 30 Aug 2021 02:48:14 -0700 Subject: [PATCH] feat: Update osconfig v1 and v1alpha with WindowsApplication Committer: @coodie PiperOrigin-RevId: 393730900 --- google/cloud/osconfig/v1/BUILD.bazel | 2 + google/cloud/osconfig/v1/inventory.proto | 29 ++++++++++++++ google/cloud/osconfig/v1alpha/BUILD.bazel | 10 +++-- google/cloud/osconfig/v1alpha/inventory.proto | 40 ++++++++++++++++--- 4 files changed, 72 insertions(+), 9 deletions(-) diff --git a/google/cloud/osconfig/v1/BUILD.bazel b/google/cloud/osconfig/v1/BUILD.bazel index 78defb414..ea1bbf50b 100644 --- a/google/cloud/osconfig/v1/BUILD.bazel +++ b/google/cloud/osconfig/v1/BUILD.bazel @@ -32,6 +32,7 @@ proto_library( "//google/api:client_proto", "//google/api:field_behavior_proto", "//google/api:resource_proto", + "//google/type:date_proto", "//google/type:datetime_proto", "//google/type:dayofweek_proto", "//google/type:timeofday_proto", @@ -121,6 +122,7 @@ go_proto_library( protos = [":osconfig_proto"], deps = [ "//google/api:annotations_go_proto", + "//google/type:date_go_proto", "//google/type:datetime_go_proto", "//google/type:dayofweek_go_proto", "//google/type:timeofday_go_proto", diff --git a/google/cloud/osconfig/v1/inventory.proto b/google/cloud/osconfig/v1/inventory.proto index ba3318e70..11c998acb 100644 --- a/google/cloud/osconfig/v1/inventory.proto +++ b/google/cloud/osconfig/v1/inventory.proto @@ -17,6 +17,7 @@ syntax = "proto3"; package google.cloud.osconfig.v1; import "google/protobuf/timestamp.proto"; +import "google/type/date.proto"; option csharp_namespace = "Google.Cloud.OsConfig.V1"; option go_package = "google.golang.org/genproto/googleapis/cloud/osconfig/v1;osconfig"; @@ -152,6 +153,9 @@ message Inventory { // Details of a COS package. VersionedPackage cos_package = 8; + + // Details of a Windows Application + WindowsApplication windows_application = 9; } } @@ -247,6 +251,31 @@ message Inventory { google.protobuf.Timestamp install_time = 5; } + // Contains information about a Windows application as retrieved from the + // Windows Registry. For more information about these fields, see + // + // [Windows Installer Properties for the Uninstall + // Registry](https://docs.microsoft.com/en-us/windows/win32/msi/uninstall-registry-key){: + // class="external" } + message WindowsApplication { + // The name of the application or product. + string display_name = 1; + + // The version of the product or application in string format. + string display_version = 2; + + // The name of the manufacturer for the product or application. + string publisher = 3; + + // The last time this product received service. The value of this property + // is replaced each time a patch is applied or removed from the product or + // the command-line option is used to repair the product. + google.type.Date install_date = 4; + + // The internet address for technical support. + string help_link = 5; + } + // Base level operating system information for the VM. OsInfo os_info = 1; diff --git a/google/cloud/osconfig/v1alpha/BUILD.bazel b/google/cloud/osconfig/v1alpha/BUILD.bazel index a6ed8f5d7..ec3771ced 100644 --- a/google/cloud/osconfig/v1alpha/BUILD.bazel +++ b/google/cloud/osconfig/v1alpha/BUILD.bazel @@ -36,6 +36,7 @@ proto_library( "//google/api:field_behavior_proto", "//google/api:resource_proto", "//google/longrunning:operations_proto", + "//google/type:date_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:field_mask_proto", "@com_google_protobuf//:timestamp_proto", @@ -123,6 +124,7 @@ go_proto_library( deps = [ "//google/api:annotations_go_proto", "//google/longrunning:longrunning_go_proto", + "//google/type:date_go_proto", ], ) @@ -131,13 +133,13 @@ go_gapic_library( srcs = [":osconfig_proto_with_info"], grpc_service_config = "osconfig_grpc_service_config.json", importpath = "cloud.google.com/go/osconfig/apiv1alpha;osconfig", - service_yaml = "osconfig_v1alpha.yaml", metadata = True, + service_yaml = "osconfig_v1alpha.yaml", deps = [ ":osconfig_go_proto", "//google/longrunning:longrunning_go_proto", - "@com_google_cloud_go//longrunning/autogen:go_default_library", "@com_google_cloud_go//longrunning:go_default_library", + "@com_google_cloud_go//longrunning/autogen:go_default_library", "@io_bazel_rules_go//proto/wkt:duration_go_proto", ], ) @@ -154,8 +156,8 @@ go_gapic_assembly_pkg( name = "gapi-cloud-osconfig-v1alpha-go", deps = [ ":osconfig_go_gapic", - ":osconfig_go_gapic_srcjar-test.srcjar", ":osconfig_go_gapic_srcjar-metadata.srcjar", + ":osconfig_go_gapic_srcjar-test.srcjar", ":osconfig_go_proto", ], ) @@ -259,8 +261,8 @@ nodejs_gapic_assembly_pkg( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "ruby_gapic_assembly_pkg", "ruby_cloud_gapic_library", + "ruby_gapic_assembly_pkg", "ruby_grpc_library", "ruby_proto_library", ) diff --git a/google/cloud/osconfig/v1alpha/inventory.proto b/google/cloud/osconfig/v1alpha/inventory.proto index 38e12f945..f9ad221e7 100644 --- a/google/cloud/osconfig/v1alpha/inventory.proto +++ b/google/cloud/osconfig/v1alpha/inventory.proto @@ -19,6 +19,7 @@ package google.cloud.osconfig.v1alpha; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; import "google/protobuf/timestamp.proto"; +import "google/type/date.proto"; option csharp_namespace = "Google.Cloud.OsConfig.V1Alpha"; option go_package = "google.golang.org/genproto/googleapis/cloud/osconfig/v1alpha;osconfig"; @@ -165,6 +166,9 @@ message Inventory { // Details of a COS package. VersionedPackage cos_package = 8; + + // Details of Windows Application. + WindowsApplication windows_application = 9; } } @@ -260,6 +264,31 @@ message Inventory { google.protobuf.Timestamp install_time = 5; } + // Contains information about a Windows application as retrieved from the + // Windows Registry. For more information about these fields, see + // + // [Windows Installer Properties for the Uninstall + // Registry](https://docs.microsoft.com/en-us/windows/win32/msi/uninstall-registry-key){: + // class="external" } + message WindowsApplication { + // The name of the application or product. + string display_name = 1; + + // The version of the product or application in string format. + string display_version = 2; + + // The name of the manufacturer for the product or application. + string publisher = 3; + + // The last time this product received service. The value of this property + // is replaced each time a patch is applied or removed from the product or + // the command-line option is used to repair the product. + google.type.Date install_date = 4; + + // The internet address for technical support. + string help_link = 5; + } + // Output only. The `Inventory` API resource name. // // Format: @@ -269,14 +298,15 @@ message Inventory { // Output only. Base level operating system information for the VM. OsInfo os_info = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; - // Output only. Inventory items related to the VM keyed by an opaque unique identifier for - // each inventory item. The identifier is unique to each distinct and - // addressable inventory item and will change, when there is a new package - // version. + // Output only. Inventory items related to the VM keyed by an opaque unique + // identifier for each inventory item. The identifier is unique to each + // distinct and addressable inventory item and will change, when there is a + // new package version. map items = 2 [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. Timestamp of the last reported inventory for the VM. - google.protobuf.Timestamp update_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY]; + google.protobuf.Timestamp update_time = 4 + [(google.api.field_behavior) = OUTPUT_ONLY]; } // A request message for getting inventory data for the specified VM.