Address comments

Author: NihaNallappagari

cns/fakes/imdsclientfake.go

@@ -58,14 +58,20 @@ func (m *MockIMDSClient) GetVMUniqueID(ctx context.Context) (string, error) {
 return "55b8499d-9b42-4f85-843f-24ff69f4a643", nil
 }
 
-func (m *MockIMDSClient) GetNCVersionsFromIMDS(ctx context.Context) (map[string]string, error) {
+func (m *MockIMDSClient) GetNCVersions(ctx context.Context) ([]imds.NetworkInterface, error) {
 if ctx.Value(SimulateError) != nil {
 return nil, imds.ErrUnexpectedStatusCode
 }
 
 // Return some mock NC versions for testing
-return map[string]string{
-"nc1": "1",
-"nc2": "2",
+return []imds.NetworkInterface{
+{
+InterfaceCompartmentID: "nc1",
+InterfaceCompartmentVersion: "1",
+},
+{
+InterfaceCompartmentID: "nc2",
+InterfaceCompartmentVersion: "2",
+},
 }, nil
 }

cns/imds/client.go

@@ -53,7 +53,6 @@ const (
 metadataHeaderValue = "true"
 defaultRetryAttempts = 3
 defaultIMDSEndpoint = "http://169.254.169.254"
-ncVersion = "ncVersion"
 )
 
 var (
@@ -104,7 +103,7 @@ func (c *Client) GetVMUniqueID(ctx context.Context) (string, error) {
 return vmUniqueID, nil
 }
 
-func (c *Client) GetNCVersionsFromIMDS(ctx context.Context) (map[string]string, error) {
+func (c *Client) GetNCVersions(ctx context.Context) ([]NetworkInterface, error) {
 var networkData NetworkMetadata
 err := retry.Do(func() error {
 networkMetadata, err := c.getInstanceMetadata(ctx, imdsNetworkPath)
@@ -125,23 +124,10 @@ func (c *Client) GetNCVersionsFromIMDS(ctx context.Context) (map[string]string,
 return nil
 }, retry.Context(ctx), retry.Attempts(c.config.retryAttempts), retry.DelayType(retry.BackOffDelay))
 if err != nil {
-return nil, err
+return nil, errors.Wrap(err, "external call failed")
 }
 
-ncVersions := make(map[string]string)
-for _, iface := range networkData.Interface {
-// IMDS only returns compartment fields (interfaceCompartmentId, interfaceCompartmentVersion)
-// We map these to NC ID and NC version concepts
-// Standard fields (ncId, ncVersion) are ignored even if present
-ncId := iface.InterfaceCompartmentId
-ncVersion := iface.InterfaceCompartmentVersion
-
-if ncId != "" {
-ncVersions[ncId] = ncVersion
-}
-}
-
-return ncVersions, nil
+return networkData.Interface, nil
 }
 
 func (c *Client) getInstanceMetadata(ctx context.Context, imdsComputePath string) (map[string]any, error) {
@@ -178,9 +164,8 @@ func (c *Client) getInstanceMetadata(ctx context.Context, imdsComputePath string
 
 // NetworkInterface represents a network interface from IMDS
 type NetworkInterface struct {
-MacAddress string `json:"macAddress"`
 // IMDS only returns compartment fields - these are mapped to NC ID and NC version concepts
-InterfaceCompartmentId string `json:"interfaceCompartmentId,omitempty"`
+InterfaceCompartmentID string `json:"interfaceCompartmentID,omitempty"`
 InterfaceCompartmentVersion string `json:"interfaceCompartmentVersion,omitempty"`
 }
 

cns/imds/client_test.go

@@ -101,21 +101,19 @@ func TestInvalidVMUniqueID(t *testing.T) {
 require.Equal(t, "", vmUniqueID)
 }
 
-func TestGetNCVersionsFromIMDS(t *testing.T) {
+func TestGetNCVersions(t *testing.T) {
 networkMetadata := []byte(`{
-"interface": [
-{
-"macAddress": "00:0D:3A:12:34:56",
-"interfaceCompartmentVersion": "1",
-"interfaceCompartmentId": "nc-12345-67890"
-},
-{
-"macAddress": "00:0D:3A:CD:EF:12",
-"interfaceCompartmentVersion": "",
-"interfaceCompartmentId": "nc-abcdef-123456"
-}
-]
-}`)
+ "interface": [
+ {
+ "interfaceCompartmentVersion": "1",
+ "interfaceCompartmentID": "nc-12345-67890"
+ },
+ {
+ "interfaceCompartmentVersion": "1",
+ "interfaceCompartmentID": ""
+ }
+ ]
+ }`)
 
 mockIMDSServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 // request header "Metadata: true" must be present
@@ -133,80 +131,87 @@ func TestGetNCVersionsFromIMDS(t *testing.T) {
 
 w.WriteHeader(http.StatusOK)
 _, writeErr := w.Write(networkMetadata)
-require.NoError(t, writeErr, "error writing response")
+if writeErr != nil {
+t.Errorf("error writing response: %v", writeErr)
+return
+}
 }))
 defer mockIMDSServer.Close()
 
 imdsClient := imds.NewClient(imds.Endpoint(mockIMDSServer.URL))
-ncVersions, err := imdsClient.GetNCVersionsFromIMDS(context.Background())
+interfaces, err := imdsClient.GetNCVersions(context.Background())
 require.NoError(t, err, "error querying testserver")
 
-expectedNCVersions := map[string]string{
-"nc-12345-67890": "1",
-"nc-abcdef-123456": "", // empty version
-}
-require.Equal(t, expectedNCVersions, ncVersions)
+// Verify we got the expected interfaces
+require.Len(t, interfaces, 2, "expected 2 interfaces")
+
+// Check first interface
+assert.Equal(t, "nc-12345-67890", interfaces[0].InterfaceCompartmentID)
+assert.Equal(t, "1", interfaces[0].InterfaceCompartmentVersion)
+
+// Check second interface
+assert.Equal(t, "", interfaces[1].InterfaceCompartmentID)
+assert.Equal(t, "1", interfaces[1].InterfaceCompartmentVersion)
 }
 
-func TestGetNCVersionsFromIMDSInvalidEndpoint(t *testing.T) {
+func TestGetNCVersionsInvalidEndpoint(t *testing.T) {
 imdsClient := imds.NewClient(imds.Endpoint(string([]byte{0x7f})), imds.RetryAttempts(1))
-_, err := imdsClient.GetNCVersionsFromIMDS(context.Background())
+_, err := imdsClient.GetNCVersions(context.Background())
 require.Error(t, err, "expected invalid path")
 }
 
-func TestGetNCVersionsFromIMDSInvalidJSON(t *testing.T) {
-mockIMDSServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+func TestGetNCVersionsInvalidJSON(t *testing.T) {
+mockIMDSServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 w.WriteHeader(http.StatusOK)
 _, err := w.Write([]byte("not json"))
-require.NoError(t, err)
+if err != nil {
+t.Errorf("error writing response: %v", err)
+return
+}
 }))
 defer mockIMDSServer.Close()
 
 imdsClient := imds.NewClient(imds.Endpoint(mockIMDSServer.URL), imds.RetryAttempts(1))
-_, err := imdsClient.GetNCVersionsFromIMDS(context.Background())
+_, err := imdsClient.GetNCVersions(context.Background())
 require.Error(t, err, "expected json decoding error")
 }
 
-func TestGetNCVersionsFromIMDSNoNCIDs(t *testing.T) {
+func TestGetNCVersionsNoNCIDs(t *testing.T) {
 networkMetadataNoNC := []byte(`{
-"interface": [
-{
-"macAddress": "00:0D:3A:12:34:56",
-"ipv4": {
-"ipAddress": [
-{
-"privateIpAddress": "10.0.0.4",
-"publicIpAddress": ""
-}
-]
-}
-},
-{
-"macAddress": "00:0D:3A:78:90:AB",
-"ipv4": {
-"ipAddress": [
-{
-"privateIpAddress": "10.0.1.4",
-"publicIpAddress": ""
-}
-]
-}
-}
-]
-}`)
+ "interface": [
+ {
+ "ipv4": {
+ "ipAddress": [
+ {
+ "privateIpAddress": "10.0.0.4",
+ "publicIpAddress": ""
+ }
+ ]
+ }
+ }
+ ]
+ }`)
 
 mockIMDSServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 metadataHeader := r.Header.Get("Metadata")
 assert.Equal(t, "true", metadataHeader)
 
 w.WriteHeader(http.StatusOK)
 _, writeErr := w.Write(networkMetadataNoNC)
-require.NoError(t, writeErr, "error writing response")
+if writeErr != nil {
+t.Errorf("error writing response: %v", writeErr)
+return
+}
 }))
 defer mockIMDSServer.Close()
 
 imdsClient := imds.NewClient(imds.Endpoint(mockIMDSServer.URL))
-ncVersions, err := imdsClient.GetNCVersionsFromIMDS(context.Background())
+interfaces, err := imdsClient.GetNCVersions(context.Background())
 require.NoError(t, err, "error querying testserver")
-require.Empty(t, ncVersions, "expected empty NC versions map when no NC IDs present")
+
+// Verify we got interfaces but they don't have compartment IDs
+require.Len(t, interfaces, 1, "expected 1 interface")
+
+// Check that interfaces don't have compartment IDs
+assert.Equal(t, "", interfaces[0].InterfaceCompartmentID)
 }