Skip to content

Commit

Permalink
Bump crossplane-runtime to v0.14.1
Browse files Browse the repository at this point in the history
This commit fixes crossplane-contrib#802
See https://github.com/crossplane/crossplane-runtime/releases/tag/v0.13.1

Signed-off-by: Nic Cope <negz@rk0n.org>
  • Loading branch information
negz committed Sep 8, 2021
1 parent e755b74 commit 8514cc4
Show file tree
Hide file tree
Showing 54 changed files with 43 additions and 60 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.16
require (
github.com/aws/aws-sdk-go v1.37.4
github.com/aws/aws-sdk-go-v2 v0.23.0
github.com/crossplane/crossplane-runtime v0.14.0
github.com/crossplane/crossplane-runtime v0.14.1
github.com/crossplane/crossplane-tools v0.0.0-20210320162312-1baca298c527
github.com/evanphx/json-patch v4.9.0+incompatible
github.com/go-ini/ini v1.46.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/crossplane/crossplane-runtime v0.14.0 h1:alBvQAwg9wJ88wEBnzyzmlN0N/v1W3Jx4OvBX3Fmrkg=
github.com/crossplane/crossplane-runtime v0.14.0/go.mod h1:Bc54/KBvV9ld/tvervcnhcSzk13FYguTqmYt72Mybps=
github.com/crossplane/crossplane-runtime v0.14.1 h1:bCPC7vKHWuhHTX22f/zfkxMcIjKd4/gZ5MjFAnLQzAI=
github.com/crossplane/crossplane-runtime v0.14.1/go.mod h1:Bc54/KBvV9ld/tvervcnhcSzk13FYguTqmYt72Mybps=
github.com/crossplane/crossplane-tools v0.0.0-20210320162312-1baca298c527 h1:9M6hMLKqjxtL9d9nwfcaAt59Ey0CPfSXQ3iIdYRUNaE=
github.com/crossplane/crossplane-tools v0.0.0-20210320162312-1baca298c527/go.mod h1:C735A9X0x0lR8iGVOOxb49Mt70Ua4EM2b7PGaRPBLd4=
github.com/dave/jennifer v1.3.0 h1:p3tl41zjjCZTNBytMwrUuiAnherNUZktlhPTKoF/sEk=
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/acm/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
}
meta.SetExternalName(cr, aws.StringValue(response.RequestCertificateOutput.CertificateArn))
return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil

}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/acm/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func TestCreate(t *testing.T) {
want: want{
cr: certificate(
withDomainName()),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"InValidInput": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/acmpca/certificateauthority/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
}
meta.SetExternalName(cr, aws.StringValue(response.CreateCertificateAuthorityOutput.CertificateAuthorityArn))
return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func TestCreate(t *testing.T) {
},
want: want{
cr: certificateAuthority(withCertificateAuthorityArn()),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"InValidInput": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
// identity of the CA it applies to, and the principal it applies.
meta.SetExternalName(cr, cr.Spec.ForProvider.Principal+"/"+awsclient.StringValue(cr.Spec.ForProvider.CertificateAuthorityARN))

return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func TestCreate(t *testing.T) {
withPrincipal(principal),
withCertificateAuthorityARN(arn),
withExternalName(principal+"/"+arn)),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"InValidInput": {
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/api/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ func postCreate(_ context.Context, cr *svcapitypes.API, resp *svcsdk.CreateApiOu
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.ApiId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/apimapping/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ func postCreate(_ context.Context, cr *svcapitypes.APIMapping, resp *svcsdk.Crea
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.ApiMappingId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/authorizer/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Authorizer, resp *svcsdk.Crea
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.AuthorizerId))
cre.ExternalNameAssigned = true
return cre, err
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/deployment/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Deployment, resp *svcsdk.Crea
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.DeploymentId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/integration/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Integration, resp *svcsdk.Cre
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.IntegrationId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/integrationresponse/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func postCreate(_ context.Context, cr *svcapitypes.IntegrationResponse, resp *sv
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.IntegrationResponseId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/model/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Model, resp *svcsdk.CreateMod
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.ModelId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/route/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Route, res *svcsdk.CreateRout
// NOTE(muvaf): Route ID is chosen as external name since it's the only unique
// identifier.
meta.SetExternalName(cr, aws.StringValue(res.RouteId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/routeresponse/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ func postCreate(_ context.Context, cr *svcapitypes.RouteResponse, resp *svcsdk.C
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.RouteResponseId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/apigatewayv2/vpclink/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ func postCreate(_ context.Context, cr *svcapitypes.VPCLink, resp *svcsdk.CreateV
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.VpcLinkId))
cre.ExternalNameAssigned = true
return cre, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/cloudfront/distribution/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Distribution, cdo *svcsdk.Cre
}

meta.SetExternalName(cr, awsclients.StringValue(cdo.Distribution.Id))
ec.ExternalNameAssigned = true
return ec, nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/dynamodb/backup/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Backup, resp *svcsdk.CreateBa
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, aws.StringValue(resp.BackupDetails.BackupArn))
cre.ExternalNameAssigned = true
return cre, err
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/address/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
} else {
meta.SetExternalName(cr, aws.StringValue(result.AllocateAddressOutput.AllocationId))
}
return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/ec2/address/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func TestCreate(t *testing.T) {
want: want{
cr: address(withExternalName(allocationID),
withConditions(xpv1.Creating())),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"SuccessfulStandard": {
Expand Down Expand Up @@ -265,7 +265,7 @@ func TestCreate(t *testing.T) {
withSpec(v1beta1.AddressParameters{
Domain: &domainStandard,
})),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"CreateFail": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/internetgateway/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex

meta.SetExternalName(cr, aws.StringValue(ig.InternetGateway.InternetGatewayId))

return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/internetgateway/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func TestCreate(t *testing.T) {
}),
withExternalName(igID),
withConditions(xpv1.Creating())),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"FailedRequest": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/natgateway/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
}
meta.SetExternalName(cr, aws.StringValue(nat.NatGateway.NatGatewayId))
return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/natgateway/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ func TestCreate(t *testing.T) {
cr: nat(withExternalName(natGatewayID),
withSpec(specNatSpec()),
),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"FailedRequest": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/routetable/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
}
meta.SetExternalName(cr, aws.StringValue(result.RouteTable.RouteTableId))
return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) { // nolint:gocyclo
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/routetable/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func TestCreate(t *testing.T) {
cr: rt(withSpec(v1beta1.RouteTableParameters{
VPCID: aws.String(vpcID),
}), withExternalName(rtID)),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"CreateFailed": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/subnet/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex

meta.SetExternalName(cr, aws.StringValue(result.Subnet.SubnetId))

return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/subnet/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ func TestCreate(t *testing.T) {
},
want: want{
cr: subnet(withExternalName(subnetID)),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"CreateFailed": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/vpc/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex

meta.SetExternalName(cr, aws.StringValue(result.Vpc.VpcId))

return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/ec2/vpc/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func TestCreate(t *testing.T) {
},
want: want{
cr: vpc(withExternalName(vpcID)),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"SuccessfulWithAttributes": {
Expand Down Expand Up @@ -282,7 +282,7 @@ func TestCreate(t *testing.T) {
withSpec(v1beta1.VPCParameters{
EnableDNSSupport: &enableDNS,
})),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"CreateFail": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ec2/vpccidrblock/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
}
}

return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(_ context.Context, _ resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/ec2/vpccidrblock/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func TestCreate(t *testing.T) {
CIDRBlock: &cidr,
VPCID: &vpcID,
}), withExternalName(matchAssociationID)),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"SuccessfulIPv6": {
Expand Down Expand Up @@ -303,7 +303,7 @@ func TestCreate(t *testing.T) {
IPv6CIDRBlock: &ipv6CIDR,
VPCID: &vpcID,
}), withExternalName(matchAssociationID)),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"CreateFail": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/efs/filesystem/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,5 @@ func postCreate(_ context.Context, cr *svcapitypes.FileSystem, obj *svcsdk.FileS
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, awsclients.StringValue(obj.FileSystemId))
return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}
2 changes: 1 addition & 1 deletion pkg/controller/identity/iamaccesskey/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
}
}
meta.SetExternalName(cr, aws.StringValue(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) {
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/identity/iamaccesskey/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ 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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
// names of the group and user that are bound.
meta.SetExternalName(cr, cr.Spec.ForProvider.GroupName+"/"+cr.Spec.ForProvider.PolicyARN)

return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(_ context.Context, _ resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func TestCreate(t *testing.T) {
withSpecGroupName(groupName),
withSpecPolicyArn(policyArn),
withExternalName(groupName+"/"+policyArn)),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"InValidInput": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
// names of the group and user that are bound.
meta.SetExternalName(cr, cr.Spec.ForProvider.GroupName+"/"+cr.Spec.ForProvider.UserName)

return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(_ context.Context, _ resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func TestCreate(t *testing.T) {
withSpecGroupName(groupName),
withSpecUserName(userName),
withExternalName(groupName+"/"+userName)),
result: managed.ExternalCreation{ExternalNameAssigned: true},
result: managed.ExternalCreation{},
},
},
"InValidInput": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/identity/iampolicy/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex

meta.SetExternalName(cr, aws.StringValue(createResp.CreatePolicyOutput.Policy.Arn))

return managed.ExternalCreation{ExternalNameAssigned: true}, nil
return managed.ExternalCreation{}, nil
}

func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) {
Expand Down
Loading

0 comments on commit 8514cc4

Please sign in to comment.