Skip to content

🌱 Print provider type and name to match config file naming #3871

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
Oct 30, 2020
Merged

🌱 Print provider type and name to match config file naming #3871

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
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/repository/components_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (f *componentsClient) Get(options ComponentsOptions) (Components, error) {
}

if file == nil {
log.V(5).Info("Fetching", "File", path, "Provider", f.provider.ManifestLabel(), "Version", options.Version)
log.V(5).Info("Fetching", "File", path, "Provider", f.provider.Name(), "Type", f.provider.Type(), "Version", options.Version)
file, err = f.repository.GetFile(options.Version, path)
if err != nil {
return nil, errors.Wrapf(err, "failed to read %q from provider's repository %q", path, f.provider.ManifestLabel())
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/repository/metadata_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (f *metadataClient) Get() (*clusterctlv1.Metadata, error) {
return nil, err
}
if file == nil {
log.V(5).Info("Fetching", "File", name, "Provider", f.provider.ManifestLabel(), "Version", version)
log.V(5).Info("Fetching", "File", name, "Provider", f.provider.Name(), "Type", f.provider.Type(), "Version", version)
file, err = f.repository.GetFile(version, name)
if err != nil {
// if there are problems in reading the metadata file from the repository, check if there are embedded metadata for the provider, if yes use them
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/repository/template_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (c *templateClient) Get(flavor, targetNamespace string, listVariablesOnly b
}

if rawArtifact == nil {
log.V(5).Info("Fetching", "File", name, "Provider", c.provider.ManifestLabel(), "Version", version)
log.V(5).Info("Fetching", "File", name, "Provider", c.provider.Name(), "Type", c.provider.Type(), "Version", version)
rawArtifact, err = c.repository.GetFile(version, name)
if err != nil {
return nil, errors.Wrapf(err, "failed to read %q from provider's repository %q", name, c.provider.ManifestLabel())
Expand Down