Skip to content

Added ExporterConfigType constant #477

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

Merged
stiidk merged 3 commits into from
May 19, 2025
Merged

Added ExporterConfigType constant #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6c618b
Added ExporterConfigType constant
stiidk May 16, 2025
7bf0762
Fix linter errors
stiidk May 18, 2025
c808267
Merge branch 'master' into fix-magic-variables-in-exporter-config
stiidk May 18, 2025
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
12 changes: 11 additions & 1 deletion api/config/v2alpha2/projectconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,17 @@ type GitCredential struct {
RepoPrefix string `json:"repoPrefix"`
}

// ExporterConfig contains configuration for decisions and user activity export
// ExporterConfigType defines the type of exporter config
type ExporterConfigType string

const (
// ExporterConfigTypeDecisions is the type for decisions exporter config
ExporterConfigTypeDecisions ExporterConfigType = "DecisionsExporter"
// ExporterConfigTypeActivity is the type for activity exporter config
ExporterConfigTypeActivity ExporterConfigType = "ActivityExporter"
)

// ExporterConfig contains configuration for exports
type ExporterConfig struct {
Enabled bool `json:"enabled,omitempty"`
Interval string `json:"interval,omitempty"`
Expand Down
16 changes: 9 additions & 7 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,14 @@ func main() {
styraHostURL := strings.TrimSuffix(ctrlConfig.Styra.Address, "/")
styraClient := styra.New(styraHostURL, styraToken)

if err := configureExporter(styraClient, ctrlConfig.DecisionsExporter, "DecisionsExporter"); err != nil {
log.Error(err, "unable to configure DecisionsExporter")
if err := configureExporter(
styraClient, ctrlConfig.DecisionsExporter, configv2alpha2.ExporterConfigTypeDecisions); err != nil {
log.Error(err, fmt.Sprintf("unable to configure %s", configv2alpha2.ExporterConfigTypeDecisions))
}

if err := configureExporter(styraClient, ctrlConfig.ActivityExporter, "ActivityExporter"); err != nil {
log.Error(err, "unable to configure ActivityExporter")
if err := configureExporter(
styraClient, ctrlConfig.ActivityExporter, configv2alpha2.ExporterConfigTypeActivity); err != nil {
log.Error(err, fmt.Sprintf("unable to configure %s", configv2alpha2.ExporterConfigTypeActivity))
}

// System Controller
Expand Down Expand Up @@ -284,7 +286,7 @@ func exit(err error) {
func configureExporter(
styraClient styra.ClientInterface,
exporterConfig *configv2alpha2.ExporterConfig,
exporterType string) error {
exporterType configv2alpha2.ExporterConfigType) error {
if exporterConfig == nil {
ctrl.Log.Info(fmt.Sprintf("no exporter configuration found for %s", exporterType))
return nil
Expand All @@ -300,10 +302,10 @@ func configureExporter(
return err
}

if exporterType == "ActivityExporter" {
if exporterType == configv2alpha2.ExporterConfigTypeActivity {
rawJSON := json.RawMessage("{\"activity_exporter\": null}")
_, err = styraClient.UpdateWorkspaceRaw(context.Background(), rawJSON)
} else if exporterType == "DecisionsExporter" {
} else if exporterType == configv2alpha2.ExporterConfigTypeDecisions {
rawJSON := json.RawMessage("{\"decisions_exporter\": null}")
_, err = styraClient.UpdateWorkspaceRaw(context.Background(), rawJSON)
}
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/styra.bankdata.dk_libraries.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
name: libraries.styra.bankdata.dk
spec:
group: styra.bankdata.dk
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/styra.bankdata.dk_systems.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
name: systems.styra.bankdata.dk
spec:
group: styra.bankdata.dk
Expand Down