Skip to content

decorators: replace init() panics with lazy error propagation #3910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebrandon1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

decorators: replace init() panics with lazy error propagation #3910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions pkg/controller/operators/decorators/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"sort"
"strings"
"sync"

"github.com/go-viper/mapstructure/v2"
"github.com/itchyny/gojq"
Expand Down Expand Up @@ -32,19 +33,26 @@ const (
)

var (
csvGVK = operatorsv1alpha1.SchemeGroupVersion.WithKind(operatorsv1alpha1.ClusterServiceVersionKind)
componentConditionsJQ *gojq.Query
csvConditionsJQ *gojq.Query
csvGVK = operatorsv1alpha1.SchemeGroupVersion.WithKind(operatorsv1alpha1.ClusterServiceVersionKind)

jqOnce sync.Once
jqErr error
componentConditions *gojq.Query
csvConditions *gojq.Query
)

func init() {
var err error
if componentConditionsJQ, err = gojq.Parse(".status.conditions"); err != nil {
panic(fmt.Errorf("failed to parse component conditions jq: %s", err))
}
if csvConditionsJQ, err = gojq.Parse(".status | [{\"type\": .phase, \"status\": \"True\", \"reason\": .reason, \"message\": .message, \"lastUpdateTime\": .lastUpdateTime,\"lastTransitionTime\": .lastTransitionTime}]"); err != nil {
panic(fmt.Errorf("failed to parse csv conditions jq: %s", err))
}
func jqQueries() (componentQ, csvQ *gojq.Query, err error) {
jqOnce.Do(func() {
if componentConditions, jqErr = gojq.Parse(".status.conditions"); jqErr != nil {
jqErr = fmt.Errorf("failed to parse component conditions jq: %w", jqErr)
return
}
if csvConditions, jqErr = gojq.Parse(".status | [{\"type\": .phase, \"status\": \"True\", \"reason\": .reason, \"message\": .message, \"lastUpdateTime\": .lastUpdateTime,\"lastTransitionTime\": .lastTransitionTime}]"); jqErr != nil {
jqErr = fmt.Errorf("failed to parse csv conditions jq: %w", jqErr)
return
}
})
return componentConditions, csvConditions, jqErr
}

// OperatorNames returns a list of operator names extracted from the given labels.
Expand Down Expand Up @@ -413,10 +421,16 @@ func (c *Component) Reference() (ref *operatorsv1.RichReference, err error) {
ObjectReference: truncated,
}

query := componentConditionsJQ
componentQ, csvQ, qErr := jqQueries()
if qErr != nil {
err = qErr
return
}

query := componentQ
switch c.GroupVersionKind() {
case csvGVK:
query = csvConditionsJQ
query = csvQ
}
iter := query.Run(c.UnstructuredContent())

Expand Down
12 changes: 12 additions & 0 deletions pkg/controller/operators/decorators/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ import (
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
)

func TestJQQueries(t *testing.T) {
componentQ, csvQ, err := jqQueries()
require.NoError(t, err)
require.NotNil(t, componentQ)
require.NotNil(t, csvQ)

componentQ2, csvQ2, err2 := jqQueries()
require.NoError(t, err2)
require.Same(t, componentQ, componentQ2, "sync.Once should return the same pointer")
require.Same(t, csvQ, csvQ2, "sync.Once should return the same pointer")
}

func TestOperatorNames(t *testing.T) {
type args struct {
labels map[string]string
Expand Down