switch-profile 2.1.0 → 2.2.0

package/README.md

@@ -154,7 +154,7 @@ sp add          # then choose "Accounts from an SSO portal"
 1. Pick an existing `[sso-session]` or create one: start URL (e.g. `https://acme.awsapps.com/start`), SSO region (where Identity Center lives, not where you deploy), and a short name, usually the client.
 2. Log in if needed.
 3. `switch-profile` lists every account and role you can access, then asks for a default region and a name prefix. Profiles are named `<prefix>-<account-name>-<role>`, for example `acme-prod-workloads-admin`.
-4. A preview shows the new profiles, the ones already set up, and the ones that no longer exist. Confirm to write them.
+4. A preview shows the new profiles, the ones already set up, and the ones that no longer exist. Then pick the new profiles to add: all are selected, so press Enter to add everything, or untick the ones you don't want (type to search by name, account or role).
 
 Run it again later to pick up new accounts. Account/role pairs that already have a profile are never duplicated, whatever its name. Generated profiles that no longer exist can be pruned (after a backup); profiles you wrote by hand are never pruned.
 

package/dist/cli.js

@@ -5351,7 +5351,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "switch-profile",
-      version: "2.1.0",
+      version: "2.2.0",
       main: "index.js",
       bin: {
         "switch-profile": "index.js"
@@ -5396,7 +5396,7 @@ var require_package = __commonJS({
         eslint: "^10.0.0",
         fuzzysort: "^3.1.0",
         globals: "^17.13.0",
-        mocha: "^8.2.1",
+        mocha: "^11.8.0",
         uqr: "^0.1.3"
       },
       files: [
@@ -5640,14 +5640,16 @@ var require_transforms = __commonJS({
         login_session: params.login_session || null
       };
       return p4.isSso = !!p4.sso_start_url, p4.isLegacySso = p4.isSso && !p4.sso_session, p4.kind = p4.isSso ? "sso" : p4.login_session ? "login" : p4.role_arn ? "role" : params.credential_process ? "process" : "keys", !p4.sso_account_id && p4.role_arn && (p4.sso_account_id = (p4.role_arn.match(/^arn:aws[^:]*:iam::(\d{12}):/) || [])[1] || null), p4;
-    }), slug = (text2) => String(text2 || "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, ""), generatedProfileName = (prefix, accountName, accountId, roleName) => [slug(prefix), slug(accountName) || accountId, slug(roleName)].filter(Boolean).join("-"), populateSsoProfiles = (configStr, { ssoSession, entries, region, prefix, prune, version }) => {
-      let config = configStr, profiles = listProfiles(config), session = ini.getSection(config, `sso-session ${ssoSession}`) || {}, samePortal = (p4) => p4.sso_session == ssoSession || p4.sso_start_url && p4.sso_start_url == session.sso_start_url, key = (accountId, roleName) => `${accountId}/${roleName}`, byKey = new Map(profiles.filter((p4) => p4.isSso && samePortal(p4)).map((p4) => [key(p4.sso_account_id, p4.sso_role_name), p4])), taken = new Set(profiles.map((p4) => p4.name)), wanted = new Set(entries.map((e) => key(e.accountId, e.roleName))), added = [], existing = [];
+    }), slug = (text2) => String(text2 || "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, ""), generatedProfileName = (prefix, accountName, accountId, roleName) => [slug(prefix), slug(accountName) || accountId, slug(roleName)].filter(Boolean).join("-"), ssoEntryKey = (accountId, roleName) => `${accountId}/${roleName}`, populateSsoProfiles = (configStr, { ssoSession, entries, region, prefix, prune, include, version }) => {
+      let config = configStr, profiles = listProfiles(config), session = ini.getSection(config, `sso-session ${ssoSession}`) || {}, samePortal = (p4) => p4.sso_session == ssoSession || p4.sso_start_url && p4.sso_start_url == session.sso_start_url, key = ssoEntryKey, included = include ? new Set(include) : null, byKey = new Map(profiles.filter((p4) => p4.isSso && samePortal(p4)).map((p4) => [key(p4.sso_account_id, p4.sso_role_name), p4])), taken = new Set(profiles.map((p4) => p4.name)), wanted = new Set(entries.map((e) => key(e.accountId, e.roleName))), added = [], addedEntries = [], existing = [];
       for (let e of entries) {
         let found = byKey.get(key(e.accountId, e.roleName));
         if (found) {
           existing.push(found.name);
           continue;
         }
+        if (included && !included.has(key(e.accountId, e.roleName)))
+          continue;
         let base = generatedProfileName(prefix || ssoSession, e.accountName, e.accountId, e.roleName), name = base;
         for (let i2 = 2; taken.has(name); i2++)
           name = `${base}-${i2}`;
@@ -5660,13 +5662,13 @@ var require_transforms = __commonJS({
           ...e.accountName ? [[ACCOUNT_NAME_KEY, e.accountName]] : [],
           [GENERATED_KEY, ssoSession],
           [VERSION_KEY, version]
-        ]), added.push(name);
+        ]), added.push(name), addedEntries.push({ name, accountId: e.accountId, accountName: e.accountName, roleName: e.roleName });
       }
       let stale = profiles.filter((p4) => p4.generated == ssoSession && !wanted.has(key(p4.sso_account_id, p4.sso_role_name))).map((p4) => p4.name), removed = [];
       if (prune)
         for (let name of stale)
           config = ini.removeSection(config, configSectionName(config, name)), removed.push(name);
