Skip to content

Commit cc057a9

Browse files
authoredJan 11, 2024
fix: run local --proxy should work when sc is off (#5604)
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the Apache 2.0 License.
1 parent 65383ed commit cc057a9

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed
 

‎internal/pkg/ecs/ecs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (c Client) ServiceConnectServices(app, env, svc string) ([]*ecs.Service, er
143143
if err != nil {
144144
return nil, fmt.Errorf("get service: %w", err)
145145
}
146-
if len(s.Deployments) == 0 {
146+
if len(s.Deployments) == 0 || s.Deployments[0].ServiceConnectConfiguration == nil {
147147
return nil, nil
148148
}
149149

‎internal/pkg/ecs/ecs_test.go

+36
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,42 @@ func TestClient_ServiceConnectServices(t *testing.T) {
575575
},
576576
wantedError: fmt.Errorf(`get service: get ECS service mockService: some error`),
577577
},
578+
"return early when no deployments": {
579+
setupMocks: func(m clientMocks) {
580+
m.resourceGetter.EXPECT().GetResourcesByTags(serviceResourceType, getRgInput).
581+
Return([]*resourcegroups.Resource{
582+
{ARN: mockSvcARN},
583+
}, nil)
584+
m.resourceGetter.EXPECT().GetResourcesByTags(clusterResourceType, getRgEnvClusterInput).
585+
Return([]*resourcegroups.Resource{
586+
{ARN: "mockARN1"}, {ARN: "mockARN2"},
587+
}, nil)
588+
m.ecsClient.EXPECT().ActiveClusters("mockARN1", "mockARN2").Return([]string{"mockARN1"}, nil)
589+
m.ecsClient.EXPECT().ActiveServices("mockARN1", []string{mockSvcARN}).Return([]string{mockSvcARN}, nil)
590+
m.ecsClient.EXPECT().Service(mockCluster, mockService).Return(&ecs.Service{
591+
Deployments: []*awsecs.Deployment{},
592+
}, nil)
593+
},
594+
},
595+
"return early when service connect is not enabled": {
596+
setupMocks: func(m clientMocks) {
597+
m.resourceGetter.EXPECT().GetResourcesByTags(serviceResourceType, getRgInput).
598+
Return([]*resourcegroups.Resource{
599+
{ARN: mockSvcARN},
600+
}, nil)
601+
m.resourceGetter.EXPECT().GetResourcesByTags(clusterResourceType, getRgEnvClusterInput).
602+
Return([]*resourcegroups.Resource{
603+
{ARN: "mockARN1"}, {ARN: "mockARN2"},
604+
}, nil)
605+
m.ecsClient.EXPECT().ActiveClusters("mockARN1", "mockARN2").Return([]string{"mockARN1"}, nil)
606+
m.ecsClient.EXPECT().ActiveServices("mockARN1", []string{mockSvcARN}).Return([]string{mockSvcARN}, nil)
607+
m.ecsClient.EXPECT().Service(mockCluster, mockService).Return(&ecs.Service{
608+
Deployments: []*awsecs.Deployment{
609+
{},
610+
},
611+
}, nil)
612+
},
613+
},
578614
"error listing namespace": {
579615
setupMocks: func(m clientMocks) {
580616
m.resourceGetter.EXPECT().GetResourcesByTags(serviceResourceType, getRgInput).

0 commit comments

Comments
 (0)
Failed to load comments.