Skip to content

Commit d106488

Browse files
Pierce Frandleganbaras
authored andcommitted
Added - Support for OpenSearch Cross Cluster Search V2
1 parent fb38e37 commit d106488

File tree

7 files changed

+962
-32
lines changed

7 files changed

+962
-32
lines changed

examples/opensearch/opensearch_cluster/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ variable "opensearch_cluster_opendashboard_node_host_ocpu_count" {
106106
}
107107

108108
variable "opensearch_cluster_software_version" {
109-
default = "1.2.4"
109+
default = "2.11.0"
110110
}
111111

112112
variable "opensearch_cluster_state" {

internal/integrationtest/opensearch_opensearch_cluster_test.go

Lines changed: 306 additions & 30 deletions
Large diffs are not rendered by default.

internal/service/opensearch/opensearch_opensearch_cluster_data_source.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,18 @@ func (s *OpensearchOpensearchClusterDataSourceCrud) SetData() error {
109109

110110
s.D.Set("freeform_tags", s.Res.FreeformTags)
111111

112+
s.D.Set("inbound_cluster_ids", s.Res.InboundClusterIds)
113+
112114
if s.Res.LifecycleDetails != nil {
113115
s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
114116
}
115117

118+
if s.Res.MaintenanceDetails != nil {
119+
s.D.Set("maintenance_details", []interface{}{MaintenanceDetailsToMap(s.Res.MaintenanceDetails)})
120+
} else {
121+
s.D.Set("maintenance_details", nil)
122+
}
123+
116124
if s.Res.MasterNodeCount != nil {
117125
s.D.Set("master_node_count", *s.Res.MasterNodeCount)
118126
}
@@ -159,6 +167,20 @@ func (s *OpensearchOpensearchClusterDataSourceCrud) SetData() error {
159167
s.D.Set("opensearch_private_ip", *s.Res.OpensearchPrivateIp)
160168
}
161169

170+
if s.Res.OutboundClusterConfig != nil {
171+
s.D.Set("outbound_cluster_config", []interface{}{OutboundClusterConfigToMap(s.Res.OutboundClusterConfig)})
172+
} else {
173+
s.D.Set("outbound_cluster_config", nil)
174+
}
175+
176+
s.D.Set("reverse_connection_endpoint_customer_ips", s.Res.ReverseConnectionEndpointCustomerIps)
177+
178+
reverseConnectionEndpoints := []interface{}{}
179+
for _, item := range s.Res.ReverseConnectionEndpoints {
180+
reverseConnectionEndpoints = append(reverseConnectionEndpoints, ReverseConnectionEndpointToMap(item))
181+
}
182+
s.D.Set("reverse_connection_endpoints", reverseConnectionEndpoints)
183+
162184
if s.Res.SecurityMasterUserName != nil {
163185
s.D.Set("security_master_user_name", *s.Res.SecurityMasterUserName)
164186
}

0 commit comments

Comments
 (0)