diff --git a/google/cloud/recommender/logging/v1/BUILD.bazel b/google/cloud/recommender/logging/v1/BUILD.bazel index 901386cd..f1cb3042 100644 --- a/google/cloud/recommender/logging/v1/BUILD.bazel +++ b/google/cloud/recommender/logging/v1/BUILD.bazel @@ -14,6 +14,8 @@ proto_library( "action_log.proto", ], deps = [ + "//google/api:field_behavior_proto", + "//google/api:resource_proto", "//google/cloud/recommender/v1:recommender_proto", ], ) @@ -52,6 +54,7 @@ go_proto_library( importpath = "google.golang.org/genproto/googleapis/cloud/recommender/logging/v1", protos = [":logging_proto"], deps = [ + "//google/api:annotations_go_proto", "//google/cloud/recommender/v1:recommender_go_proto", ], ) @@ -70,6 +73,8 @@ moved_proto_library( name = "logging_moved_proto", srcs = [":logging_proto"], deps = [ + "//google/api:field_behavior_proto", + "//google/api:resource_proto", "//google/cloud/recommender/v1:recommender_proto", ], ) diff --git a/google/cloud/recommender/logging/v1/action_log.proto b/google/cloud/recommender/logging/v1/action_log.proto index d9c751fc..9634f2a7 100644 --- a/google/cloud/recommender/logging/v1/action_log.proto +++ b/google/cloud/recommender/logging/v1/action_log.proto @@ -16,6 +16,9 @@ syntax = "proto3"; package google.cloud.recommender.logging.v1; +import "google/api/field_behavior.proto"; +import "google/api/resource.proto"; +import "google/cloud/recommender/v1/insight.proto"; import "google/cloud/recommender/v1/recommendation.proto"; option go_package = "google.golang.org/genproto/googleapis/cloud/recommender/logging/v1;logging"; @@ -23,19 +26,39 @@ option java_multiple_files = true; option java_outer_classname = "ActionLogProto"; option java_package = "com.google.cloud.recommender.logging.v1"; -// Log content of an action on a recommendation. This includes Mark* actions, as -// well as ApplyRule actions. +// Log content of an action on a recommendation. This includes Mark* actions. message ActionLog { // Required. User that executed this action. Eg, foo@gmail.com string actor = 1; - // Required. Action that was taken by the actor. Eg, MarkCompleted. + // Required. State change that was made by the actor. Eg, SUCCEEDED. google.cloud.recommender.v1.RecommendationStateInfo.State state = 2; // Optional. Metadata that was included with the action that was taken. map state_metadata = 3; // Required. Name of the recommendation which was acted on. Eg, : - // 'projects/foo/locations/global/recommenders/roleReco/recommendations/r1' + // 'projects/123/locations/global/recommenders/roleReco/recommendations/r1' string recommendation_name = 4; } + +// Log content of an action on an insight. This includes Mark* actions. +message InsightActionLog { + // Required. User that executed this action. Eg, foo@gmail.com + string actor = 1 [(google.api.field_behavior) = REQUIRED]; + + // Required. State change that was made by the actor. Eg, ACCEPTED. + google.cloud.recommender.v1.InsightStateInfo.State state = 2 [(google.api.field_behavior) = REQUIRED]; + + // Optional. Metadata that was included with the action that was taken. + map state_metadata = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Required. Name of the insight which was acted on. Eg, : + // 'projects/123/locations/global/insightTypes/roleInsight/insights/i1' + string insight = 4 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "recommender.googleapis.com/Insight" + } + ]; +} diff --git a/google/cloud/recommender/logging/v1/recommender.yaml b/google/cloud/recommender/logging/v1/recommender.yaml index bf436442..8f9a63a7 100644 --- a/google/cloud/recommender/logging/v1/recommender.yaml +++ b/google/cloud/recommender/logging/v1/recommender.yaml @@ -5,3 +5,4 @@ title: Recommender API Logging types: - name: google.cloud.recommender.logging.v1.ActionLog +- name: google.cloud.recommender.logging.v1.InsightActionLog