Skip to content

Commit 11652a9

Browse files
sethsecsethsec
committed
Fix service slug mismatches for awsservicemap v1.1.0 across all commands
awsservicemap v1.1.0 switched to URL-based service slugs, breaking all commands that used the old identifiers. Affected slugs and their fixes: secretsmanager -> secrets-manager (resource-trusts, inventory) ssm -> systems-manager (inventory) elb -> elasticloadbalancing (endpoints, inventory, network-ports) es -> opensearch-service (endpoints, inventory, resource-trusts) mq -> amazon-mq (endpoints, inventory) stepfunctions -> step-functions (inventory) sagemaker -> sagemaker-ai (env-vars) clouddirectory -> directoryservice (directory-services) kinesis -> streams (inventory) lightsail -> amazonlightsail.com (endpoints, env-vars, network-ports) Each mismatch caused IsServiceInRegion to return false for all regions, silently skipping enumeration of that service entirely.
1 parent 6ac7a0b commit 11652a9

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎aws/directory-services.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func (m *DirectoryModule) executeChecks(r string, wg *sync.WaitGroup, semaphore
198198
JsonFileSource: "DOWNLOAD_FROM_AWS",
199199
}
200200
}
201-
res, err := servicemap.IsServiceInRegion("clouddirectory", r)
201+
res, err := servicemap.IsServiceInRegion("directoryservice", r)
202202
if err != nil {
203203
m.modLog.Error(err)
204204
}

‎aws/endpoints.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ func (m *EndpointsModule) executeChecks(r string, wg *sync.WaitGroup, semaphore
293293
wg.Add(1)
294294
go m.getEksClustersPerRegion(r, wg, semaphore, dataReceiver)
295295
}
296-
res, err = servicemap.IsServiceInRegion("mq", r)
296+
res, err = servicemap.IsServiceInRegion("amazon-mq", r)
297297
if err != nil {
298298
m.modLog.Error(err)
299299
}
@@ -302,7 +302,7 @@ func (m *EndpointsModule) executeChecks(r string, wg *sync.WaitGroup, semaphore
302302
wg.Add(1)
303303
go m.getMqBrokersPerRegion(r, wg, semaphore, dataReceiver)
304304
}
305-
res, err = servicemap.IsServiceInRegion("es", r)
305+
res, err = servicemap.IsServiceInRegion("opensearch-service", r)
306306
if err != nil {
307307
m.modLog.Error(err)
308308
}
@@ -320,7 +320,7 @@ func (m *EndpointsModule) executeChecks(r string, wg *sync.WaitGroup, semaphore
320320
wg.Add(1)
321321
m.getGrafanaEndPointsPerRegion(r, wg, semaphore, dataReceiver)
322322
}
323-
res, err = servicemap.IsServiceInRegion("elb", r)
323+
res, err = servicemap.IsServiceInRegion("elasticloadbalancing", r)
324324
if err != nil {
325325
m.modLog.Error(err)
326326
}
@@ -378,7 +378,7 @@ func (m *EndpointsModule) executeChecks(r string, wg *sync.WaitGroup, semaphore
378378
wg.Add(1)
379379
go m.getAppRunnerEndpointsPerRegion(r, wg, semaphore, dataReceiver)
380380

381-
res, err = servicemap.IsServiceInRegion("lightsail", r)
381+
res, err = servicemap.IsServiceInRegion("amazonlightsail.com", r)
382382
if err != nil {
383383
m.modLog.Error(err)
384384
}

‎aws/env-vars.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ func (m *EnvsModule) executeChecks(r string, wg *sync.WaitGroup, semaphore chan
310310
wg.Add(1)
311311
go m.getAppRunnerEnvironmentVariablesPerRegion(r, wg, semaphore, dataReceiver)
312312

313-
res, err = servicemap.IsServiceInRegion("lightsail", r)
313+
res, err = servicemap.IsServiceInRegion("amazonlightsail.com", r)
314314
if err != nil {
315315
m.modLog.Error(err)
316316
}
@@ -320,7 +320,7 @@ func (m *EnvsModule) executeChecks(r string, wg *sync.WaitGroup, semaphore chan
320320
go m.getLightsailEnvironmentVariablesPerRegion(r, wg, semaphore, dataReceiver)
321321
}
322322

323-
res, err = servicemap.IsServiceInRegion("sagemaker", r)
323+
res, err = servicemap.IsServiceInRegion("sagemaker-ai", r)
324324
if err != nil {
325325
m.modLog.Error(err)
326326
}

‎aws/inventory.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
599599
go m.getEKSNodeGroupsPerRegion(r, wg, semaphore)
600600
}
601601

602-
res, err = servicemap.IsServiceInRegion("elb", r)
602+
res, err = servicemap.IsServiceInRegion("elasticloadbalancing", r)
603603
if err != nil {
604604
m.modLog.Error(err)
605605
}
@@ -645,7 +645,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
645645
go m.GetEMRInstancesPerRegion(r, wg, semaphore)
646646
}
647647

