fix formatting errors

Author: NihaNallappagari

cns/fakes/imdsclientfake.go

@@ -60,38 +60,38 @@ func (m *MockIMDSClient) GetVMUniqueID(ctx context.Context) (string, error) {
 }
 
 func (m *MockIMDSClient) GetNetworkInterfaces(ctx context.Context) ([]imds.NetworkInterface, error) {
-    if ctx.Value(SimulateError) != nil {
-        return nil, imds.ErrUnexpectedStatusCode
-    }
+	if ctx.Value(SimulateError) != nil {
+		return nil, imds.ErrUnexpectedStatusCode
+	}
 
-    // Parse MAC addresses for testing
-    macAddr1, _ := net.ParseMAC("00:15:5d:01:02:01")
-    macAddr2, _ := net.ParseMAC("00:15:5d:01:02:02")
+	// Parse MAC addresses for testing
+	macAddr1, _ := net.ParseMAC("00:15:5d:01:02:01")
+	macAddr2, _ := net.ParseMAC("00:15:5d:01:02:02")
 
-    // Return some mock network interfaces for testing
-    return []imds.NetworkInterface{
-        {
-            InterfaceCompartmentID: "nc1",
-            MacAddress:            imds.HardwareAddr(macAddr1),
-        },
-        {
-            InterfaceCompartmentID: "nc2",
-            MacAddress:            imds.HardwareAddr(macAddr2),
-        },
-    }, nil
+	// Return some mock network interfaces for testing
+	return []imds.NetworkInterface{
+		{
+			InterfaceCompartmentID: "nc1",
+			MacAddress:             imds.HardwareAddr(macAddr1),
+		},
+		{
+			InterfaceCompartmentID: "nc2",
+			MacAddress:             imds.HardwareAddr(macAddr2),
+		},
+	}, nil
 }
 
 func (m *MockIMDSClient) GetIMDSVersions(ctx context.Context) (*imds.APIVersionsResponse, error) {
-    if ctx.Value(SimulateError) != nil {
-        return nil, imds.ErrUnexpectedStatusCode
-    }
+	if ctx.Value(SimulateError) != nil {
+		return nil, imds.ErrUnexpectedStatusCode
+	}
 
-    // Return supported API versions including the expected one
-    return &imds.APIVersionsResponse{
-        APIVersions: []string{
-            "2017-03-01",
-            "2021-01-01",
-            "2025-07-24",
-        },
-    }, nil
+	// Return supported API versions including the expected one
+	return &imds.APIVersionsResponse{
+		APIVersions: []string{
+			"2017-03-01",
+			"2021-01-01",
+			"2025-07-24",
+		},
+	}, nil
 }

cns/imds/client.go

