Skip to content

Commit 51a24bd

Browse files
committed
lint: fix the address of a variable cannot be nil
1 parent 89f9ebf commit 51a24bd

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

pkg/3scale/amp/component/apicast_options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type APIcastTracingConfig struct {
4141

4242
type OpentelemetryConfig struct {
4343
Enabled bool
44-
Secret v1.Secret
44+
Secret *v1.Secret
4545
ConfigFile string
4646
}
4747

pkg/3scale/amp/component/deployment_annotations.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ func getWatchedSecretAnnotations(ctx context.Context, client k8sclient.Client, d
102102
}
103103
}
104104

105-
if &apicast.Options.ProductionOpentelemetry != nil && apicast.Options.ProductionOpentelemetry.Enabled {
106-
if &apicast.Options.ProductionOpentelemetry.Secret != nil && apicast.Options.ProductionOpentelemetry.Secret.Name != "" {
105+
if apicast.Options.ProductionOpentelemetry.Enabled {
106+
if apicast.Options.ProductionOpentelemetry.Secret != nil && apicast.Options.ProductionOpentelemetry.Secret.Name != "" {
107107
telemetryConfigSecret := &corev1.Secret{}
108108
telemetryConfigSecretKey := k8sclient.ObjectKey{
109109
Name: apicast.Options.ProductionOpentelemetry.Secret.Name,
@@ -154,8 +154,8 @@ func getWatchedSecretAnnotations(ctx context.Context, client k8sclient.Client, d
154154
}
155155
}
156156

157-
if &apicast.Options.StagingOpentelemetry != nil && apicast.Options.StagingOpentelemetry.Enabled {
158-
if &apicast.Options.StagingOpentelemetry.Secret != nil && apicast.Options.StagingOpentelemetry.Secret.Name != "" {
157+
if apicast.Options.StagingOpentelemetry.Enabled {
158+
if apicast.Options.StagingOpentelemetry.Secret != nil && apicast.Options.StagingOpentelemetry.Secret.Name != "" {
159159
telemetryConfigSecret := &corev1.Secret{}
160160
telemetryConfigSecretKey := k8sclient.ObjectKey{
161161
Name: apicast.Options.StagingOpentelemetry.Secret.Name,

pkg/3scale/amp/operator/apicast_options_provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ func (a *ApicastOptionsProvider) getOpenTelemetryStagingConfig(ctx context.Conte
539539
return res, err.ToAggregate()
540540
}
541541

542-
res.Secret = *secret
542+
res.Secret = secret
543543

544544
secretKeys := helper.MapKeys(helper.GetSecretStringDataFromData(secret.Data))
545545
if len(secretKeys) == 0 {
@@ -602,7 +602,7 @@ func (a *ApicastOptionsProvider) getOpenTelemetryProductionConfig(ctx context.Co
602602
return res, err.ToAggregate()
603603
}
604604

605-
res.Secret = *secret
605+
res.Secret = secret
606606

607607
secretKeys := helper.MapKeys(helper.GetSecretStringDataFromData(secret.Data))
608608
if len(secretKeys) == 0 {

pkg/3scale/amp/operator/apicast_options_provider_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ func TestGetApicastOptionsProvider(t *testing.T) {
332332
opentelemtryKey := component.OpentelemetryConfigMountBasePath + "/some-key"
333333

334334
opts.StagingOpentelemetry.Enabled = trueOpenTelemetry
335-
opts.StagingOpentelemetry.Secret = *otlpSecret()
335+
opts.StagingOpentelemetry.Secret = otlpSecret()
336336
opts.StagingOpentelemetry.ConfigFile = opentelemtryKey
337337

338338
return opts
@@ -359,7 +359,7 @@ func TestGetApicastOptionsProvider(t *testing.T) {
359359
opentelemtryKey := component.OpentelemetryConfigMountBasePath + "/config.json"
360360

361361
opts.ProductionOpentelemetry.Enabled = trueOpenTelemetry
362-
opts.ProductionOpentelemetry.Secret = *otlpSecret()
362+
opts.ProductionOpentelemetry.Secret = otlpSecret()
363363
opts.ProductionOpentelemetry.ConfigFile = opentelemtryKey
364364

365365
return opts

0 commit comments

Comments
 (0)