Fix apps tests: add region flag to m run and handle new org format

Two fixes for apps v2 integration tests:

1. Add -r flag to 'fly m run' commands
   Without specifying a region, the command prompts interactively for
   region selection, which fails in CI with "Error: prompt: non interactive".

   Fixed by adding: -r %s (f.PrimaryRegion())

   Affected:
   - TestAppsV2ConfigSave_ProcessGroups (3 commands)
   - TestAppsV2ConfigSave_OneMachineNoAppConfig (1 command)

2. Handle new org list JSON format in verifyTestOrgExists
   The API now returns: {"personal": "flyctl-ci-preflight"}
   instead of: {"flyctl-ci-preflight": "..."}

   Updated to check both keys (old format) and values (new format)
   to find the org slug.

Author: mattp-fly

test/preflight/apps_v2_integration_test.go

@@ -128,9 +128,9 @@ func TestAppsV2ConfigSave_ProcessGroups(t *testing.T) {
 	appName := f.CreateRandomAppMachines()
 	configFilePath := filepath.Join(f.WorkDir(), appconfig.DefaultConfigFileName)
 
-	f.Fly("m run -a %s --env ENV=preflight --  nginx nginx -g 'daemon off;'", appName)
-	f.Fly("m run -a %s --env ENV=preflight --  nginx nginx -g 'daemon off;'", appName)
-	f.Fly("m run -a %s --env ENV=preflight --  nginx tail -F /dev/null", appName)
+	f.Fly("m run -a %s -r %s --env ENV=preflight --  nginx nginx -g 'daemon off;'", appName, f.PrimaryRegion())
+	f.Fly("m run -a %s -r %s --env ENV=preflight --  nginx nginx -g 'daemon off;'", appName, f.PrimaryRegion())
+	f.Fly("m run -a %s -r %s --env ENV=preflight --  nginx tail -F /dev/null", appName, f.PrimaryRegion())
 	f.Fly("m list -a %s", appName)
 	result := f.Fly("config save -a %s", appName)
 	configFileBytes, err := os.ReadFile(configFilePath)
@@ -151,7 +151,7 @@ func TestAppsV2ConfigSave_OneMachineNoAppConfig(t *testing.T) {
 	appName := f.CreateRandomAppMachines()
 	configFilePath := filepath.Join(f.WorkDir(), appconfig.DefaultConfigFileName)
 
-	f.Fly("m run -a %s --env ENV=preflight --  nginx tail -F /dev/null", appName)
+	f.Fly("m run -a %s -r %s --env ENV=preflight --  nginx tail -F /dev/null", appName, f.PrimaryRegion())
 	if _, err := os.Stat(configFilePath); !errors.Is(err, os.ErrNotExist) {
 		f.Fatalf("config file exists at %s :-(", configFilePath)
 	}

test/preflight/testlib/test_env.go

@@ -279,7 +279,22 @@ func (f *FlyctlTestEnv) verifyTestOrgExists() {
 	result.AssertSuccessfulExit()
 	var orgMap map[string]string
 	result.StdOutJSON(&orgMap)
-	if _, present := orgMap[f.orgSlug]; !present {
+
+	// Check if org exists as a key (old format) or as a value (new format)
+	found := false
+	if _, present := orgMap[f.orgSlug]; present {
+		found = true
+	} else {
+		// Check values for org slug (handles {"personal": "flyctl-ci-preflight"} format)
+		for _, v := range orgMap {
+			if v == f.orgSlug {
+				found = true
+				break
+			}
+		}
+	}
+
+	if !found {
 		f.Fatalf("could not find org with name '%s' in `%s` output: %s", f.orgSlug, result.cmdStr, result.stdOut.String())
 	}
 }