fix: implement String for logging of PodInfo and IPConfig (#2020)

Signed-off-by: Evan Baker <[email protected]>

Author: rbtr

cns/NetworkContainerContract.go

@@ -166,6 +166,8 @@ type PodInfo interface {
 	OrchestratorContext() (json.RawMessage, error)
 	// Equals implements a functional equals for PodInfos
 	Equals(PodInfo) bool
+	// String implements string for logging PodInfos
+	String() string
 }
 
 type KubernetesPodInfo struct {
@@ -183,6 +185,11 @@ type podInfo struct {
 	Version             podInfoScheme
 }
 
+func (p podInfo) String() string {
+	return fmt.Sprintf("InfraContainerID: [%s], InterfaceID: [%s], Key: [%s], Name: [%s], Namespace: [%s]",
+		p.InfraContainerID(), p.InterfaceID(), p.Key(), p.Name(), p.Namespace())
+}
+
 func (p *podInfo) Equals(o PodInfo) bool {
 	if (p == nil) != (o == nil) {
 		return false

cns/api.go

@@ -97,9 +97,9 @@ func (i *IPConfigurationStatus) WithStateMiddleware(fs ...stateMiddlewareFunc) {
 	i.stateMiddlewareFuncs = append(i.stateMiddlewareFuncs, fs...)
 }
 
-func (i *IPConfigurationStatus) String() string {
-	return fmt.Sprintf("IPConfigurationStatus: Id: [%s], NcId: [%s], IpAddress: [%s], State: [%s], PodInfo: [%v]",
-		i.ID, i.NCID, i.IPAddress, i.state, i.PodInfo)
+func (i IPConfigurationStatus) String() string {
+	return fmt.Sprintf("ID: [%s], NCID: [%s], IPAddress: [%s], State: [%s], LastStateTransition: [%s] PodInfo: [%s]",
+		i.ID, i.NCID, i.IPAddress, i.state, i.LastStateTransition.Format(time.RFC3339), i.PodInfo)
 }
 
 // MarshalJSON is a custom marshaller for IPConfigurationStatus that

cns/restserver/util.go

@@ -282,7 +282,7 @@ func (service *HTTPRestService) addIPConfigStateUntransacted(ncID string, hostVe
 
 		if ipState, exists := service.PodIPConfigState[ipID]; exists {
 			logger.Printf("[Azure-Cns] Set ipId %s, IP %s version to %d, programmed host nc version is %d, "+
-				"ipState: %+v", ipID, ipconfig.IPAddress, ipconfig.NCVersion, hostVersion, ipState)
+				"ipState: %s", ipID, ipconfig.IPAddress, ipconfig.NCVersion, hostVersion, ipState)
 			continue
 		}