Skip to content

feat(firehose): check if consumer id is set or generate one #108

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
merged 1 commit into from
Feb 21, 2023
Merged

feat(firehose): check if consumer id is set or generate one #108

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
15 changes: 13 additions & 2 deletions modules/firehose/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"github.com/odpf/entropy/pkg/helm"
)

const firehoseConsumerIDStartingSequence = "0001"

var (
//go:embed schema/config.json
completeConfigSchema string
Expand All @@ -35,14 +37,23 @@ type moduleConfig struct {
} `json:"firehose"`
}

func (mc *moduleConfig) validate() error {
func (mc *moduleConfig) validateAndSanitize(r resource.Resource) error {
if mc.StopTime != nil && mc.StopTime.Before(time.Now()) {
return errors.ErrInvalid.
WithMsgf("value for stop_time must be greater than current time")
}

if mc.Firehose.KafkaConsumerID == "" {
mc.Firehose.KafkaConsumerID = fmt.Sprintf("%s-%s", generateFirehoseName(r), firehoseConsumerIDStartingSequence)
}

return nil
}

func generateFirehoseName(r resource.Resource) string {
return fmt.Sprintf("%s-%s-firehose", r.Project, r.Name)
}

func (mc moduleConfig) GetHelmReleaseConfig(r resource.Resource) (*helm.ReleaseConfig, error) {
var output Output
err := json.Unmarshal(r.State.Output, &output)
Expand All @@ -52,7 +63,7 @@ func (mc moduleConfig) GetHelmReleaseConfig(r resource.Resource) (*helm.ReleaseC
defaults := output.Defaults

rc := helm.DefaultReleaseConfig()
rc.Name = fmt.Sprintf("%s-%s-firehose", r.Project, r.Name)
rc.Name = generateFirehoseName(r)
rc.Repository = defaults.ChartRepository
rc.Chart = defaults.ChartName
rc.Namespace = defaults.Namespace
Expand Down
4 changes: 2 additions & 2 deletions modules/firehose/plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (m *firehoseModule) planCreate(res module.ExpandedResource, act module.Acti
if err := json.Unmarshal(act.Params, &reqConf); err != nil {
return nil, errors.ErrInvalid.WithMsgf("invalid config json: %v", err)
}
if err := reqConf.validate(); err != nil {
if err := reqConf.validateAndSanitize(res.Resource); err != nil {
return nil, err
}

Expand Down Expand Up @@ -68,7 +68,7 @@ func (m *firehoseModule) planChange(res module.ExpandedResource, act module.Acti
if err := json.Unmarshal(act.Params, &reqConf); err != nil {
return nil, errors.ErrInvalid.WithMsgf("invalid config json: %v", err)
}
if err := reqConf.validate(); err != nil {
if err := reqConf.validateAndSanitize(r); err != nil {
return nil, err
}
conf = reqConf
Expand Down