Skip to content

chore: add back container log feature #3985

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
mergify merged 3 commits into from
Sep 14, 2022
Merged

chore: add back container log feature #3985

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
235612a
revert the revert of conatiner log feature
Lou1415926 Sep 8, 2022
6c79df7
resolve conflict
Lou1415926 Sep 14, 2022
302a91f
Merge branch 'mainline' into revert/revert/container-log
mergify[bot] Sep 14, 2022
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
10 changes: 5 additions & 5 deletions internal/pkg/cli/flag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ const (
endTimeFlag = "end-time"
tasksFlag = "tasks"
logGroupFlag = "log-group"
// containerLogFlag = "container"
prodEnvFlag = "prod"
deployFlag = "deploy"
resourcesFlag = "resources"
containerLogFlag = "container"
prodEnvFlag = "prod"
deployFlag = "deploy"
resourcesFlag = "resources"

githubURLFlag = "github-url"
repoURLFlag = "url"
Expand Down Expand Up @@ -244,7 +244,7 @@ Defaults to all logs. Only one of end-time / follow may be used.`
tasksLogsFlagDescription = "Optional. Only return logs from specific task IDs."
includeStateMachineLogsFlagDescription = "Optional. Include logs from the state machine executions."
logGroupFlagDescription = "Optional. Only return logs from specific log group."
// containerLogFlagDescription = "Optional. Return only logs from a specific container."
containerLogFlagDescription = "Optional. Return only logs from a specific container."

deployTestFlagDescription = `Deploy your service or job to a "test" environment.`
githubURLFlagDescription = "(Deprecated.) Use '--url' instead. Repository URL to trigger your pipeline."
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/cli/svc_logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,6 @@ func buildSvcLogsCmd() *cobra.Command {
cmd.Flags().StringSliceVar(&vars.taskIDs, tasksFlag, nil, tasksLogsFlagDescription)
cmd.Flags().StringVar(&vars.logGroup, logGroupFlag, "", logGroupFlagDescription)
cmd.Flags().BoolVarP(&vars.previous, previousFlag, previousFlagShort, false, previousFlagDescription)
// cmd.Flags().StringVar(&vars.containerName, containerLogFlag, "", containerLogFlagDescription)
cmd.Flags().StringVar(&vars.containerName, containerLogFlag, "", containerLogFlagDescription)
return cmd
}