Merge pull request #1720 from akesser/feature/update-opensearchservic…

…e-version Feature/update opensearchservice version
crossplane-contrib · Apr 6, 2023 · a679f94 · a679f94
2 parents b48e870 + dc5810d
commit a679f94
Show file tree

Hide file tree

Showing 8 changed files with 615 additions and 665 deletions.
diff --git a/apis/opensearchservice/generator-config.yaml b/apis/opensearchservice/generator-config.yaml
@@ -8,24 +8,21 @@ ignore:
   field_paths:
     # SnapshotOptions is irrelevant for OpenSearch 5.3+
     - CreateDomainInput.SnapshotOptions
-    - CreateDomainInput.Name
+    - CreateDomainInput.DomainName
     - CreateDomainInput.EncryptionAtRestOptions
     - CreateDomainInput.VPCOptions
-    - DeleteDomainInput.Name
+    - DeleteDomainInput.DomainName
+    - DescribeDomainInput.DomainName
+    - DescribeDomainAutoTunesInput.DomainName
+    - DescribeDomainChangeProgressInput.DomainName
+    - DescribeDomainConfigInput.DomainName
 resources:
   Domain:
     renames:
       operations:
         CreateDomain:
           input_fields:
-            DomainName: Name
             TagList: Tags
-        DeleteDomain:
-          input_fields:
-            DomainName: Name
-        DescribeDomain:
-          input_fields:
-            DomainName: Name
     fields:
       ClusterConfig:
         is_read_only: true

diff --git a/apis/opensearchservice/v1alpha1/zz_domain.go b/apis/opensearchservice/v1alpha1/zz_domain.go
diff --git a/apis/opensearchservice/v1alpha1/zz_generated.deepcopy.go b/apis/opensearchservice/v1alpha1/zz_generated.deepcopy.go
diff --git a/examples/opensearchservice/domain.yaml b/examples/opensearchservice/domain.yaml
@@ -4,7 +4,6 @@ metadata:
   name: sample-domain
 spec:
   forProvider:
-    name: sample-domain
     region: us-east-1
     ebsOptions:
       ebsEnabled: true
@@ -19,7 +18,6 @@ metadata:
   name: sample2-domain
 spec:
   forProvider:
-    name: sample2-domain
     region: us-east-1
     ebsOptions:
       ebsEnabled: true

diff --git a/package/crds/opensearchservice.aws.crossplane.io_domains.yaml b/package/crds/opensearchservice.aws.crossplane.io_domains.yaml
@@ -370,11 +370,6 @@ spec:
                       type: object
                     description: Key-value pairs to configure slow log publishing.
                     type: object
-                  name:
-                    description: Name of the OpenSearch Service domain to create.
-                      Domain names are unique across the domains owned by an account
-                      within an Amazon Web Services Region.
-                    type: string
                   nodeToNodeEncryptionOptions:
                     description: Enables node-to-node encryption.
                     properties:
@@ -582,7 +577,6 @@ spec:
                         type: array
                     type: object
                 required:
-                - name
                 - region
                 type: object
               providerConfigRef:
@@ -918,6 +912,11 @@ spec:
                   domainID:
                     description: Unique identifier for the domain.
                     type: string
+                  domainName:
+                    description: Name of the domain. Domain names are unique across
+                      all domains owned by the same account within an Amazon Web Services
+                      Region.
+                    type: string
                   encryptionAtRestOptions:
                     description: Encryption at rest settings for the domain.
                     properties: