chore(UI): downsizing overview

pkg/api/v1/api.proto

@@ -441,7 +441,6 @@ message OverviewApplication {
 }
 
 message GetOverviewResponse {
-  map<string, Application> applications = 2;
   repeated EnvironmentGroup environment_groups = 3;
   string git_revision = 4;
   string branch = 5;
@@ -563,45 +562,13 @@ message UpstreamNotDeployed {
 }
 
 message Environment {
-
-  message Application {
-    message ArgoCD {
-      message SyncWindow {
-        string kind = 1; // "allow" or "deny"
-        string schedule = 2; // crontab format
-        string duration = 3; // duration the window is open (or closed)
-      }
-      repeated SyncWindow sync_windows = 1;
-    }
-    message DeploymentMetaData {
-      string deploy_author = 1;
-      // we use a string here, because the UI cannot handle int64 as a type.
-      // the string contains the unix timestamps in seconds (utc)
-      string deploy_time = 2;
-    }
-
-    string name = 1;
-    // version=0 means "nothing is deployed"
-    uint64 version = 2;
-    map<string, Lock> locks = 3;
-    // "version" describes the currently deployed version. "queuedVersion" describes a version that was to be deployed, but a lock stopped the deployment:
-    // "queuedVersion" has nothing to do with queue.go
-    // queued_version=0 means "nothing is queued"
-    uint64 queued_version = 4;
-    // google.protobuf.Timestamp deploy_date = 5; // This is never used
-    bool undeploy_version = 6;
-    ArgoCD argo_cd = 7;
-    DeploymentMetaData deployment_meta_data = 8;
-    map<string, Lock> team_locks = 9; //Keep in mind that team lock information will be duplicated if there is a team with more than one application (which is usually the case)
-    string team = 10;
-  }
-
   string name = 1;
   EnvironmentConfig config = 2;
-  map<string, Lock> locks = 3;
-  map<string, Application> applications = 4;
+  map<string, Lock> locks = 3; //Environment Locks. Lock ID -> Lock
   uint32 distance_to_upstream = 5;
   Priority priority = 6;
+  map<string, Locks> app_locks = 7;  //Application Locks. AppName -> []Locks
+  map<string, Locks> team_locks = 8; //Team Locks. TeamName -> []Locks
 }
 
 message Release {

pkg/db/db.go

@@ -1120,10 +1120,7 @@ func (h *DBHandler) DBInsertRelease(ctx context.Context, transaction *sql.Tx, re
 			previousEslVersion+1,
 			err)
 	}
-	err = h.UpdateOverviewRelease(ctx, transaction, release)
-	if err != nil {
-		return err
-	}
+
 	logger.FromContext(ctx).Sugar().Infof(
 		"inserted release: app '%s' and version '%v' and eslVersion %v",
 		release.App,
@@ -1979,7 +1976,10 @@ func processAllLatestDeploymentsForApp(rows *sql.Rows) (map[string]Deployment, e
 			}
 			return nil, fmt.Errorf("Error scanning deployments row from DB. Error: %w\n", err)
 		}
-
+		err = json.Unmarshal(([]byte)(jsonMetadata), &curr.Metadata)
+		if err != nil {
+			return nil, fmt.Errorf("Error during json unmarshal in deployments. Error: %w. Data: %s\n", err, jsonMetadata)
+		}
 		if releaseVersion.Valid {
 			curr.Version = &releaseVersion.Int64
 		}
@@ -5661,7 +5661,6 @@ func (h *DBHandler) ReadLatestOverviewCache(ctx context.Context, transaction *sq
 		result := &api.GetOverviewResponse{
 			Branch:            "",
 			ManifestRepoUrl:   "",
-			Applications:      map[string]*api.Application{},
 			LightweightApps:   []*api.OverviewApplication{},
 			EnvironmentGroups: []*api.EnvironmentGroup{},
 			GitRevision:       "",

pkg/db/db_test.go

@@ -37,7 +37,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"go.uber.org/zap"
-	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 type errMatcher struct {
@@ -2578,7 +2577,7 @@ func TestReadWriteOverviewCache(t *testing.T) {
 		Name      string
 		Overviews []*api.GetOverviewResponse
 	}
-
+	//TODO: This test suite has some commented out sections. These should be resolved in Ref: SRX-9PBRYS.
 	tcs := []TestCase{
 		{
 			Name: "Read and write",
@@ -2597,36 +2596,42 @@ func TestReadWriteOverviewCache(t *testing.T) {
 										Argocd:           &api.EnvironmentConfig_ArgoCD{},
 										EnvironmentGroup: &dev,
 									},
-									Applications: map[string]*api.Environment_Application{
-										"test": {
-											Name:    "test",
-											Version: 1,
-											DeploymentMetaData: &api.Environment_Application_DeploymentMetaData{
-												DeployAuthor: "[email protected]",
-												DeployTime:   "1",
-											},
-											Team: "team-123",
-										},
-									},
+									//Applications: map[string]*api.Environment_Application{
+									//	"test": {
+									//		Name:    "test",
+									//		Version: 1,
+									//		DeploymentMetaData: &api.Environment_Application_DeploymentMetaData{
+									//			DeployAuthor: "[email protected]",
+									//			DeployTime:   "1",
+									//		},
+									//		Team: "team-123",
+									//	},
+									//},
 									Priority: api.Priority_YOLO,
 								},
 							},
 							Priority: api.Priority_YOLO,
 						},
 					},
-					Applications: map[string]*api.Application{
-						"test": {
+					//Applications: map[string]*api.Application{
+					//	"test": {
+					//		Name: "test",
+					//		Releases: []*api.Release{
+					//			{
+					//				Version:        1,
+					//				SourceCommitId: "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
+					//				SourceAuthor:   "example <[email protected]>",
+					//				SourceMessage:  "changed something (#678)",
+					//				PrNumber:       "678",
+					//				CreatedAt:      &timestamppb.Timestamp{Seconds: 1, Nanos: 1},
+					//			},
+					//		},
+					//		Team: "team-123",
+					//	},
+					//},
+					LightweightApps: []*api.OverviewApplication{
+						{
 							Name: "test",
-							Releases: []*api.Release{
-								{
-									Version:        1,
-									SourceCommitId: "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
-									SourceAuthor:   "example <[email protected]>",
-									SourceMessage:  "changed something (#678)",
-									PrNumber:       "678",
-									CreatedAt:      &timestamppb.Timestamp{Seconds: 1, Nanos: 1},
-								},
-							},
 							Team: "team-123",
 						},
 					},
@@ -2651,36 +2656,42 @@ func TestReadWriteOverviewCache(t *testing.T) {
 										Argocd:           &api.EnvironmentConfig_ArgoCD{},
 										EnvironmentGroup: &dev,
 									},
-									Applications: map[string]*api.Environment_Application{
-										"test": {
-											Name:    "test",
-											Version: 1,
-											DeploymentMetaData: &api.Environment_Application_DeploymentMetaData{
-												DeployAuthor: "[email protected]",
-												DeployTime:   "1",
-											},
-											Team: "team-123",
-										},
-									},
+									//Applications: map[string]*api.Environment_Application{
+									//	"test": {
+									//		Name:    "test",
+									//		Version: 1,
+									//		DeploymentMetaData: &api.Environment_Application_DeploymentMetaData{
+									//			DeployAuthor: "[email protected]",
+									//			DeployTime:   "1",
+									//		},
+									//		Team: "team-123",
+									//	},
+									//},
 									Priority: api.Priority_YOLO,
 								},
 							},
 							Priority: api.Priority_YOLO,
 						},
 					},
