Merge pull request #114 from crossplane-contrib/backport-113-to-relea…

…se-0.2 [Backport release-0.2] Remove region from iam group resource spec
crossplane-contrib · Oct 16, 2021 · f04290b · f04290b
2 parents 14670d0 + 08aad6e
commit f04290b
Show file tree

Hide file tree

Showing 37 changed files with 14 additions and 232 deletions.
diff --git a/apis/iam/v1alpha1/zz_accesskey_types.go b/apis/iam/v1alpha1/zz_accesskey_types.go
diff --git a/apis/iam/v1alpha1/zz_generated.deepcopy.go b/apis/iam/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/iam/v1alpha1/zz_grouppolicy_types.go b/apis/iam/v1alpha1/zz_grouppolicy_types.go
diff --git a/apis/iam/v1alpha1/zz_grouppolicyattachment_types.go b/apis/iam/v1alpha1/zz_grouppolicyattachment_types.go
diff --git a/apis/iam/v1alpha1/zz_iamgroup_types.go b/apis/iam/v1alpha1/zz_iamgroup_types.go
diff --git a/apis/iam/v1alpha1/zz_instanceprofile_types.go b/apis/iam/v1alpha1/zz_instanceprofile_types.go
diff --git a/apis/iam/v1alpha1/zz_policy_types.go b/apis/iam/v1alpha1/zz_policy_types.go
diff --git a/apis/iam/v1alpha1/zz_policyattachment_types.go b/apis/iam/v1alpha1/zz_policyattachment_types.go
diff --git a/apis/iam/v1alpha1/zz_role_types.go b/apis/iam/v1alpha1/zz_role_types.go
diff --git a/apis/iam/v1alpha1/zz_rolepolicy_types.go b/apis/iam/v1alpha1/zz_rolepolicy_types.go
diff --git a/apis/iam/v1alpha1/zz_rolepolicyattachment_types.go b/apis/iam/v1alpha1/zz_rolepolicyattachment_types.go
diff --git a/apis/iam/v1alpha1/zz_user_types.go b/apis/iam/v1alpha1/zz_user_types.go
diff --git a/apis/iam/v1alpha1/zz_usergroupmembership_types.go b/apis/iam/v1alpha1/zz_usergroupmembership_types.go
diff --git a/apis/iam/v1alpha1/zz_userpolicy_types.go b/apis/iam/v1alpha1/zz_userpolicy_types.go
diff --git a/apis/iam/v1alpha1/zz_userpolicyattachment_types.go b/apis/iam/v1alpha1/zz_userpolicyattachment_types.go
diff --git a/cmd/generator/main.go b/cmd/generator/main.go
@@ -221,7 +221,9 @@ func main() { // nolint:gocyclo
 			// We don't want Aws prefix in all kinds.
 			kind := strcase.ToCamel(strings.TrimPrefix(strings.TrimPrefix(name, "aws_"), group))
 			resource := resources[name]
-			resource.Schema["region"] = regionSchema
+			if group != "iam" {
+				resource.Schema["region"] = regionSchema
+			}
 			// tags_all is used only in tfstate to accumulate provider-wide
 			// default tags in TF, which is not something we support. So, we don't
 			// need it as a parameter while "tags" is already in place.

diff --git a/examples/iam/accesskey.yaml b/examples/iam/accesskey.yaml
@@ -4,7 +4,6 @@ metadata:
   name: sample-access-key
 spec:
   forProvider:
-    region: ""
     userRef:
       name: sample-user
   writeConnectionSecretToRef:

diff --git a/examples/iam/role.yaml b/examples/iam/role.yaml
@@ -4,7 +4,6 @@ metadata:
   name: sample-eks-cluster
 spec:
   forProvider:
-    region: ""
     assumeRolePolicy: |
       {
         "Version": "2012-10-17",

diff --git a/examples/iam/rolepolicyattachment.yaml b/examples/iam/rolepolicyattachment.yaml
@@ -4,7 +4,6 @@ metadata:
   name: sample-cluster-policy
 spec:
   forProvider:
-    region: ""
     policyArn: arn:aws:iam::aws:policy/AmazonEKSClusterPolicy
     roleRef:
       name: sample-eks-cluster
@@ -15,7 +14,6 @@ metadata:
   name: sample-vpc-resource-controller
 spec:
   forProvider:
-    region: ""
     policyArn: arn:aws:iam::aws:policy/AmazonEKSVPCResourceController
     roleRef:
       name: sample-eks-cluster
diff --git a/examples/iam/user.yaml b/examples/iam/user.yaml
@@ -3,7 +3,4 @@ kind: User
 metadata:
   name: sample-user
 spec:
-  forProvider:
-    region: ""
-    tags:
-      k1: v1
+  forProvider: {}
diff --git a/examples/iam/userpolicy.yaml b/examples/iam/userpolicy.yaml
@@ -4,7 +4,6 @@ metadata:
   name: sample-user-policy
 spec:
   forProvider:
-    region: ""
     userRef:
       name: sample-user
     policy: |