Skip to content

Commit bb449ae

Browse files
committed
Fix linting errors across test and converter files
- Fix errcheck warnings in pkg/utils/otel_test.go by properly handling os.Setenv/Unsetenv error returns (6 issues fixed) - Remove unused ptrString function from itx_past_meeting_summary_converters.go while keeping ptrBool which is used in participant converters - Convert if-else chain to switch statement in itx_past_meeting_participant_converters.go to improve code readability (gocritic fix) All lint errors resolved, achieving 0 issues. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> Signed-off-by: Andres Tobon <andrest2455@gmail.com>
1 parent 0175ce4 commit bb449ae

File tree

3 files changed

+30
-34
lines changed

3 files changed

+30
-34
lines changed

cmd/meeting-api/service/itx_past_meeting_participant_converters.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@ func ConvertCreateParticipantPayload(payload *meetingservice.CreateItxPastMeetin
7070

7171
// Attendee uses full name instead of first/last
7272
var name string
73-
if payload.FirstName != nil && payload.LastName != nil {
73+
switch {
74+
case payload.FirstName != nil && payload.LastName != nil:
7475
name = strings.TrimSpace(fmt.Sprintf("%s %s", *payload.FirstName, *payload.LastName))
75-
} else if payload.FirstName != nil {
76+
case payload.FirstName != nil:
7677
name = *payload.FirstName
77-
} else if payload.LastName != nil {
78+
case payload.LastName != nil:
7879
name = *payload.LastName
7980
}
8081
if name != "" {

cmd/meeting-api/service/itx_past_meeting_summary_converters.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,6 @@ func parseContentIntoITXParts(content string) (overview string, details []itx.Zo
219219
return overview, details, nextSteps
220220
}
221221

222-
// Helper function to convert string to pointer
223-
func ptrString(s string) *string {
224-
return &s
225-
}
226-
227222
// Helper function to convert bool to pointer
228223
func ptrBool(b bool) *bool {
229224
return &b

pkg/utils/otel_test.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestOTelConfigFromEnv_Defaults(t *testing.T) {
2626
"OTEL_LOGS_EXPORTER",
2727
}
2828
for _, env := range envVars {
29-
os.Unsetenv(env)
29+
_ = os.Unsetenv(env)
3030
}
3131

3232
cfg := OTelConfigFromEnv()
@@ -64,26 +64,26 @@ func TestOTelConfigFromEnv_Defaults(t *testing.T) {
6464
// reads and parses all supported OTEL_* environment variables.
6565
func TestOTelConfigFromEnv_CustomValues(t *testing.T) {
6666
// Set all environment variables
67-
os.Setenv("OTEL_SERVICE_NAME", "test-service")
68-
os.Setenv("OTEL_SERVICE_VERSION", "1.2.3")
69-
os.Setenv("OTEL_EXPORTER_OTLP_PROTOCOL", "http")
70-
os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", "localhost:4318")
71-
os.Setenv("OTEL_EXPORTER_OTLP_INSECURE", "true")
72-
os.Setenv("OTEL_TRACES_EXPORTER", "otlp")
73-
os.Setenv("OTEL_TRACES_SAMPLE_RATIO", "0.5")
74-
os.Setenv("OTEL_METRICS_EXPORTER", "otlp")
75-
os.Setenv("OTEL_LOGS_EXPORTER", "otlp")
67+
_ = os.Setenv("OTEL_SERVICE_NAME", "test-service")
68+
_ = os.Setenv("OTEL_SERVICE_VERSION", "1.2.3")
69+
_ = os.Setenv("OTEL_EXPORTER_OTLP_PROTOCOL", "http")
70+
_ = os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", "localhost:4318")
71+
_ = os.Setenv("OTEL_EXPORTER_OTLP_INSECURE", "true")
72+
_ = os.Setenv("OTEL_TRACES_EXPORTER", "otlp")
73+
_ = os.Setenv("OTEL_TRACES_SAMPLE_RATIO", "0.5")
74+
_ = os.Setenv("OTEL_METRICS_EXPORTER", "otlp")
75+
_ = os.Setenv("OTEL_LOGS_EXPORTER", "otlp")
7676

7777
defer func() {
78-
os.Unsetenv("OTEL_SERVICE_NAME")
79-
os.Unsetenv("OTEL_SERVICE_VERSION")
80-
os.Unsetenv("OTEL_EXPORTER_OTLP_PROTOCOL")
81-
os.Unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT")
82-
os.Unsetenv("OTEL_EXPORTER_OTLP_INSECURE")
83-
os.Unsetenv("OTEL_TRACES_EXPORTER")
84-
os.Unsetenv("OTEL_TRACES_SAMPLE_RATIO")
85-
os.Unsetenv("OTEL_METRICS_EXPORTER")
86-
os.Unsetenv("OTEL_LOGS_EXPORTER")
78+
_ = os.Unsetenv("OTEL_SERVICE_NAME")
79+
_ = os.Unsetenv("OTEL_SERVICE_VERSION")
80+
_ = os.Unsetenv("OTEL_EXPORTER_OTLP_PROTOCOL")
81+
_ = os.Unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT")
82+
_ = os.Unsetenv("OTEL_EXPORTER_OTLP_INSECURE")
83+
_ = os.Unsetenv("OTEL_TRACES_EXPORTER")
84+
_ = os.Unsetenv("OTEL_TRACES_SAMPLE_RATIO")
85+
_ = os.Unsetenv("OTEL_METRICS_EXPORTER")
86+
_ = os.Unsetenv("OTEL_LOGS_EXPORTER")
8787
}()
8888

8989
cfg := OTelConfigFromEnv()
@@ -139,11 +139,11 @@ func TestOTelConfigFromEnv_TracesSampleRatio(t *testing.T) {
139139
for _, tt := range tests {
140140
t.Run(tt.name, func(t *testing.T) {
141141
// Clear and set the env var
142-
os.Unsetenv("OTEL_TRACES_SAMPLE_RATIO")
142+
_ = os.Unsetenv("OTEL_TRACES_SAMPLE_RATIO")
143143
if tt.envValue != "" {
144-
os.Setenv("OTEL_TRACES_SAMPLE_RATIO", tt.envValue)
144+
_ = os.Setenv("OTEL_TRACES_SAMPLE_RATIO", tt.envValue)
145145
}
146-
defer os.Unsetenv("OTEL_TRACES_SAMPLE_RATIO")
146+
defer func() { _ = os.Unsetenv("OTEL_TRACES_SAMPLE_RATIO") }()
147147

148148
cfg := OTelConfigFromEnv()
149149

@@ -173,11 +173,11 @@ func TestOTelConfigFromEnv_InsecureFlag(t *testing.T) {
173173

174174
for _, tt := range tests {
175175
t.Run(tt.name, func(t *testing.T) {
176-
os.Unsetenv("OTEL_EXPORTER_OTLP_INSECURE")
176+
_ = os.Unsetenv("OTEL_EXPORTER_OTLP_INSECURE")
177177
if tt.envValue != "" {
178-
os.Setenv("OTEL_EXPORTER_OTLP_INSECURE", tt.envValue)
178+
_ = os.Setenv("OTEL_EXPORTER_OTLP_INSECURE", tt.envValue)
179179
}
180-
defer os.Unsetenv("OTEL_EXPORTER_OTLP_INSECURE")
180+
defer func() { _ = os.Unsetenv("OTEL_EXPORTER_OTLP_INSECURE") }()
181181

182182
cfg := OTelConfigFromEnv()
183183

@@ -369,7 +369,7 @@ func TestSetupOTelSDK(t *testing.T) {
369369
"OTEL_LOGS_EXPORTER",
370370
}
371371
for _, env := range envVars {
372-
os.Unsetenv(env)
372+
_ = os.Unsetenv(env)
373373
}
374374

375375
ctx := context.Background()

0 commit comments

Comments
 (0)