Skip to content

Commit f64b6a6

Browse files
xiaoweimxiaoweim
committed
normalize test logs and tidy PR
1 parent cce5d0b commit f64b6a6

File tree

6 files changed

+52
-114
lines changed

6 files changed

+52
-114
lines changed

‎apis/common/parent/zz_generated.deepcopy.go

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mockgcp/mockdataproc/jobs.go

+20-7
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,35 @@ func (s *jobControllerServer) SubmitJob(ctx context.Context, req *pb.SubmitJobRe
8585
if err := s.storage.Create(ctx, fqn, obj); err != nil {
8686
return nil, err
8787
}
88-
8988
updated, err := mutateObject(ctx, s.storage, fqn, func(obj *pb.Job) error {
89+
obj.Status.State = pb.JobStatus_SETUP_DONE
90+
obj.StatusHistory = append(obj.StatusHistory, &pb.JobStatus{
91+
State: pb.JobStatus_PENDING,
92+
StateStartTime: timestamppb.New(now),
93+
})
94+
return nil
95+
})
96+
if err != nil {
97+
return nil, err
98+
}
99+
updated, err = mutateObject(ctx, s.storage, fqn, func(obj *pb.Job) error {
90100
obj.Status.State = pb.JobStatus_RUNNING
101+
obj.StatusHistory = append(obj.StatusHistory, &pb.JobStatus{
102+
State: pb.JobStatus_SETUP_DONE,
103+
StateStartTime: timestamppb.New(now),
104+
})
91105
return nil
92106
})
93107
if err != nil {
94108
return nil, err
95109
}
96110
updated, err = mutateObject(ctx, s.storage, fqn, func(obj *pb.Job) error {
97111
obj.Status.State = pb.JobStatus_DONE
112+
obj.StatusHistory = append(obj.StatusHistory, &pb.JobStatus{
113+
State: pb.JobStatus_RUNNING,
114+
StateStartTime: timestamppb.New(now),
115+
Details: "Agent reported job success",
116+
})
98117
return nil
99118
})
100119
if err != nil {
@@ -177,9 +196,6 @@ func (s *MockService) parseJobName(projectID, region, jobID string) (*jobName, e
177196
if region == "" {
178197
return nil, status.Errorf(codes.InvalidArgument, "region is required")
179198
}
180-
// if jobID == "" {
181-
// return nil, status.Errorf(codes.InvalidArgument, "jobID is required")
182-
// }
183199

184200
name := &jobName{
185201
Project: project,
@@ -201,9 +217,6 @@ func (s *MockService) buildJobName(projectName, region, jobID string) (*jobName,
201217
if region == "" {
202218
return nil, status.Errorf(codes.InvalidArgument, "region is required")
203219
}
204-
// if jobID == "" {
205-
// return nil, status.Errorf(codes.InvalidArgument, "jobID is required")
206-
// }
207220

208221
return &jobName{
209222
Project: project,

‎mockgcp/mockdataproc/normalize.go

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ func (s *MockService) ConfigureVisitor(url string, replacements mockgcpregistry.
3232
replacements.ReplacePath(".clusters[].statusHistory[].stateStartTime", "2024-04-01T12:34:56.123456Z")
3333
replacements.ReplacePath(".metadata.statusHistory[].stateStartTime", "2024-04-01T12:34:56.123456Z")
3434

35+
// Job
36+
replacements.ReplacePath(".statusHistory[].stateStartTime", "2024-04-01T12:34:56.123456Z")
37+
replacements.ReplacePath(".status.stateStartTime", "2024-04-01T12:34:56.123456Z")
38+
3539
// metrics are volatile and more "data plane"
3640
replacements.RemovePath(".metrics")
3741
replacements.RemovePath(".response.metrics")

‎mockgcp/mockdataproc/testdata/cluster/crud/_http.log

+26-6
Original file line numberDiff line numberDiff line change
@@ -318,11 +318,13 @@ X-Xss-Protection: 0
318318
}
319319
},
320320
"labels": {
321+
"cnrm-test": "true",
321322
"goog-dataproc-autozone": "enabled",
322323
"goog-dataproc-cluster-name": "test-${uniqueId}",
323324
"goog-dataproc-cluster-uuid": "${dataStoreClusterUUID}",
324325
"goog-dataproc-location": "us-central1",
325-
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}"
326+
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}",
327+
"managed-by-cnrm": "true"
326328
},
327329
"projectId": "${projectId}"
328330
}
@@ -462,11 +464,13 @@ X-Xss-Protection: 0
462464
}
463465
},
464466
"labels": {
467+
"cnrm-test": "true",
465468
"goog-dataproc-autozone": "enabled",
466469
"goog-dataproc-cluster-name": "test-${uniqueId}",
467470
"goog-dataproc-cluster-uuid": "${dataStoreClusterUUID}",
468471
"goog-dataproc-location": "us-central1",
469-
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}"
472+
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}",
473+
"managed-by-cnrm": "true"
470474
},
471475
"projectId": "${projectId}",
472476
"status": {
@@ -615,11 +619,13 @@ X-Xss-Protection: 0
615619
}
616620
},
617621
"labels": {
622+
"cnrm-test": "true",
618623
"goog-dataproc-autozone": "enabled",
619624
"goog-dataproc-cluster-name": "test-${uniqueId}",
620625
"goog-dataproc-cluster-uuid": "${dataStoreClusterUUID}",
621626
"goog-dataproc-location": "us-central1",
622-
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}"
627+
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}",
628+
"managed-by-cnrm": "true"
623629
},
624630
"projectId": "${projectId}",
625631
"status": {
@@ -831,11 +837,13 @@ X-Xss-Protection: 0
831837
}
832838
},
833839
"labels": {
840+
"cnrm-test": "true",
834841
"goog-dataproc-autozone": "enabled",
835842
"goog-dataproc-cluster-name": "test-${uniqueId}",
836843
"goog-dataproc-cluster-uuid": "${dataStoreClusterUUID}",
837844
"goog-dataproc-location": "us-central1",
838-
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}"
845+
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}",
846+
"managed-by-cnrm": "true"
839847
},
840848
"projectId": "${projectId}"
841849
}
@@ -976,11 +984,13 @@ X-Xss-Protection: 0
976984
}
977985
},
978986
"labels": {
987+
"cnrm-test": "true",
979988
"goog-dataproc-autozone": "enabled",
980989
"goog-dataproc-cluster-name": "test-${uniqueId}",
981990
"goog-dataproc-cluster-uuid": "${dataStoreClusterUUID}",
982991
"goog-dataproc-location": "us-central1",
983-
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}"
992+
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}",
993+
"managed-by-cnrm": "true"
984994
},
985995
"projectId": "${projectId}",
986996
"status": {
@@ -999,6 +1009,10 @@ X-Xss-Protection: 0
9991009
{
10001010
"state": "UPDATING",
10011011
"stateStartTime": "2024-04-01T12:34:56.123456Z"
1012+
},
1013+
{
1014+
"state": "RUNNING",
1015+
"stateStartTime": "2024-04-01T12:34:56.123456Z"
10021016
}
10031017
]
10041018
}
@@ -1140,11 +1154,13 @@ X-Xss-Protection: 0
11401154
}
11411155
},
11421156
"labels": {
1157+
"cnrm-test": "true",
11431158
"goog-dataproc-autozone": "enabled",
11441159
"goog-dataproc-cluster-name": "test-${uniqueId}",
11451160
"goog-dataproc-cluster-uuid": "${dataStoreClusterUUID}",
11461161
"goog-dataproc-location": "us-central1",
1147-
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}"
1162+
"goog-drz-dataproc-uuid": "cluster-${dataStoreClusterUUID}",
1163+
"managed-by-cnrm": "true"
11481164
},
11491165
"projectId": "${projectId}",
11501166
"status": {
@@ -1163,6 +1179,10 @@ X-Xss-Protection: 0
11631179
{
11641180
"state": "UPDATING",
11651181
"stateStartTime": "2024-04-01T12:34:56.123456Z"
1182+
},
1183+
{
1184+
"state": "RUNNING",
1185+
"stateStartTime": "2024-04-01T12:34:56.123456Z"
11661186
}
11671187
]
11681188
}

‎pkg/controller/direct/iam/mapper.generated.go

-99
This file was deleted.

‎tests/e2e/normalize.go

+2
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ func normalizeKRMObject(t *testing.T, u *unstructured.Unstructured, project test
111111
//Specific to Dataproc
112112
visitor.replacePaths[".status.observedState.stateHistory[].stateStartTime"] = "2024-04-01T12:34:56.123456Z"
113113
visitor.replacePaths[".status.observedState.stateTime"] = "2024-04-01T12:34:56.123456Z"
114+
visitor.replacePaths[".status.observedState.statusHistory[].stateStartTime"] = "2024-04-01T12:34:56.123456Z"
115+
visitor.replacePaths[".status.observedState.status.stateStartTime"] = "2024-04-01T12:34:56.123456Z"
114116
visitor.replacePaths[".status.observedState.outputUri"] = "gs://dataproc-staging-us-central1-${projectNumber}-h/google-cloud-dataproc-metainfo/fffc/jobs/srvls-batch/driveroutput"
115117

116118
// Specific to Firestore

0 commit comments

Comments
 (0)