From bd8644ae5767e447bc478158fa6d527566510c55 Mon Sep 17 00:00:00 2001 From: Trece Wicklander-Bryant Date: Wed, 2 Nov 2022 00:31:09 -0700 Subject: [PATCH 1/2] fix: Adds Support For NAP 3.12.2 --- .../nginx-app-protect/nap/nap_release.go | 29 ++++++++--------- .../nginx-app-protect/nap/releases.go | 31 +++++++++++++++++++ 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/extensions/nginx-app-protect/nap/nap_release.go b/src/extensions/nginx-app-protect/nap/nap_release.go index 2c0af6dfa3..bbae030f21 100644 --- a/src/extensions/nginx-app-protect/nap/nap_release.go +++ b/src/extensions/nginx-app-protect/nap/nap_release.go @@ -14,20 +14,21 @@ import ( func NewNAPReleaseMap() *NAPReleaseMap { return &NAPReleaseMap{ ReleaseMap: map[string]NAPRelease{ - "3.12": NAPRelease3_12(), - "3.11": NAPRelease3_11(), - "3.10": NAPRelease3_10(), - "3.9.1": NAPRelease3_9_1(), - "3.9": NAPRelease3_9(), - "3.8": NAPRelease3_8(), - "3.7": NAPRelease3_7(), - "3.6": NAPRelease3_6(), - "3.5": NAPRelease3_5(), - "3.4": NAPRelease3_4(), - "3.3": NAPRelease3_3(), - "3.2": NAPRelease3_2(), - "3.1": NAPRelease3_1(), - "3.0": NAPRelease3_0(), + "3.12.2": NAPRelease3_12_2(), + "3.12": NAPRelease3_12(), + "3.11": NAPRelease3_11(), + "3.10": NAPRelease3_10(), + "3.9.1": NAPRelease3_9_1(), + "3.9": NAPRelease3_9(), + "3.8": NAPRelease3_8(), + "3.7": NAPRelease3_7(), + "3.6": NAPRelease3_6(), + "3.5": NAPRelease3_5(), + "3.4": NAPRelease3_4(), + "3.3": NAPRelease3_3(), + "3.2": NAPRelease3_2(), + "3.1": NAPRelease3_1(), + "3.0": NAPRelease3_0(), }, } } diff --git a/src/extensions/nginx-app-protect/nap/releases.go b/src/extensions/nginx-app-protect/nap/releases.go index fc9d321789..cbcdd51b13 100644 --- a/src/extensions/nginx-app-protect/nap/releases.go +++ b/src/extensions/nginx-app-protect/nap/releases.go @@ -1,5 +1,36 @@ package nap +// NAPRelease3_12_2 returns information regarding packages and versioning for NAP release +// version 3.12.2. +func NAPRelease3_12_2() NAPRelease { + return NAPRelease{ + NAPPackages: NAPReleasePackages{ + Alpine310: "", + AmazonLinux2: "app-protect-27+3.1088.2-1.el7.ngx.x86_64.rpm", + Centos7: "app-protect-27+3.1088.2-1.el7.ngx.x86_64.rpm", + Debian9: "", + Debian10: "app-protect_27+3.1088.2~buster_amd64.deb", + Redhat7: "app-protect-27+3.1088.2-1.el7.ngx.x86_64.rpm", + Redhat8: "app-protect-27+3.1088.2-1.el8.ngx.x86_64.rpm", + Ubuntu1804: "app-protect_27+3.1088.2~bionic_amd64.deb", + Ubuntu2004: "app-protect_27+3.1088.2~focal_amd64.deb", + }, + NAPCompilerPackages: NAPReleasePackages{}, + NAPEnginePackages: NAPReleasePackages{}, + NAPPluginPackages: NAPReleasePackages{}, + NAPPlusModulePackages: NAPReleasePackages{}, + VersioningDetails: NAPVersioningDetails{ + NAPBuild: "3.1088.2", + NAPCompiler: "10.139.2", + NAPEngine: "10.139.2", + NAPPlugin: "3.1088.2", + NAPPlusModule: "27+3.1088.2", + NAPRelease: "3.12.x", + NginxPlus: "27", + }, + } +} + // NAPRelease3_12 returns information regarding packages and versioning for NAP release // version 3.12. func NAPRelease3_12() NAPRelease { From 5ea0669a460ebda748503fee0972cc577c16f469 Mon Sep 17 00:00:00 2001 From: Trece Wicklander-Bryant Date: Wed, 2 Nov 2022 14:39:53 -0700 Subject: [PATCH 2/2] chore: Addresses Feedback --- .../nginx-app-protect/nap/releases.go | 2 +- .../nginx-app-protect/nap/nap_release.go | 29 ++++++++--------- .../nginx-app-protect/nap/releases.go | 31 +++++++++++++++++++ 3 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/extensions/nginx-app-protect/nap/releases.go b/src/extensions/nginx-app-protect/nap/releases.go index cbcdd51b13..6b5dfde844 100644 --- a/src/extensions/nginx-app-protect/nap/releases.go +++ b/src/extensions/nginx-app-protect/nap/releases.go @@ -25,7 +25,7 @@ func NAPRelease3_12_2() NAPRelease { NAPEngine: "10.139.2", NAPPlugin: "3.1088.2", NAPPlusModule: "27+3.1088.2", - NAPRelease: "3.12.x", + NAPRelease: "3.12.2", NginxPlus: "27", }, } diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/nginx-app-protect/nap/nap_release.go b/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/nginx-app-protect/nap/nap_release.go index 2c0af6dfa3..bbae030f21 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/nginx-app-protect/nap/nap_release.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/nginx-app-protect/nap/nap_release.go @@ -14,20 +14,21 @@ import ( func NewNAPReleaseMap() *NAPReleaseMap { return &NAPReleaseMap{ ReleaseMap: map[string]NAPRelease{ - "3.12": NAPRelease3_12(), - "3.11": NAPRelease3_11(), - "3.10": NAPRelease3_10(), - "3.9.1": NAPRelease3_9_1(), - "3.9": NAPRelease3_9(), - "3.8": NAPRelease3_8(), - "3.7": NAPRelease3_7(), - "3.6": NAPRelease3_6(), - "3.5": NAPRelease3_5(), - "3.4": NAPRelease3_4(), - "3.3": NAPRelease3_3(), - "3.2": NAPRelease3_2(), - "3.1": NAPRelease3_1(), - "3.0": NAPRelease3_0(), + "3.12.2": NAPRelease3_12_2(), + "3.12": NAPRelease3_12(), + "3.11": NAPRelease3_11(), + "3.10": NAPRelease3_10(), + "3.9.1": NAPRelease3_9_1(), + "3.9": NAPRelease3_9(), + "3.8": NAPRelease3_8(), + "3.7": NAPRelease3_7(), + "3.6": NAPRelease3_6(), + "3.5": NAPRelease3_5(), + "3.4": NAPRelease3_4(), + "3.3": NAPRelease3_3(), + "3.2": NAPRelease3_2(), + "3.1": NAPRelease3_1(), + "3.0": NAPRelease3_0(), }, } } diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/nginx-app-protect/nap/releases.go b/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/nginx-app-protect/nap/releases.go index fc9d321789..6b5dfde844 100644 --- a/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/nginx-app-protect/nap/releases.go +++ b/test/performance/vendor/github.com/nginx/agent/v2/src/extensions/nginx-app-protect/nap/releases.go @@ -1,5 +1,36 @@ package nap +// NAPRelease3_12_2 returns information regarding packages and versioning for NAP release +// version 3.12.2. +func NAPRelease3_12_2() NAPRelease { + return NAPRelease{ + NAPPackages: NAPReleasePackages{ + Alpine310: "", + AmazonLinux2: "app-protect-27+3.1088.2-1.el7.ngx.x86_64.rpm", + Centos7: "app-protect-27+3.1088.2-1.el7.ngx.x86_64.rpm", + Debian9: "", + Debian10: "app-protect_27+3.1088.2~buster_amd64.deb", + Redhat7: "app-protect-27+3.1088.2-1.el7.ngx.x86_64.rpm", + Redhat8: "app-protect-27+3.1088.2-1.el8.ngx.x86_64.rpm", + Ubuntu1804: "app-protect_27+3.1088.2~bionic_amd64.deb", + Ubuntu2004: "app-protect_27+3.1088.2~focal_amd64.deb", + }, + NAPCompilerPackages: NAPReleasePackages{}, + NAPEnginePackages: NAPReleasePackages{}, + NAPPluginPackages: NAPReleasePackages{}, + NAPPlusModulePackages: NAPReleasePackages{}, + VersioningDetails: NAPVersioningDetails{ + NAPBuild: "3.1088.2", + NAPCompiler: "10.139.2", + NAPEngine: "10.139.2", + NAPPlugin: "3.1088.2", + NAPPlusModule: "27+3.1088.2", + NAPRelease: "3.12.2", + NginxPlus: "27", + }, + } +} + // NAPRelease3_12 returns information regarding packages and versioning for NAP release // version 3.12. func NAPRelease3_12() NAPRelease {