Skip to content

Commit a23a8f5

Browse files
committed
Adding logging to framework methodes
1 parent 5e8513d commit a23a8f5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

tests/framework/generate_manifests.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"io"
88
"text/template"
99

10-
. "github.com/onsi/ginkgo/v2"
1110
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1211
"k8s.io/apimachinery/pkg/util/yaml"
1312
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -222,7 +221,6 @@ func GenerateScaleListenerObjects(numListeners int, tls bool) (ScaleObjects, err
222221
}
223222

224223
func generateSecrets(secrets []string) ([]client.Object, error) {
225-
GinkgoWriter.Printf("Generating secrets\n")
226224
objects := make([]client.Object, 0, len(secrets))
227225

228226
for _, secret := range secrets {
@@ -239,7 +237,6 @@ func generateSecrets(secrets []string) ([]client.Object, error) {
239237

240238
objects = append(objects, objs...)
241239
}
242-
GinkgoWriter.Printf("Generated %d secrets\n", len(objects))
243240

244241
return objects, nil
245242
}

tests/framework/ngf.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ func InstallNGF(cfg InstallationConfig, extraArgs ...string) ([]byte, error) {
102102

103103
// CreateLicenseSecret creates the NGINX Plus JWT secret.
104104
func CreateLicenseSecret(k8sClient client.Client, namespace, filename string) error {
105-
GinkgoWriter.Printf("Creating NGINX Plus license secret in namespace %q from file %q\n", namespace, filename)
106-
107105
conf, err := os.ReadFile(filename)
108106
if err != nil {
109107
readFileErr := fmt.Errorf("error reading file %q: %w", filename, err)

tests/suite/advanced_routing_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ func expectRequestToRespondFromExpectedServer(
119119
GinkgoWriter.Printf("Expecting request to respond from the server %q\n", expServerName)
120120
status, body, err := framework.Get(appURL, address, timeoutConfig.RequestTimeout, headers, queryParams)
121121
if err != nil {
122+
GinkgoWriter.Printf("ERROR making GET request to %q: %v\n", appURL, err)
123+
122124
return err
123125
}
124126

tests/suite/system_suite_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ func createNGFInstallConfig(cfg setupConfig, extraInstallArgs ...string) framewo
237237
installCfg.NgfImageRepository = *ngfImageRepository
238238
installCfg.NginxImageRepository = *nginxImageRepository
239239
if *plusEnabled && cfg.nfr {
240+
GinkgoWriter.Printf("Using NGINX Plus image repository %q\n", *nginxPlusImageRepository)
240241
installCfg.NginxImageRepository = *nginxPlusImageRepository
241242
}
242243
installCfg.ImageTag = *imageTag
@@ -246,9 +247,11 @@ func createNGFInstallConfig(cfg setupConfig, extraInstallArgs ...string) framewo
246247
chartVersion = "0.0.0-edge"
247248
installCfg.ChartVersion = chartVersion
248249
if *plusEnabled && cfg.nfr {
250+
GinkgoWriter.Printf("Using NGINX Plus image repository %q\n", *nginxPlusImageRepository)
249251
installCfg.NginxImageRepository = fmt.Sprintf(formatNginxPlusEdgeImagePath, *gkeProject)
250252
}
251253
case *plusEnabled && cfg.nfr:
254+
GinkgoWriter.Printf("Using NGINX Plus image repository %q\n", *nginxPlusImageRepository)
252255
installCfg.NginxImageRepository = fmt.Sprintf(formatNginxPlusEdgeImagePath, *gkeProject)
253256
}
254257

0 commit comments

Comments
 (0)