venconn: the server field in config can now be omitted

Author: maelvls

pkg/agent/config.go

@@ -267,13 +267,22 @@ func getConfiguration(log *log.Logger, cfg Config, flags AgentCmdFlags) (Config,
 		flags.VenafiCloudMode = true
 	}
 
-	baseURL := cfg.Server
-	if baseURL == "" {
-		log.Printf("Using deprecated Endpoint configuration. User Server instead.")
-		baseURL = fmt.Sprintf("%s://%s", cfg.Endpoint.Protocol, cfg.Endpoint.Host)
-		_, err := url.Parse(baseURL)
-		if err != nil {
-			return Config{}, nil, fmt.Errorf("failed to parse server URL: %w", err)
+	// In VenafiConnection mode, we don't need the server field. For the other
+	// modes, we do need to validate the server field.
+	var baseURL string
+	if flags.VenConnName != "" {
+		if cfg.Server != "" {
+			log.Printf("ignoring the server field specified in the config file. In Venafi Connection mode, this field is not needed. Use the VenafiConnection's spec.vcp.url field instead.")
+		}
+	} else {
+		baseURL = cfg.Server
+		if baseURL == "" {
+			log.Printf("Using deprecated Endpoint configuration. User Server instead.")
+			baseURL = fmt.Sprintf("%s://%s", cfg.Endpoint.Protocol, cfg.Endpoint.Host)
+			_, err := url.Parse(baseURL)
+			if err != nil {
+				return Config{}, nil, fmt.Errorf("failed to parse server URL: %w", err)
+			}
 		}
 	}
 

pkg/agent/config_test.go

@@ -178,7 +178,7 @@ func TestGetConfiguration(t *testing.T) {
 			assert.Equal(t, Config{}, got)
 		})
 
-		t.Run("warning about venafi-cloud.uploader_id and venafi-cloud.upload_path being skipped", func(t *testing.T) {
+		t.Run("warning about server, venafi-cloud.uploader_id, and venafi-cloud.upload_path being skipped", func(t *testing.T) {
 			log, out := withLogs(t)
 			cfg := fillRequired(Config{VenafiCloud: &VenafiCloudConfig{
 				UploaderID: "test-agent",
@@ -191,6 +191,17 @@ func TestGetConfiguration(t *testing.T) {
 			assert.Equal(t, cfg, got)
 			assert.Contains(t, out.String(), "ignoring venafi-cloud.uploader_id")
 			assert.Contains(t, out.String(), "ignoring venafi-cloud.upload_path")
+			assert.Contains(t, out.String(), "ignoring the server field")
+		})
+
+		t.Run("server field can be left empty in venconn mode", func(t *testing.T) {
+			_, _, err := getConfiguration(discardLogs(t),
+				withConfig(testutil.Undent(`
+					server: ""
+					period: 1h`,
+				)),
+				withCmdLineFlags("--venafi-connection", "venafi-components", "--install-namespace", "venafi"))
+			assert.NoError(t, err)
 		})
 	})
 }
@@ -567,7 +578,8 @@ func discardLogs(_ testing.TB) *log.Logger {
 	return log.New(io.Discard, "", 0)
 }
 
-// Shortcut for ParseConfig.
+// ParseConfig does some validation but we don't want this extra validation, so
+// this is just using yaml.Unmarshal.
 func withConfig(s string) Config {
 	var cfg Config
 

pkg/testutil/testutil.go

@@ -191,7 +191,7 @@ type AssertRequest func(t testing.TB, r *http.Request)
 func FakeVenafiCloud(t *testing.T) (_ *httptest.Server, _ *x509.Certificate, setAssert func(AssertRequest)) {
 	t.Helper()
 
-	var assertFn AssertRequest
+	assertFn := func(_ testing.TB, _ *http.Request) {}
 	assertFnMu := sync.Mutex{}
 	setAssert = func(setAssert AssertRequest) {
 		assertFnMu.Lock()