@@ -390,7 +390,7 @@ mutation startRepositoryMigration(
390390 $lockSource: Boolean)" ;
391391 var gql = @"
392392 startRepositoryMigration(
393- input: {
393+ input: {
394394 sourceId: $sourceId,
395395 ownerId: $ownerId,
396396 sourceRepositoryUrl: $sourceRepositoryUrl,
@@ -456,7 +456,7 @@ mutation startOrganizationMigration (
456456 $targetEnterpriseId: ID!,
457457 $sourceAccessToken: String!)" ;
458458 var gql = @"
459- startOrganizationMigration(
459+ startOrganizationMigration(
460460 input: {
461461 sourceOrgUrl: $sourceOrgUrl,
462462 targetOrgName: $targetOrgName,
@@ -620,8 +620,15 @@ public virtual async Task<int> GetIdpGroupId(string org, string groupName)
620620 {
621621 var url = $ "{ _apiUrl } /orgs/{ org . EscapeDataString ( ) } /external-groups";
622622
623- var group = await _client . GetAllAsync ( url , data => ( JArray ) data [ "groups" ] )
624- . SingleAsync ( x => string . Equals ( ( string ) x [ "group_name" ] , groupName , StringComparison . OrdinalIgnoreCase ) ) ;
623+ var allGroups = await _client . GetAllAsync ( url , data => ( JArray ) data [ "groups" ] ) . ToListAsync ( ) ;
624+
625+ var group = allGroups . SingleOrDefault ( x => string . Equals ( ( string ) x [ "group_name" ] , groupName , StringComparison . OrdinalIgnoreCase ) ) ;
626+
627+ if ( group == null )
628+ {
629+ var availableGroups = string . Join ( ", " , allGroups . Select ( g => $ "'{ g [ "group_name" ] } '") ) ;
630+ throw new OctoshiftCliException ( $ "IDP group '{ groupName } ' not found in organization '{ org } '. Available groups: { availableGroups } ") ;
631+ }
625632
626633 return ( int ) group [ "group_id" ] ;
627634 }
@@ -1077,7 +1084,7 @@ mutation abortRepositoryMigration(
10771084 )" ;
10781085 var gql = @"
10791086 abortRepositoryMigration(
1080- input: {
1087+ input: {
10811088 migrationId: $migrationId
10821089 })
10831090 { success }" ;
0 commit comments