Rebase conflicts

api/proto/teleport/legacy/types/types.proto

@@ -6498,11 +6498,6 @@ 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.
@@ -7797,12 +7792,6 @@ 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"];
-  // PollInterval is the frequency at which to poll for AWS resources
-  google.protobuf.Duration PollInterval = 2 [
-    (gogoproto.jsontag) = "poll_interval,omitempty",
-    (gogoproto.nullable) = false,
-    (gogoproto.stdduration) = true
-  ];
 }
 
 // AccessGraphAWSSync is a configuration for AWS Access Graph service poll service.
@@ -7819,6 +7808,6 @@ message AccessGraphAWSSync {
 message AccessGraphAzureSync {
   repeated string Regions = 1 [(gogoproto.jsontag) = "regions,omitempty"];
   string SubscriptionID = 2 [(gogoproto.jsontag) = "subscription_id,omitempty"];
-  string UMIClientID = 3 [(gogoproto.jsontag) = "umi_client_id,omitempty"];
+  string UmiClientId = 3 [(gogoproto.jsontag) = "umi_client_id,omitempty"];
   string Integration = 4 [(gogoproto.jsontag) = "integration,omitempty"];
 }