Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions pkg/capabilities/capabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -652,13 +652,7 @@ type RemoteTriggerConfig struct {
BatchCollectionPeriod time.Duration
}

type RemoteTargetConfig struct { // deprecated - v1 only
RequestHashExcludedAttributes []string
}

type RemoteExecutableConfig struct {
RequestHashExcludedAttributes []string // deprecated - v1 only

// Fields below are used only by v2 capabilities
TransmissionSchedule TransmissionSchedule
DeltaStage time.Duration
Expand Down Expand Up @@ -736,17 +730,6 @@ type CapabilityMethodConfig struct {
}

type CapabilityConfiguration struct {
DefaultConfig *values.Map

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: used for Vault config

// RestrictedKeys is a list of keys that can't be provided by users in their
// configuration; we'll remove these fields before passing them to the capability.
RestrictedKeys []string
// RestrictedConfig is configuration that can only be set by us; this
// takes precedence over any user-provided config.
RestrictedConfig *values.Map

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: still used for billing or not?

RemoteTriggerConfig *RemoteTriggerConfig
RemoteTargetConfig *RemoteTargetConfig
RemoteExecutableConfig *RemoteExecutableConfig

// v2 / "NoDAG" capabilities - config for Don2Don framework.
CapabilityMethodConfig map[string]CapabilityMethodConfig
// if true, the capability won't be callable via don2don
Expand Down
288 changes: 61 additions & 227 deletions pkg/capabilities/pb/registry.pb.go

Large diffs are not rendered by default.

26 changes: 2 additions & 24 deletions pkg/capabilities/pb/registry.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ message RemoteTriggerConfig {
google.protobuf.Duration batchCollectionPeriod = 6;
}

// deprecated - v1 only
message RemoteTargetConfig {
// A collection of dot seperated paths to attributes that should be excluded from the request sent to the remote target
// when calculating the hash of the request. This is useful for excluding attributes that are not deterministic to ensure
// that the hash of logically identical requests is consistent.
repeated string requestHashExcludedAttributes = 1;
}

enum TransmissionSchedule {
AllAtOnce = 0;
OneAtATime = 1;
Expand All @@ -40,12 +32,7 @@ enum AggregatorType {
}

message RemoteExecutableConfig {
// A collection of dot seperated paths to attributes that should be excluded from the request sent to the remote executable capability
// when calculating the hash of the request. This is useful for excluding attributes that are not deterministic to ensure
// that the hash of logically identical requests is consistent.
repeated string requestHashExcludedAttributes = 1; // deprecated - v1 only
reserved 2; // unused registrationRefresh
reserved 3; // unused registrationExpiry
reserved 1,2,3; // deprecated v1 fields

TransmissionSchedule transmission_schedule = 4;
google.protobuf.Duration delta_stage = 5;
Expand Down Expand Up @@ -88,16 +75,7 @@ message OCR3Config {
}

message CapabilityConfig {
values.v1.Map default_config = 1;

oneof remote_config {
RemoteTriggerConfig remote_trigger_config = 2;
RemoteTargetConfig remote_target_config = 3;
RemoteExecutableConfig remote_executable_config = 4;
}

values.v1.Map restricted_config = 5;
repeated string restricted_keys = 6;
reserved 1,2,3,4,5,6; // deprecated v1 fields

// v2 ("NoDAG") capabilities - config for Don2Don framework.
map<string, CapabilityMethodConfig> method_configs = 7;
Expand Down
275 changes: 0 additions & 275 deletions pkg/capabilities/pb/triggers.pb.go

This file was deleted.

26 changes: 0 additions & 26 deletions pkg/capabilities/pb/triggers.proto

This file was deleted.

Loading
Loading