Bump crossplane-runtime

This commit fixes crossplane-contrib#802 Signed-off-by: Nic Cope <negz@rk0n.org>
negz · Oct 12, 2021 · d2abd6f · d2abd6f
1 parent 079a7ed
commit d2abd6f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 5 deletions.
diff --git a/pkg/controller/acm/controller.go b/pkg/controller/acm/controller.go
@@ -165,7 +165,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
 	if err != nil {
 		return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
 	}
-	meta.SetExternalName(cr, awsclient.StringValue(response.CertificateArn))
+	meta.SetExternalName(cr, aws.ToString(response.CertificateArn))
 	return managed.ExternalCreation{}, nil
 
 }

diff --git a/pkg/controller/ec2/vpc/controller_test.go b/pkg/controller/ec2/vpc/controller_test.go
@@ -230,6 +230,25 @@ func TestCreate(t *testing.T) {
 		want
 	}{
 		"Successful": {
+			args: args{
+				vpc: &fake.MockVPCClient{
+					MockCreate: func(ctx context.Context, input *awsec2.CreateVpcInput, opts []func(*awsec2.Options)) (*awsec2.CreateVpcOutput, error) {
+						return &awsec2.CreateVpcOutput{
+							Vpc: &awsec2types.Vpc{
+								VpcId:     aws.String(vpcID),
+								CidrBlock: aws.String(cidr),
+							},
+						}, nil
+					},
+				},
+				cr: vpc(),
+			},
+			want: want{
+				cr:     vpc(withExternalName(vpcID)),
+				result: managed.ExternalCreation{},
+			},
+		},
+		"SuccessfulWithAttributes": {
 			args: args{
 				vpc: &fake.MockVPCClient{
 					MockCreate: func(ctx context.Context, input *awsec2.CreateVpcInput, opts []func(*awsec2.Options)) (*awsec2.CreateVpcOutput, error) {

diff --git a/pkg/controller/identity/iamaccesskey/controller.go b/pkg/controller/identity/iamaccesskey/controller.go
@@ -146,7 +146,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
 		}
 	}
 	meta.SetExternalName(cr, aws.ToString(response.AccessKey.AccessKeyId))
-	return managed.ExternalCreation{ExternalNameAssigned: true, ConnectionDetails: conn}, nil
+	return managed.ExternalCreation{ConnectionDetails: conn}, nil
 }
 
 func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) {

diff --git a/pkg/controller/identity/iamaccesskey/controller_test.go b/pkg/controller/identity/iamaccesskey/controller_test.go
@@ -252,7 +252,7 @@ func TestCreate(t *testing.T) {
 					withUsername(userName),
 					withAccessKey(accessKeyID)),
 				result: managed.ExternalCreation{
-					ExternalNameAssigned: true,
+
 					ConnectionDetails: map[string][]byte{
 						xpv1.ResourceCredentialsSecretPasswordKey: []byte(secretKeyID),
 						xpv1.ResourceCredentialsSecretUserKey:     []byte(accessKeyID),

diff --git a/pkg/controller/identity/iamgrouppolicyattachment/controller_test.go b/pkg/controller/identity/iamgrouppolicyattachment/controller_test.go
@@ -205,6 +205,7 @@ func TestCreate(t *testing.T) {
 					withSpecGroupName(groupName),
 					withSpecPolicyArn(policyArn),
 					withExternalName(groupName+"/"+policyArn)),
+				result: managed.ExternalCreation{},
 			},
 		},
 		"InValidInput": {

diff --git a/pkg/controller/identity/openidconnectprovider/controller.go b/pkg/controller/identity/openidconnectprovider/controller.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsiam "github.com/aws/aws-sdk-go-v2/service/iam"
-	awsgo "github.com/aws/aws-sdk-go/aws"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/pkg/errors"
@@ -144,7 +143,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
 		return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
 	}
 
-	meta.SetExternalName(cr, awsgo.StringValue(observed.OpenIDConnectProviderArn))
+	meta.SetExternalName(cr, aws.ToString(observed.OpenIDConnectProviderArn))
 	return managed.ExternalCreation{}, nil
 }
 

diff --git a/pkg/controller/identity/openidconnectprovider/controller_test.go b/pkg/controller/identity/openidconnectprovider/controller_test.go
@@ -236,6 +236,7 @@ func TestCreate(t *testing.T) {
 				cr: oidcProvider(withURL(url), func(provider *svcapitypes.OpenIDConnectProvider) {
 					meta.SetExternalName(provider, providerArn)
 				}),
+				result: managed.ExternalCreation{},
 			},
 		},
 	}