diff --git a/data/flux_influxdb_versions.yml b/data/flux_influxdb_versions.yml index 3b6a80151..9d61ed2ed 100644 --- a/data/flux_influxdb_versions.yml +++ b/data/flux_influxdb_versions.yml @@ -5,22 +5,24 @@ # build/deploy process. flux: - latest: 0.194.3 + latest: 0.194.4 cloud: current: 0.194.3 oss: - '1.7': 0.50.2 - '1.8': 0.65.1 - '2.0': 0.131.0 - '2.1': 0.139.0 - '2.2': 0.162.0 - '2.3': 0.171.0 - '2.4': 0.179.0 - '2.5': 0.188.1 + '2.7': 0.194.4 '2.6': 0.191.0 - '2.7': 0.193.0 - nightly: 0.194.3 + '2.5': 0.188.1 + '2.4': 0.179.0 + '2.3': 0.171.0 + '2.2': 0.162.0 + '2.1': 0.139.0 + '2.0': 0.131.0 + '1.8': 0.65.1 + '1.7': 0.50.2 + nightly: 0.194.4 enterprise: + '1.11': 0.194.3 + '1.10': 0.188.0 '1.9': 0.161.0 '1.8': 0.65.1 '1.7': 0.50.2 diff --git a/flux-build-scripts/update-flux-versions.js b/flux-build-scripts/update-flux-versions.js index 13c6013ab..17a05efae 100644 --- a/flux-build-scripts/update-flux-versions.js +++ b/flux-build-scripts/update-flux-versions.js @@ -70,13 +70,27 @@ function addVersion(versionObj, influxdbVer, fluxVer) { versionObj[influxdbVer] = fluxVer } +// Compare semantic minor versions +function isSemanticNewer(semverX, semverY) { + xMajor = parseInt(semverX.split(".")[0]) + xMinor = parseInt(semverX.split(".")[1]) + yMajor = parseInt(semverY.split(".")[0]) + yMinor = parseInt(semverY.split(".")[1]) + + if (xMajor > yMajor) {return true} + else if (xMajor == yMajor) { + if (xMinor >= yMinor) {return true} + else {return false} + } else {return false} +} + // Load product data from the product data file const productData = yaml.load(fs.readFileSync(path.resolve(__dirname,'../data/products.yml'), 'utf8')) -// Update InfluxDB version arrays by removing 'v' from each version and filtering -// out InfluxDB versions that don't have a Flux dependency in their go.mod -const ossVersionArr = productData.influxdb.minor_versions.map((element, index) => {return element.replace('v', '')}).filter(element => parseFloat(element) >= 1.7).reverse(); -const enterpriseVersionArr = productData.enterprise_influxdb.minor_versions.map((element, index) => {return element.replace('v', '')}).filter(element => parseFloat(element) >= 1.9).reverse(); +// Update InfluxDB version arrays by removing 'v' from each version +// Filter out InfluxDB Enterprise versions that don't have a Flux dependency in their go.mod +const ossVersionArr = productData.influxdb.minor_versions.map((element) => {return element.replace('v', '')}); +const enterpriseVersionArr = productData.enterprise_influxdb.minor_versions.map((element) => {return element.replace('v', '')}).filter(version => isSemanticNewer(version, '1.9')); // Instantiate base Flux version variables var ossVersions = {}; @@ -89,7 +103,7 @@ var fluxVersions = {}; await getAllFluxVersions(enterpriseVersionArr, 'enterprise', enterpriseVersions); // Manually add versions that aren't included in the original versions arrays - await addVersion(ossVersions, 'nightly', await getFluxVersion('master')); + await addVersion(ossVersions, 'nightly', await getFluxVersion('2.7')); await addVersion(enterpriseVersions, '1.8', await getFluxVersion('1.8')); await addVersion(enterpriseVersions, '1.7', await getFluxVersion('1.7')); diff --git a/layouts/partials/footer/modals/flux-influxdb-versions.html b/layouts/partials/footer/modals/flux-influxdb-versions.html index 754e386df..722bfd019 100644 --- a/layouts/partials/footer/modals/flux-influxdb-versions.html +++ b/layouts/partials/footer/modals/flux-influxdb-versions.html @@ -60,20 +60,41 @@

