Merge pull request GoogleCloudPlatform#1861 from justinsb/monitoring_…

…dashboard_tests tests: simplify monitoringdashboard test case, add to tests-e2e-direct
gemmahou · Jun 7, 2024 · 87b178d · 87b178d
2 parents a8c8d40 + 066aac1
commit 87b178d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...ngdashboard/monitoringdashboardrefs/_generated_object_monitoringdashboardrefs.golden.yaml b/...ngdashboard/monitoringdashboardrefs/_generated_object_monitoringdashboardrefs.golden.yaml
@@ -52,7 +52,7 @@ spec:
           filter: metric.type="agent.googleapis.com/nginx/connections/accepted_count"
           resourceNames: []
         title: Widget 4
-  displayName: monitoringdashboard-${uniqueId}
+  displayName: monitoringdashboard updated
   projectRef:
     name: otherproject
   resourceID: monitoringdashboard-${uniqueId}

diff --git a/...e/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_http.log b/...e/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_http.log
@@ -524,9 +524,9 @@ User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
       }
     ]
   },
-  "displayName": "monitoringdashboard-${uniqueId}",
+  "displayName": "monitoringdashboard updated",
   "etag": "abcdef0123A=",
-  "name": "projects/${projectId}/dashboards/monitoringdashboard-${uniqueId}"
+  "name": "projects/projects/other${uniqueId}/dashboards/monitoringdashboard-${uniqueId}"
 }
 
 200 OK
@@ -613,7 +613,7 @@ X-Xss-Protection: 0
       }
     ]
   },
-  "displayName": "monitoringdashboard-${uniqueId}",
+  "displayName": "monitoringdashboard updated",
   "etag": "abcdef0123A=",
   "name": "projects/${projectNumber}/dashboards/monitoringdashboard-${uniqueId}"
 }
@@ -708,7 +708,7 @@ X-Xss-Protection: 0
       }
     ]
   },
-  "displayName": "monitoringdashboard-${uniqueId}",
+  "displayName": "monitoringdashboard updated",
   "etag": "abcdef0123A=",
   "name": "projects/${projectNumber}/dashboards/monitoringdashboard-${uniqueId}"
 }

diff --git a/...testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/update.yaml b/...testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/update.yaml
@@ -19,7 +19,7 @@ metadata:
 spec:
   projectRef:
     name: otherproject
-  displayName: "monitoringdashboard-${uniqueId}"
+  displayName: "monitoringdashboard updated"
   columnLayout:
     columns:
     - weight: 2

diff --git a/scripts/github-actions/tests-e2e-direct.sh b/scripts/github-actions/tests-e2e-direct.sh
@@ -38,7 +38,7 @@ echo "Running e2e tests fixtures for LoggingLogMetric direct reconciliation..."
 GOLDEN_OBJECT_CHECKS=1 \
 GOLDEN_REQUEST_CHECKS=1 \
 E2E_KUBE_TARGET=envtest RUN_E2E=1 E2E_GCP_TARGET=mock \
-  go test -test.count=1 -timeout 600s -v ./tests/e2e -run 'TestAllInSeries/fixtures/explicitlogmetric|TestAllInSeries/fixtures/exponentiallogmetric|TestAllInSeries/fixtures/linearlogmetric|TestAllInSeries/fixtures/logbucketmetric'
+  go test -test.count=1 -timeout 600s -v ./tests/e2e -run 'TestAllInSeries/fixtures/explicitlogmetric|TestAllInSeries/fixtures/exponentiallogmetric|TestAllInSeries/fixtures/linearlogmetric|TestAllInSeries/fixtures/logbucketmetric|TestAllInSeries/fixtures/monitoringdashboard'
 
 echo "Running scenarios tests for LoggingLogMetric direct reconciliation..."