change DataStream to camelCase

Signed-off-by: Christian Groschupp <[email protected]>
opensearch-project · Apr 5, 2024 · 2d1982c · 2d1982c
1 parent 2973c9f
commit 2d1982c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/opensearch-operator/api/v1/opensearch_index_types.go b/opensearch-operator/api/v1/opensearch_index_types.go
@@ -4,14 +4,14 @@ import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 )
 
-type OpensearchDatastreamTimestampFieldSpec struct {
+type OpensearchDataStreamTimestampFieldSpec struct {
 	// Name of the field that are used for the DataStream
 	Name string `json:"name"`
 }
 
-type OpensearchDatastreamSpec struct {
+type OpensearchDataStreamSpec struct {
 	// TimestampField for dataStream
-	TimestampField OpensearchDatastreamTimestampFieldSpec `json:"timestamp_field,omitempty"`
+	TimestampField OpensearchDataStreamTimestampFieldSpec `json:"timestamp_field,omitempty"`
 }
 
 // Describes the specs of an index

diff --git a/opensearch-operator/api/v1/opensearch_indextemplate_types.go b/opensearch-operator/api/v1/opensearch_indextemplate_types.go
@@ -49,7 +49,7 @@ type OpensearchIndexTemplateSpec struct {
 	IndexPatterns []string `json:"indexPatterns"`
 
 	// The dataStream config that should be applied
-	DataStream *OpensearchDatastreamSpec `json:"dataStream,omitempty"`
+	DataStream *OpensearchDataStreamSpec `json:"dataStream,omitempty"`
 
 	// The template that should be applied
 	Template OpensearchIndexSpec `json:"template,omitempty"`

diff --git a/opensearch-operator/api/v1/zz_generated.deepcopy.go b/opensearch-operator/api/v1/zz_generated.deepcopy.go
diff --git a/opensearch-operator/opensearch-gateway/requests/Templates.go b/opensearch-operator/opensearch-gateway/requests/Templates.go
@@ -4,7 +4,7 @@ import apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
 
 type IndexTemplate struct {
 	IndexPatterns []string              `json:"index_patterns"`
-	DataStream    *Datastream           `json:"data_stream,omitempty"`
+	DataStream    *DataStream           `json:"data_stream,omitempty"`
 	Template      Index                 `json:"template,omitempty"`
 	ComposedOf    []string              `json:"composed_of,omitempty"`
 	Priority      int                   `json:"priority,omitempty"`
@@ -24,12 +24,12 @@ type Index struct {
 	Aliases  map[string]IndexAlias `json:"aliases,omitempty"`
 }
 
-type DatastreamTimestampFieldSpec struct {
+type DataStreamTimestampFieldSpec struct {
 	Name string `json:"name"`
 }
 
-type Datastream struct {
-	TimestampField *DatastreamTimestampFieldSpec `json:"timestamp_field,omitempty"`
+type DataStream struct {
+	TimestampField *DataStreamTimestampFieldSpec `json:"timestamp_field,omitempty"`
 }
 
 type IndexAlias struct {

diff --git a/opensearch-operator/pkg/helpers/translate.go b/opensearch-operator/pkg/helpers/translate.go
@@ -38,13 +38,13 @@ func TranslateComponentTemplateToRequest(spec v1.OpensearchComponentTemplateSpec
 }
 
 // TranslateDatastreamToRequest rewrites the CRD format to the gateway format
-func TranslateDatastreamToRequest(spec *v1.OpensearchDatastreamSpec) *requests.Datastream {
+func TranslateDatastreamToRequest(spec *v1.OpensearchDataStreamSpec) *requests.DataStream {
 	if spec == nil {
 		return nil
 	}
-	request := requests.Datastream{}
+	request := requests.DataStream{}
 	if spec.TimestampField.Name != "" {
-		request.TimestampField = &requests.DatastreamTimestampFieldSpec{Name: spec.TimestampField.Name}
+		request.TimestampField = &requests.DataStreamTimestampFieldSpec{Name: spec.TimestampField.Name}
 	}
 
 	return &request

diff --git a/opensearch-operator/pkg/reconcilers/indextemplate_test.go b/opensearch-operator/pkg/reconcilers/indextemplate_test.go
@@ -62,7 +62,7 @@ var _ = Describe("indextemplate reconciler", func() {
 				Priority:   0,
 				Version:    0,
 				Meta:       &apiextensionsv1.JSON{},
-				DataStream: &opsterv1.OpensearchDatastreamSpec{TimestampField: opsterv1.OpensearchDatastreamTimestampFieldSpec{Name: "@mytimestamp"}},
+				DataStream: &opsterv1.OpensearchDataStreamSpec{TimestampField: opsterv1.OpensearchDataStreamTimestampFieldSpec{Name: "@mytimestamp"}},
 			},
 		}
 
@@ -286,7 +286,7 @@ var _ = Describe("indextemplate reconciler", func() {
 							Priority:   0,
 							Version:    0,
 							Meta:       &apiextensionsv1.JSON{},
-							DataStream: &requests.Datastream{TimestampField: &requests.DatastreamTimestampFieldSpec{Name: "@mytimestamp"}},
+							DataStream: &requests.DataStream{TimestampField: &requests.DataStreamTimestampFieldSpec{Name: "@mytimestamp"}},
 						},
 					}