Skip to content

Commit

Permalink
Did not fully fetch from origin/master when rebasing
Browse files Browse the repository at this point in the history
  • Loading branch information
mvbrock committed Nov 13, 2024
1 parent fe10587 commit 6a370af
Show file tree
Hide file tree
Showing 3 changed files with 547 additions and 410 deletions.
11 changes: 11 additions & 0 deletions api/proto/teleport/legacy/types/types.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6498,6 +6498,11 @@ message PluginEntraIDSyncSettings {
// This field is populated on a best-effort basis for legacy plugins but mandatory for plugins created after its introduction.
// For existing plugins, it is filled in using the Entra integration when utilized.
string tenant_id = 4;

// entra_app_id refers to the Entra Application ID that supports the SSO for "sso_connector_id".
// This field is populated on a best-effort basis for legacy plugins but mandatory for plugins created after its introduction.
// For existing plugins, it is filled in using the entity descriptor url when utilized.
string entra_app_id = 5;
}

// EntraIDCredentialsSource defines the credentials source for Entra ID.
Expand Down Expand Up @@ -7792,6 +7797,12 @@ message AccessGraphSync {
repeated AccessGraphAWSSync AWS = 1 [(gogoproto.jsontag) = "aws,omitempty"];
// Azure is a configuration for the Azure Access Graph service poll service.
repeated AccessGraphAzureSync Azure = 2 [(gogoproto.jsontag) = "azure,omitempty"];

Check failure on line 7799 in api/proto/teleport/legacy/types/types.proto

View workflow job for this annotation

GitHub Actions / Lint (Proto)

Field "2" with name "Azure" on message "AccessGraphSync" changed option "json_name" from "PollInterval" to "Azure".

Check failure on line 7799 in api/proto/teleport/legacy/types/types.proto

View workflow job for this annotation

GitHub Actions / Lint (Proto)

Field "2" with name "Azure" on message "AccessGraphSync" changed cardinality from "optional with explicit presence" to "repeated".

Check failure on line 7799 in api/proto/teleport/legacy/types/types.proto

View workflow job for this annotation

GitHub Actions / Lint (Proto)

Field "2" with name "Azure" on message "AccessGraphSync" changed type from "google.protobuf.Duration" to "types.AccessGraphAzureSync".

Check failure on line 7799 in api/proto/teleport/legacy/types/types.proto

View workflow job for this annotation

GitHub Actions / Lint (Proto)

Field "2" on message "AccessGraphSync" changed name from "PollInterval" to "Azure".
// PollInterval is the frequency at which to poll for AWS resources
google.protobuf.Duration PollInterval = 3 [
(gogoproto.jsontag) = "poll_interval,omitempty",
(gogoproto.nullable) = false,
(gogoproto.stdduration) = true
];
}

// AccessGraphAWSSync is a configuration for AWS Access Graph service poll service.
Expand Down
110 changes: 69 additions & 41 deletions api/types/discoveryconfig/derived.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6a370af

Please sign in to comment.