chore: grab module from s3 bucket and skip version validation (#151)

Author: pablomartinezbernardo

installer/configurator/configurator.go

@@ -128,6 +128,12 @@ func main() {
 		handleError(err, sender, *appID, *dryRun)
 	}
 
+	// TODO: Re-enable once we again have signatures available
+	if !*skipVerify {
+		log.Debug("Temporarily skipping module signature verification")
+		*skipVerify = true
+	}
+
 	if err := configurator.DownloadAndInstallModule(*arch, *skipVerify); err != nil {
 		handleError(err, sender, *appID, *dryRun)
 	}

installer/configurator/nginx_configurator.go

@@ -45,19 +45,6 @@ func (n *NginxConfigurator) VerifyRequirements() error {
 	log.Info("Detected NGINX version: ", n.Version)
 	IntegrationVersion = n.Version
 
-	minSupportedVersion, maxSupportedVersion, err := getSupportedModuleVersions()
-	if err != nil {
-		return NewInstallerError(NginxError, fmt.Errorf("could not retrieve the supported versions for nginx-datadog"))
-	}
-
-	log.Debug(fmt.Sprintf("Got lowest and highest supported versions for nginx-datadog from module release assets: [%s-%s]", minSupportedVersion, maxSupportedVersion))
-
-	if compareVersions(n.Version, minSupportedVersion) < 0 || compareVersions(n.Version, maxSupportedVersion) > 0 {
-		return NewInstallerError(NginxError, fmt.Errorf("nginx version %s is not supported, must be in range [%s-%s]", n.Version, minSupportedVersion, maxSupportedVersion))
-	}
-
-	log.Info("The installed NGINX version is supported")
-
 	return nil
 }
 
@@ -142,14 +129,13 @@ func (n *NginxConfigurator) DownloadAndInstallModule(arch string, skipVerify boo
 		return err
 	}
 
-	// TODO: Use the releases once the module is actually released with RUM
-	// baseURL := fmt.Sprintf("https://github.com/DataDog/nginx-datadog/releases/latest/download/")
-	baseURL := "https://ddagent-windows-unstable.s3.amazonaws.com/inject-browser-sdk/nginx/latest/"
+	baseURL := "https://rum-auto-instrumentation.s3.us-east-1.amazonaws.com/nginx/latest/"
 	moduleURL := baseURL + fmt.Sprintf("ngx_http_datadog_module-%s-%s.so.tgz", arch, n.Version)
 
 	moduleContent, err := downloadFile(moduleURL)
 	if err != nil {
-		return NewInstallerError(NginxError, fmt.Errorf("failed to download module: %v", err))
+		return NewInstallerError(NginxError, fmt.Errorf("failed to download module %s. "+
+			"This is likely because this NGINX version (%s) is not supported: %v", moduleURL, n.Version, err))
 	}
 
 	tmpDir, err := os.MkdirTemp("", "nginx-module-verification")

installer/configurator/utils.go

@@ -3,78 +3,15 @@ package main
 import (
 	"archive/tar"
 	"compress/gzip"
-	"context"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
-	"regexp"
-	"strconv"
 	"strings"
 
-	"github.com/google/go-github/github"
-
 	log "github.com/sirupsen/logrus"
 )
 
-func getSupportedModuleVersions() (string, string, error) {
-	client := github.NewClient(nil)
-
-	release, _, err := client.Repositories.GetLatestRelease(context.Background(), "DataDog", "nginx-datadog")
-	if err != nil {
-		return "", "", NewInstallerError(NginxError, fmt.Errorf("error getting latest release for the NGINX module: %v", err))
-	}
-
-	log.Debug("Got latest release for the NGINX module")
-
-	re := regexp.MustCompile(`ngx_http_datadog_module-(?:amd64|arm64)-(\d+\.\d+\.\d+)\.so\.tgz`)
-
-	lowestVersion, highestVersion := "", ""
-	for _, asset := range release.Assets {
-		matches := re.FindStringSubmatch(*asset.Name)
-		if len(matches) > 1 {
-			version := matches[1]
-			if lowestVersion == "" || compareVersions(version, lowestVersion) < 0 {
-				lowestVersion = version
-			}
-			if highestVersion == "" || compareVersions(version, highestVersion) > 0 {
-				highestVersion = version
-			}
-		}
-	}
-
-	if lowestVersion == "" || highestVersion == "" {
-		return "", "", NewInstallerError(NginxError, fmt.Errorf("no valid version found for the NGINX module in the release assets"))
-	}
-
-	return lowestVersion, highestVersion, nil
-}
-
-func compareVersions(v1, v2 string) int {
-	v1Segments := strings.Split(v1, ".")
-	v2Segments := strings.Split(v2, ".")
-
-	for i := 0; i < len(v1Segments) && i < len(v2Segments); i++ {
-		v1digit, _ := strconv.Atoi(v1Segments[i])
-		v2digit, _ := strconv.Atoi(v2Segments[i])
-		if v1digit < v2digit {
-			return -1
-		}
-		if v1digit > v2digit {
-			return 1
-		}
-	}
-
-	if len(v1Segments) < len(v2Segments) {
-		return -1
-	}
-	if len(v1Segments) > len(v2Segments) {
-		return 1
-	}
-
-	return 0
-}
-
 func extractTarGzFile(srcPath, destPath string) error {
 	file, err := os.Open(srcPath)
 	if err != nil {