TUN-8770: add cli configuration and tunnel configuration to diagnostic zipfile

## Summary

Adds two new jobs which will export the cli configuration and tunnel configuration in separate files. These files will also be added to the zipfile's root.

 Closes TUN-8770

Author: lmpn

diagnostic/consts.go

@@ -31,4 +31,6 @@ const (
 	networkBaseName           = "network.json"
 	rawNetworkBaseName        = "raw-network.txt"
 	tunnelStateBaseName       = "tunnelstate.json"
+	cliConfigurationBaseName  = "cli-configuration.json"
+	configurationBaseName     = "configuration.json"
 )

diagnostic/diagnostic.go

@@ -376,6 +376,16 @@ func createJobs(
 			fn:      jsonNetworkCollectorFunc,
 			bypass:  noDiagNetwork,
 		},
+		{
+			jobName: "cli configuration",
+			fn:      collectFromEndpointAdapter(client.GetCliConfiguration, cliConfigurationBaseName),
+			bypass:  false,
+		},
+		{
+			jobName: "configuration",
+			fn:      collectFromEndpointAdapter(client.GetTunnelConfiguration, configurationBaseName),
+			bypass:  false,
+		},
 	}
 
 	return jobs