BREAKING CHANGE: 'eksDashboardUrl' and 'incidentsUrl' are no longer r…

…equired properties in WebService
techfromsage · Sep 12, 2024 · 26e0589 · 26e0589
1 parent 2c01ef1
commit 26e0589
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 70 deletions.
diff --git a/e2e/full-stack.e2e.ts b/e2e/full-stack.e2e.ts
@@ -149,9 +149,7 @@ export class FullStackChart extends TalisChart {
       repositoryUrl: "https://github.com/stefanprodan/podinfo",
       issuesUrl: "https://github.com/talis/talis-cdk8s-constructs/issues",
       chatUrl: "None",
-      eksDashboardUrl: "None",
       graphsUrl: "None",
-      incidentsUrl: "None",
       logsUrl: "None",
       runbookUrl: "None",
       uptimeUrl: "None",

diff --git a/e2e/rails-app.e2e.ts b/e2e/rails-app.e2e.ts
@@ -84,9 +84,7 @@ export class RubyOnRailsAppChart extends TalisChart {
       issuesUrl: "https://github.com/talis/talis-cdk8s-constructs/issues",
       externalUrl: "None",
       chatUrl: "None",
-      eksDashboardUrl: "None",
       graphsUrl: "None",
-      incidentsUrl: "None",
       logsUrl: "None",
       runbookUrl: "None",
       uptimeUrl: "None",

diff --git a/e2e/web-service-canary.e2e.ts b/e2e/web-service-canary.e2e.ts
@@ -60,9 +60,7 @@ export class WebServiceCanaryChart extends TalisChart {
       repositoryUrl: "https://github.com/stefanprodan/podinfo",
       issuesUrl: "https://github.com/talis/talis-cdk8s-constructs/issues",
       chatUrl: "None",
-      eksDashboardUrl: "None",
       graphsUrl: "None",
-      incidentsUrl: "None",
       logsUrl: "None",
       runbookUrl: "None",
       uptimeUrl: "None",

diff --git a/examples/advanced-web-service/__snapshots__/chart.test.ts.snap b/examples/advanced-web-service/__snapshots__/chart.test.ts.snap
@@ -196,9 +196,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -340,9 +338,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -829,9 +825,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -1193,9 +1187,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -1682,9 +1674,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -1826,9 +1816,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -2315,9 +2303,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -2678,9 +2664,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -3167,9 +3151,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",
@@ -3310,9 +3292,7 @@ proxy_cookie_path / "/$cookie_path_patches";
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Advanced web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",

diff --git a/examples/advanced-web-service/chart.ts b/examples/advanced-web-service/chart.ts
@@ -35,10 +35,8 @@ export class AdvancedWebServiceChart extends TalisChart {
       // Service annotations
       description: "Advanced web service",
       chatUrl: "https://example.slack.com/archives/ABCDEF123",
-      eksDashboardUrl: "https://example.io/dashboard",
       externalUrl: "https://api.example.com/",
       graphsUrl: "https://example.io/grafana",
-      incidentsUrl: "https://example.io/incidents",
       issuesUrl: "https://github.com/talis/talis-cdk8s-constructs/issues",
       logsUrl: "https://example.io/loki",
       repositoryUrl: "https://github.com/talis/talis-cdk8s-constructs",

diff --git a/examples/background-worker/__snapshots__/chart.test.ts.snap b/examples/background-worker/__snapshots__/chart.test.ts.snap
@@ -66,9 +66,7 @@ exports[`BackgroundWorker example > Change release version 1`] = `
       "annotations": {
         "talis.io/chat": "https://talis.slack.com/archives/C04P9DPCX",
         "talis.io/description": "Frontend to the Resque job queue system",
-        "talis.io/eks-dashboard": "None",
         "talis.io/graphs": "None",
-        "talis.io/incidents": "None",
         "talis.io/issues": "https://github.com/talis/platform/issues",
         "talis.io/logs": "None",
         "talis.io/repository": "https://github.com/talis/resque-web-container",
@@ -487,9 +485,7 @@ exports[`BackgroundWorker example > Snapshot 1`] = `
       "annotations": {
         "talis.io/chat": "https://talis.slack.com/archives/C04P9DPCX",
         "talis.io/description": "Frontend to the Resque job queue system",
-        "talis.io/eks-dashboard": "None",
         "talis.io/graphs": "None",
-        "talis.io/incidents": "None",
         "talis.io/issues": "https://github.com/talis/platform/issues",
         "talis.io/logs": "None",
         "talis.io/repository": "https://github.com/talis/resque-web-container",

diff --git a/examples/simple-web-service/__snapshots__/main.test.ts.snap b/examples/simple-web-service/__snapshots__/main.test.ts.snap
@@ -9,9 +9,7 @@ exports[`Simple WebService example > Snapshot 1`] = `
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Simple web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://github.com/talis/talis-cdk8s-constructs/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://github.com/talis/talis-cdk8s-constructs",

diff --git a/examples/simple-web-service/main.ts b/examples/simple-web-service/main.ts
@@ -16,10 +16,8 @@ export class SimpleWebServiceChart extends Chart {
       // Service annotations
       description: "Simple web service",
       chatUrl: "https://example.slack.com/archives/ABCDEF123",
-      eksDashboardUrl: "https://example.io/dashboard",
       externalUrl: "https://api.example.com/",
       graphsUrl: "https://example.io/grafana",
-      incidentsUrl: "https://example.io/incidents",
       issuesUrl: "https://github.com/talis/talis-cdk8s-constructs/issues",
       logsUrl: "https://example.io/loki",
       repositoryUrl: "https://github.com/talis/talis-cdk8s-constructs",

diff --git a/lib/web-service/resque-web.ts b/lib/web-service/resque-web.ts
@@ -36,11 +36,9 @@ export class ResqueWeb extends Construct {
       repositoryUrl: "https://github.com/talis/resque-web-container",
       issuesUrl: "https://github.com/talis/platform/issues",
       chatUrl: "https://talis.slack.com/archives/C04P9DPCX",
-      incidentsUrl: "None",
       runbookUrl: "None",
       logsUrl: "None",
       graphsUrl: "None",
-      eksDashboardUrl: "None",
       uptimeUrl: "None",
 
       // Container options

diff --git a/lib/web-service/web-service-props.ts b/lib/web-service/web-service-props.ts
@@ -74,9 +74,6 @@ interface ServiceAnnotations {
   /** Link to Slack channel of the project/team that owns the project for `talis.io/chat` annotation. */
   readonly chatUrl: string;
 
-  /** Link to incident dashboard for `talis.io/incidents` annotation. */
-  readonly incidentsUrl: string;
-
   /** Link to project runbook for `talis.io/runbook` annotation. */
   readonly runbookUrl: string;
 
@@ -86,9 +83,6 @@ interface ServiceAnnotations {
   /** Link to the graphs in Grafana for `talis.io/graphs` annotation. */
   readonly graphsUrl: string;
 
-  /** Link to the Kubernetes dashboard for `talis.io/eks-dashboard` annotation. */
-  readonly eksDashboardUrl: string;
-
   /** Link to the uptime dashboard for `talis.io/uptime` annotation. */
   readonly uptimeUrl: string;
 }

diff --git a/lib/web-service/web-service.ts b/lib/web-service/web-service.ts
@@ -142,9 +142,7 @@ export class WebService extends Construct {
           annotations: {
             "talis.io/chat": props.chatUrl,
             "talis.io/description": props.description,
-            "talis.io/eks-dashboard": props.eksDashboardUrl,
             "talis.io/graphs": props.graphsUrl,
-            "talis.io/incidents": props.incidentsUrl,
             "talis.io/issues": props.issuesUrl,
             "talis.io/logs": props.logsUrl,
             "talis.io/repository": props.repositoryUrl,

diff --git a/test/web-service/__snapshots__/resque-web.test.ts.snap b/test/web-service/__snapshots__/resque-web.test.ts.snap
@@ -9,9 +9,7 @@ exports[`ResqueWeb > Creates resque web objects 1`] = `
       "annotations": {
         "talis.io/chat": "https://talis.slack.com/archives/C04P9DPCX",
         "talis.io/description": "Frontend to the Resque job queue system",
-        "talis.io/eks-dashboard": "None",
         "talis.io/graphs": "None",
-        "talis.io/incidents": "None",
         "talis.io/issues": "https://github.com/talis/platform/issues",
         "talis.io/logs": "None",
         "talis.io/repository": "https://github.com/talis/resque-web-container",
@@ -218,9 +216,7 @@ exports[`ResqueWeb > Customizations 1`] = `
       "annotations": {
         "talis.io/chat": "https://talis.slack.com/archives/C04P9DPCX",
         "talis.io/description": "Frontend to the Resque job queue system",
-        "talis.io/eks-dashboard": "None",
         "talis.io/graphs": "None",
-        "talis.io/incidents": "None",
         "talis.io/issues": "https://github.com/talis/platform/issues",
         "talis.io/logs": "None",
         "talis.io/repository": "https://github.com/talis/resque-web-container",
@@ -456,9 +452,7 @@ exports[`ResqueWeb > ingressAnnotations are merged 1`] = `
       "annotations": {
         "talis.io/chat": "https://talis.slack.com/archives/C04P9DPCX",
         "talis.io/description": "Frontend to the Resque job queue system",
-        "talis.io/eks-dashboard": "None",
         "talis.io/graphs": "None",
-        "talis.io/incidents": "None",
         "talis.io/issues": "https://github.com/talis/platform/issues",
         "talis.io/logs": "None",
         "talis.io/repository": "https://github.com/talis/resque-web-container",
@@ -675,9 +669,7 @@ exports[`ResqueWeb > selectorLabels are merged 1`] = `
       "annotations": {
         "talis.io/chat": "https://talis.slack.com/archives/C04P9DPCX",
         "talis.io/description": "Frontend to the Resque job queue system",
-        "talis.io/eks-dashboard": "None",
         "talis.io/graphs": "None",
-        "talis.io/incidents": "None",
         "talis.io/issues": "https://github.com/talis/platform/issues",
         "talis.io/logs": "None",
         "talis.io/repository": "https://github.com/talis/resque-web-container",

diff --git a/test/web-service/__snapshots__/web-service.test.ts.snap b/test/web-service/__snapshots__/web-service.test.ts.snap
@@ -75,9 +75,7 @@ exports[`WebService > Props > All the props 1`] = `
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Test web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://example.io/repo/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://example.io/repo",
@@ -564,9 +562,7 @@ exports[`WebService > Props > All the props 1`] = `
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Test web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://example.io/repo/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://example.io/repo",
@@ -1004,9 +1000,7 @@ exports[`WebService > Props > Horizontal Pod Autoscaler 1`] = `
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Test web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://example.io/repo/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://example.io/repo",
@@ -1228,9 +1222,7 @@ exports[`WebService > Props > Horizontal Pod Autoscaler for both memory and cpu
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Test web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://example.io/repo/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://example.io/repo",
@@ -1462,9 +1454,7 @@ exports[`WebService > Props > Horizontal Pod Autoscaler for memory 1`] = `
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Test web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://example.io/repo/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://example.io/repo",
@@ -1690,9 +1680,7 @@ exports[`WebService > Props > Minimal required props 1`] = `
       "annotations": {
         "talis.io/chat": "https://example.slack.com/archives/ABCDEF123",
         "talis.io/description": "Test web service",
-        "talis.io/eks-dashboard": "https://example.io/dashboard",
         "talis.io/graphs": "https://example.io/grafana",
-        "talis.io/incidents": "https://example.io/incidents",
         "talis.io/issues": "https://example.io/repo/issues",
         "talis.io/logs": "https://example.io/loki",
         "talis.io/repository": "https://example.io/repo",

diff --git a/test/web-service/web-service.test.ts b/test/web-service/web-service.test.ts
@@ -20,10 +20,8 @@ import { makeChart } from "../test-util";
 const annotations = {
   description: "Test web service",
   chatUrl: "https://example.slack.com/archives/ABCDEF123",
-  eksDashboardUrl: "https://example.io/dashboard",
   externalUrl: "https://api.example.com/",
   graphsUrl: "https://example.io/grafana",
-  incidentsUrl: "https://example.io/incidents",
   issuesUrl: "https://example.io/repo/issues",
   logsUrl: "https://example.io/loki",
   repositoryUrl: "https://example.io/repo",
@@ -958,12 +956,10 @@ describe("WebService", () => {
         "talis.io/repository": requiredProps.repositoryUrl,
         "talis.io/issues": requiredProps.issuesUrl,
         "talis.io/chat": requiredProps.chatUrl,
-        "talis.io/incidents": requiredProps.incidentsUrl,
         "talis.io/runbook": requiredProps.runbookUrl,
         "talis.io/url": requiredProps.externalUrl,
         "talis.io/logs": requiredProps.logsUrl,
         "talis.io/graphs": requiredProps.graphsUrl,
-        "talis.io/eks-dashboard": requiredProps.eksDashboardUrl,
         "talis.io/uptime": requiredProps.uptimeUrl,
       });
     });