Merge pull request #690 from svscheg/issue505

Fix for issue 505
crossplane-contrib · Jun 12, 2023 · c0ff895 · c0ff895
2 parents 3df2e87 + 83b9955
commit c0ff895
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 46 deletions.
diff --git a/apis/ses/v1beta1/zz_domainidentity_types.go b/apis/ses/v1beta1/zz_domainidentity_types.go
diff --git a/apis/ses/v1beta1/zz_domainmailfrom_types.go b/apis/ses/v1beta1/zz_domainmailfrom_types.go
diff --git a/apis/ses/v1beta1/zz_generated.deepcopy.go b/apis/ses/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/ses/v1beta1/zz_generated.resolvers.go b/apis/ses/v1beta1/zz_generated.resolvers.go
diff --git a/apis/ses/v1beta1/zz_identitynotificationtopic_types.go b/apis/ses/v1beta1/zz_identitynotificationtopic_types.go
diff --git a/config/externalname.go b/config/externalname.go
@@ -2185,7 +2185,7 @@ var ExternalNameConfigs = map[string]config.ExternalName{
 	// DKIM tokens can be imported using the domain attribute
 	"aws_ses_domain_dkim": config.ParameterAsIdentifier("domain"),
 	// SES domain identities can be imported using the domain name.
-	"aws_ses_domain_identity": config.IdentifierFromProvider,
+	"aws_ses_domain_identity": config.ParameterAsIdentifier("domain"),
 	// MAIL FROM domain can be imported using the domain attribute
 	"aws_ses_domain_mail_from": config.IdentifierFromProvider,
 	// SES email identities can be imported using the email address.

diff --git a/examples-generated/ses/domaindkim.yaml b/examples-generated/ses/domaindkim.yaml
@@ -45,7 +45,6 @@ metadata:
   name: example
 spec:
   forProvider:
-    domain: example.com
     region: us-west-1
 
 ---

diff --git a/examples-generated/ses/domainidentity.yaml b/examples-generated/ses/domainidentity.yaml
@@ -8,7 +8,6 @@ metadata:
   name: example
 spec:
   forProvider:
-    domain: example.com
     region: us-west-1
 
 ---

diff --git a/examples-generated/ses/domainmailfrom.yaml b/examples-generated/ses/domainmailfrom.yaml
@@ -11,7 +11,7 @@ spec:
     domainSelector:
       matchLabels:
         testing.upbound.io/example-name: example
-    mailFromDomain: example.com
+    mailFromDomain: bounce.${aws_ses_domain_identity.example.domain}
     region: us-west-1
 
 ---
@@ -70,7 +70,6 @@ metadata:
   name: example
 spec:
   forProvider:
-    domain: example.com
     region: us-west-1
 
 ---

diff --git a/examples-generated/ses/identitypolicy.yaml b/examples-generated/ses/identitypolicy.yaml
@@ -27,7 +27,6 @@ metadata:
   name: example
 spec:
   forProvider:
-    domain: example.com
     region: us-west-1
 
 ---

diff --git a/examples/ses/domaindkim.yaml b/examples/ses/domaindkim.yaml
@@ -3,9 +3,10 @@ kind: DomainDKIM
 metadata:
   annotations:
     meta.upbound.io/example-id: ses/v1beta1/domaindkim
+    crossplane.io/external-name: testdomain.com
   labels:
     testing.upbound.io/example-name: example
-  name: example
+  name: exampledkim
 spec:
   forProvider:
     region: us-east-1
diff --git a/examples/ses/domainidentity.yaml b/examples/ses/domainidentity.yaml
@@ -3,10 +3,10 @@ kind: DomainIdentity
 metadata:
   annotations:
     meta.upbound.io/example-id: ses/v1beta1/domainidentity
+    crossplane.io/external-name: testdomain.com
   labels:
     testing.upbound.io/example-name: example
-  name: example
+  name: examplename
 spec:
   forProvider:
-    domain: "example.com"
     region: us-west-1
diff --git a/examples/ses/domainmailfrom.yaml b/examples/ses/domainmailfrom.yaml
@@ -11,7 +11,7 @@ spec:
     domainSelector:
       matchLabels:
         testing.upbound.io/example-name: example
-    mailFromDomain: "mail.example.com"
+    mailFromDomain: "mail.testdomain.com"
     region: us-west-1
 
 ---
@@ -21,10 +21,10 @@ kind: DomainIdentity
 metadata:
   annotations:
     meta.upbound.io/example-id: ses/v1beta1/domainmailfrom
+    crossplane.io/external-name: testdomain.com
   labels:
     testing.upbound.io/example-name: example
   name: example
 spec:
   forProvider:
-    domain: "example.com"
     region: us-west-1
diff --git a/examples/ses/identitypolicy.yaml b/examples/ses/identitypolicy.yaml
@@ -21,7 +21,7 @@ spec:
                   "Principal": {
                       "AWS": "*"
                   },
-                  "Resource": "arn:aws:ses:us-west-1:153891904029:identity/example.com",
+                  "Resource": "arn:aws:ses:us-west-1:153891904029:identity/testdomain.com",
                   "Action": ["SES:SendEmail", "SES:SendRawEmail"]
               }
           ]
@@ -35,10 +35,10 @@ kind: DomainIdentity
 metadata:
   annotations:
     meta.upbound.io/example-id: ses/v1beta1/identitypolicy
+    crossplane.io/external-name: testdomain.com
   labels:
     testing.upbound.io/example-name: example
   name: example
 spec:
   forProvider:
-    domain: "example.com"
     region: us-west-1
diff --git a/internal/controller/ses/domainidentity/zz_controller.go b/internal/controller/ses/domainidentity/zz_controller.go
diff --git a/package/crds/ses.aws.upbound.io_domainidentities.yaml b/package/crds/ses.aws.upbound.io_domainidentities.yaml
@@ -68,9 +68,6 @@ spec:
                 type: string
               forProvider:
                 properties:
-                  domain:
-                    description: The domain name to assign to SES
-                    type: string
                   region:
                     description: Region is the region you'd like your resource to
                       be created in.
@@ -264,9 +261,6 @@ spec:
             required:
             - forProvider
             type: object
-            x-kubernetes-validations:
-            - message: domain is a required parameter
-              rule: self.managementPolicy == 'ObserveOnly' || has(self.forProvider.domain)
           status:
             description: DomainIdentityStatus defines the observed state of DomainIdentity.
             properties:
@@ -275,9 +269,6 @@ spec:
                   arn:
                     description: The ARN of the domain identity.
                     type: string
-                  domain:
-                    description: The domain name to assign to SES
-                    type: string
                   id:
                     type: string
                   verificationToken: