✨ Install a specific provider version

apps/cnquery/cmd/providers.go

@@ -49,7 +49,7 @@ var listProvidersCmd = &cobra.Command{
 }
 
 var installProviderCmd = &cobra.Command{
-	Use:    "install <NAME>",
+	Use:    "install <NAME[@VERSION]>",
 	Short:  "Install or update a provider.",
 	Long:   "",
 	PreRun: func(cmd *cobra.Command, args []string) {},
@@ -68,10 +68,33 @@ var installProviderCmd = &cobra.Command{
 			return
 		}
 
-		log.Fatal().Msg("cannot install providers by name yet")
+		if len(args) == 0 {
+			log.Fatal().Msg("no provider specified, use the NAME[@VERSION] format to pass in a provider name")
+		}
+
+		// if no url or file is specified, we default to installing by name from the default upstream
+		installProviderByName(args[0])
 	},
 }
 
+func installProviderByName(name string) {
+	parts := strings.Split(name, "@")
+	if len(parts) > 2 {
+		log.Fatal().Msg("invalid provider name")
+	}
+	name = parts[0]
+	version := ""
+	if len(parts) == 2 {
+		// trim the v prefix, allowing users to specify both 9.0.0 and v9.0.0
+		version = strings.TrimPrefix(parts[1], "v")
+	}
+	installed, err := providers.Install(name, version)
+	if err != nil {
+		log.Fatal().Err(err).Msg("failed to install")
+	}
+	providers.PrintInstallResults([]*providers.Provider{installed})
+}
+
 func installProviderUrl(u string) {
 	if i := strings.Index(u, "://"); i == -1 {
 		u = "http://" + u

providers/coordinator.go

@@ -235,7 +235,7 @@ func (c *coordinator) tryProviderUpdate(provider *Provider, update UpdateProvide
 	if err != nil {
 		return nil, err
 	}
-
+	PrintInstallResults([]*Provider{provider})
 	now := time.Now()
 	if err := os.Chtimes(binPath, now, now); err != nil {
 		log.Warn().

providers/providers.go

@@ -175,15 +175,23 @@ func EnsureProvider(existing Providers, connectorName string, connectorType stri
 		return nil, errors.New("cannot find installed provider for connection " + connectorName)
 	}
 
-	nu, err := Install(upstream.Name)
+	nu, err := Install(upstream.Name, "")
+	if err != nil {
+		return nil, err
+	}
 	existing.Add(nu)
-	return nu, err
+	PrintInstallResults([]*Provider{nu})
+	return nu, nil
 }
 
-func Install(name string) (*Provider, error) {
-	version, err := LatestVersion(name)
-	if err != nil {
-		return nil, err
+func Install(name string, version string) (*Provider, error) {
+	if version == "" {
+		// if no version is specified, we default to installing the latest one
+		latestVersion, err := LatestVersion(name)
+		if err != nil {
+			return nil, err
+		}
+		version = latestVersion
 	}
 
 	log.Info().
@@ -205,10 +213,17 @@ func installVersion(name string, version string) (*Provider, error) {
 	log.Debug().Str("url", url).Msg("installing provider from URL")
 	res, err := http.Get(url)
 	if err != nil {
-		log.Debug().Str("url", url).Msg("failed to install form URL (get request)")
+		log.Debug().Str("url", url).Msg("failed to install from URL (get request)")
 		return nil, errors.Wrap(err, "failed to install "+name+"-"+version)
 	}
+	if res.StatusCode == http.StatusNotFound {
+		return nil, errors.New("cannot find provider " + name + "-" + version + " under url " + url)
+	} else if res.StatusCode != http.StatusOK {
+		log.Debug().Str("url", url).Int("status", res.StatusCode).Msg("failed to install from URL (status code)")
+		return nil, errors.New("failed to install " + name + "-" + version + ", received status code: " + res.Status)
+	}
 
+	// else we know we got a 200 response, we can safely install
 	installed, err := InstallIO(res.Body, InstallConf{
 		Dst: DefaultPath,
 	})
@@ -231,7 +246,6 @@ func installVersion(name string, version string) (*Provider, error) {
 	// otherwise it will load old data
 	CachedProviders = nil
 
-	PrintInstallResults(installed)
 	return installed[0], nil
 }