Merge branch 'branch/v17' into joerger/v17/remove-NewCLIPromptV2

Makefile

@@ -13,7 +13,7 @@
 #   Stable releases:   "1.0.0"
 #   Pre-releases:      "1.0.0-alpha.1", "1.0.0-beta.2", "1.0.0-rc.3"
 #   Master/dev branch: "1.0.0-dev"
-VERSION=17.0.0-alpha.5
+VERSION=17.0.0-beta.1
 
 DOCKER_IMAGE ?= teleport
 

api/proto/teleport/integration/v1/awsoidc_service.proto

@@ -515,6 +515,13 @@ message EKSCluster {
   // Known values are:
   // CREATING | ACTIVE | DELETING | FAILED | UPDATING | PENDING
   string status = 6;
+  // EndpointPublicAccess indicates whether this EKS Cluster is accessible publicly.
+  // If only private access is available, then the EKS Cluster can't be enrolled from Teleport Cloud.
+  bool endpoint_public_access = 7;
+  // AuthenticationMode is the allowed authentication mode for the cluster.
+  // Known values are:
+  // API | API_AND_CONFIG_MAP | CONFIG_MAP
+  string authentication_mode = 8;
 }
 
 // ListEKSClustersResponse contains a page of AWS EKS Clusters.

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

@@ -6257,6 +6257,8 @@ message PluginSpecV1 {
     PluginAWSICSettings aws_ic = 16;
     // Settings for the Email Access Request plugin
     PluginEmailSettings email = 17;
+    // Settings for the Microsoft Teams plugin
+    PluginMSTeamsSettings msteams = 18;
   }
 
   // generation contains a unique ID that should:
@@ -6597,6 +6599,33 @@ message AWSICProvisioningSpec {
   string bearer_token = 2;
 }
 
+// PluginAWSICStatusV1 defines AWS Identity Center plugin sub-process status.
+message PluginAWSICStatusV1 {
+  // GroupImportStatus is a status of Identity Center group and group members import.
+  AWSICGroupImportStatus group_import_status = 1;
+}
+
+// AWSICGroupImportStatus defines Identity Center group and group members import status.
+message AWSICGroupImportStatus {
+  // StatusCode is a status code of group and group members import operation.
+  AWSICGroupImportStatusCode status_code = 1;
+  // ErrorMessage contains error message for a group and group members import attempt
+  // that met with an error.
+  string error_message = 2;
+}
+
+// AWSICGroupImportStatus defines Identity Center group and group members
+// import status codes.
+enum AWSICGroupImportStatusCode {
+  // UNSPECIFIED denotes that a status is unknown.
+  UNSPECIFIED = 0;
+  // DONE denotes that the group and group members import operation was
+  // completed.
+  DONE = 1;
+  // FAILED denotes that the group and group members import met with an error.
+  FAILED = 2;
+}
+
 // PluginEmailSettings holds the settings for an Email Access Request plugin.
 message PluginEmailSettings {
   option (gogoproto.equal) = true;
@@ -6636,6 +6665,21 @@ message SMTPSpec {
   string start_tls_policy = 3;
 }
 
+// PluginMSTeamsSettings defines the settings for a Microsoft Teams integration plugin
+message PluginMSTeamsSettings {
+  option (gogoproto.equal) = true;
+  // AppId is the Microsoft application ID (uuid, for Azure bots must be underlying app id, not bot's id).
+  string app_id = 1;
+  // TenantId is the Microsoft tenant ID.
+  string tenant_id = 2;
+  // TeamsAppId is the Microsoft teams application ID.
+  string teams_app_id = 3;
+  // Region to be used by the Microsoft Graph API client.
+  string region = 4;
+  // DefaultRecipient is the default recipient to use if no access monitoring rules are specified.
+  string default_recipient = 5;
+}
+
 message PluginBootstrapCredentialsV1 {
   oneof credentials {
     PluginOAuth2AuthorizationCodeCredentials oauth2_authorization_code = 1;
@@ -6672,6 +6716,8 @@ message PluginStatusV1 {
     PluginEntraIDStatusV1 entra_id = 5;
     // Okta holds status details for the Okta plugin
     PluginOktaStatusV1 okta = 7;
+    // AWSIC holds status details for the AWS Identity Center plugin.
+    PluginAWSICStatusV1 aws_ic = 8;
   }
 
   // last_raw_error variable stores the most recent raw error message received from an API or service.

api/types/plugin.go

@@ -81,6 +81,8 @@ const (
 	PluginTypeAWSIdentityCenter = "aws-identity-center"
 	// PluginTypeEmail indicates an Email Access Request plugin
 	PluginTypeEmail = "email"
+	// PluginTypeMSTeams indicates a Microsoft Teams integration
+	PluginTypeMSTeams = "msteams"
 )
 
 // PluginSubkind represents the type of the plugin, e.g., access request, MDM etc.
@@ -127,6 +129,7 @@ type PluginStatus interface {
 	GetGitlab() *PluginGitlabStatusV1
 	GetEntraId() *PluginEntraIDStatusV1
 	GetOkta() *PluginOktaStatusV1
+	GetAwsIc() *PluginAWSICStatusV1
 }
 
 // NewPluginV1 creates a new PluginV1 resource.
@@ -541,6 +544,8 @@ func (p *PluginV1) GetType() PluginType {
 		return PluginTypeAWSIdentityCenter
 	case *PluginSpecV1_Email:
 		return PluginTypeEmail
+	case *PluginSpecV1_Msteams:
+		return PluginTypeMSTeams
 	default:
 		return PluginTypeUnknown
 	}