@@ -45,17 +45,17 @@ func RetryAttempts(attempts uint) ClientOption {
 }
 
 const (
-	vmUniqueIDProperty   	= "vmId"
-	imdsComputePath      	= "/metadata/instance/compute"
-	imdsNetworkPath      	= "/metadata/instance/network"
-	imdsVersionsPath     	= "/metadata/versions"
-	imdsDefaultAPIVersion  	= "api-version=2021-01-01"
-	imdsNCDetailsVersion 	= "api-version=2025-07-24"
-	imdsFormatJSON      	= "format=json"
-	metadataHeaderKey   	= "Metadata"
-	metadataHeaderValue  	= "true"
-	defaultRetryAttempts 	= 3
-	defaultIMDSEndpoint  	= "http://169.254.169.254"
+	vmUniqueIDProperty    = "vmId"
+	imdsComputePath       = "/metadata/instance/compute"
+	imdsNetworkPath       = "/metadata/instance/network"
+	imdsVersionsPath      = "/metadata/versions"
+	imdsDefaultAPIVersion = "api-version=2021-01-01"
+	imdsNCDetailsVersion  = "api-version=2025-07-24"
+	imdsFormatJSON        = "format=json"
+	metadataHeaderKey     = "Metadata"
+	metadataHeaderValue   = "true"
+	defaultRetryAttempts  = 3
+	defaultIMDSEndpoint   = "http://169.254.169.254"
 )
 
 var (
@@ -132,7 +132,6 @@ func (c *Client) GetNetworkInterfaces(ctx context.Context) ([]NetworkInterface,
 	return networkData.Interface, nil
 }
 
-
 func (c *Client) getInstanceMetadata(ctx context.Context, imdsMetadataPath, imdsAPIVersion string) (map[string]any, error) {
 	imdsRequestURL, err := url.JoinPath(c.config.endpoint, imdsMetadataPath)
 	if err != nil {
@@ -166,82 +165,85 @@ func (c *Client) getInstanceMetadata(ctx context.Context, imdsMetadataPath, imds
 }
 
 func (c *Client) GetIMDSVersions(ctx context.Context) (*APIVersionsResponse, error) {
-    var versionsResp APIVersionsResponse
-    err := retry.Do(func() error {
-        // Build the URL for the versions endpoint
-        imdsRequestURL, err := url.JoinPath(c.config.endpoint, imdsVersionsPath)
-        if err != nil {
-            return errors.Wrap(err, "unable to build path to IMDS versions endpoint")
-        }
-
-        req, err := http.NewRequestWithContext(ctx, http.MethodGet, imdsRequestURL, http.NoBody)
-        if err != nil {
-            return errors.Wrap(err, "error building IMDS versions http request")
-        }
-
-        req.Header.Add(metadataHeaderKey, metadataHeaderValue)
-        resp, err := c.cli.Do(req)
-        if err != nil {
-            return errors.Wrap(err, "error querying IMDS versions API")
-        }
-        defer resp.Body.Close()
-
-        if resp.StatusCode != http.StatusOK {
-            return errors.Wrapf(ErrUnexpectedStatusCode, "unexpected status code %d", resp.StatusCode)
-        }
-
-        if err := json.NewDecoder(resp.Body).Decode(&versionsResp); err != nil {
-            return errors.Wrap(err, "error decoding IMDS versions response as json")
-        }
-
-        return nil
-    }, retry.Context(ctx), retry.Attempts(c.config.retryAttempts), retry.DelayType(retry.BackOffDelay))
-    
-    if err != nil {
-        return nil, errors.Wrap(err, "exhausted retries querying IMDS versions")
-    }
-
-    return &versionsResp, nil
+	var versionsResp APIVersionsResponse
+	err := retry.Do(func() error {
+		// Build the URL for the versions endpoint
+		imdsRequestURL, err := url.JoinPath(c.config.endpoint, imdsVersionsPath)
+		if err != nil {
+			return errors.Wrap(err, "unable to build path to IMDS versions endpoint")
+		}
+
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, imdsRequestURL, http.NoBody)
+		if err != nil {
+			return errors.Wrap(err, "error building IMDS versions http request")
+		}
+
+		req.Header.Add(metadataHeaderKey, metadataHeaderValue)
+		resp, err := c.cli.Do(req)
+		if err != nil {
+			return errors.Wrap(err, "error querying IMDS versions API")
+		}
+		defer resp.Body.Close()
+
+		if resp.StatusCode != http.StatusOK {
+			return errors.Wrapf(ErrUnexpectedStatusCode, "unexpected status code %d", resp.StatusCode)
+		}
+
+		if err := json.NewDecoder(resp.Body).Decode(&versionsResp); err != nil {
+			return errors.Wrap(err, "error decoding IMDS versions response as json")
+		}
+
+		return nil
+	}, retry.Context(ctx), retry.Attempts(c.config.retryAttempts), retry.DelayType(retry.BackOffDelay))
+
+	if err != nil {
+		return nil, errors.Wrap(err, "exhausted retries querying IMDS versions")
+	}
+
+	return &versionsResp, nil
 }
 
 // Required for  marshaling/unmarshaling of mac address
 type HardwareAddr net.HardwareAddr
 
-func (h HardwareAddr) MarshalJSON() ([]byte, error) {
-    return json.Marshal(net.HardwareAddr(h).String())
+func (h *HardwareAddr) MarshalJSON() ([]byte, error) {
+	data, err := json.Marshal(net.HardwareAddr(*h).String())
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to marshal hardware address")
+	}
+	return data, nil
 }
 
 func (h *HardwareAddr) UnmarshalJSON(data []byte) error {
-    var s string
-    if err := json.Unmarshal(data, &s); err != nil {
-        return err
-    }
-    mac, err := net.ParseMAC(s)
-    if err != nil {
-        return err
-    }
-    *h = HardwareAddr(mac)
-    return nil
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return errors.Wrap(err, "failed to unmarshal JSON data")
+	}
+	mac, err := net.ParseMAC(s)
+	if err != nil {
+		return errors.Wrap(err, "failed to parse MAC address")
+	}
+	*h = HardwareAddr(mac)
+	return nil
 }
 
-func (h HardwareAddr) String() string {
-    return net.HardwareAddr(h).String()
+func (h *HardwareAddr) String() string {
+	return net.HardwareAddr(*h).String()
 }
 
 // NetworkInterface represents a network interface from IMDS
 type NetworkInterface struct {
 	// IMDS returns compartment fields - these are mapped to NC ID and NC version
-	MacAddress               HardwareAddr      `json:"macAddress"`
-	InterfaceCompartmentID   string            `json:"interfaceCompartmentID,omitempty"`
+	MacAddress             HardwareAddr `json:"macAddress"`
+	InterfaceCompartmentID string       `json:"interfaceCompartmentID,omitempty"`
 }
 
 // NetworkInterfaces represents the network interfaces from IMDS
 type NetworkInterfaces struct {
 	Interface []NetworkInterface `json:"interface"`
 }
 
-
 // APIVersionsResponse represents versions form IMDS
 type APIVersionsResponse struct {
-    APIVersions []string `json:"apiVersions"`
-}
+	APIVersions []string `json:"apiVersions"`
+}