Replace product references to "Machine ID" with "Machine & Workload Identity"

tool/tctl/common/auth_command.go

@@ -1131,7 +1131,7 @@ func (a *AuthCommand) generateUserKeys(ctx context.Context, clusterAPI certifica
 	// someone is programatically parsing stdout.
 	_, _ = fmt.Fprintln(
 		os.Stderr,
-		"\nGenerating credentials to allow a machine access to Teleport? We recommend Teleport's Machine ID! Find out more at https://goteleport.com/r/machineid-tip",
+		"\nGenerating credentials to allow a machine access to Teleport? We recommend Teleport's Machine & Workload Identity! Find out more at https://goteleport.com/r/machineid-tip",
 	)
 
 	fmt.Fprintf(a.helperMsgDst(), "The credentials have been written to %s\n", strings.Join(filesWritten, ", "))

tool/tctl/common/bots_command.go

@@ -99,7 +99,7 @@ type BotsCommand struct {
 
 // Initialize sets up the "tctl bots" command.
 func (c *BotsCommand) Initialize(app *kingpin.Application, _ *tctlcfg.GlobalCLIFlags, config *servicecfg.Config) {
-	bots := app.Command("bots", "Manage Machine ID bots on the cluster.").Alias("bot")
+	bots := app.Command("bots", "Manage Machine & Workload Identity bots on the cluster.").Alias("bot")
 
 	c.botsList = bots.Command("ls", "List all certificate renewal bots registered with the cluster.")
 	c.botsList.Flag("format", "Output format, 'text' or 'json'").Hidden().Default(teleport.Text).EnumVar(&c.format, teleport.Text, teleport.JSON)

web/packages/teleport/src/Bots/Add/AddBotsPicker.tsx

@@ -54,7 +54,7 @@ export const integrations: BotIntegration[] = [
   {
     title: 'GitHub Actions + SSH',
     description:
-      'Use Machine & Workload Identity to grant GitHub Actions CI/CD access to Teleport resources.',
+      'Use Machine & Workload Identity (MWI) to grant GitHub Actions CI/CD access to Teleport resources.',
     link: cfg.getBotsNewRoute(BotFlowType.GitHubActionsSsh),
     icon: 'github',
     kind: IntegrationEnrollKind.MachineIDGitHubActions,
@@ -76,7 +76,7 @@ export const integrations: BotIntegration[] = [
   {
     title: 'GitHub Actions + Kubernetes',
     description:
-      'Use Machine & Workload Identity to grant GitHub Actions CI/CD access to Teleport resources.',
+      'Use Machine & Workload Identity (MWI) to grant GitHub Actions CI/CD access to Kubernetes clusters.',
     link: cfg.getBotsNewRoute(BotFlowType.GitHubActionsK8s),
     icon: 'github',
     kind: IntegrationEnrollKind.MachineIDGitHubActionsKubernetes,
@@ -86,7 +86,8 @@ export const integrations: BotIntegration[] = [
   },
   {
     title: 'CircleCI',
-    description: 'Use Machine ID to power CircleCI CI/CD workflows.',
+    description:
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials in CircleCI CI/CD workflows.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/circleci/',
     icon: 'circleci',
     kind: IntegrationEnrollKind.MachineIDCircleCI,
@@ -96,7 +97,8 @@ export const integrations: BotIntegration[] = [
   },
   {
     title: 'GitLab CI/CD',
-    description: 'Use Machine ID to power GitLab CI/CD workflows.',
+    description:
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials in GitLab pipelines.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/gitlab/',
     icon: 'gitlab',
     kind: IntegrationEnrollKind.MachineIDGitLab,
@@ -107,7 +109,7 @@ export const integrations: BotIntegration[] = [
   {
     title: 'Jenkins',
     description:
-      'Use Machine ID to eliminate long-lived credentials in Jenkins.',
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials in Jenkins.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/jenkins/',
     icon: 'jenkins',
     kind: IntegrationEnrollKind.MachineIDJenkins,
@@ -118,7 +120,7 @@ export const integrations: BotIntegration[] = [
   {
     title: 'Ansible',
     description:
-      'Use Machine ID to eliminate long-lived credentials from auth with Linux hosts.',
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials from Ansible workflows.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/access-guides/ansible/',
     icon: 'ansible',
     kind: IntegrationEnrollKind.MachineIDAnsible,
@@ -129,7 +131,7 @@ export const integrations: BotIntegration[] = [
   {
     title: 'Spacelift',
     description:
-      'Use Machine ID to authenticate workloads running in Spacelift with Teleport.',
+      'Use Machine & Workload Identity (MWI) to authenticate Spacelift runs with Teleport.',
     link: 'https://goteleport.com/docs/admin-guides/infrastructure-as-code/terraform-provider/spacelift/',
     icon: 'spacelift',
     kind: IntegrationEnrollKind.MachineIDSpacelift,
@@ -139,7 +141,8 @@ export const integrations: BotIntegration[] = [
   },
   {
     title: 'AWS',
-    description: 'Connect EC2 instances and RDS databases seamlessly.',
+    description:
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials on EC2 VMs.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/aws/',
     icon: 'aws',
     kind: IntegrationEnrollKind.MachineIDAWS,
@@ -149,7 +152,8 @@ export const integrations: BotIntegration[] = [
   },
   {
     title: 'Google Cloud',
-    description: 'Connect GCE instances and CloudSQL databases seamlessly.',
+    description:
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials on GCE VMs.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/gcp/',
     icon: 'googlecloud',
     kind: IntegrationEnrollKind.MachineIDGCP,
@@ -160,7 +164,7 @@ export const integrations: BotIntegration[] = [
   {
     title: 'Azure',
     description:
-      'Use Machine ID to eliminate long-lived credentials on Azure VMs.',
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials on Azure VMs.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/azure/',
     icon: 'azure',
     kind: IntegrationEnrollKind.MachineIDAzure,
@@ -171,7 +175,7 @@ export const integrations: BotIntegration[] = [
   {
     title: 'Kubernetes',
     description:
-      'Use Machine ID to eliminate long-lived credentials for Kubernetes workloads.',
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials for Kubernetes workloads.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/deployment/kubernetes/',
     icon: 'kube',
     kind: IntegrationEnrollKind.MachineIDKubernetes,
@@ -182,7 +186,7 @@ export const integrations: BotIntegration[] = [
   {
     title: 'Argo CD',
     description:
-      'Use Machine ID to enable Argo CD to connect to external Kubernetes clusters.',
+      'Use Machine & Workload Identity (MWI) to enable Argo CD to connect to external Kubernetes clusters.',
     link: 'https://goteleport.com/docs/machine-workload-identity/machine-id/access-guides/argocd/',
     icon: 'argocd',
     kind: IntegrationEnrollKind.MachineIDArgoCD,
@@ -191,8 +195,9 @@ export const integrations: BotIntegration[] = [
     tags: ['bot', 'cicd'],
   },
   {
-    title: 'Generic',
-    description: 'Use Machine ID to Integrate generic server with Teleport.',
+    title: 'Generic Linux',
+    description:
+      'Use Machine & Workload Identity (MWI) to eliminate long-lived credentials on Linux servers.',
     link: 'https://goteleport.com/docs/enroll-resources/machine-id/getting-started/',
     icon: 'server',
     kind: IntegrationEnrollKind.MachineID,
@@ -213,8 +218,8 @@ export function AddBotsPicker() {
       </FeatureHeader>
 
       <P mb="5">
-        Set up Teleport Machine ID to allow CI/CD workflows and other machines
-        to access resources protected by Teleport.
+        Set up Teleport Machine & Workload Identity to allow CI/CD workflows and
+        other machines to access resources protected by Teleport.
       </P>
 
       <BotTiles hasCreateBotPermission={ctx.getFeatureFlags().addBots} />
@@ -278,7 +283,7 @@ function ExternalLinkTile({ integration }: { integration: BotIntegration }) {
 
   return (
     <Tile
-      title={`Machine ID: ${integration.title}`}
+      title={`MWI: ${integration.title}`}
       description={integration.description}
       tags={integration.tags}
       link={{ external: true, url: integration.link, onClick: onBotClick }}
@@ -319,7 +324,7 @@ function GuidedTile({
 
   return (
     <Tile
-      title={`Machine ID: ${integration.title}`}
+      title={`MWI: ${integration.title}`}
       description={integration.description}
       tags={integration.tags}
       hasAccess={hasCreateBotPermission}

web/packages/teleport/src/Bots/Add/GitHubActionsSsh/AddBotToWorkflow.tsx

@@ -107,7 +107,7 @@ jobs:
       with:
         version: ${version}
     # server access example
-    - name: Fetch credentials using Machine ID
+    - name: Fetch credentials using Machine & Workload Identity
       id: auth
       uses: teleport-actions/auth@v2
       with:

web/packages/teleport/src/Bots/Add/GitHubActionsSsh/GitHubActionsSsh.tsx

@@ -47,7 +47,7 @@ export function GitHubActionsSsh() {
   return (
     <GitHubSshFlowProvider>
       <GuidedFlow
-        title="GitHub Actions and Machine ID Integration"
+        title="GitHub Actions and Machine & Workload Identity Integration"
         icon={<ResourceIcon name="github" width="20px" />}
         views={views}
         name="GitHub Actions + SSH"

web/packages/teleport/src/Bots/InfoGuide.tsx

@@ -34,7 +34,7 @@ const InfoGuideReferenceLinks = {
     href: 'https://goteleport.com/docs/reference/architecture/machine-id-architecture/#tbot',
   },
   AccessResources: {
-    title: 'Access your Infrastructure with Machine ID',
+    title: 'Access your Infrastructure with Machine & Workload Identity',
     href: 'https://goteleport.com/docs/enroll-resources/machine-id/access-guides/',
   },
 };

web/packages/teleport/src/Bots/List/EmptyState/EmptyState.tsx

@@ -74,9 +74,10 @@ export function EmptyState() {
           Static keys and API keys in your automated workflows are the target of
           hackers and are one of the primary sources of security breaches.
           <br />
-          Teleport Machine ID replaces shared credentials and secrets with
-          short-lived x.509 or SSH certificates and gives you a unified plan to
-          register, define access policies, and audit all your workflows.
+          Teleport Machine & Workload Identity replaces shared credentials and
+          secrets with short-lived X.509 or SSH certificates and gives you a
+          unified plan to register, define access policies, and audit all your
+          workflows.
         </Text>
       </Box>
       <FeatureContainer py={2} pr={2}>
@@ -87,7 +88,7 @@ export function EmptyState() {
             isSliding={!!intervalId}
             onClick={() => handleOnClick(0)}
             title="Eliminate secrets and shared credentials from CI/CD workflows"
-            description="Teleport Machine ID replaces passwords, API, and static keys with short-lived SSH and x.509 certificates."
+            description="Teleport Machine & Workload Identity replaces passwords, API, and static keys with short-lived SSH and X.509 certificates."
           />
           <DetailsTab
             active={currIndex === 1}

web/packages/teleport/src/Integrations/Enroll/Shared/IntegrationPicker.tsx

@@ -41,7 +41,7 @@ function titleOrName<T extends BaseIntegration>(i: T) {
 export function displayName<T extends BaseIntegration>(i: T) {
   const name = titleOrName(i);
   if ('type' in i && i.type === 'bot') {
-    return `Machine ID: ${name}`;
+    return `MWI: ${name}`;
   }
   return name;
 }