[Do Not Merge] One proxy per vm vc test revendor

Makefile

@@ -96,7 +96,6 @@ SHIMCMD := cc-shim
 SHIMPATH := $(PKGLIBEXECDIR)/$(SHIMCMD)
 
 PROXYCMD := cc-proxy
-PROXYURL := unix://$(PKGRUNDIR)/proxy.sock
 PROXYPATH := $(PKGLIBEXECDIR)/$(PROXYCMD)
 
 # Default number of vCPUs
@@ -165,7 +164,6 @@ USER_VARS += PKGLIBEXECDIR
 USER_VARS += PKGRUNDIR
 USER_VARS += PREFIX
 USER_VARS += PROXYPATH
-USER_VARS += PROXYURL
 USER_VARS += QEMUBINDIR
 USER_VARS += QEMUCMD
 USER_VARS += QEMUPATH
@@ -219,7 +217,6 @@ var defaultShimPath = "$(SHIMPATH)"
 
 const defaultKernelParams = "$(KERNELPARAMS)"
 const defaultMachineType = "$(MACHINETYPE)"
-const defaultProxyURL = "$(PROXYURL)"
 const defaultRootDirectory = "$(PKGRUNDIR)"
 const defaultRuntimeLib = "$(PKGLIBDIR)"
 const defaultRuntimeRun = "$(PKGRUNDIR)"
@@ -288,7 +285,7 @@ $(GENERATED_FILES): %: %.in Makefile VERSION
 		-e "s|@KERNELPARAMS@|$(KERNELPARAMS)|g" \
 		-e "s|@LOCALSTATEDIR@|$(LOCALSTATEDIR)|g" \
 		-e "s|@PKGLIBEXECDIR@|$(PKGLIBEXECDIR)|g" \
-		-e "s|@PROXYURL@|$(PROXYURL)|g" \
+		-e "s|@PROXYPATH@|$(PROXYPATH)|g" \
 		-e "s|@QEMUPATH@|$(QEMUPATH)|g" \
 		-e "s|@MACHINETYPE@|$(MACHINETYPE)|g" \
 		-e "s|@SHIMPATH@|$(SHIMPATH)|g" \

cc-env.go

@@ -64,6 +64,7 @@ type RuntimeConfigInfo struct {
 type RuntimeInfo struct {
 	Version RuntimeVersionInfo
 	Config  RuntimeConfigInfo
+	Debug   bool
 }
 
 // RuntimeVersionInfo stores details of the runtime version
@@ -78,20 +79,23 @@ type HypervisorInfo struct {
 	MachineType string
 	Version     string
 	Path        string
+	Debug       bool
 }
 
 // ProxyInfo stores proxy details
 type ProxyInfo struct {
 	Type    string
 	Version string
-	URL     string
+	Path    string
+	Debug   bool
 }
 
 // ShimInfo stores shim details
 type ShimInfo struct {
 	Type    string
 	Version string
 	Path    string
+	Debug   bool
 }
 
 // AgentInfo stores agent details
@@ -202,8 +206,6 @@ func getProxyInfo(config oci.RuntimeConfig) (ProxyInfo, error) {
 		return ProxyInfo{}, errors.New("cannot determine proxy config")
 	}
 
-	proxyURL := proxyConfig.URL
-
 	version, err := getCommandVersion(defaultProxyPath)
 	if err != nil {
 		version = unknown
@@ -212,7 +214,8 @@ func getProxyInfo(config oci.RuntimeConfig) (ProxyInfo, error) {
 	ccProxy := ProxyInfo{
 		Type:    string(config.ProxyType),
 		Version: version,
-		URL:     proxyURL,
+		Path:    proxyConfig.Path,
+		Debug:   proxyConfig.Debug,
 	}
 
 	return ccProxy, nil
@@ -239,6 +242,7 @@ func getShimInfo(config oci.RuntimeConfig) (ShimInfo, error) {
 		Type:    string(config.ShimType),
 		Version: version,
 		Path:    shimPath,
+		Debug:   shimConfig.Debug,
 	}
 
 	return ccShim, nil

config.go

@@ -89,7 +89,8 @@ type hypervisor struct {
 }
 
 type proxy struct {
-	URL string `toml:"url"`
+	Path  string `toml:"path"`
+	Debug bool   `toml:"enable_debug"`
 }
 
 type runtime struct {
@@ -172,12 +173,16 @@ func (h hypervisor) defaultMemSz() uint32 {
 	return h.DefaultMemSz
 }
 
-func (p proxy) url() string {
-	if p.URL == "" {
-		return defaultProxyURL
+func (p proxy) path() string {
+	if p.Path == "" {
+		return defaultProxyPath
 	}
 
-	return p.URL
+	return p.Path
+}
+
+func (p proxy) debug() bool {
+	return p.Debug
 }
 
 func (s shim) path() (string, error) {
@@ -265,7 +270,8 @@ func updateRuntimeConfig(configPath string, tomlConf tomlConfig, config *oci.Run
 		switch k {
 		case ccProxyTableType:
 			pConfig := vc.CCProxyConfig{
-				URL: proxy.url(),
+				Path:  proxy.path(),
+				Debug: proxy.debug(),
 			}
 
 			config.ProxyType = vc.CCProxyType

config/configuration.toml.in

@@ -61,7 +61,11 @@ disable_block_device_use = @DEFDISABLEBLOCK@
 #disable_nesting_checks = true
 
 [proxy.cc]
-url = "@PROXYURL@"
+path = "@PROXYPATH@"
+
+# If enabled, proxy messages will be sent to the system log
+# (default: disabled)
+#enable_debug = true
 
 [shim.cc]
 path = "@SHIMPATH@"