This repository has been archived by the owner on Jun 29, 2022. It is now read-only.
cli/cmd: cleanups part 3 #1018
Merged
cli/cmd: cleanups part 3 #1018
Conversation
This file contains 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
invidian
force-pushed
the
invidian/cli-cleanup-part3
branch
from
45afd6f
to
6127d0b
Compare
invidian
force-pushed
the
invidian/cli-cleanup-part3
branch
from
6127d0b
to
8b9e1df
Compare
invidian
force-pushed
the
invidian/cli-cleanup-part3
branch
5 times, most recently
from
bb3c326
to
9344de1
Compare
invidian
force-pushed
the
invidian/cli-cleanup-part3
branch
from
9344de1
to
e9fa3d5
Compare
ipochi
reviewed
Oct 21, 2020
invidian
force-pushed
the
invidian/cli-cleanup-part3
branch
from
e9fa3d5
to
2b4b98a
Compare
|
@ipochi I had to rebase, one more LGTM? |
ipochi
previously approved these changes
Oct 21, 2020
So all subcommands use the same function to determine which components should be used. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
As it does not add any value, as we create a slice of objects anyway instead of specifying them by hand. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
To soften the dependency on log.Entry and to separate the functionality from CLI code. This also makes code easier to move around and avoids hiding function complexity. Part of #630 Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
So they are easier to trace and debug. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
To soften the dependency on log.Entry and to separate the functionality from CLI code. This also makes code easier to move around and avoids hiding function complexity. Part of #630 Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
knrt10
force-pushed
the
invidian/cli-cleanup-part3
branch
from
2b4b98a
to
a4ddc0e
Compare
|
CI was not triggering, so I had to re-push |
knrt10
force-pushed
the
invidian/cli-cleanup-part3
branch
from
a4ddc0e
to
8724400
Compare
iaguis
previously requested changes
Oct 22, 2020
| @@ -187,7 +187,10 @@ func readKubeconfigFromTerraformState(contextLogger *log.Entry) ([]byte, error) | |||
| contextLogger.Warn("Kubeconfig file not found in assets directory, pulling kubeconfig from " + | |||
| "Terraform state, this might be slow. Run 'lokoctl cluster apply' to fix it.") | |||
|
|
|||
| c, err := initialize(contextLogger) | |||
| // TODO: Add Terraform verbose support back. | |||
There was a problem hiding this comment.
I understand this means you can't configure verboseness when reading the kubeconfig from the terraform state.
In that case I think I'm fine with this.
| @@ -111,7 +111,11 @@ func clusterApply(contextLogger *log.Entry, options clusterApplyOptions) error { | |||
|
|
|||
| fmt.Printf("\nYour configurations are stored in %s\n", c.assetDir) | |||
|
|
|||
| kubeconfig, err := getKubeconfig(contextLogger, c.lokomotiveConfig, true) | |||
| kg := kubeconfigGetter{ | |||
There was a problem hiding this comment.
I'm not super convinced by this getter (especially regarding naming) but I think this is an improvement over the current state so I'm not blocking this.
There was a problem hiding this comment.
Yeah, once moved to separate package, we need to continue refactoring...
knrt10
force-pushed
the
invidian/cli-cleanup-part3
branch
from
8724400
to
3455bd0
Compare
To soften the dependency on log.Entry and to separate the functionality from CLI code. This also makes code easier to move around and avoids hiding function complexity. Part of #630 Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io> Co-authored-by: knrt10 <kautilya@kinvolk.io>
This should allow better structure for the code and should make easier to move this code to some other package. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
Pass required information via options struct instead. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
Use options struct instead. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io> Co-authored-by: knrt10 <kautilya@kinvolk.io>
Use config struct instead. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
To add it a name and also to allow adding more information there, to separate this code from CLI code. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
Pass explicity kubeconfig path via options instead. Also fixes #1094. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
knrt10
force-pushed
the
invidian/cli-cleanup-part3
branch
from
3455bd0
to
2c86b58
Compare
|
Thanks for merging! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Includes commits from #1015Part of #603.