-      return { config, added, existing, stale, removed };
+      return { config, added, addedEntries, existing, stale, removed };
     }, listSsoSessions = (configStr) => ini.listSections(configStr).filter((s) => s.startsWith("sso-session ")).map((s) => ({ name: s.replace(/^sso-session\s+/, ""), ...ini.getSection(configStr, s) })), addSsoSession = (configStr, { name, startUrl, region, version }) => ini.getSection(configStr, `sso-session ${name}`) ? configStr : ini.setSection(configStr, `sso-session ${name}`, [
       ["sso_start_url", startUrl],
       ["sso_region", region],
@@ -5678,6 +5680,7 @@ var require_transforms = __commonJS({
       ACCOUNT_NAME_KEY,
       generatedProfileName,
       populateSsoProfiles,
+      ssoEntryKey,
       listSsoSessions,
       addSsoSession,
       NAME_KEY,
@@ -7902,14 +7905,25 @@ AWS recommends SSO or console sign-in instead.`), !await ask(p4.confirm({ messag
       ].filter(Boolean).join(`
 `);
       opts.json || p4.log.message(summary);
-      let prune = !!opts.prune;
+      let prune = !!opts.prune, include;
       if (interactive && !opts.yes) {
-        if (preview.added.length && !await ask(p4.confirm({ message: `Add ${preview.added.length} profile${preview.added.length == 1 ? "" : "s"}?` })))
-          return p4.outro(ui2.dim("Nothing changed."));
+        if (preview.added.length) {
+          let all = preview.addedEntries.map((e) => transforms.ssoEntryKey(e.accountId, e.roleName)), picked = await ask(p4.autocompleteMultiselect({
+            message: `Add which profiles? ${ui2.dim("(all selected: space to untick, type to search, enter to confirm)")}`,
+            maxItems: 12,
+            initialValues: all,
+            options: preview.addedEntries.map((e, i2) => ({ value: all[i2], label: e.name, hint: [e.accountName, e.accountId, e.roleName].filter(Boolean).join(" \xB7 ") }))
+          }));
+          if (!picked.length && !preview.stale.length)
+            return p4.outro(ui2.dim("Nothing changed."));
+          picked.length < all.length && (include = picked);
+        }
         preview.stale.length && (prune = await ask(p4.confirm({ message: `Remove the ${preview.stale.length} profile${preview.stale.length == 1 ? "" : "s"} that no longer exist${preview.stale.length == 1 ? "s" : ""}?`, initialValue: !1 })));
       }
+      if (include && !include.length && !prune)
+        return p4.outro(ui2.dim("Nothing changed."));
       prune && await aws.backupAwsFiles();
-      let result = transforms.populateSsoProfiles(configStr, { ssoSession: sessionName, entries, region, prefix, prune, version: settings2.CLI_VERSION });
+      let result = transforms.populateSsoProfiles(configStr, { ssoSession: sessionName, entries, region, prefix, prune, include, version: settings2.CLI_VERSION });
       if (await aws.writeAwsFile(aws.AWS_CONFIG_FILE, result.config), await settings2.update({}), opts.json) {
         process.stdout.write(JSON.stringify({ added: result.added, existing: result.existing, removed: result.removed, stale: prune ? [] : result.stale }) + `
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switch-profile",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "main": "index.js",
   "bin": {
     "switch-profile": "index.js"
@@ -45,7 +45,7 @@
     "eslint": "^10.0.0",
     "fuzzysort": "^3.1.0",
     "globals": "^17.13.0",
-    "mocha": "^8.2.1",
+    "mocha": "^11.8.0",
     "uqr": "^0.1.3"
   },
   "files": [