Rebase with #1122, make reviewable green

Signed-off-by: Yury Tsarev <yury@upbound.io>
crossplane-contrib · Feb 20, 2022 · 240cc0d · 240cc0d
1 parent 6e90be5
commit 240cc0d
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 44 deletions.
diff --git a/apis/iam/v1alpha1/zz_types.go b/apis/iam/v1alpha1/zz_types.go
diff --git a/package/crds/iam.aws.crossplane.io_instanceprofiles.yaml b/package/crds/iam.aws.crossplane.io_instanceprofiles.yaml
@@ -193,9 +193,10 @@ spec:
                       properties:
                         arn:
                           description: "The Amazon Resource Name (ARN). ARNs are unique
-                            identifiers for AWS resources. \n For more information
-                            about ARNs, go to Amazon Resource Names (ARNs) (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)
-                            in the AWS General Reference."
+                            identifiers for Amazon Web Services resources. \n For
+                            more information about ARNs, go to Amazon Resource Names
+                            (ARNs) (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)
+                            in the Amazon Web Services General Reference."
                           type: string
                         assumeRolePolicyDocument:
                           type: string
@@ -220,10 +221,10 @@ spec:
                           properties:
                             permissionsBoundaryARN:
                               description: "The Amazon Resource Name (ARN). ARNs are
-                                unique identifiers for AWS resources. \n For more
-                                information about ARNs, go to Amazon Resource Names
-                                (ARNs) (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)
-                                in the AWS General Reference."
+                                unique identifiers for Amazon Web Services resources.
+                                \n For more information about ARNs, go to Amazon Resource
+                                Names (ARNs) (https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html)
+                                in the Amazon Web Services General Reference."
                               type: string
                             permissionsBoundaryType:
                               type: string

diff --git a/pkg/controller/aws.go b/pkg/controller/aws.go
@@ -101,8 +101,8 @@ import (
 	"github.com/crossplane/provider-aws/pkg/controller/iam/accesskey"
 	"github.com/crossplane/provider-aws/pkg/controller/iam/group"
 	"github.com/crossplane/provider-aws/pkg/controller/iam/grouppolicyattachment"
-	"github.com/crossplane/provider-aws/pkg/controller/iam/instanceprofile"
 	"github.com/crossplane/provider-aws/pkg/controller/iam/groupusermembership"
+	"github.com/crossplane/provider-aws/pkg/controller/iam/instanceprofile"
 	"github.com/crossplane/provider-aws/pkg/controller/iam/openidconnectprovider"
 	"github.com/crossplane/provider-aws/pkg/controller/iam/policy"
 	"github.com/crossplane/provider-aws/pkg/controller/iam/role"

diff --git a/pkg/controller/iam/instanceprofile/setup.go b/pkg/controller/iam/instanceprofile/setup.go
@@ -88,6 +88,9 @@ func postCreate(_ context.Context, cr *svcapitypes.InstanceProfile, resp *svcsdk
 		return managed.ExternalCreation{}, err
 	}
 	sess, err := session.NewSession()
+	if err != nil {
+		return cre, err
+	}
 	svc := iam.New(sess)
 	input := &iam.AddRoleToInstanceProfileInput{
 		InstanceProfileName: aws.String(cr.Name),
@@ -101,6 +104,9 @@ func postCreate(_ context.Context, cr *svcapitypes.InstanceProfile, resp *svcsdk
 func preDelete(_ context.Context, cr *svcapitypes.InstanceProfile, obj *svcsdk.DeleteInstanceProfileInput) (bool, error) {
 	obj.InstanceProfileName = aws.String(meta.GetExternalName(cr))
 	sess, err := session.NewSession()
+	if err != nil {
+		return false, err
+	}
 	svc := iam.New(sess)
 	input := &iam.RemoveRoleFromInstanceProfileInput{
 		InstanceProfileName: aws.String(cr.Name),