Add vpcid missing test case

- update docs

Author: ikosenn

docs/guide/targetgroupbinding/targetgroupbinding.md

@@ -17,6 +17,20 @@ TargetGroupBinding CR supports TargetGroups of either `instance` or `ip` TargetT
     If TargetType is not explicitly specified, a mutating webhook will automatically call AWS API to find the TargetType for your TargetGroup and set it to correct value.
 
 
+## Sample YAML
+```yaml
+apiVersion: elbv2.k8s.aws/v1beta1
+kind: TargetGroupBinding
+metadata:
+  name: my-tgb
+spec:
+  serviceRef:
+    name: awesome-service # route traffic to the awesome-service
+    port: 80
+  targetGroupARN: <arn-to-targetGroup>
+```
+
+
 ## VpcId
 TargetGroupBinding CR supports the explicit definition of the Virtual Private Cloud (VPC) of your TargetGroup.
 
@@ -35,6 +49,7 @@ spec:
     name: awesome-service # route traffic to the awesome-service
     port: 80
   targetGroupARN: <arn-to-targetGroup>
+  vpcId: <vpcId>
 ```
 
 

pkg/targetgroupbinding/resource_manager.go

@@ -388,6 +388,8 @@ func (m *defaultResourceManager) registerPodEndpoints(ctx context.Context, tgARN
 	// Target group is in a different VPC from the cluster's VPC
 	if tgVpcId != "" && tgVpcId != m.vpcID {
 		vpcId = tgVpcId
+		m.logger.Info("registering endpoints using the targetGroup's vpcId", tgVpcId,
+			"which is different from the cluster's vpcId", m.vpcID)
 	}
 	vpcInfo, err := m.vpcInfoProvider.FetchVPCInfo(ctx, vpcId)
 	if err != nil {

webhooks/elbv2/targetgroupbinding_mutator_test.go

@@ -181,6 +181,40 @@ func Test_targetGroupBindingMutator_MutateCreate(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "targetGroupBinding with VpcId absent will be defaulted via AWS API",
+			fields: fields{
+				describeTargetGroupsAsListCalls: []describeTargetGroupsAsListCall{
+					{
+						req: &elbv2sdk.DescribeTargetGroupsInput{
+							TargetGroupArns: awssdk.StringSlice([]string{"tg-1"}),
+						},
+						resp: []*elbv2sdk.TargetGroup{
+							{
+								VpcId: awssdk.String("vpcid-01"),
+							},
+						},
+					},
+				},
+			},
+			args: args{
+				obj: &elbv2api.TargetGroupBinding{
+					Spec: elbv2api.TargetGroupBindingSpec{
+						TargetGroupARN: "tg-1",
+						TargetType:     &instanceTargetType,
+						IPAddressType:  &targetGroupIPAddressTypeIPv4,
+					},
+				},
+			},
+			want: &elbv2api.TargetGroupBinding{
+				Spec: elbv2api.TargetGroupBindingSpec{
+					TargetGroupARN: "tg-1",
+					TargetType:     &instanceTargetType,
+					IPAddressType:  &targetGroupIPAddressTypeIPv4,
+					VpcId:          "vpcid-01",
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -436,3 +470,86 @@ func Test_targetGroupBindingMutator_getIPAddressTypeFromAWS(t *testing.T) {
 		})
 	}
 }
+
+func Test_targetGroupBindingMutator_obtainSDKVpcIDFromAWS(t *testing.T) {
+	type describeTargetGroupsAsListCall struct {
+		req  *elbv2sdk.DescribeTargetGroupsInput
+		resp []*elbv2sdk.TargetGroup
+		err  error
+	}
+
+	type fields struct {
+		describeTargetGroupsAsListCalls []describeTargetGroupsAsListCall
+	}
+	type args struct {
+		tgARN string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    string
+		wantErr error
+	}{
+		{
+			name: "fetch vpcid from aws",
+			fields: fields{
+				describeTargetGroupsAsListCalls: []describeTargetGroupsAsListCall{
+					{
+						req: &elbv2sdk.DescribeTargetGroupsInput{
+							TargetGroupArns: awssdk.StringSlice([]string{"tg-1"}),
+						},
+						resp: []*elbv2sdk.TargetGroup{
+							{
+								VpcId: awssdk.String("vpcid-01"),
+							},
+						},
+					},
+				},
+			},
+			args: args{
+				tgARN: "tg-1",
+			},
+			want: "vpcid-01",
+		},
+		{
+			name: "some error while fetching vpcId",
+			fields: fields{
+				describeTargetGroupsAsListCalls: []describeTargetGroupsAsListCall{
+					{
+						req: &elbv2sdk.DescribeTargetGroupsInput{
+							TargetGroupArns: awssdk.StringSlice([]string{"tg-1"}),
+						},
+						err: errors.New("vpcid not found"),
+					},
+				},
+			},
+			args: args{
+				tgARN: "tg-1",
+			},
+			wantErr: errors.New("vpcid not found"),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctrl := gomock.NewController(t)
+			defer ctrl.Finish()
+			elbv2Client := services.NewMockELBV2(ctrl)
+			for _, call := range tt.fields.describeTargetGroupsAsListCalls {
+				elbv2Client.EXPECT().DescribeTargetGroupsAsList(gomock.Any(), call.req).Return(call.resp, call.err)
+			}
+
+			m := &targetGroupBindingMutator{
+				elbv2Client: elbv2Client,
+				logger:      logr.New(&log.NullLogSink{}),
+			}
+			got, err := m.getVpcIdFromAWS(context.Background(), tt.args.tgARN)
+			if tt.wantErr != nil {
+				assert.EqualError(t, err, tt.wantErr.Error())
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tt.want, got)
+			}
+		})
+	}
+}