648-
res, err = servicemap.IsServiceInRegion("es", r)
648+
res, err = servicemap.IsServiceInRegion("opensearch-service", r)
649649
if err != nil {
650650
m.modLog.Error(err)
651651
}
@@ -682,7 +682,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
682682

683683
}
684684

685-
res, err = servicemap.IsServiceInRegion("kinesis", r)
685+
res, err = servicemap.IsServiceInRegion("streams", r)
686686
if err != nil {
687687
m.modLog.Error(err)
688688
}
@@ -703,7 +703,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
703703
go m.getLambdaFunctionsPerRegion(r, wg, semaphore)
704704
}
705705

706-
res, err = servicemap.IsServiceInRegion("lightsail", r)
706+
res, err = servicemap.IsServiceInRegion("amazonlightsail.com", r)
707707
if err != nil {
708708
m.modLog.Error(err)
709709
}
@@ -713,7 +713,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
713713
go m.getLightsailInstancesAndContainersPerRegion(r, wg, semaphore)
714714
}
715715

716-
res, err = servicemap.IsServiceInRegion("mq", r)
716+
res, err = servicemap.IsServiceInRegion("amazon-mq", r)
717717
if err != nil {
718718
m.modLog.Error(err)
719719
}
@@ -743,7 +743,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
743743
go m.getRedshiftClustersPerRegion(r, wg, semaphore)
744744
}
745745

746-
res, err = servicemap.IsServiceInRegion("secretsmanager", r)
746+
res, err = servicemap.IsServiceInRegion("secrets-manager", r)
747747
if err != nil {
748748
m.modLog.Error(err)
749749
}
@@ -773,7 +773,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
773773
go m.getSQSQueuesPerRegion(r, wg, semaphore)
774774
}
775775

776-
res, err = servicemap.IsServiceInRegion("ssm", r)
776+
res, err = servicemap.IsServiceInRegion("systems-manager", r)
777777
if err != nil {
778778
m.modLog.Error(err)
779779
}
@@ -783,7 +783,7 @@ func (m *Inventory2Module) executeChecks(r string, wg *sync.WaitGroup, semaphore
783783
go m.getSSMParametersPerRegion(r, wg, semaphore)
784784
}
785785

786-
res, err = servicemap.IsServiceInRegion("stepfunctions", r)
786+
res, err = servicemap.IsServiceInRegion("step-functions", r)
787787
if err != nil {
788788
m.modLog.Error(err)
789789
}

‎aws/network-ports.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ func (m *NetworkPortsModule) executeChecks(r string, wg *sync.WaitGroup, dataRec
318318
m.getElastiCacheNetworkPortsPerRegion(r, dataReceiver)
319319
}
320320

321-
res, err = servicemap.IsServiceInRegion("elb", r)
321+
res, err = servicemap.IsServiceInRegion("elasticloadbalancing", r)
322322
if err != nil {
323323
m.modLog.Error(err)
324324
}
@@ -327,7 +327,7 @@ func (m *NetworkPortsModule) executeChecks(r string, wg *sync.WaitGroup, dataRec
327327
m.getLBNetworkPortsPerRegion(r, dataReceiver)
328328
}
329329

330-
res, err = servicemap.IsServiceInRegion("lightsail", r)
330+
res, err = servicemap.IsServiceInRegion("amazonlightsail.com", r)
331331
if err != nil {
332332
m.modLog.Error(err)
333333
}

‎aws/resource-trusts.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func (m *ResourceTrustsModule) executeChecks(r string, wg *sync.WaitGroup, semap
272272
m.getEFSfilesystemPoliciesPerRegion(r, wg, semaphore, dataReceiver)
273273
}
274274

275-
res, err = servicemap.IsServiceInRegion("secretsmanager", r)
275+
res, err = servicemap.IsServiceInRegion("secrets-manager", r)
276276
if err != nil {
277277
m.modLog.Error(err)
278278
}
@@ -329,7 +329,7 @@ func (m *ResourceTrustsModule) executeChecks(r string, wg *sync.WaitGroup, semap
329329
}
330330

331331
if m.OpenSearchClient != nil {
332-
res, err = servicemap.IsServiceInRegion("es", r)
332+
res, err = servicemap.IsServiceInRegion("opensearch-service", r)
333333
if err != nil {
334334
m.modLog.Error(err)
335335
}

0 commit comments

Comments
 (0)