-					Applications: map[string]*api.Application{
-						"test": {
+					//Applications: map[string]*api.Application{
+					//	"test": {
+					//		Name: "test",
+					//		Releases: []*api.Release{
+					//			{
+					//				Version:        1,
+					//				SourceCommitId: "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
+					//				SourceAuthor:   "example <[email protected]>",
+					//				SourceMessage:  "changed something (#678)",
+					//				PrNumber:       "678",
+					//				CreatedAt:      &timestamppb.Timestamp{Seconds: 1, Nanos: 1},
+					//			},
+					//		},
+					//		Team: "team-123",
+					//	},
+					//},
+					LightweightApps: []*api.OverviewApplication{
+						{
 							Name: "test",
-							Releases: []*api.Release{
-								{
-									Version:        1,
-									SourceCommitId: "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
-									SourceAuthor:   "example <[email protected]>",
-									SourceMessage:  "changed something (#678)",
-									PrNumber:       "678",
-									CreatedAt:      &timestamppb.Timestamp{Seconds: 1, Nanos: 1},
-								},
-							},
 							Team: "team-123",
 						},
 					},
@@ -2700,36 +2711,42 @@ func TestReadWriteOverviewCache(t *testing.T) {
 										Argocd:           &api.EnvironmentConfig_ArgoCD{},
 										EnvironmentGroup: &dev,
 									},
-									Applications: map[string]*api.Environment_Application{
-										"test2": {
-											Name:    "test2",
-											Version: 1,
-											DeploymentMetaData: &api.Environment_Application_DeploymentMetaData{
-												DeployAuthor: "[email protected]",
-												DeployTime:   "1",
-											},
-											Team: "team-123",
-										},
-									},
+									//Applications: map[string]*api.Environment_Application{
+									//	"test2": {
+									//		Name:    "test2",
+									//		Version: 1,
+									//		DeploymentMetaData: &api.Environment_Application_DeploymentMetaData{
+									//			DeployAuthor: "[email protected]",
+									//			DeployTime:   "1",
+									//		},
+									//		Team: "team-123",
+									//	},
+									//},
 									Priority: api.Priority_CANARY,
 								},
 							},
 							Priority: api.Priority_CANARY,
 						},
 					},
-					Applications: map[string]*api.Application{
-						"test2": {
+					//Applications: map[string]*api.Application{
+					//	"test2": {
+					//		Name: "test2",
+					//		Releases: []*api.Release{
+					//			{
+					//				Version:        1,
+					//				SourceCommitId: "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
+					//				SourceAuthor:   "example <[email protected]>",
+					//				SourceMessage:  "changed something (#678)",
+					//				PrNumber:       "678",
+					//				CreatedAt:      &timestamppb.Timestamp{Seconds: 1, Nanos: 1},
+					//			},
+					//		},
+					//		Team: "team-123",
+					//	},
+					//},
+					LightweightApps: []*api.OverviewApplication{
+						{
 							Name: "test2",
-							Releases: []*api.Release{
-								{
-									Version:        1,
-									SourceCommitId: "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
-									SourceAuthor:   "example <[email protected]>",
-									SourceMessage:  "changed something (#678)",
-									PrNumber:       "678",
-									CreatedAt:      &timestamppb.Timestamp{Seconds: 1, Nanos: 1},
-								},
-							},
 							Team: "team-123",
 						},
 					},