ridv/australis
1
0
Fork 0
Code Issues Pull requests Projects Releases 16 Packages Wiki Activity Actions

Changing role, env, and name to be string pointers. This is due to the fact that TaskQuery can now take nil pointers to ignore certain fields. This allows querying for all jobs of a certain environment, all jobs from a certain role, and all jobs with a certain name.

Browse source
This commit is contained in:
Renan DelValle 2018-09-16 21:23:36 -07:00
parent ce71939546
commit 0a3288a1dd
No known key found for this signature in database
GPG key ID: C240AD6D6F443EC9
5 changed files with 104 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
cmd/fetch.go
View file

@ -16,16 +16,16 @@ func init() {
// Fetch Task Config
fetchCmd.AddCommand(taskConfigCmd)
taskConfigCmd.Flags().StringVarP(&env, "environment", "e", "", "Aurora Environment")
taskConfigCmd.Flags().StringVarP(&role, "role", "r", "", "Aurora Role")
taskConfigCmd.Flags().StringVarP(&name, "name", "n", "", "Aurora Name")
taskConfigCmd.Flags().StringVarP(env, "environment", "e", "", "Aurora Environment")
taskConfigCmd.Flags().StringVarP(role, "role", "r", "", "Aurora Role")
taskConfigCmd.Flags().StringVarP(name, "name", "n", "", "Aurora Name")
// Fetch Leader
fetchCmd.AddCommand(leaderCmd)
// Fetch jobs
fetchCmd.AddCommand(fetchJobsCmd)
fetchJobsCmd.Flags().StringVarP(&role, "role", "r", "", "Aurora Role")
fetchJobsCmd.Flags().StringVarP(role, "role", "r", "", "Aurora Role")
}
var fetchCmd = &cobra.Command{
@ -59,6 +59,17 @@ var fetchJobsCmd = &cobra.Command{
func fetchTasks(cmd *cobra.Command, args []string) {
fmt.Printf("Fetching job configuration for [%s/%s/%s] \n", env, role, name)
// Task Query takes nil for values it shouldn't need to match against.
// This allows us to potentially more expensive calls for specific environments, roles, or job names.
if *env == "" {
env = nil
}
if *role == "" {
role = nil
}
if *role == "" {
role = nil
}
//TODO: Add filtering down by status
taskQuery := &aurora.TaskQuery{Environment: env, Role: role, JobName: name}
@ -93,22 +104,22 @@ func fetchLeader(cmd *cobra.Command, args []string) {
// TODO: Expand this to be able to filter by job name and environment.
func fetchJobs(cmd *cobra.Command, args []string) {
fmt.Printf("Fetching tasks under role: %s \n", role)
fmt.Printf("Fetching tasks under role: %s \n", *role)
if role == "" {
if *role == "" {
fmt.Println("Role must be specified.")
os.Exit(1)
}
if role == "*" {
if *role == "*" {
fmt.Println("Warning: This is an expensive operation.")
role = ""
*role = ""
}
_, result, err := client.GetJobs(role)
_, result, err := client.GetJobs(*role)
if err != nil {
fmt.Print("error: %+v\n", err.Error())
fmt.Printf("error: %+v\n", err.Error())
os.Exit(1)
}