Skip to content

Commit

Permalink
fix custom diff for Domain.opensearch ignoring valid diff
Browse files Browse the repository at this point in the history
Signed-off-by: Erhan Cagirici <[email protected]>
  • Loading branch information
erhancagirici committed Oct 22, 2024
1 parent 5c35bab commit 1780bfe
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 2 deletions.
8 changes: 6 additions & 2 deletions config/opensearch/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

// Configure adds configurations for the opensearch group.
func Configure(p *config.Provider) {
func Configure(p *config.Provider) { //nolint:gocyclo
p.AddResourceConfigurator("aws_opensearch_domain", func(r *config.Resource) {
config.MoveToStatus(r.TerraformResource, "access_policies")
r.References["encrypt_at_rest.kms_key_id"] = config.Reference{
Expand All @@ -36,7 +36,11 @@ func Configure(p *config.Provider) {
r.UseAsync = true

r.TerraformCustomDiff = func(diff *terraform.InstanceDiff, _ *terraform.InstanceState, _ *terraform.ResourceConfig) (*terraform.InstanceDiff, error) {
if diff != nil && diff.Attributes != nil {
if diff == nil || diff.Empty() || diff.Destroy || diff.Attributes == nil {
return diff, nil
}
asoDiff, ok := diff.Attributes["advanced_security_options.#"]
if ok && asoDiff.Old == "" && asoDiff.New == "" && asoDiff.NewComputed {
delete(diff.Attributes, "advanced_security_options.#")
}
return diff, nil
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# SPDX-FileCopyrightText: 2024 The Crossplane Authors <https://crossplane.io>
#
# SPDX-License-Identifier: CC0-1.0

apiVersion: opensearch.aws.upbound.io/v1beta1
kind: Domain
metadata:
annotations:
meta.upbound.io/example-id: opensearch/v1beta1/domain
labels:
testing.upbound.io/example-name: example-advanced-security-options
name: example-advanced-security-options
spec:
writeConnectionSecretToRef:
name: example-aso-domain
namespace: default
forProvider:
domainName: ${Rand.RFC1123Subdomain}
engineVersion: OpenSearch_1.0
region: us-west-1
advancedSecurityOptions:
- enabled: true
internalUserDatabaseEnabled: false
masterUserOptions:
- masterUserArn: arn:aws:iam::${data.aws_account_id}:user/example
nodeToNodeEncryption:
- enabled: true
encryptAtRest:
- enabled: true
domainEndpointOptions:
- enforceHttps: true
clusterConfig:
- instanceType: m4.large.search
ebsOptions:
- ebsEnabled: true
volumeType: gp2
volumeSize: 10

0 comments on commit 1780bfe

Please sign in to comment.