Skip to content

Commit f80d2e3

Browse files
bigkraigbigkraig
committed
Renamed ALB AWS packages to prefix with alb for simpler imports
1 parent e09d131 commit f80d2e3

24 files changed

+94
-94
lines changed

‎pkg/alb/lb/loadbalancer.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/ls"
1818
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
1919
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
20-
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/ec2"
21-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
22-
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/waf"
20+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albec2"
21+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
22+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albwaf"
2323
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
2424
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
2525
api "k8s.io/api/core/v1"
@@ -319,12 +319,12 @@ func (l *LoadBalancer) reconcileExistingManagedSG() error {
319319
if len(l.options.desired.ports) < 1 {
320320
return fmt.Errorf("No ports specified on ingress. Ingress resource may be misconfigured")
321321
}
322-
vpcID, err := ec2.EC2svc.GetVPCID()
322+
vpcID, err := albec2.EC2svc.GetVPCID()
323323
if err != nil {
324324
return err
325325
}
326326

327-
sgID, instanceSG, err := ec2.EC2svc.UpdateSGIfNeeded(vpcID, aws.String(l.id), l.options.current.ports, l.options.desired.ports, l.options.current.inboundCidrs, l.options.desired.inboundCidrs)
327+
sgID, instanceSG, err := albec2.EC2svc.UpdateSGIfNeeded(vpcID, aws.String(l.id), l.options.current.ports, l.options.desired.ports, l.options.current.inboundCidrs, l.options.desired.inboundCidrs)
328328
if err != nil {
329329
return err
330330
}
@@ -350,11 +350,11 @@ func (l *LoadBalancer) create(rOpts *ReconcileOptions) error {
350350
sgs = append(sgs, l.options.desired.managedSG)
351351

352352
if l.options.desired.managedInstanceSG == nil {
353-
vpcID, err := ec2.EC2svc.GetVPCID()
353+
vpcID, err := albec2.EC2svc.GetVPCID()
354354
if err != nil {
355355
return err
356356
}
357-
instSG, err := ec2.EC2svc.CreateNewInstanceSG(aws.String(l.id), l.options.desired.managedSG, vpcID)
357+
instSG, err := albec2.EC2svc.CreateNewInstanceSG(aws.String(l.id), l.options.desired.managedSG, vpcID)
358358
if err != nil {
359359
return err
360360
}
@@ -364,11 +364,11 @@ func (l *LoadBalancer) create(rOpts *ReconcileOptions) error {
364364

365365
// when sgs are not known, attempt to create them
366366
if len(sgs) < 1 {
367-
vpcID, err := ec2.EC2svc.GetVPCID()
367+
vpcID, err := albec2.EC2svc.GetVPCID()
368368
if err != nil {
369369
return err
370370
}
371-
newSG, newInstSG, err := ec2.EC2svc.CreateSecurityGroupFromPorts(vpcID, aws.String(l.id), l.options.desired.ports, l.options.desired.inboundCidrs)
371+
newSG, newInstSG, err := albec2.EC2svc.CreateSecurityGroupFromPorts(vpcID, aws.String(l.id), l.options.desired.ports, l.options.desired.inboundCidrs)
372372
if err != nil {
373373
return err
374374
}
@@ -425,7 +425,7 @@ func (l *LoadBalancer) create(rOpts *ReconcileOptions) error {
425425
}
426426

427427
if l.options.desired.wafACLID != nil {
428-
_, err = waf.WAFRegionalsvc.Associate(l.lb.current.LoadBalancerArn, l.options.desired.wafACLID)
428+
_, err = albwaf.WAFRegionalsvc.Associate(l.lb.current.LoadBalancerArn, l.options.desired.wafACLID)
429429
if err != nil {
430430
rOpts.Eventf(api.EventTypeWarning, "ERROR", "%s WAF (%s) association failed: %s", *l.lb.current.LoadBalancerName, l.options.desired.wafACLID, err.Error())
431431
l.logger.Errorf("Failed ELBV2 (ALB) WAF (%s) association: %s", l.options.desired.wafACLID, err.Error())
@@ -551,7 +551,7 @@ func (l *LoadBalancer) modify(rOpts *ReconcileOptions) error {
551551

552552
if needsMod&wafAssociationModified != 0 {
553553
if l.options.desired.wafACLID != nil {
554-
if _, err := waf.WAFRegionalsvc.Associate(l.lb.current.LoadBalancerArn, l.options.desired.wafACLID); err != nil {
554+
if _, err := albwaf.WAFRegionalsvc.Associate(l.lb.current.LoadBalancerArn, l.options.desired.wafACLID); err != nil {
555555
rOpts.Eventf(api.EventTypeWarning, "ERROR", "%s Waf (%s) association failed: %s", *l.lb.current.LoadBalancerName, *l.options.desired.wafACLID, err.Error())
556556
l.logger.Errorf("Failed ELBV2 (ALB) Waf (%s) association failed: %s", *l.options.desired.wafACLID, err.Error())
557557
} else {
@@ -560,7 +560,7 @@ func (l *LoadBalancer) modify(rOpts *ReconcileOptions) error {
560560
l.logger.Infof("WAF Association updated %s", *l.options.desired.wafACLID)
561561
}
562562
} else if l.options.current.wafACLID != nil {
563-
if _, err := waf.WAFRegionalsvc.Disassociate(l.lb.current.LoadBalancerArn); err != nil {
563+
if _, err := albwaf.WAFRegionalsvc.Disassociate(l.lb.current.LoadBalancerArn); err != nil {
564564
rOpts.Eventf(api.EventTypeWarning, "ERROR", "%s Waf disassociation failed: %s", *l.lb.current.LoadBalancerName, err.Error())
565565
l.logger.Errorf("Failed ELBV2 (ALB) Waf disassociation failed: %s", err.Error())
566566
} else {
@@ -593,7 +593,7 @@ func (l *LoadBalancer) delete(rOpts *ReconcileOptions) error {
593593

594594
// we need to disassociate the WAF before deletion
595595
if l.options.current.wafACLID != nil {
596-
if _, err := waf.WAFRegionalsvc.Disassociate(l.lb.current.LoadBalancerArn); err != nil {
596+
if _, err := albwaf.WAFRegionalsvc.Disassociate(l.lb.current.LoadBalancerArn); err != nil {
597597
rOpts.Eventf(api.EventTypeWarning, "ERROR", "Error disassociating WAF for %s: %s", *l.lb.current.LoadBalancerName, err.Error())
598598
l.logger.Errorf("Failed disassociation of ELBV2 (ALB) WAF: %s.", err.Error())
599599
return err
@@ -617,7 +617,7 @@ func (l *LoadBalancer) delete(rOpts *ReconcileOptions) error {
617617
// Deletions are attempted as best effort, if it fails we log the error but don't
618618
// fail the overall reconcile
619619
if l.options.current.managedSG != nil {
620-
if err := ec2.EC2svc.DisassociateSGFromInstanceIfNeeded(l.targetgroups[0].CurrentTargets(), l.options.current.managedInstanceSG); err != nil {
620+
if err := albec2.EC2svc.DisassociateSGFromInstanceIfNeeded(l.targetgroups[0].CurrentTargets(), l.options.current.managedInstanceSG); err != nil {
621621
rOpts.Eventf(api.EventTypeWarning, "WARN", "Failed disassociating sgs from instances: %s", err.Error())
622622
l.logger.Warnf("Failed in deletion of managed SG: %s.", err.Error())
623623
}
@@ -644,7 +644,7 @@ func attemptSGDeletion(sg *string) error {
644644
var rErr error
645645
for i := 0; i < 6; i++ {
646646
time.Sleep(20 * time.Second)
647-
if err := ec2.EC2svc.DeleteSecurityGroupByID(sg); err != nil {
647+
if err := albec2.EC2svc.DeleteSecurityGroupByID(sg); err != nil {
648648
rErr = err
649649
if aerr, ok := err.(awserr.Error); ok {
650650
if aerr.Code() == "DependencyViolation" {

‎pkg/alb/lb/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/aws/aws-sdk-go/service/elbv2"
55
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/ls"
66
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
7-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
7+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
88
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
99
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
1010
)

‎pkg/alb/ls/listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/aws/aws-sdk-go/service/elbv2"
66
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/rs"
77
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
8-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
8+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
99
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
1010
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
1111
api "k8s.io/api/core/v1"

‎pkg/alb/ls/listener_test.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"testing"
55

66
"github.com/aws/aws-sdk-go/aws"
7-
awselb "github.com/aws/aws-sdk-go/service/elbv2"
7+
"github.com/aws/aws-sdk-go/service/elbv2"
88
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
9-
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
9+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
1010
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
1111
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
1212
)
@@ -21,14 +21,14 @@ const (
2121

2222
var (
2323
logr *log.Logger
24-
mockList1 *awselb.Listener
25-
mockList2 *awselb.Listener
26-
mockList3 *awselb.Listener
24+
mockList1 *elbv2.Listener
25+
mockList2 *elbv2.Listener
26+
mockList3 *elbv2.Listener
2727
rOpts1 *ReconcileOptions
2828
)
2929

3030
func init() {
31-
elbv2.ELBV2svc = mockELBV2Client{}
31+
albelbv2.ELBV2svc = mockELBV2Client{}
3232
logr = log.New("test")
3333

3434
rOpts1 = &ReconcileOptions{
@@ -39,31 +39,31 @@ func init() {
3939
}
4040

4141
func setup() {
42-
mockList1 = &awselb.Listener{
42+
mockList1 = &elbv2.Listener{
4343
Port: aws.Int64(newPort),
4444
Protocol: aws.String("HTTP"),
45-
DefaultActions: []*awselb.Action{{
45+
DefaultActions: []*elbv2.Action{{
4646
Type: aws.String("default"),
4747
TargetGroupArn: aws.String(newTg),
4848
}},
4949
}
5050

51-
mockList2 = &awselb.Listener{
51+
mockList2 = &elbv2.Listener{
5252
Port: aws.Int64(newPort2),
5353
Protocol: aws.String("HTTP"),
54-
DefaultActions: []*awselb.Action{{
54+
DefaultActions: []*elbv2.Action{{
5555
Type: aws.String("default"),
5656
TargetGroupArn: aws.String(newTg),
5757
}},
5858
}
5959

60-
mockList3 = &awselb.Listener{
60+
mockList3 = &elbv2.Listener{
6161
Port: aws.Int64(newPort),
6262
Protocol: aws.String("HTTPS"),
63-
Certificates: []*awselb.Certificate{
63+
Certificates: []*elbv2.Certificate{
6464
{CertificateArn: aws.String("abc")},
6565
},
66-
DefaultActions: []*awselb.Action{{
66+
DefaultActions: []*elbv2.Action{{
6767
Type: aws.String("default"),
6868
TargetGroupArn: aws.String(newTg),
6969
}},
@@ -128,12 +128,12 @@ func TestNewHTTPSListener(t *testing.T) {
128128
}
129129

130130
type mockELBV2Client struct {
131-
elbv2.ELBV2API
131+
albelbv2.ELBV2API
132132
}
133133

134-
func (m mockELBV2Client) CreateListener(*awselb.CreateListenerInput) (*awselb.CreateListenerOutput, error) {
135-
o := &awselb.CreateListenerOutput{
136-
Listeners: []*awselb.Listener{
134+
func (m mockELBV2Client) CreateListener(*elbv2.CreateListenerInput) (*elbv2.CreateListenerOutput, error) {
135+
o := &elbv2.CreateListenerOutput{
136+
Listeners: []*elbv2.Listener{
137137
{
138138
Port: aws.Int64(newPort),
139139
ListenerArn: aws.String(newARN),
@@ -147,9 +147,9 @@ func (m mockELBV2Client) RemoveListener(*string) error {
147147
return nil
148148
}
149149

150-
func (m mockELBV2Client) ModifyListener(*awselb.ModifyListenerInput) (*awselb.ModifyListenerOutput, error) {
151-
o := &awselb.ModifyListenerOutput{
152-
Listeners: []*awselb.Listener{
150+
func (m mockELBV2Client) ModifyListener(*elbv2.ModifyListenerInput) (*elbv2.ModifyListenerOutput, error) {
151+
o := &elbv2.ModifyListenerOutput{
152+
Listeners: []*elbv2.Listener{
153153
{
154154
Port: aws.Int64(newPort2),
155155
ListenerArn: aws.String(newARN),
@@ -185,7 +185,7 @@ func TestReconcileCreate(t *testing.T) {
185185
// attempted.
186186
func TestReconcileDelete(t *testing.T) {
187187
setup()
188-
elbv2.ELBV2svc = mockELBV2Client{}
188+
albelbv2.ELBV2svc = mockELBV2Client{}
189189

190190
l := Listener{
191191
logger: logr,

‎pkg/alb/ls/listeners.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/rs"
1212
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
1313
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
14-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
14+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
1515
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
1616
)
1717

‎pkg/alb/rs/rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
api "k8s.io/api/core/v1"
1111

1212
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
13-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
13+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
1414
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
1515
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
1616
)

‎pkg/alb/rs/rule_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/aws/aws-sdk-go/service/elbv2"
99

1010
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/tg"
11-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
11+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
1212
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
1313
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
1414
)

‎pkg/alb/tg/targetgroup.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/aws/aws-sdk-go/aws"
1010
"github.com/aws/aws-sdk-go/service/elbv2"
1111
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
12-
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/ec2"
13-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
12+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albec2"
13+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
1414
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
1515
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
1616
api "k8s.io/api/core/v1"
@@ -382,7 +382,7 @@ func (t *TargetGroup) registerTargets(additions util.AWSStringSlice, rOpts *Reco
382382

383383
// when managing security groups, ensure sg is associated with instance
384384
if rOpts.ManagedSGInstance != nil {
385-
err := ec2.EC2svc.AssociateSGToInstanceIfNeeded(additions, rOpts.ManagedSGInstance)
385+
err := albec2.EC2svc.AssociateSGToInstanceIfNeeded(additions, rOpts.ManagedSGInstance)
386386
if err != nil {
387387
return err
388388
}
@@ -414,7 +414,7 @@ func (t *TargetGroup) deregisterTargets(removals util.AWSStringSlice, rOpts *Rec
414414

415415
// when managing security groups, ensure sg is disassociated with instance
416416
if rOpts.ManagedSGInstance != nil {
417-
err := ec2.EC2svc.DisassociateSGFromInstanceIfNeeded(removals, rOpts.ManagedSGInstance)
417+
err := albec2.EC2svc.DisassociateSGFromInstanceIfNeeded(removals, rOpts.ManagedSGInstance)
418418
if err != nil {
419419
return err
420420
}

‎pkg/alb/tg/targetgroups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
extensions "k8s.io/api/extensions/v1beta1"
99

1010
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
11-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
11+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
1212
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
1313
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
1414
)

‎pkg/alb/tg/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package tg
22

33
import (
44
"github.com/aws/aws-sdk-go/service/elbv2"
5-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
5+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
66
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
77
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
88
)

‎pkg/albingress/albingress.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/alb/lb"
1515
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
16-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
16+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
1717
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"
1818
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
1919
)

‎pkg/albingress/albingress_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func setup() {
1818
//setupELBV2()
1919

2020
a = &ALBIngress{
21-
ID: "clustername-ingressname",
21+
id: "clustername-ingressname",
2222
namespace: "namespace",
2323
clusterName: "clustername",
2424
ingressName: "ingressname",

‎pkg/albingress/albingresses.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"k8s.io/ingress/core/pkg/ingress/annotations/class"
1414

1515
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/annotations"
16-
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/ec2"
17-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
18-
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/waf"
16+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albec2"
17+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
18+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albwaf"
1919
util "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/types"
2020
)
2121

@@ -100,23 +100,23 @@ func AssembleIngressesFromAWS(o *AssembleIngressesFromAWSOptions) ALBIngresses {
100100
managedSGInboundCidrs := []*string{}
101101
managedSGPorts := []int64{}
102102
if len(loadBalancer.SecurityGroups) == 1 {
103-
tags, err := ec2.EC2svc.DescribeSGTags(loadBalancer.SecurityGroups[0])
103+
tags, err := albec2.EC2svc.DescribeSGTags(loadBalancer.SecurityGroups[0])
104104
if err != nil {
105105
logger.Fatalf(err.Error())
106106
}
107107

108108
for _, tag := range tags {
109109
// If the subnet is labeled as managed by ALB, capture it as the managedSG
110-
if *tag.Key == ec2.ManagedByKey && *tag.Value == ec2.ManagedByValue {
110+
if *tag.Key == albec2.ManagedByKey && *tag.Value == albec2.ManagedByValue {
111111
managedSG = loadBalancer.SecurityGroups[0]
112-
ports, err := ec2.EC2svc.DescribeSGPorts(loadBalancer.SecurityGroups[0])
112+
ports, err := albec2.EC2svc.DescribeSGPorts(loadBalancer.SecurityGroups[0])
113113
if err != nil {
114114
logger.Fatalf("Failed to describe ports of managed security group. Error: %s", err.Error())
115115
}
116116

117117
managedSGPorts = ports
118118

119-
cidrs, err := ec2.EC2svc.DescribeSGInboundCidrs(loadBalancer.SecurityGroups[0])
119+
cidrs, err := albec2.EC2svc.DescribeSGInboundCidrs(loadBalancer.SecurityGroups[0])
120120
if err != nil {
121121
logger.Fatalf("Failed to describe ingress ipv4 ranges of managed security group. Error: %s", err.Error())
122122
}
@@ -125,7 +125,7 @@ func AssembleIngressesFromAWS(o *AssembleIngressesFromAWSOptions) ALBIngresses {
125125
}
126126
// when a alb-managed SG existed, we must find a correlated instance SG
127127
if managedSG != nil {
128-
instanceSG, err := ec2.EC2svc.DescribeSGByPermissionGroup(managedSG)
128+
instanceSG, err := albec2.EC2svc.DescribeSGByPermissionGroup(managedSG)
129129
if err != nil {
130130
logger.Fatalf("Failed to find related managed instance SG. Was it deleted from AWS? Error: %s", err.Error())
131131
}
@@ -152,7 +152,7 @@ func AssembleIngressesFromAWS(o *AssembleIngressesFromAWSOptions) ALBIngresses {
152152
}
153153

154154
// Check WAF
155-
wafResult, err := waf.WAFRegionalsvc.GetWebACLSummary(loadBalancer.LoadBalancerArn)
155+
wafResult, err := albwaf.WAFRegionalsvc.GetWebACLSummary(loadBalancer.LoadBalancerArn)
156156
if err != nil {
157157
logger.Fatalf("Failed to get associated WAF ACL. Error: %s", err.Error())
158158
}

‎pkg/annotations/annotations.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"github.com/aws/aws-sdk-go/service/ec2"
1414
"github.com/aws/aws-sdk-go/service/elbv2"
1515
"github.com/karlseguin/ccache"
16-
albec2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/ec2"
17-
albelbv2 "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/elbv2"
16+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albec2"
17+
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/aws/albelbv2"
1818
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/config"
1919
albprom "github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/prometheus"
2020
"github.com/kubernetes-sigs/aws-alb-ingress-controller/pkg/util/log"

0 commit comments

Comments
 (0)