[v15] Fix Machine ID Onboarding UI

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

@@ -92,39 +92,39 @@ export function getWorkflowExampleYaml(
   includeNameComment: boolean = true
 ): string {
   return `on:
-push:
-  branches:
-  - main
+  push:
+    branches:
+    - main
 jobs:
-demo:
-  permissions:
-    # The "id-token: write" permission is required or Machine ID will not be
-    # able to authenticate with the cluster.
-    id-token: write
-    contents: read
-  ${includeNameComment && '# if you added a workflow name in the previous step, make sure you use the same value here'}
-  name: ${botName}-example
-  runs-on: ubuntu-latest
-  steps:
-  - name: Checkout repository
-    uses: actions/checkout@v3
-  - name: Fetch Teleport binaries
-    uses: teleport-actions/setup@v1
-    with:
-      version: ${version}
-  # server access example
-  - name: Fetch credentials using Machine ID
-    id: auth
-    uses: teleport-actions/auth@v2
-    with:
-      proxy: ${proxyAddr}
-      token: ${tokenName}
-      # Enable the submission of anonymous usage telemetry. This
-      # helps us shape the future development of \`tbot\`. You can disable this
-      # by omitting this.
-      anonymous-telemetry: 1
-  - name: List nodes (tsh)
-    # Enters a command from the cluster, in this case "tsh ls" using Machine
-    # ID credentials to list remote SSH nodes.
-    run: tsh ls`;
+  demo:
+    permissions:
+      # The "id-token: write" permission is required or Machine ID will not be
+      # able to authenticate with the cluster.
+      id-token: write
+      contents: read
+    ${includeNameComment && '# if you added a workflow name in the previous step, make sure you use the same value here'}
+    name: ${botName}-example
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Fetch Teleport binaries
+      uses: teleport-actions/setup@v1
+      with:
+        version: ${version}
+    # server access example
+    - name: Fetch credentials using Machine ID
+      id: auth
+      uses: teleport-actions/auth@v2
+      with:
+        proxy: ${proxyAddr}
+        token: ${tokenName}
+        # Enable the submission of anonymous usage telemetry. This
+        # helps us shape the future development of \`tbot\`. You can disable this
+        # by omitting this.
+        anonymous-telemetry: 1
+    - name: List nodes (tsh)
+      # Enters a command from the cluster, in this case "tsh ls" using Machine
+      # ID credentials to list remote SSH nodes.
+      run: tsh ls`;
 }

web/packages/teleport/src/Bots/Add/GitHubActions/useGitHubFlow.tsx

@@ -125,7 +125,10 @@ export function GitHubFlowProvider({
             },
           }).then(token => {
             setTokenName(token.id);
-            return serviceCreateBot(createBotRequest);
+            return serviceCreateBot({
+              ...createBotRequest,
+              roles: [createBotRequest.botName],
+            });
           });
         })
     );