update prometheus metrics with N+ license expiry (#8229)

Author: vepatel

cmd/nginx-ingress/main.go

@@ -34,7 +34,7 @@ import (
 	cr_validation "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation"
 	k8s_nginx "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned"
 	conf_scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme"
-	"github.com/nginx/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 	nginxCollector "github.com/nginx/nginx-prometheus-exporter/collector"
 	"github.com/prometheus/client_golang/prometheus"
 	api_v1 "k8s.io/api/core/v1"

go.mod

@@ -12,8 +12,8 @@ require (
 	github.com/google/go-cmp v0.7.0
 	github.com/gruntwork-io/terratest v0.50.0
 	github.com/jinzhu/copier v0.4.0
-	github.com/nginx/nginx-plus-go-client/v2 v2.4.0
-	github.com/nginx/nginx-prometheus-exporter v1.4.2
+	github.com/nginx/nginx-plus-go-client/v3 v3.0.0
+	github.com/nginx/nginx-prometheus-exporter v1.5.0
 	github.com/nginx/telemetry-exporter v0.1.4
 	github.com/nginxinc/nginx-service-mesh v1.7.0
 	github.com/prometheus/client_golang v1.23.0

go.sum

@@ -307,10 +307,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/nginx/nginx-plus-go-client/v2 v2.4.0 h1:4c7V57CLCZUOxQCUcS9G8a5MClzdmxByBm+f4zKMzAY=
-github.com/nginx/nginx-plus-go-client/v2 v2.4.0/go.mod h1:P+dIP2oKYzFoyf/zlLWQa8Sf+fHb+CclOKzxAjxpvug=
-github.com/nginx/nginx-prometheus-exporter v1.4.2 h1:qNUGi64kWCiMblXap7uaiA0kuQbztIt6rVr1X8MR/78=
-github.com/nginx/nginx-prometheus-exporter v1.4.2/go.mod h1:10Xdh7PF/ecPGhQa+Ok4p6QgegxO6k7gblX3rDDMBIY=
+github.com/nginx/nginx-plus-go-client/v3 v3.0.0 h1:toZ6X4+4zhUkifYvUdiAaAe4tlq+Y7c03Ns4zb/2ytY=
+github.com/nginx/nginx-plus-go-client/v3 v3.0.0/go.mod h1:sCHx+oXai55zsoco5IKSIsVoDH6dEAMtlw9qjkJ9gFM=
+github.com/nginx/nginx-prometheus-exporter v1.5.0 h1:6BqClq0CoNUBSMwP2T3uWzJLhGHbTAe3B8o8wYmLvpQ=
+github.com/nginx/nginx-prometheus-exporter v1.5.0/go.mod h1:K5A81hb680XeT2sLQruDbst940cPXhDIL0MdzG9Vbyg=
 github.com/nginx/telemetry-exporter v0.1.4 h1:3ikgKlyz/O57oaBLkxCInMjr74AhGTKr9rHdRAkkl/w=
 github.com/nginx/telemetry-exporter v0.1.4/go.mod h1:bl6qmsxgk4a9D0X8R5E3sUNXN2iECPEK1JNbRLhN5C4=
 github.com/nginxinc/nginx-service-mesh v1.7.0 h1:oxKr+Jdbxkos10VTy5xF2UHCcmfIhqWNlsOK/zPnZDM=

internal/healthcheck/healthcheck.go

@@ -18,7 +18,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 
 	"github.com/nginx/kubernetes-ingress/internal/configs"
-	"github.com/nginx/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 	"k8s.io/utils/strings/slices"
 )
 

internal/healthcheck/healthcheck_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/nginx/kubernetes-ingress/internal/healthcheck"
-	"github.com/nginx/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 )
 
 // testHandler creates http handler for testing HealthServer.

internal/license_reporting/license_reporting.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	nl "github.com/nginx/kubernetes-ingress/internal/logger"
-	"github.com/nginx/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 
 	clusterInfo "github.com/nginx/kubernetes-ingress/internal/common_cluster_info"
 	api_v1 "k8s.io/api/core/v1"
@@ -140,6 +140,9 @@ func licenseExpiring(licenseData *client.NginxLicense) (bool, int64) {
 }
 
 func usageGraceEnding(licenseData *client.NginxLicense) (bool, int64) {
+	if licenseData.Reporting == nil {
+		return false, 0
+	}
 	grace := time.Second * time.Duration(licenseData.Reporting.Grace) //nolint:gosec
 	daysUntilUsageGraceEnds := int64(grace.Hours() / 24)
 	expiryDays := int64(expiryThreshold.Hours() / 24)

internal/license_reporting/license_reporting_test.go

@@ -11,7 +11,7 @@ import (
 
 	nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog"
 	"github.com/nginx/kubernetes-ingress/internal/logger/levels"
-	"github.com/nginx/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/fake"
@@ -131,7 +131,7 @@ func TestUsageGraceEnding(t *testing.T) {
 	}{
 		{
 			licenseData: client.NginxLicense{
-				Reporting: client.LicenseReporting{
+				Reporting: &client.LicenseReporting{
 					Grace: 3600, // seconds
 				},
 			},
@@ -141,7 +141,7 @@ func TestUsageGraceEnding(t *testing.T) {
 		},
 		{
 			licenseData: client.NginxLicense{
-				Reporting: client.LicenseReporting{
+				Reporting: &client.LicenseReporting{
 					Grace: 60 * 60 * 24 * 31, // 31 days
 				},
 			},
@@ -151,14 +151,20 @@ func TestUsageGraceEnding(t *testing.T) {
 		},
 		{
 			licenseData: client.NginxLicense{
-				Reporting: client.LicenseReporting{
+				Reporting: &client.LicenseReporting{
 					Grace: 0,
 				},
 			},
 			belowExpiringThreshold: true,
 			days:                   0,
 			name:                   "Grace period ended",
 		},
+		{
+			licenseData:            client.NginxLicense{},
+			belowExpiringThreshold: false,
+			days:                   0,
+			name:                   "No grace period",
+		},
 	}
 
 	for _, tc := range testCases {

internal/nginx/fake_manager.go

@@ -9,7 +9,7 @@ import (
 	nl "github.com/nginx/kubernetes-ingress/internal/logger"
 	nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog"
 	"github.com/nginx/kubernetes-ingress/internal/logger/levels"
-	"github.com/nginx/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 )
 
 // FakeManager provides a fake implementation of the Manager interface.

internal/nginx/manager.go

@@ -20,7 +20,7 @@ import (
 	nl "github.com/nginx/kubernetes-ingress/internal/logger"
 	"github.com/nginx/kubernetes-ingress/internal/metrics/collectors"
 
-	"github.com/nginx/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 )
 
 const (

internal/nginx/manager_test.go

@@ -3,7 +3,7 @@ package nginx
 import (
 	"testing"
 
-	"github.com/nginx/nginx-plus-go-client/v2/client"
+	"github.com/nginx/nginx-plus-go-client/v3/client"
 )
 
 // Helper functions to create pointers