InfluxDB Enterprise

+ {{ range $key, $value := $enterprise }} - {{ $versionSemVer := split $value "." }} - {{ $supported := cond (ge (index $versionSemVer 0) (index $introducedSemVer 0)) (cond (ge (index $versionSemVer 1) (index $introducedSemVer 1)) (cond (ge (index $versionSemVer 2) (index $introducedSemVer 2)) true false) false) false }} - {{ $deprecated := and (isset $.Page.Params "deprecated") (cond (ge (index $versionSemVer 0) (index $deprecatedSemVer 0)) (cond (ge (index $versionSemVer 1) (index $deprecatedSemVer 1)) (cond (ge (index $versionSemVer 2) (index $deprecatedSemVer 2)) true false) false) false) }} - {{ $excluded := gt (len (findRE (string $excludePatternEnterprise) $key)) 0 }} -
-

InfluxDB Enterprise {{ $key }}

-

- {{ if $excluded }} - {{ else if $deprecated }} - {{ else if $supported }} - {{ end }} -

-
+ {{ $versionSemVer := split $value "." }} + {{ $supported := cond (ge (index $versionSemVer 0) (index $introducedSemVer 0)) (cond (ge (index $versionSemVer 1) (index $introducedSemVer 1)) (cond (ge (index $versionSemVer 2) (index $introducedSemVer 2)) true false) false) false }} + {{ $deprecated := and (isset $.Page.Params "deprecated") (cond (ge (index $versionSemVer 0) (index $deprecatedSemVer 0)) (cond (ge (index $versionSemVer 1) (index $deprecatedSemVer 1)) (cond (ge (index $versionSemVer 2) (index $deprecatedSemVer 2)) true false) false) false) }} + {{ $excluded := gt (len (findRE (string $excludePatternEnterprise) $key)) 0 }} + {{ if le (len $key) 3 }} +
+

InfluxDB Enterprise {{ $key }}

+

+ {{ if $excluded }} + {{ else if $deprecated }} + {{ else if $supported }} + {{ end }} +

+
+ {{ end }} + {{ end }} + + {{ range $key, $value := $enterprise }} + {{ $versionSemVer := split $value "." }} + {{ $supported := cond (ge (index $versionSemVer 0) (index $introducedSemVer 0)) (cond (ge (index $versionSemVer 1) (index $introducedSemVer 1)) (cond (ge (index $versionSemVer 2) (index $introducedSemVer 2)) true false) false) false }} + {{ $deprecated := and (isset $.Page.Params "deprecated") (cond (ge (index $versionSemVer 0) (index $deprecatedSemVer 0)) (cond (ge (index $versionSemVer 1) (index $deprecatedSemVer 1)) (cond (ge (index $versionSemVer 2) (index $deprecatedSemVer 2)) true false) false) false) }} + {{ $excluded := gt (len (findRE (string $excludePatternEnterprise) $key)) 0 }} + {{ if gt (len $key) 3 }} +
+

InfluxDB Enterprise {{ $key }}

+

+ {{ if $excluded }} + {{ else if $deprecated }} + {{ else if $supported }} + {{ end }} +

+
+ {{ end }} {{ end }}
diff --git a/layouts/shortcodes/flux/influxdb-versions.html b/layouts/shortcodes/flux/influxdb-versions.html index ee609b65b..0e579858b 100644 --- a/layouts/shortcodes/flux/influxdb-versions.html +++ b/layouts/shortcodes/flux/influxdb-versions.html @@ -47,12 +47,25 @@ + {{ range $key, $value := $enterprise }} - - InfluxDB Enterprise {{ $key }} - {{ $value }} - - + {{ if le (len $key) 3}} + + InfluxDB Enterprise {{ $key }} + {{ $value }} + + + {{ end }} + {{ end }} + + {{ range $key, $value := $enterprise }} + {{ if gt (len $key) 3}} + + InfluxDB Enterprise {{ $key }} + {{ $value }} + + + {{ end }} {{ end }}