Merge pull request #3871 from benmoss/clusterctl-debug-provider

🌱 Print provider type and name to match config file naming

Author: k8s-ci-robot

cmd/clusterctl/client/repository/components_client.go

@@ -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())

cmd/clusterctl/client/repository/metadata_client.go

@@ -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

cmd/clusterctl/client/repository/template_client.go

@@ -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())