-
Notifications
You must be signed in to change notification settings - Fork 4
Feat: Remove requirement of channel and templates to just manage user groups #25
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.
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
halkeye
wants to merge
1
commit into
timoreimann:master
Choose a base branch
from
halkeye:feat-24
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,12 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| "strings" | ||
| "text/template" | ||
|
|
||
| "gopkg.in/yaml.v2" | ||
| ) | ||
|
|
@@ -70,12 +72,46 @@ func (cc ConfigChannel) String() string { | |
|
|
||
| // ConfigSlackSync represents a synchronization between a set of PagerDuty schedules and a Slack channel. | ||
| type ConfigSlackSync struct { | ||
| Name string `yaml:"name"` | ||
| Schedules []ConfigSchedule `yaml:"schedules"` | ||
| Channel ConfigChannel `yaml:"channel"` | ||
| Template string `yaml:"template"` | ||
| PretendUsers bool `yaml:"pretendUsers"` | ||
| DryRun bool `yaml:"dryRun"` | ||
| Name string `yaml:"name"` | ||
| Schedules []ConfigSchedule `yaml:"schedules"` | ||
| Channel *ConfigChannel `yaml:"channel"` | ||
| Template *template.Template `yaml:"-"` | ||
| templateString string `yaml:"template"` | ||
| PretendUsers bool `yaml:"pretendUsers"` | ||
| DryRun bool `yaml:"dryRun"` | ||
| } | ||
|
|
||
| func (css *ConfigSlackSync) populateChannel(_ context.Context, allChannels channelList) error { | ||
| if css.Channel == nil { | ||
| return nil | ||
| } | ||
|
|
||
| slChannel := allChannels.find(css.Channel.ID, css.Channel.Name) | ||
| if slChannel == nil { | ||
| return fmt.Errorf("failed to find configured Slack channel %s", css.Channel) | ||
| } | ||
|
|
||
| css.Channel = &ConfigChannel{ | ||
| ID: slChannel.ID, | ||
| Name: slChannel.Name, | ||
| } | ||
|
|
||
| fmt.Printf("Slack sync %s: found Slack channel %q (ID %s)\n", css.Name, css.Channel.Name, css.Channel.ID) | ||
| return nil | ||
| } | ||
|
|
||
| func (css *ConfigSlackSync) populateTemplate(_ context.Context) error { | ||
| if css.templateString == "" { | ||
| return nil | ||
| } | ||
|
|
||
| var err error | ||
| css.Template, err = template.New("topic").Parse(css.templateString) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to parse %s's template %q: %s", css.Name, css.templateString, err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| type config struct { | ||
|
|
@@ -95,7 +131,7 @@ func generateConfig(p params) (config, error) { | |
| } | ||
| } else { | ||
| if p.tmplFile != "" { | ||
| b, err := ioutil.ReadFile(p.tmplFile) | ||
| b, err := os.ReadFile(p.tmplFile) | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good drive-by. 👍 |
||
| if err != nil { | ||
| return config{}, err | ||
| } | ||
|
|
@@ -114,22 +150,18 @@ func generateConfig(p params) (config, error) { | |
| cfg.SlackSyncs[i].PretendUsers = *p.pretendUsers | ||
| } | ||
| } | ||
|
|
||
| if p.dryRun != nil { | ||
| for i := range cfg.SlackSyncs { | ||
| cfg.SlackSyncs[i].DryRun = *p.dryRun | ||
| } | ||
| } | ||
|
|
||
| err = validateConfig(&cfg) | ||
| if err != nil { | ||
| return config{}, err | ||
| } | ||
|
|
||
| return cfg, err | ||
| } | ||
|
|
||
| func readConfigFile(file string) (config, error) { | ||
| content, err := ioutil.ReadFile(file) | ||
| content, err := os.ReadFile(file) | ||
| if err != nil { | ||
| return config{}, err | ||
| } | ||
|
|
@@ -142,11 +174,13 @@ func readConfigFile(file string) (config, error) { | |
| func singleSlackSync(p params) (config, error) { | ||
| slackSync := ConfigSlackSync{ | ||
| Name: "default", | ||
| Channel: ConfigChannel{ | ||
| } | ||
|
|
||
| if len(p.channelID) != 0 || len(p.channelName) != 0 { | ||
| slackSync.Channel = &ConfigChannel{ | ||
| ID: p.channelID, | ||
| Name: p.channelName, | ||
| }, | ||
| Template: p.tmplString, | ||
| } | ||
| } | ||
| for _, schedule := range p.schedules { | ||
| cfgSchedule, err := parseSchedule(schedule) | ||
|
|
@@ -229,7 +263,7 @@ func parseSchedule(schedule string) (ConfigSchedule, error) { | |
| return cfgSchedule, nil | ||
| } | ||
|
|
||
| func validateConfig(cfg *config) error { | ||
| func (cfg *config) validateConfig() error { | ||
| foundNames := map[string]bool{} | ||
| for _, sync := range cfg.SlackSyncs { | ||
| if _, ok := foundNames[sync.Name]; ok { | ||
|
|
@@ -248,8 +282,8 @@ func validateConfig(cfg *config) error { | |
| } | ||
| } | ||
|
|
||
| channelGiven := sync.Channel.ID != "" || sync.Channel.Name != "" | ||
| if sync.Template != "" { | ||
| channelGiven := sync.Channel != nil | ||
| if sync.Template != nil { | ||
| if !channelGiven { | ||
| return fmt.Errorf("slack sync %q invalid: must specify either channel ID or channel name when topic is given", sync.Name) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suppose we could drop the
context.Contextparameter from the signature here and then again frompopulateTemplate(unless they are part of some interface that I'm missing)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably, i got in the habit of always including context so you don't have to go back later if things change, but you are right, it doesn't make sense here.