Add END OF LIFE coloumn to getmesh list (#124)

* Add END OF LIFE coloumn to `getmesh list`

Signed-off-by: Arko Dasgupta <[email protected]>

Author: arkodg

internal/manifest/manifest.go

@@ -72,19 +72,23 @@ func fetchManifest(url string) (*Manifest, error) {
 		return nil, fmt.Errorf("error unmarshalling fetched manifest: %v", err)
 	}
 
+	// Populate End of Life field within each distribution
+	if err := (&ret).SetEOLInIstioDistributions(); err != nil {
+		return nil, fmt.Errorf("error setting end of life in istio distribution: %v", err)
+	}
 	return &ret, nil
 }
 
 func PrintManifest(ms *Manifest, current *IstioDistribution) error {
-	column := []string{"ISTIO VERSION", "FLAVOR", "FLAVOR VERSION", "K8S VERSIONS"}
+	column := []string{"ISTIO VERSION", "FLAVOR", "FLAVOR VERSION", "K8S VERSIONS", "END OF LIFE"}
 	data := make([][]string, len(ms.IstioDistributions))
 	for i, m := range ms.IstioDistributions {
 		ps := strings.Join(m.K8SVersions, ",")
 		if current != nil && m.Equal(current) {
 			m.Version = "*" + m.Version
 		}
 		data[i] = []string{m.Version, m.Flavor,
-			strconv.Itoa(int(m.FlavorVersion)), ps}
+			strconv.Itoa(int(m.FlavorVersion)), ps, m.EndOfLife}
 	}
 
 	table := tablewriter.NewWriter(logger.GetWriter())

internal/manifest/manifest_test.go

@@ -84,22 +84,24 @@ func TestPrintManifest(t *testing.T) {
 					Flavor:        IstioDistributionFlavorTetrate,
 					FlavorVersion: 0,
 					K8SVersions:   []string{"1.16"},
+					EndOfLife:     "2022-01-01",
 				},
 				{
 					Version:       "1.7.5",
 					Flavor:        IstioDistributionFlavorTetrate,
 					FlavorVersion: 0,
 					K8SVersions:   []string{"1.16"},
+					EndOfLife:     "2022-01-01",
 				},
 			},
 		}
 
 		buf := logger.ExecuteWithLock(func() {
 			require.NoError(t, PrintManifest(manifest, nil))
 		})
-		require.Equal(t, `ISTIO VERSION	FLAVOR 	FLAVOR VERSION	K8S VERSIONS 
-    1.7.6    	tetrate	      0       	    1.16    	
-    1.7.5    	tetrate	      0       	    1.16    	
+		require.Equal(t, `ISTIO VERSION	FLAVOR 	FLAVOR VERSION	K8S VERSIONS	END OF LIFE 
+    1.7.6    	tetrate	      0       	    1.16    	2022-01-01 	
+    1.7.5    	tetrate	      0       	    1.16    	2022-01-01 	
 `,
 			buf.String())
 	})
@@ -118,18 +120,21 @@ func TestPrintManifest(t *testing.T) {
 					Flavor:        IstioDistributionFlavorIstio,
 					FlavorVersion: 0,
 					K8SVersions:   []string{"1.18"},
+					EndOfLife:     "2023-01-01",
 				},
 				{
 					Version:       "1.7.6",
 					Flavor:        IstioDistributionFlavorTetrateFIPS,
 					FlavorVersion: 0,
 					K8SVersions:   []string{"1.16"},
+					EndOfLife:     "2022-01-01",
 				},
 				{
 					Version:       "1.7.5",
 					Flavor:        IstioDistributionFlavorTetrate,
 					FlavorVersion: 0,
 					K8SVersions:   []string{"1.16"},
+					EndOfLife:     "2022-01-01",
 				},
 			},
 		}
@@ -138,10 +143,10 @@ func TestPrintManifest(t *testing.T) {
 			require.NoError(t, PrintManifest(manifest, current))
 		})
 
-		require.Equal(t, `ISTIO VERSION	  FLAVOR   	FLAVOR VERSION	K8S VERSIONS 
-    1.8.3    	   istio   	      0       	    1.18    	
-   *1.7.6    	tetratefips	      0       	    1.16    	
-    1.7.5    	  tetrate  	      0       	    1.16    	
+		require.Equal(t, `ISTIO VERSION	  FLAVOR   	FLAVOR VERSION	K8S VERSIONS	END OF LIFE 
+    1.8.3    	   istio   	      0       	    1.18    	2023-01-01 	
+   *1.7.6    	tetratefips	      0       	    1.16    	2022-01-01 	
+    1.7.5    	  tetrate  	      0       	    1.16    	2022-01-01 	
 `,
 			buf.String())
 	})

internal/manifest/type.go

@@ -19,6 +19,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/Masterminds/semver"
 )
 
 type Manifest struct {
@@ -42,6 +44,8 @@ type IstioDistribution struct {
 	IsSecurityPatch bool `json:"is_security_patch,omitempty"`
 	// Release notes for this distribution.
 	ReleaseNotes []string `json:"release_notes,omitempty"`
+	// EndOfLife of this distribution (format: "YYYY-MM-DD")
+	EndOfLife string `json:"end_of_life,omitempty"`
 }
 
 const (
@@ -62,6 +66,25 @@ func (x *Manifest) GetEOLDates() (map[string]time.Time, error) {
 	return ret, nil
 }
 
+func (x *Manifest) SetEOLInIstioDistributions() error {
+	for _, dist := range x.IstioDistributions {
+		iVer, err := semver.NewVersion(dist.Version)
+		if err != nil {
+			return err
+		}
+		for v, date := range x.IstioMinorVersionsEOLDates {
+			dVer, err := semver.NewVersion(v)
+			if err != nil {
+				return err
+			}
+			if (dVer.Major() == iVer.Major()) && (dVer.Minor() == iVer.Minor()) {
+				dist.EndOfLife = date
+			}
+		}
+	}
+	return nil
+}
+
 func parseManifestEOLDate(in string) (time.Time, error) {
 	const layout = "2006-01-02"
 	return time.Parse(layout, in)

internal/manifest/type_test.go

@@ -580,3 +580,29 @@ func TestGetLatestDistribution(t *testing.T) {
 		})
 	}
 }
+
+func TestEOLInIstioDistributions(t *testing.T) {
+	ms := &Manifest{
+		IstioDistributions: []*IstioDistribution{
+			{
+				Version:       "1.8.1",
+				Flavor:        IstioDistributionFlavorTetrate,
+				FlavorVersion: 10,
+				K8SVersions:   []string{"1.16"},
+			},
+			{
+				Version:       "1.7.5",
+				Flavor:        IstioDistributionFlavorTetrate,
+				FlavorVersion: 0,
+				K8SVersions:   []string{"1.16"},
+			},
+		},
+		IstioMinorVersionsEOLDates: map[string]string{
+			"1.7": "2022-01-01",
+			"1.8": "2023-01-01",
+		},
+	}
+	require.NoError(t, ms.SetEOLInIstioDistributions())
+	require.Equal(t, "2023-01-01", ms.IstioDistributions[0].EndOfLife)
+	require.Equal(t, "2022-01-01", ms.IstioDistributions[1].EndOfLife)
+}