Skip to content

Commit bbbe966

Browse files
committed
[chore] remove unused func GetPortsForConfig
1 parent 7a83815 commit bbbe966

File tree

2 files changed

+0
-83
lines changed

2 files changed

+0
-83
lines changed

internal/components/component.go

-13
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,3 @@ func ConstructServicePort(current *corev1.ServicePort, port int32) corev1.Servic
125125
}
126126
return svc
127127
}
128-
129-
func GetPortsForConfig(logger logr.Logger, config map[string]interface{}, retriever ParserRetriever) ([]corev1.ServicePort, error) {
130-
var ports []corev1.ServicePort
131-
for componentName, componentDef := range config {
132-
parser := retriever(componentName)
133-
if parsedPorts, err := parser.Ports(logger, componentName, componentDef); err != nil {
134-
return nil, err
135-
} else {
136-
ports = append(ports, parsedPorts...)
137-
}
138-
}
139-
return ports, nil
140-
}

internal/components/component_test.go

-70
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@
44
package components_test
55

66
import (
7-
"fmt"
87
"testing"
98

10-
"github.com/go-logr/logr"
119
"github.com/stretchr/testify/assert"
12-
corev1 "k8s.io/api/core/v1"
13-
"k8s.io/apimachinery/pkg/util/intstr"
1410

1511
"github.com/open-telemetry/opentelemetry-operator/internal/components"
16-
"github.com/open-telemetry/opentelemetry-operator/internal/components/receivers"
1712
)
1813

1914
func TestComponentType(t *testing.T) {
@@ -59,68 +54,3 @@ func TestReceiverParsePortFromEndpoint(t *testing.T) {
5954
})
6055
}
6156
}
62-
63-
func TestGetPortsForConfig(t *testing.T) {
64-
type args struct {
65-
config map[string]interface{}
66-
retriever components.ParserRetriever
67-
}
68-
tests := []struct {
69-
name string
70-
args args
71-
want []corev1.ServicePort
72-
wantErr assert.ErrorAssertionFunc
73-
}{
74-
{
75-
name: "nothing",
76-
args: args{
77-
config: nil,
78-
retriever: receivers.ReceiverFor,
79-
},
80-
want: nil,
81-
wantErr: assert.NoError,
82-
},
83-
{
84-
name: "bad config",
85-
args: args{
86-
config: map[string]interface{}{
87-
"test": "garbage",
88-
},
89-
retriever: receivers.ReceiverFor,
90-
},
91-
want: nil,
92-
wantErr: assert.Error,
93-
},
94-
{
95-
name: "receivers",
96-
args: args{
97-
config: map[string]interface{}{
98-
"otlp": map[string]interface{}{
99-
"protocols": map[string]interface{}{
100-
"grpc": map[string]interface{}{},
101-
},
102-
},
103-
},
104-
retriever: receivers.ReceiverFor,
105-
},
106-
want: []corev1.ServicePort{
107-
{
108-
Name: "otlp-grpc",
109-
Port: 4317,
110-
TargetPort: intstr.FromInt32(4317),
111-
AppProtocol: &components.GrpcProtocol,
112-
},
113-
},
114-
wantErr: assert.NoError,
115-
},
116-
}
117-
for _, tt := range tests {
118-
t.Run(tt.name, func(t *testing.T) {
119-
got, err := components.GetPortsForConfig(logr.Discard(), tt.args.config, tt.args.retriever)
120-
if !tt.wantErr(t, err, fmt.Sprintf("GetPortsForConfig(%v)", tt.args.config)) {
121-
return
122-
}
123-
assert.Equalf(t, tt.want, got, "GetPortsForConfig(%v)", tt.args.config)
124-
})
125-
}
126-
}

0 commit comments

Comments
 (0)