Plugins: Update missed ConversionHandler checks (grafana#92011)

toddtreece · web-flow · commit a12b37255683 · 2024-08-16T16:10:32.000+03:00
diff --git a/pkg/plugins/backendplugin/coreplugin/core_plugin.go b/pkg/plugins/backendplugin/coreplugin/core_plugin.go
@@ -145,7 +145,7 @@ func (cp *corePlugin) ValidateAdmission(ctx context.Context, req *backend.Admiss
 }
 
 func (cp *corePlugin) ConvertObjects(ctx context.Context, req *backend.ConversionRequest) (*backend.ConversionResponse, error) {
-	if cp.AdmissionHandler != nil {
+	if cp.ConversionHandler != nil {
 		ctx = backend.WithGrafanaConfig(ctx, req.PluginContext.GrafanaConfig)
 		return cp.ConversionHandler.ConvertObjects(ctx, req)
 	}
diff --git a/pkg/tests/api/plugins/backendplugin/backendplugin_test.go b/pkg/tests/api/plugins/backendplugin/backendplugin_test.go
@@ -955,7 +955,7 @@ func (tp *testPlugin) MutateAdmission(ctx context.Context, req *backend.Admissio
 
 // ConvertObject implements backend.AdmissionHandler.
 func (tp *testPlugin) ConvertObjects(ctx context.Context, req *backend.ConversionRequest) (*backend.ConversionResponse, error) {
-	if tp.AdmissionHandler != nil {
+	if tp.ConversionHandler != nil {
 		return tp.ConversionHandler.ConvertObjects(ctx, req)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func (cp corePlugin) ValidateAdmission(ctx context.Context, req backend.Admiss`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`func (cp corePlugin) ConvertObjects(ctx context.Context, req backend.ConversionRequest) (*backend.ConversionResponse, error) {`
`148`		`- if cp.AdmissionHandler != nil {`
	`148`	`+ if cp.ConversionHandler != nil {`
`149`	`149`	`ctx = backend.WithGrafanaConfig(ctx, req.PluginContext.GrafanaConfig)`
`150`	`150`	`return cp.ConversionHandler.ConvertObjects(ctx, req)`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,7 @@ func (tp testPlugin) MutateAdmission(ctx context.Context, req backend.Admissio`
`955`	`955`
`956`	`956`	`// ConvertObject implements backend.AdmissionHandler.`
`957`	`957`	`func (tp testPlugin) ConvertObjects(ctx context.Context, req backend.ConversionRequest) (*backend.ConversionResponse, error) {`
`958`		`- if tp.AdmissionHandler != nil {`
	`958`	`+ if tp.ConversionHandler != nil {`
`959`	`959`	`return tp.ConversionHandler.ConvertObjects(ctx, req)`
`960`	`960`	`}`
`961`	`961`