tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 07:34:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pointers value access fixes

Browse Source 
Signed-off-by: aiordache <anca.iordache@docker.com>
(cherry picked from commit 65d6fe57546b4f7a58ecf878d8740155285bc19a)
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
aiordache 2020-07-22 15:48:04 +02:00 committed by Nicolas De Loof
parent 12215130b5
commit 3706d8617f
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ecs/pkg/amazon/sdk/sdk.go
View File

@ -301,7 +301,7 @@ func (s sdk) ListStackParameters(ctx context.Context, name string) (map[string]s
} }
parameters := map[string]string{} parameters := map[string]string{}
for _, parameter := range st.Stacks[0].Parameters { for _, parameter := range st.Stacks[0].Parameters {
parameters[*parameter.ParameterKey] = *parameter.ParameterValue parameters[aws.StringValue(parameter.ParameterKey)] = aws.StringValue(parameter.ParameterValue)
} }
return parameters, nil return parameters, nil
} }
@ -318,10 +318,10 @@ func (s sdk) ListStackResources(ctx context.Context, name string) ([]compose.Sta
resources := []compose.StackResource{} resources := []compose.StackResource{}
for _, r := range res.StackResourceSummaries { for _, r := range res.StackResourceSummaries {
resources = append(resources, compose.StackResource{ resources = append(resources, compose.StackResource{
LogicalID: *r.LogicalResourceId, LogicalID: aws.StringValue(r.LogicalResourceId),
Type: *r.ResourceType, Type: aws.StringValue(r.ResourceType),
ARN: *r.PhysicalResourceId, ARN: aws.StringValue(r.PhysicalResourceId),
Status: *r.ResourceStatus, Status: aws.StringValue(r.ResourceStatus),
}) })
} }
return resources, nil return resources, nil
@ -350,7 +350,7 @@ func (s sdk) CreateSecret(ctx context.Context, secret compose.Secret) (string, e
if err != nil { if err != nil {
return "", err return "", err
} }
return *response.ARN, nil return aws.StringValue(response.ARN), nil
} }
func (s sdk) InspectSecret(ctx context.Context, id string) (compose.Secret, error) { func (s sdk) InspectSecret(ctx context.Context, id string) (compose.Secret, error) {
@ -361,11 +361,11 @@ func (s sdk) InspectSecret(ctx context.Context, id string) (compose.Secret, erro
} }
labels := map[string]string{} labels := map[string]string{}
for _, tag := range response.Tags { for _, tag := range response.Tags {
labels[*tag.Key] = *tag.Value labels[aws.StringValue(tag.Key)] = aws.StringValue(tag.Value)
} }
secret := compose.Secret{ secret := compose.Secret{
ID: *response.ARN, ID: aws.StringValue(response.ARN),
Name: *response.Name, Name: aws.StringValue(response.Name),
Labels: labels, Labels: labels,
} }
if response.Description != nil { if response.Description != nil {
@ -431,8 +431,8 @@ func (s sdk) GetLogs(ctx context.Context, name string, consumer compose.LogConsu
} }
for _, event := range events.Events { for _, event := range events.Events {
p := strings.Split(*event.LogStreamName, "/") p := strings.Split(aws.StringValue(event.LogStreamName), "/")
consumer.Log(p[1], p[2], *event.Message) consumer.Log(p[1], p[2], aws.StringValue(event.Message))
startTime = *event.IngestionTime startTime = *event.IngestionTime
} }
} }
@ -455,7 +455,7 @@ func (s sdk) DescribeServices(ctx context.Context, cluster string, arns []string
var name string var name string
for _, t := range service.Tags { for _, t := range service.Tags {
if *t.Key == compose.ServiceTag { if *t.Key == compose.ServiceTag {
name = *t.Value name = aws.StringValue(t.Value)
} }
} }
if name == "" { if name == "" {
@ -472,10 +472,10 @@ func (s sdk) DescribeServices(ctx context.Context, cluster string, arns []string
return nil, err return nil, err
} }
status = append(status, compose.ServiceStatus{ status = append(status, compose.ServiceStatus{
ID: *service.ServiceName, ID: aws.StringValue(service.ServiceName),
Name: name, Name: name,
Replicas: int(*service.RunningCount), Replicas: int(aws.Int64Value(service.RunningCount)),
Desired: int(*service.DesiredCount), Desired: int(aws.Int64Value(service.DesiredCount)),
LoadBalancers: loadBalancers, LoadBalancers: loadBalancers,
}) })
} }
@ -505,8 +505,12 @@ func (s sdk) getURLWithPortMapping(ctx context.Context, targetGroupArns []string
return nil, err return nil, err
} }
filterLB := func(arn *string, lbs []*elbv2.LoadBalancer) *elbv2.LoadBalancer { filterLB := func(arn *string, lbs []*elbv2.LoadBalancer) *elbv2.LoadBalancer {
if aws.StringValue(arn) == "" {
// load balancer arn is nil/""
return nil
}
for _, lb := range lbs { for _, lb := range lbs {
if *lb.LoadBalancerArn == *arn { if aws.StringValue(lb.LoadBalancerArn) == aws.StringValue(arn) {
return lb return lb
} }
} }
@ -520,10 +524,10 @@ func (s sdk) getURLWithPortMapping(ctx context.Context, targetGroupArns []string
continue continue
} }
loadBalancers = append(loadBalancers, compose.LoadBalancer{ loadBalancers = append(loadBalancers, compose.LoadBalancer{
URL: *lb.DNSName, URL: aws.StringValue(lb.DNSName),
TargetPort: int(*tg.Port), TargetPort: int(aws.Int64Value(tg.Port)),
PublishedPort: int(*tg.Port), PublishedPort: int(aws.Int64Value(tg.Port)),
Protocol: *tg.Protocol, Protocol: aws.StringValue(tg.Protocol),
}) })
} }
@ -556,7 +560,7 @@ func (s sdk) GetPublicIPs(ctx context.Context, interfaces ...string) (map[string
publicIPs := map[string]string{} publicIPs := map[string]string{}
for _, interf := range desc.NetworkInterfaces { for _, interf := range desc.NetworkInterfaces {
if interf.Association != nil { if interf.Association != nil {
publicIPs[*interf.NetworkInterfaceId] = *interf.Association.PublicIp publicIPs[aws.StringValue(interf.NetworkInterfaceId)] = aws.StringValue(interf.Association.PublicIp)
} }
} }
return publicIPs, nil return publicIPs, nil
@ -581,5 +585,9 @@ func (s sdk) GetLoadBalancerURL(ctx context.Context, arn string) (string, error)
if err != nil { if err != nil {
return "", err return "", err
} }
return *lbs.LoadBalancers[0].DNSName, nil dnsName := aws.StringValue(lbs.LoadBalancers[0].DNSName)
if dnsName == "" {
return "", fmt.Errorf("Load balancer %s doesn't have a dns name", aws.StringValue(lbs.LoadBalancers[0].LoadBalancerArn))
}
return dnsName, nil
} }